add TODOs and fix fhir_id not being available in a "list"

Author: clewellyn-nava

apps/fhir/bluebutton/v3/urls.py

@@ -55,6 +55,8 @@
     # C4DIC
     # Digital Insurance Card ViewSet
     # TODO - Change the URI for this endpoint when we finalize
+    # TODO - We are sending this to list even though it is a retrieve BECAUSE we're not asking for a resource id by the
+    # application, which means we're kinda breaking REST principles here.
     re_path(
         r'DigitalInsuranceCard[/]?',
         waffle_switch('v3_endpoints')(DigitalInsuranceCardViewSet.as_view({'get': 'list'}, version=3)),

apps/fhir/bluebutton/views/insurancecard_viewset.py

@@ -1,5 +1,6 @@
-from rest_framework import viewsets, permissions
-from apps.fhir.bluebutton.views.generic import FhirDataView
+from rest_framework import permissions
+from apps.fhir.bluebutton.models import Crosswalk
+from apps.fhir.bluebutton.views.viewsets_base import ResourceViewSet
 from apps.authorization.permissions import DataAccessGrantPermission
 from apps.capabilities.permissions import TokenHasProtectedCapability
 from apps.fhir.bluebutton.permissions import (
@@ -15,7 +16,7 @@ def has_permission(self, request, view) -> bool:  # type: ignore
         return True
 
 
-class DigitalInsuranceCardViewSet(FhirDataView, viewsets.ViewSet):
+class DigitalInsuranceCardViewSet(ResourceViewSet):
     """Digital Insurance Card (bundle) django-rest-framework ViewSet experiment
 
     Args:
@@ -50,8 +51,10 @@ def build_url(self, fhir_settings, resource_type, resource_id=None, *args, **kwa
             # only if called by tests
             return f"{fhir_settings.fhir_url}{resource_type}/"
         else:
+            # TODO - is this preferred (explicit), or should we keep using the implicit model APIS that Django creates?
+            fhir_id = Crosswalk.objects.get(user=self.request.user).fhir_id(self.version)
             if self.version == 3 and getattr(fhir_settings, 'fhir_url_v3', None):
                 fhir_url = fhir_settings.fhir_url_v3
             else:
                 fhir_url = fhir_settings.fhir_url
-            return f"{fhir_url}/v{self.version}/fhir/Patient/{resource_id}/$generate-insurance-card"
+            return f"{fhir_url}/v{self.version}/fhir/Patient/{fhir_id}/$generate-insurance-card"

apps/fhir/bluebutton/views/viewsets_base.py

@@ -35,7 +35,7 @@ def list(self, request, *args, **kwargs):
         out = self.fetch_data(request, self.resource_type, *args, **kwargs)
         return Response(out)
 
-    def retrieve(self, request, resource_id=None, *args, **kwargs):
+    def retrieve(self, request, resource_id, *args, **kwargs):
         out = self.fetch_data(request, self.resource_type, resource_id=resource_id, *args, **kwargs)
         return Response(out)
 
@@ -70,4 +70,4 @@ def filter_parameters(self, request):
 
     # TODO - investigate if this is needed, or if we can assume application/json+fhir everywhere
     def build_parameters(self, request):
-        return {'_format': 'application/json+fhir'}
+        return {'_format': 'application/json'}