Merge branch 'main' into isaacmilarky/NDH-539-build-missing-query-string-params-search-func

Author: IsaacMilarky

README.md

@@ -72,10 +72,10 @@ A list of core team members responsible for the code and documentation in this r
 
 ## Repository Structure
 
-This is the main repository for the Naitonal Provider Directory (NPD) workstream. You will find more information about each component in a README.md file within its respective directory.
+This is the main repository for the National Provider Directory (NPD) workstream. You will find more information about each component in a README.md file within its respective directory.
 
 - [backend](./backend/): FHIR Provider Directory API and directory browser
-- [frontend](./backend/): Directory browser React application
+- [frontend](./frontend/): Directory browser React application
 - [flyway](./flyway/): Database migrations
 - [playwright](./playwright/): End-to-end test suite
 

backend/app/settings.py

@@ -92,10 +92,16 @@
 CORS_ALLOW_ALL_ORIGINS = True
 CORS_ALLOWED_METHODS = ["GET"]
 
-CSRF_COOKIE_SECURE = config("DJANGO_CSRF_COOKIE_SECURE", cast=bool, default=False)  # Only if using HTTPS
-CSRF_COOKIE_HTTPONLY = config("DJANGO_CSRF_COOKIE_HTTPONLY", cast=bool, default=False) # Must be False for JavaScript access
+CSRF_COOKIE_SECURE = config(
+    "DJANGO_CSRF_COOKIE_SECURE", cast=bool, default=False
+)  # Only if using HTTPS
+CSRF_COOKIE_HTTPONLY = config(
+    "DJANGO_CSRF_COOKIE_HTTPONLY", cast=bool, default=False
+)  # Must be False for JavaScript access
 CSRF_COOKIE_SAMESITE = config("DJANGO_CSRF_COOKIE_SAMESITE", default="Lax")  # or 'Strict' or 'None'
-CSRF_TRUSTED_ORIGINS = config("DJANGO_CSRF_TRUSTED_DOMAINS", default="").split(",")  # Add your domains
+CSRF_TRUSTED_ORIGINS = config("DJANGO_CSRF_TRUSTED_DOMAINS", default="").split(
+    ","
+)  # Add your domains
 
 if DEBUG:
     # in development, allow the frontend app to POST forms to the backend
@@ -226,6 +232,7 @@
         "rest_framework.authentication.SessionAuthentication",
     ],
     "DEFAULT_SCHEMA_CLASS": "drf_spectacular.openapi.AutoSchema",
+    "DEFAULT_RENDERER_CLASSES": ("rest_framework.renderers.JSONRenderer",),
 }
 
 SPECTACULAR_SETTINGS = {
@@ -322,11 +329,7 @@
             "handlers": ["console"],
             "level": LOG_LEVEL,
         },
-        'django.security.csrf': {
-            'handlers': ['console'],
-            'level': LOG_LEVEL,
-            'propagate': False
-        },
+        "django.security.csrf": {"handlers": ["console"], "level": LOG_LEVEL, "propagate": False},
     },
 }
 

backend/app/urls.py

@@ -48,7 +48,7 @@
     # See app/tests/test_routing.py for validation tests to ensure that changes
     # inside npdfhir.urls don't break our routing configuration.
     path("fhir/", include("npdfhir.urls")),
-    path("fhir", npdfhir_router.get_api_root_view, name="api-root"),
+    path("fhir", npdfhir_router.get_api_root_view(), name="api-root"),
     path("admin/", admin.site.urls),
     # everything else goes to provider_directory
     path("", include("provider_directory.urls")),

backend/npdfhir/serializers.py

@@ -613,11 +613,11 @@ class CapabilityStatementSerializer(serializers.Serializer):
     Serializer for FHIR CapablityStatement resource
     """
 
-    def to_representation(self, instance):
+    def to_representation(self):
         request = self.context.get("request")
         baseURL = request.build_absolute_uri("/fhir")
         metadataURL = request.build_absolute_uri(reverse("fhir-metadata"))
-        schemaData = get_schema_data(request, "schema")
+        schemaData = get_schema_data(request)
 
         capability_statement = CapabilityStatement(
             url=metadataURL,

backend/npdfhir/tests/test_basic_views.py

@@ -11,3 +11,11 @@ def test_health_view(self):
         res_obj = response.json()
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(res_obj["status"], "healthy")
+
+    def test_fhir_endpoint_list_without_slash(self):
+        response = self.client.get("/fhir")
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+    def test_fhir_endpoint_list_with_slash(self):
+        response = self.client.get("/fhir/")
+        self.assertEqual(response.status_code, status.HTTP_200_OK)

backend/npdfhir/urls.py

@@ -14,7 +14,7 @@
     re_path("docs/redoc/?", SpectacularRedocView.as_view(url_name="schema"), name="schema-redoc"),
     re_path("docs/?", SpectacularSwaggerView.as_view(url_name="schema"), name="schema-swagger-ui"),
     path("healthCheck", views.health, name="healthCheck"),
-    path("metadata", views.FHIRCapabilityStatementView.as_view(), name="fhir-metadata"),
+    path("metadata/?", views.FHIRCapabilityStatementView.as_view(), name="fhir-metadata"),
     # Router URLs
     # everything else is passed to the rest_framework router to manage
     path("", include(router.urls), name="index"),

backend/npdfhir/utils.py

@@ -1,7 +1,7 @@
 from django.urls import reverse
 from fhir.resources.R4B.address import Address
 from fhir.resources.R4B.reference import Reference
-from rest_framework.test import APIClient
+from drf_spectacular.views import SpectacularJSONAPIView
 
 
 def SmartyStreetstoFHIR(address):
@@ -17,15 +17,13 @@ def SmartyStreetstoFHIR(address):
     )
 
 
-def get_schema_data(request, url_name, additional_args=None):
-    client = APIClient()
-    if request.user:
-        # reuse the authenticated user from the active request to make the
-        # internal request to retrieve the current schema
-        client.force_authenticate(user=request.user)
-    schema_url = reverse(url_name, kwargs=additional_args)
-    response = client.get(schema_url)
-    return response.data
+def get_schema_data(request):
+    schema_view = SpectacularJSONAPIView.as_view()
+    response = schema_view(request._request)
+    # The response contains the schema data in its .data attribute
+    schema_data = response.data
+
+    return schema_data
 
 
 def genReference(url_name, identifier, request):

backend/npdfhir/views.py

@@ -553,7 +553,10 @@ def get(self, request):
         """
         Query metadata about this FHIR instance, represented as FHIR CapabilityStatement resource
         """
-        serializer = CapabilityStatementSerializer(context={"request": request})
-        response = serializer.to_representation(None)
+        serialized_capability_statement = CapabilityStatementSerializer(
+            context={"request": request}
+        )
+
+        response = Response(serialized_capability_statement.to_representation())
 
-        return Response(response)
+        return response

backend/requirements.txt

@@ -47,4 +47,4 @@ text-unidecode==1.3
 types-python-dateutil==2.9.0.20250516
 typing_extensions==4.14.0
 unittest-xml-reporting==3.2.0
-urllib3==2.6.0
+urllib3==2.6.3

etls/loadFIPS/requirements.txt

@@ -3,4 +3,5 @@ pandas==2.3.1
 sqlalchemy==2.0.41
 python-dotenv==1.1.1
 pangres==4.2.1
-psycopg2-binary==2.9.10
+psycopg2-binary==2.9.10
+urllib3==2.6.3