Merge branch 'main' into sjp/streamline-joins

Author: spopelka-dsac

backend/npdfhir/filters/organization_filter_set.py

@@ -1,4 +1,4 @@
-from django.contrib.postgres.search import SearchVector
+from django.contrib.postgres.search import SearchVector, SearchQuery
 from django.db.models import Q
 from django_filters import rest_framework as filters
 
@@ -52,8 +52,10 @@ class Meta:
 
     def filter_name(self, queryset, name, value):
         return (
-            queryset.annotate(search=SearchVector("organizationtoname__name"))
-            .filter(search=value)
+            queryset.annotate(
+                search=SearchVector("organizationtoname__name"),
+            )
+            .filter(search=SearchQuery(value, search_type="plain"))
             .distinct()
         )
 

backend/npdfhir/serializers.py

@@ -417,7 +417,7 @@ def to_representation(self, instance):
             if len(names) > 1:
                 aliases = names[1:]
         if aliases:
-            organization.alias = aliases
+            organization.alias = [n['name'] for n in aliases]
 
         if instance.parent_id is not None:
             organization.partOf = genReference(

backend/npdfhir/tests/fixtures/organization.py

@@ -36,6 +36,7 @@ def create_organization(
     other_state_code="NY",
     other_issuer="New York State Medicaid",
     organization_type=None,
+    aliases=None
 ):
     """
     Creates an Organization + OrganizationToName.
@@ -91,4 +92,12 @@ def create_organization(
         is_primary=True,
     )
 
+    if aliases:
+        for alias in aliases:
+            OrganizationToName.objects.create(
+                organization=org,
+                name=alias,
+                is_primary=False,
+            )
+
     return org