NDH-800 fix location filters and add tests

Signed-off-by: Isaac Milarsky <isaac.milarsky@hhs.cms.gov>

Author: Isaac Milarsky

backend/npdfhir/filters/organization_affiliation_filter_set.py

@@ -85,16 +85,16 @@ def filter_organization_type(self, queryset, name, value):
         ).filter(
             taxonomy_search=query
         ).distinct()
-
+    
     def filter_location(self, queryset, name, value):
         return queryset.annotate(
             location_search=SearchVector(
-                "location_set__name",
-                "location_set__address__address_us__delivery_line_1",
-                "location_set__address__address_us__delivery_line_2",
-                "location_set__address__address_us__city_name",
-                "location_set__address__address_us__state_code__abbreviation",
-                "location_set__address__address_us__zipcode",
+                "location__name",
+                "location__address__address_us__delivery_line_1",
+                "location__address__address_us__delivery_line_2",
+                "location__address__address_us__city_name",
+                "location__address__address_us__state_code__abbreviation",
+                "location__address__address_us__zipcode",
             )
         ).filter(
             location_search=SearchQuery(value, search_type="websearch")
@@ -103,18 +103,18 @@ def filter_location(self, queryset, name, value):
     def filter_address_city(self, queryset, name, value):
         return queryset.annotate(
             search=SearchVector(
-                "location_set__address__address_us__city_name"
+                "location__address__address_us__city_name"
             )
         ).filter(search=value)
 
     def filter_address_state(self, queryset, name, value):
         return queryset.annotate(
             search=SearchVector(
-                "location_set__address__address_us__state_code__abbreviation"
+                "location__address__address_us__state_code__abbreviation"
             )
         ).filter(search=value)
 
     def filter_address_postalcode(self, queryset, name, value):
         return queryset.filter(
-            location_set__address__address_us__zipcode=value
+            location__address__address_us__zipcode=value
         )

backend/npdfhir/tests/test_organization_affiliation.py

@@ -6,6 +6,7 @@
 from ..models import (
     EhrVendor,
     LocationToEndpointInstance,
+    Location,
     Nucc,
     Organization,
     OtherIdType,
@@ -73,6 +74,10 @@ def setUpTestData(cls):
         loc_good_1 = create_location(
             organization=cls.org_good_1,
             name="Good Location 1",
+            city="Albuquerque",
+            state="NM",
+            zipcode="87101",
+            addr_line_1="807 Dusty Ln"
         )
 
         endpoint_instance = create_endpoint_instance(
@@ -96,8 +101,15 @@ def setUpTestData(cls):
 
         cls.orgs.append(cls.org_good_2)
 
-        loc_good_2a = create_location(organization=cls.org_good_2, name="Location A")
-        loc_good_2b = create_location(organization=cls.org_good_2, name="Location B")
+        loc_good_2a = create_location(
+            organization=cls.org_good_2,
+            name="Location A",
+            city="Springfield",
+            state="MO",
+            zipcode="65203",
+            addr_line_1="403 Spring Ln"
+        )
+        loc_good_2b = create_location(organization=cls.org_good_2, name="Location B", zipcode="01234")
 
         endpoint_good_2a = create_endpoint_instance(
             organization=cls.org_good_2,
@@ -332,6 +344,121 @@ def test_retrieve_single_organization_affil(self):
         self.assertIn("organization", org_affiliation_entry)
         self.assertIn("participatingOrganization", org_affiliation_entry)
         self.assertIn("endpoint", org_affiliation_entry)
+    
+    def test_list_filter_by_address(self):
+        address_search = "807 Dusty Ln"
+        url = reverse("fhir-organizationaffiliation-list")
+        response = self.client.get(url, {"address": address_search})
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        assert_has_results(self, response)
+
+        bundle = response.data["results"]
+
+        for entry in bundle["entry"]:
+            self.assertIn("resource", entry)
+            location_entry = entry["resource"]
+
+            address_lines = []
+            for location in location_entry['location']:
+                loc_id = location['reference'].split('/')[-1]
+                loc_obj = (
+                    Location.objects.filter(pk=loc_id).first()
+                )
+                address_lines.append(loc_obj.address.address_us.delivery_line_1)
+
+            self.assertIn(address_search, address_lines)
+    
+    def test_list_filter_by_address_city(self):
+        address_search = "Springfield"
+        url = reverse("fhir-organizationaffiliation-list")
+        response = self.client.get(url, {"address_city": address_search})
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        assert_has_results(self, response)
+
+        bundle = response.data["results"]
+
+        for entry in bundle["entry"]:
+            self.assertIn("resource", entry)
+            location_entry = entry["resource"]
+
+            address_lines = []
+            for location in location_entry['location']:
+                loc_id = location['reference'].split('/')[-1]
+                loc_obj = (
+                    Location.objects.filter(pk=loc_id).first()
+                )
+                address_lines.append(loc_obj.address.address_us.city_name)
+
+            self.assertIn(address_search, address_lines)
+    
+    def test_list_filter_by_address_state(self):
+        address_search = "NY"
+        url = reverse("fhir-organizationaffiliation-list")
+        response = self.client.get(url, {"address_state": address_search})
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        assert_has_results(self, response)
+
+        bundle = response.data["results"]
+
+        for entry in bundle["entry"]:
+            self.assertIn("resource", entry)
+            location_entry = entry["resource"]
+
+            address_lines = []
+            for location in location_entry['location']:
+                loc_id = location['reference'].split('/')[-1]
+                loc_obj = (
+                    Location.objects.filter(pk=loc_id).first()
+                )
+                address_lines.append(loc_obj.address.address_us.state_code.abbreviation)
+
+            self.assertIn(address_search, address_lines)
+    
+    def test_list_filter_by_address_zipcode(self):
+        address_search = "87101"
+        url = reverse("fhir-organizationaffiliation-list")
+        response = self.client.get(url, {"address_postalcode": address_search})
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        assert_has_results(self, response)
+
+        bundle = response.data["results"]
+
+        for entry in bundle["entry"]:
+            self.assertIn("resource", entry)
+            location_entry = entry["resource"]
+
+            address_lines = []
+            for location in location_entry['location']:
+                loc_id = location['reference'].split('/')[-1]
+                loc_obj = (
+                    Location.objects.filter(pk=loc_id).first()
+                )
+                address_lines.append(loc_obj.address.address_us.zipcode)
+
+            self.assertIn(address_search, address_lines)
+    
+    def test_list_filter_by_address_zipcode_leading_zero(self):
+        address_search = "01234"
+        url = reverse("fhir-organizationaffiliation-list")
+        response = self.client.get(url, {"address_postalcode": address_search})
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        assert_has_results(self, response)
+
+        bundle = response.data["results"]
+
+        for entry in bundle["entry"]:
+            self.assertIn("resource", entry)
+            location_entry = entry["resource"]
+
+            address_lines = []
+            for location in location_entry['location']:
+                loc_id = location['reference'].split('/')[-1]
+                loc_obj = (
+                    Location.objects.filter(pk=loc_id).first()
+                )
+                address_lines.append(loc_obj.address.address_us.zipcode)
+
+            self.assertIn(address_search, address_lines)
 
     def test_retrieve_non_existant_organization_affil(self):
         url = reverse(