Removed exact match param from swagger

core/collections/views.py

@@ -52,7 +52,7 @@
     CanViewConceptDictionaryVersion
 )
 from core.common.serializers import TaskSerializer
-from core.common.swagger_parameters import q_param, compress_header, page_param, verbose_param, exact_match_param, \
+from core.common.swagger_parameters import q_param, compress_header, page_param, verbose_param, \
     include_facets_header, sort_asc_param, sort_desc_param, updated_since_param, include_retired_param, limit_param
 from core.common.tasks import add_references, export_collection, delete_collection, index_expansion_concepts, \
     index_expansion_mappings
@@ -186,7 +186,7 @@ def get_serializer_class(self):
 
     @swagger_auto_schema(
         manual_parameters=[
-            q_param, limit_param, sort_desc_param, sort_asc_param, exact_match_param, page_param, verbose_param,
+            q_param, limit_param, sort_desc_param, sort_asc_param, page_param, verbose_param,
             include_retired_param, updated_since_param, include_facets_header, compress_header
         ]
     )

core/common/mixins.py

@@ -132,9 +132,8 @@ def list(self, request, *args, **kwargs):  # pylint:disable=too-many-locals
         query_params = request.query_params.dict()
         is_csv = query_params.get('csv', False)
         search_string = query_params.get('type', None)
-        exact_match = query_params.get('exact_match', None)
         search_term = query_params.get('q', None)
-        if not exact_match and is_csv:
+        if is_csv:
             pattern = search_term
             if pattern:
                 query_params._mutable = True  # pylint: disable=protected-access

core/common/search.py

@@ -8,13 +8,11 @@
 
 
 class CustomESFacetedSearch(FacetedSearch):
-    def __init__(self, query=None, filters={}, sort=(), exact_match=False):  # pylint: disable=dangerous-default-value
-        self.exact_match = exact_match
+    def __init__(self, query=None, filters={}, sort=()):  # pylint: disable=dangerous-default-value
         super().__init__(query=query, filters=filters, sort=sort)
 
-    def format_search_str(self, search_str):
-        if self.exact_match:
-            return search_str.replace('*', '')
+    @staticmethod
+    def format_search_str(search_str):
         return f"{search_str}*".replace('**', '*')
 
     def query(self, search, query):

core/common/swagger_parameters.py

@@ -21,9 +21,6 @@
 # QUERY PARAMS
 q_param = openapi.Parameter('q', openapi.IN_QUERY, description="search text", type=openapi.TYPE_STRING)
 page_param = openapi.Parameter('page', openapi.IN_QUERY, description="page number", type=openapi.TYPE_INTEGER)
-exact_match_param = openapi.Parameter(
-    'exact_match', openapi.IN_QUERY, description="on | off (no wildcards)", type=openapi.TYPE_STRING, default='off'
-)
 limit_param = openapi.Parameter(
     'limit', openapi.IN_QUERY, description="result list size", type=openapi.TYPE_INTEGER, default=25
 )

core/common/views.py

@@ -57,7 +57,6 @@ class BaseAPIView(generics.GenericAPIView, PathWalkerMixin):
     sort_desc_param = 'sortDesc'
     sort_param = 'sort'
     default_qs_sort_attr = '-updated_at'
-    exact_match = 'exact_match'
     facet_class = None
     total_count = 0
 
@@ -195,9 +194,6 @@ def is_valid_sort(self, field):
 
         return False
 
-    def is_exact_match_on(self):
-        return self.request.query_params.dict().get(self.exact_match, None) == 'on'
-
     def clean_fields(self, fields):
         if self.is_concept_document() and self.request.query_params.get(SEARCH_MAP_CODES_PARAM) in get_falsy_values():
             if isinstance(fields, dict):
@@ -423,7 +419,7 @@ def get_facets(self):
 
             faceted_search = self.facet_class(  # pylint: disable=not-callable
                 self.get_search_string(lower=False),
-                filters=filters, exact_match=True
+                filters=filters
             )
             faceted_search.params(request_timeout=ES_REQUEST_TIMEOUT)
             try:

core/concepts/views.py

@@ -18,7 +18,7 @@
 from core.common.exceptions import Http400, Http403
 from core.common.mixins import ListWithHeadersMixin, ConceptDictionaryMixin
 from core.common.swagger_parameters import (
-    q_param, limit_param, sort_desc_param, page_param, exact_match_param, sort_asc_param, verbose_param,
+    q_param, limit_param, sort_desc_param, page_param, sort_asc_param, verbose_param,
     include_facets_header, updated_since_param, include_inverse_mappings_param, include_retired_param,
     compress_header, include_source_versions_param, include_collection_versions_param, cascade_method_param,
     cascade_map_types_param, cascade_exclude_map_types_param, cascade_hierarchy_param, cascade_mappings_param,
@@ -188,7 +188,7 @@ def _set_source_versions(self):
 
     @swagger_auto_schema(
         manual_parameters=[
-            q_param, limit_param, sort_desc_param, sort_asc_param, exact_match_param, page_param, verbose_param,
+            q_param, limit_param, sort_desc_param, sort_asc_param, page_param, verbose_param,
             include_retired_param, include_inverse_mappings_param, updated_since_param,
             include_facets_header, compress_header
         ]

core/mappings/views.py

@@ -12,7 +12,7 @@
 from core.common.exceptions import Http400
 from core.common.mixins import ListWithHeadersMixin, ConceptDictionaryMixin
 from core.common.swagger_parameters import (
-    q_param, limit_param, sort_desc_param, page_param, exact_match_param, sort_asc_param, verbose_param,
+    q_param, limit_param, sort_desc_param, page_param, sort_asc_param, verbose_param,
     include_facets_header, updated_since_param, include_retired_param,
     compress_header, include_source_versions_param, include_collection_versions_param)
 from core.common.views import SourceChildCommonBaseView, SourceChildExtrasView, \
@@ -92,7 +92,7 @@ def get_queryset(self):
 
     @swagger_auto_schema(
         manual_parameters=[
-            q_param, limit_param, sort_desc_param, sort_asc_param, exact_match_param, page_param, verbose_param,
+            q_param, limit_param, sort_desc_param, sort_asc_param, page_param, verbose_param,
             include_retired_param, updated_since_param,
             include_facets_header, compress_header
         ]

core/sources/views.py

@@ -23,7 +23,7 @@
 from core.common.permissions import CanViewConceptDictionary, CanEditConceptDictionary, HasAccessToVersionedObject, \
     CanViewConceptDictionaryVersion
 from core.common.serializers import TaskSerializer
-from core.common.swagger_parameters import q_param, limit_param, sort_desc_param, sort_asc_param, exact_match_param, \
+from core.common.swagger_parameters import q_param, limit_param, sort_desc_param, sort_asc_param, \
     page_param, verbose_param, include_retired_param, updated_since_param, include_facets_header, compress_header
 from core.common.tasks import export_source, index_source_concepts, index_source_mappings, delete_source
 from core.common.utils import parse_boolean_query_param, compact_dict_by_values, to_parent_uri
@@ -130,7 +130,7 @@ def get_serializer_class(self):
 
     @swagger_auto_schema(
         manual_parameters=[
-            q_param, limit_param, sort_desc_param, sort_asc_param, exact_match_param, page_param, verbose_param,
+            q_param, limit_param, sort_desc_param, sort_asc_param, page_param, verbose_param,
             include_retired_param, updated_since_param, include_facets_header, compress_header
         ]
     )