Merge branch 'main' into wbprice/troubleshoot-api-service-not-starting

Author: wbprice

.github/workflows/frontend-test.yml

@@ -0,0 +1,30 @@
+name: Frontend Tests
+permissions:
+  contents: read
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Setup NodeJS
+        uses: actions/setup-node@v4
+
+      - name: Setup frontend
+        working-directory: frontend
+        run: |
+          npm ci
+
+      - name: Run tests
+        working-directory: frontend
+        run: |
+          npm run coverage

.gitignore

@@ -171,7 +171,8 @@ cython_debug/
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
+.idea/
+
 .git-credentials-alt
 
 scratch/

backend/.env_template

@@ -11,6 +11,6 @@ NPD_DB_NAME=''
 NPD_DB_PORT=5432
 NPD_DB_ENGINE='django.db.backends.postgresql'
 DEBUG=True
-DJANGO_ALLOWED_HOSTS=['localhost', '127.0.0.1']
+DJANGO_ALLOWED_HOSTS=['localhost','127.0.0.1','0.0.0.0']
 DJANGO_LOGLEVEL='WARNING'
 NPD_PROJECT_NAME='[Project Name]'

backend/app/settings.py

@@ -15,6 +15,7 @@
 import os
 import sys
 import logging
+from npdfhir.middleware import HealthCheckMiddleware
 
 # Detect if tests are being run
 TESTING = 'test' in sys.argv
@@ -35,7 +36,7 @@
 
 
 if DEBUG:
-    ALLOWED_HOSTS = ['localhost', '127.0.0.1']
+    ALLOWED_HOSTS = ['localhost','127.0.0.1','0.0.0.0']
 else:
     ALLOWED_HOSTS = config("DJANGO_ALLOWED_HOSTS").split(',')
 
@@ -56,13 +57,13 @@
     'django_filters',
     'drf_yasg',
     'xmlrunner',
-    'provider_directory.apps.ProviderDirectory',
 ]
 
 if not TESTING:
     INSTALLED_APPS.append('debug_toolbar')
 
 MIDDLEWARE = [
+    'npdfhir.middleware.HealthCheckMiddleware',
     'corsheaders.middleware.CorsMiddleware',
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',

backend/docker-compose.yml

@@ -54,7 +54,7 @@ services:
       NPD_DJANGO_SECRET: ${NPD_DJANGO_SECRET:-_pth2#=k8-wf-_^t%2))it+3..8la^@@97^#ock7.v=@792w7}
       DEBUG: ${DEBUG:-True}
       DJANGO_LOGLEVEL: ${DJANGO_LOGLEVEL:-INFO}
-      DJANGO_ALLOWED_HOSTS: "${DJANGO_ALLOWED_HOSTS:-['localhost','127.0.0.1']}"
+      DJANGO_ALLOWED_HOSTS: "${DJANGO_ALLOWED_HOSTS:-['localhost','127.0.0.1','0.0.0.0']}"
       NPD_DB_ENGINE: ${NPD_DB_ENGINE:-django.db.backends.postgresql}
       NPD_DB_NAME: ${NPD_DB_NAME:-npd_development}
       NPD_DB_USER: ${NPD_DB_USER:-postgres}

backend/npdfhir/middleware.py

@@ -0,0 +1,10 @@
+from django.http import HttpResponse
+
+class HealthCheckMiddleware:
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        if request.path == '/fhir/healthCheck':
+            return HttpResponse('healthy')
+        return self.get_response(request)

backend/npdfhir/urls.py

@@ -6,6 +6,7 @@
 from debug_toolbar.toolbar import debug_toolbar_urls
 from drf_yasg.views import get_schema_view
 from drf_yasg import openapi
+from django.urls import path
 
 schema_view = get_schema_view(
     openapi.Info(

backend/npdfhir/views.py

@@ -5,7 +5,6 @@
 from rest_framework.response import Response
 from rest_framework.pagination import PageNumberPagination
 from rest_framework.renderers import BrowsableAPIRenderer
-from django.core.cache import cache
 from .models import Provider, EndpointInstance, ClinicalOrganization
 from .serializers import PractitionerSerializer, ClinicalOrganizationSerializer, BundleSerializer, EndpointSerializer
 from .mappings import genderMapping, addressUseMapping
@@ -168,7 +167,11 @@ def list(self, request):
         all_params = request.query_params
 
         providers = Provider.objects.all().prefetch_related(
-            'npi', 'individual', 'individual__individualtoname_set', 'individual__individualtoaddress_set', 'individual__individualtoaddress_set__address__address_us', 'individual__individualtoaddress_set__address__address_us__state_code', 'individual__individualtoaddress_set__address_use', 'individual__individualtophone_set', 'individual__individualtoemail_set', 'providertootherid_set', 'providertotaxonomy_set')
+            'npi', 'individual', 'individual__individualtoname_set', 'individual__individualtoaddress_set',
+            'individual__individualtoaddress_set__address__address_us',
+            'individual__individualtoaddress_set__address__address_us__state_code',
+            'individual__individualtoaddress_set__address_use', 'individual__individualtophone_set',
+            'individual__individualtoemail_set', 'providertootherid_set', 'providertotaxonomy_set')
 
         for param, value in all_params.items():
             match param:
@@ -182,7 +185,8 @@ def list(self, request):
                 case 'name':
                     providers = providers.annotate(
                         search=SearchVector('individual__individualtoname__last_name',
-                                            'individual__individualtoname__first_name', 'individual__individualtoname__middle_name')
+                                            'individual__individualtoname__first_name',
+                                            'individual__individualtoname__middle_name')
                     ).filter(search=value)
                 case 'gender':
                     if value in genderMapping.keys():
@@ -200,7 +204,7 @@ def list(self, request):
                             'individual__individualtoaddress__address__address_us__delivery_line_2',
                             'individual__individualtoaddress__address__address_us__city_name',
                             'individual__individualtoaddress__address__address_us__state_code__abbreviation',
-                            'individual__individualtoaddress__address__address_us__zipcode',)
+                            'individual__individualtoaddress__address__address_us__zipcode', )
                     ).filter(search=value)
                 case 'address-city':
                     providers = providers.annotate(
@@ -284,7 +288,15 @@ def list(self, request):
         all_params = request.query_params
 
         organizations = ClinicalOrganization.objects.all().prefetch_related(
-            'npi', 'organization', 'organization__organizationtoname_set', 'organization__organizationtoaddress_set', 'organization__organizationtoaddress_set__address', 'organization__organizationtoaddress_set__address__address_us', 'organization__organizationtoaddress_set__address__address_us__state_code', 'organization__organizationtoaddress_set__address_use', 'organizationtootherid_set', 'organizationtotaxonomy_set', 'organization__authorized_official__individualtophone_set', 'organization__authorized_official__individualtoname_set', 'organization__authorized_official__individualtoemail_set', 'organization__authorized_official__individualtoaddress_set')
+            'npi', 'organization', 'organization__organizationtoname_set', 'organization__organizationtoaddress_set',
+            'organization__organizationtoaddress_set__address',
+            'organization__organizationtoaddress_set__address__address_us',
+            'organization__organizationtoaddress_set__address__address_us__state_code',
+            'organization__organizationtoaddress_set__address_use', 'organizationtootherid_set',
+            'organizationtotaxonomy_set', 'organization__authorized_official__individualtophone_set',
+            'organization__authorized_official__individualtoname_set',
+            'organization__authorized_official__individualtoemail_set',
+            'organization__authorized_official__individualtoaddress_set')
 
         for param, value in all_params.items():
             match param:
@@ -312,7 +324,7 @@ def list(self, request):
                             'organization__organizationtoaddress__address__address_us__delivery_line_2',
                             'organization__organizationtoaddress__address__address_us__city_name',
                             'organization__organizationtoaddress__address__address_us__state_code__abbreviation',
-                            'organization__organizationtoaddress__address__address_us__zipcode',)
+                            'organization__organizationtoaddress__address__address_us__zipcode', )
                     ).filter(search=value)
                 case 'address-city':
                     organizations = organizations.annotate(

frontend/.gitignore

@@ -25,3 +25,5 @@ dist-ssr
 *.sw?
 
 static/
+
+coverage/