fix comments on viewsets

Author: clewellyn-nava

apps/fhir/bluebutton/views/insurancecard.py

@@ -27,8 +27,8 @@ class DigitalInsuranceCardSearchView(FhirDataView):
         HasDigitalInsuranceCardScope,
     ]
 
-    required_coverage_scopes = ['patient/Coverage.rs', 'patient/Coverage.s', 'patient/Coverage.read']
-    required_patient_scopes = ['patient/Patient.r', 'patient/Patient.rs', 'patient/Patient.read']
+    required_coverage_search_scopes = ['patient/Coverage.rs', 'patient/Coverage.s', 'patient/Coverage.read']
+    required_patient_read_scopes = ['patient/Patient.r', 'patient/Patient.rs', 'patient/Patient.read']
 
     def __init__(self, version=1):
         super().__init__(version)

apps/fhir/bluebutton/views/insurancecard_viewset.py

@@ -28,8 +28,8 @@ class DigitalInsuranceCardViewSet(FhirDataView, viewsets.ViewSet):
     version = 1
     resource_type = 'Bundle'
 
-    required_coverage_scopes = ['patient/Coverage.rs', 'patient/Coverage.s', 'patient/Coverage.read']
-    required_patient_scopes = ['patient/Patient.r', 'patient/Patient.rs', 'patient/Patient.read']
+    required_coverage_search_scopes = ['patient/Coverage.rs', 'patient/Coverage.s', 'patient/Coverage.read']
+    required_patient_read_scopes = ['patient/Patient.r', 'patient/Patient.rs', 'patient/Patient.read']
 
     permission_classes = [
         permissions.IsAuthenticated,
@@ -48,7 +48,7 @@ def initial(self, request, *args, **kwargs):
         return super().initial(request, self.resource_type, *args, **kwargs)
 
     def list(self, request, *args, **kwargs):
-        """Equivalent to get() in FhirDataView"""
+        '''Equivalent to get() in FhirDataView'''
         out = self.fetch_data(request, self.resource_type, *args, **kwargs)
         return Response(out)
 

apps/fhir/bluebutton/views/patient_viewset.py

@@ -59,6 +59,7 @@ def get_permissions(self):
         return [p() for p in perm_classes]
 
     def list(self, request, *args, **kwargs):
+        '''Equivalent to get() in FhirDataView'''
         out = self.fetch_data(request, self.resource_type, *args, **kwargs)
         return Response(out)
 
@@ -70,12 +71,9 @@ def build_parameters(self, request):
         return {'_format': 'application/json+fhir'}
 
     def build_url(self, fhir_settings, resource_type, resource_id=None, *args, **kwargs):
-        # Similar to the previous SearchView / ReadView implementations
         if fhir_settings.fhir_url.endswith('v1/fhir/'):
-            if resource_id:
-                return f"{fhir_settings.fhir_url}{resource_type}/{resource_id}/"
-            else:
-                return f"{fhir_settings.fhir_url}{resource_type}/"
+            # only if called by tests
+            return '{}{}/{}/'.format(fhir_settings.fhir_url, resource_type, resource_id)
         else:
             if self.version == 3 and getattr(fhir_settings, 'fhir_url_v3', None):
                 fhir_url = fhir_settings.fhir_url_v3