merge with main

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

Author: Isaac Milarsky

backend/npdfhir/tests/test_organization_affiliation.py

@@ -19,6 +19,7 @@
     assert_fhir_response,
     assert_has_results,
     extract_resource_ids,
+    extract_resource_fields
 )
 
 
@@ -221,53 +222,53 @@ def test_list_default(self):
             self.assertIn("participatingOrganization", org_affiliation_entry)
             self.assertIn("endpoint", org_affiliation_entry)
 
-    #    def test_list_in_default_order(self):
-    #        url = reverse("fhir-organizationaffiliation-list")
-    #        response = self.client.get(url)
-    #        assert_fhir_response(self, response)
-    #
-    #        particpiationg_orgs = extract_resource_fields(response, "participatingOrganization")
-    #        participating_org_names = [org["display"] for org in particpiationg_orgs]
-    #
-    #        sorted = ["A Good Clinical Org", "B Good Clinical Org", "C Good Clinical Org"]
-    #
-    #        self.assertEqual(
-    #            participating_org_names,
-    #            sorted,
-    #            f"Expected fhir org affilations sorted by participating org name but got {participating_org_names}\n Sorted: {sorted}",
-    #        )
-    #
-    #    def test_list_in_descending_order(self):
-    #        url = reverse("fhir-organizationaffiliation-list")
-    #        response = self.client.get(url, {"_sort": "-organization_name"})
-    #        assert_fhir_response(self, response)
-    #
-    #        particpiationg_orgs = extract_resource_fields(response, "participatingOrganization")
-    #        participating_org_names = [org["display"] for org in particpiationg_orgs]
-    #
-    #        sorted = ["C Good Clinical Org", "B Good Clinical Org", "A Good Clinical Org"]
-    #
-    #        self.assertEqual(
-    #            participating_org_names,
-    #            sorted,
-    #            f"Expected fhir org affilations sorted in descending order by participating org name but got {participating_org_names}\n Sorted: {sorted}",
-    #        )
-    #
-    #    def test_list_in_ehr_vendor_order(self):
-    #        url = reverse("fhir-organizationaffiliation-list")
-    #        response = self.client.get(url, {"_sort": "ehr_vendor_name"})
-    #        assert_fhir_response(self, response)
-    #
-    #        ehr_orgs = extract_resource_fields(response, "organization")
-    #        ehr_org_names = [org["display"] for org in ehr_orgs]
-    #
-    #        sorted = ["Epic", "Legendary", "Zod"]
-    #
-    #        self.assertEqual(
-    #            ehr_org_names,
-    #            sorted,
-    #            f"Expected fhir org affilations sorted in descending order by ehr org name but got {ehr_org_names}\n Sorted: {sorted}",
-    #        )
+    def test_list_in_default_order(self):
+        url = reverse("fhir-organizationaffiliation-list")
+        response = self.client.get(url)
+        assert_fhir_response(self, response)
+
+        particpiationg_orgs = extract_resource_fields(response, "participatingOrganization")
+        participating_org_names = [org["display"] for org in particpiationg_orgs]
+
+        sorted = ["A Good Clinical Org", "B Good Clinical Org", "C Good Clinical Org"]
+
+        self.assertEqual(
+            participating_org_names,
+            sorted,
+            f"Expected fhir org affilations sorted by participating org name but got {participating_org_names}\n Sorted: {sorted}",
+        )
+
+    def test_list_in_descending_order(self):
+        url = reverse("fhir-organizationaffiliation-list")
+        response = self.client.get(url, {"_sort": "-organization_name"})
+        assert_fhir_response(self, response)
+
+        particpiationg_orgs = extract_resource_fields(response, "participatingOrganization")
+        participating_org_names = [org["display"] for org in particpiationg_orgs]
+
+        sorted = ["C Good Clinical Org", "B Good Clinical Org", "A Good Clinical Org"]
+
+        self.assertEqual(
+            participating_org_names,
+            sorted,
+            f"Expected fhir org affilations sorted in descending order by participating org name but got {participating_org_names}\n Sorted: {sorted}",
+        )
+
+    def test_list_in_ehr_vendor_order(self):
+        url = reverse("fhir-organizationaffiliation-list")
+        response = self.client.get(url, {"_sort": "ehr_vendor_name"})
+        assert_fhir_response(self, response)
+
+        ehr_orgs = extract_resource_fields(response, "organization")
+        ehr_org_names = [org["display"] for org in ehr_orgs]
+
+        sorted = ["Epic", "Legendary", "Zod"]
+
+        self.assertEqual(
+            ehr_org_names,
+            sorted,
+            f"Expected fhir org affilations sorted in descending order by ehr org name but got {ehr_org_names}\n Sorted: {sorted}",
+        )
 
     def test_list_has_correct_orgs(self):
         url = reverse("fhir-organizationaffiliation-list")
@@ -277,7 +278,7 @@ def test_list_has_correct_orgs(self):
 
         valid_ids = [str(org.id) for org in self.orgs]
 
-        self.assertEqual(ids, valid_ids)
+        self.assertEqual(sorted(ids), sorted(valid_ids))
 
     def test_list_does_not_have_incorrect_orgs(self):
         url = reverse("fhir-organizationaffiliation-list")

backend/npdfhir/views.py

@@ -465,18 +465,11 @@ def get(self, request):
 
 
 class FHIROrganizationAffiliationViewSet(viewsets.GenericViewSet):
-    queryset = Organization.objects.none()
-    if DEBUG:
-        renderer_classes = [FHIRRenderer, BrowsableAPIRenderer]
-    else:
-        renderer_classes = [FHIRRenderer]
-    filter_backends = [DjangoFilterBackend, ParamOrderingFilter]
-    filterset_class = OrganizationAffiliationFilterSet
-    pagination_class = CustomPaginator
+    """
+    ViewSet for FHIR EHR Vendor to Organizaton relationships
+    """
 
-    ordering = ["organization_name"]
-    ordering_fields = ["ehr_vendor_name", "organization_name", "endpoint_name"]
-    lookup_url_kwarg = "id"
+    #queryset = Organization.objects.none()
 
     endpoint_subquery = LocationToEndpointInstance.objects.filter(
         location__organization=OuterRef("pk"), endpoint_instance__ehr_vendor__isnull=False
@@ -530,9 +523,21 @@ class FHIROrganizationAffiliationViewSet(viewsets.GenericViewSet):
             participating_npi=F("clinicalorganization__npi__npi"),
         )
         .distinct()
-        .order_by("organization_name")
     )
 
+    if DEBUG:
+        renderer_classes = [FHIRRenderer, BrowsableAPIRenderer]
+    else:
+        renderer_classes = [FHIRRenderer]
+    filter_backends = [DjangoFilterBackend, ParamOrderingFilter]
+    filterset_class = OrganizationAffiliationFilterSet
+    pagination_class = CustomPaginator
+
+    ordering = ["organization_name"]
+    ordering_fields = ["ehr_vendor_name", "organization_name"]
+    lookup_url_kwarg = "id"
+
+    # permission_classes = [permissions.IsAuthenticated]
     @extend_schema(
         responses={
             200: OpenApiResponse(description=docs.endpoints.organization_affiliation.list_response)