fixing small merge conflict

Author: spopelka-dsac

backend/npdfhir/views.py

@@ -31,6 +31,7 @@
     Provider,
     ProviderToLocation,
     OrganizationToAddress,
+    OrganizationToName,
     IndividualToAddress,
 )
 
@@ -318,34 +319,38 @@ class FHIROrganizationViewSet(viewsets.GenericViewSet):
     ViewSet for FHIR Organization resources
     """
 
-    queryset = Organization.objects.annotate(
-        primary_name=Subquery(
-            OrganizationToName.objects.filter(
-                organization_id=OuterRef("pk"),
-                is_primary=True,
-            ).values("name")[:1]
+    queryset = (
+        Organization.objects.annotate(
+            primary_name=Subquery(
+                OrganizationToName.objects.filter(
+                    organization_id=OuterRef("pk"),
+                    is_primary=True,
+                ).values("name")[:1]
+            )
+        )
+        .all()
+        .prefetch_related(
+            "authorized_official",
+            "ein",
+            "organizationtoname_set",
+            "organizationtoaddress_set",
+            "organizationtoaddress_set__address",
+            "organizationtoaddress_set__address__address_us",
+            "organizationtoaddress_set__address__address_us__state_code",
+            "organizationtoaddress_set__address_use",
+            "authorized_official__individualtophone_set",
+            "authorized_official__individualtoname_set",
+            "authorized_official__individualtoemail_set",
+            "authorized_official__individualtoaddress_set",
+            "authorized_official__individualtoaddress_set__address__address_us",
+            "authorized_official__individualtoaddress_set__address__address_us__state_code",
+            "clinicalorganization",
+            "clinicalorganization__npi",
+            "clinicalorganization__organizationtootherid_set",
+            "clinicalorganization__organizationtootherid_set__other_id_type",
+            "clinicalorganization__organizationtotaxonomy_set",
+            "clinicalorganization__organizationtotaxonomy_set__nucc_code",
         )
-    ).all().prefetch_related(
-        "authorized_official",
-        "ein",
-        "organizationtoname_set",
-        "organizationtoaddress_set",
-        "organizationtoaddress_set__address",
-        "organizationtoaddress_set__address__address_us",
-        "organizationtoaddress_set__address__address_us__state_code",
-        "organizationtoaddress_set__address_use",
-        "authorized_official__individualtophone_set",
-        "authorized_official__individualtoname_set",
-        "authorized_official__individualtoemail_set",
-        "authorized_official__individualtoaddress_set",
-        "authorized_official__individualtoaddress_set__address__address_us",
-        "authorized_official__individualtoaddress_set__address__address_us__state_code",
-        "clinicalorganization",
-        "clinicalorganization__npi",
-        "clinicalorganization__organizationtootherid_set",
-        "clinicalorganization__organizationtootherid_set__other_id_type",
-        "clinicalorganization__organizationtotaxonomy_set",
-        "clinicalorganization__organizationtotaxonomy_set__nucc_code",
     )
     if DEBUG:
         renderer_classes = [FHIRRenderer, BrowsableAPIRenderer]