Current state

Author: jadudm

Makefile

@@ -20,4 +20,8 @@ build-local:
 	cd dev-local ; make build-local ; cd ..
 
 run-local:
-	cd dev-local ; make run-local ; cd ..
+	cd dev-local ; make run-local ; cd ..
+
+exec-web:
+	cd dev-local ; make exec-web ; cd ..
+	

apps/fhir/bluebutton/v3/urls.py

@@ -17,6 +17,12 @@
 admin.autodiscover()
 
 urlpatterns = [
+    # IF WE DECIDE TO MIRROR BFD
+    # re_path(
+    #     r"Patient/(?P<resource_id>/$generate_insurance_card[^/]+)",
+    #     waffle_switch('v3_endpoints')(DigitalInsuranceCardView.as_view(version=3)),
+    #     name='bb_oauth_fhir_dic_read',
+    # ),
     # Patient ReadView
     re_path(
         r"Patient/(?P<resource_id>[^/]+)",

apps/fhir/bluebutton/views/insurancecard.py

@@ -4,6 +4,7 @@
                                               ApplicationActivePermission)
 from apps.authorization.permissions import DataAccessGrantPermission
 from apps.capabilities.permissions import TokenHasProtectedCapability
+from django.http import JsonResponse
 
 from rest_framework import permissions  # pyright: ignore[reportMissingImports]
 
@@ -79,18 +80,38 @@ def get(self, request, *args, **kwargs):
         print("GET OF INSURANCE CARD")
         print("request: ", request.__dict__)
         print("self.resource_type: ", self.resource_type)
-        return super().get(request, self.resource_type, *args, **kwargs)
-        # return JsonResponse(status=200, data={"ok": "go"})
+        # return super().get(request, self.resource_type, *args, **kwargs)
+        return JsonResponse(status=200, data={"ok": "go"})
 
     # How do the has_permission herre and the has_permission in the permission classes
     # play together? If they pass, can this fail? Visa-versa?
+    # def has_permission(self, request, view) -> bool:  # type: ignore
+    #     required_scopes = getattr(view, 'required_scopes', None)
+    #     if required_scopes is None:
+    #         return True
+
+    #     if hasattr(request, 'auth') and request.auth is not None:
+    #         token_scopes = request.auth.scope
+    #         return any(scope in token_scopes for scope in required_scopes)
+    #     return False
+
+    def has_permission(self, request, view):
+        # TODO: Why is this not being called?
+        # A print statement where this comment is does not appear when unit tests are run.
+        # But, the permission classes run. Where/when does has_permission get called?
+        # required_scopes = getattr(view, 'required_scopes', None)
+        # if required_scopes is None:
+        #     return False
+        # return request.user.is_authenticated and hasattr(request.user, 'crosswalk')
+        return True
 
     def build_parameters(self, request):
         return {
             '_format': 'application/json'
         }
 
     def build_url(self, fhir_settings, resource_type, resource_id=None, *args, **kwargs):
+        print("BUILD_URL IN DIGITALINSURANCECARD")
         if fhir_settings.fhir_url.endswith('v1/fhir/'):
             # only if called by tests
             return f"{fhir_settings.fhir_url}{resource_type}/"

apps/fhir/bluebutton/views/read.py

@@ -40,6 +40,7 @@ def build_parameters(self, *args, **kwargs):
         }
 
     def build_url(self, fhir_settings, resource_type, resource_id, **kwargs):  # type: ignore
+        print("THIS IS THE BUILD_URL IN READ.PY")
         if fhir_settings.fhir_url.endswith('v1/fhir/'):
             # only if called by tests
             return '{}{}/{}/'.format(fhir_settings.fhir_url, resource_type, resource_id)

apps/testclient/constants.py

@@ -49,8 +49,9 @@ def fmt(name: str, uri: str, version: int, patient: str = BAD_PATIENT_ID):
             case EndpointUrl.coverage:
                 return f'{uri}/{version_as_string}/fhir/Coverage/?_format=application/fhir+json'
             case EndpointUrl.digital_insurance_card:
-                # return f'{uri}/{version_as_string}/fhir/DigitalInsuranceCard/?_format=application/fhir+json'
-                return f"{uri}/{version_as_string}/fhir/Patient/{patient}/$generate-insurance-card"
+                return f'{uri}/{version_as_string}/fhir/DigitalInsuranceCard/?_format=application/fhir+json'
+                # return f"{uri}/{version_as_string}/fhir/Patient/{patient}/$generate-insurance-card"
+                # ?_format=application/fhir+json
             case _:
                 logger.error(f'Could not match name in EndpointUrl: {name}')
 

apps/testclient/views.py

@@ -87,8 +87,8 @@ def _get_fhir_data_as_json(request: HttpRequest, params: FhirDataParams) -> Dict
     if params.version in [Versions.V1, Versions.V2] and request.GET.get('nav_link', None):
         uri = _build_pagination_uri(uri, params, request)
 
-    oas = _get_oauth2_session_with_token(request)
-    r = oas.get(uri)
+    oath_session = _get_oauth2_session_with_token(request)
+    r = oath_session.get(uri)
 
     try:
         result_json = r.json()

dev-local/Makefile

@@ -8,17 +8,14 @@ build-local:
     	--platform "linux/amd64" \
     	-t bb-local:latest \
     	-f Dockerfile.local ..
-# TODO: Is this necessary in a local build? Probably not.
-#	@echo "building selenium ecr image"
-# 	cd ../dev-local ; docker build \
-#     	--platform "linux/amd64" \
-#     	-t selenium-ecr:latest \
-#     	-f Dockerfile.selenium-ecr ..
 	cd ../dev-local ; docker build \
     	--platform "linux/amd64" \
     	-t selenium-local:latest \
     	-f Dockerfile.selenium-local ..
+
 run-local:
 	@echo "Configuring for ${ENV}" ; \
 		./run-appropriate-stack.bash
-	
+
+exec-web:
+	docker exec -it `docker ps -aqf "name=.*web.*"` /bin/bash