Cleanup: Remove/add some TODOs

Author: JamesDemeryNava

apps/core/models.py

@@ -1,12 +1,9 @@
 from waffle.models import AbstractUserFlag
-# from django.db import models
 
 
 class Flag(AbstractUserFlag):
     """ Custom version of waffle feature Flag model """
     """ This makes future extensions nicer """
-    # Added as part of BB2-4250 testing
-    # objects = models.Manager()
 
     def is_active_for_user(self, user):
         # use app_user which is the owner of the current app

apps/dot_ext/tests/test_authorization.py

@@ -1038,6 +1038,7 @@ def test_permission_denied_raised_for_authorize_app_not_in_flag(
         # when the validate_v3_authorization_request of AuthorizationView function is called
         # when the v3_early_adopter flag is not active for an application_user
         # set up a fake request
+        # TODO: When we enable v3 endpoints for all applications, remove this test
         query_params = urlencode({'client_id': 'FAKE_CLIENT_ID'})
         request = HttpRequest()
         request.META['QUERY_STRING'] = query_params
@@ -1081,9 +1082,10 @@ def test_permission_denied_raised_for_refresh_token_app_not_in_flag(
         mock_get_application_model,
         mock_get_user_model
     ):
-        # Unit test to show that we will raise an PermissionDenied
+        # BB2-4250Unit test to show that we will raise an PermissionDenied
         # when the validate_v3_token_call of TokenView function is called
         # when the v3_early_adopter flag is not active for an application_user
+        # TODO: When we enable v3 endpoints for all applications, remove this test
         token_value = 'FAKE_REFRESH_TOKEN'
         body = urlencode({'refresh_token': token_value}).encode('utf-8')
         request = HttpRequest()

apps/fhir/bluebutton/views/generic.py

@@ -96,7 +96,6 @@ def initial(self, request, resource_type, *args, **kwargs):
         if "HTTP_AUTHORIZATION" in req_meta:
             access_token = req_meta["HTTP_AUTHORIZATION"].split(" ")[1]
             try:
-                # TODO-4250 is this a place we need a flag check as well?
                 at = AccessToken.objects.get(token=access_token)
                 log_message = {
                     "name": "FHIR Endpoint AT Logging",

apps/fhir/bluebutton/views/read.py

@@ -37,7 +37,6 @@ def initial(self, request, *args, **kwargs):
         return super().initial(request, self.resource_type, *args, **kwargs)
 
     def get(self, request, *args, **kwargs):
-        # 4250-TODO: Do we check for the flag here as well? Implement the same thing in search? In case of refresh token?
         return super().get(request, self.resource_type, *args, **kwargs)
 
     def build_parameters(self, *args, **kwargs):

apps/integration_tests/integration_test_fhir_resources.py

@@ -768,42 +768,48 @@ def _err_response_caused_by_illegalarguments(self, v2=False):
     @override_switch('v3_endpoints', active=True)
     def test_patient_read_endpoint_v3_403(self):
         '''
-        test patient read and search v2
+        test patient read v3 throwing a 403 when an app is not in the flag
+        TODO - Should be removed when v3_early_adopter flag is deleted and v3 is available for all apps
         '''
         self._call_v3_endpoint_to_assert_403(FHIR_RES_TYPE_PATIENT, settings.DEFAULT_SAMPLE_FHIR_ID_V3, False, None)
 
     @override_switch('v3_endpoints', active=True)
     def test_coverage_read_endpoint_v3_403(self):
         '''
-        test patient read and search v2
+        test coverage read v3 throwing a 403 when an app is not in the flag
+        TODO - Should be removed when v3_early_adopter flag is deleted and v3 is available for all apps
         '''
         self._call_v3_endpoint_to_assert_403(FHIR_RES_TYPE_COVERAGE, 'part-a-99999999999999', False, None)
 
     @override_switch('v3_endpoints', active=True)
     def test_eob_read_endpoint_v3_403(self):
         '''
-        test patient read and search v2
+        test eob read v3 throwing a 403 when an app is not in the flag
+        TODO - Should be removed when v3_early_adopter flag is deleted and v3 is available for all apps
         '''
         self._call_v3_endpoint_to_assert_403(FHIR_RES_TYPE_EOB, 'outpatient--9999999999999', False, None)
 
     @override_switch('v3_endpoints', active=True)
     def test_patient_search_endpoint_v3_403(self):
         '''
-        test patient read and search v2
+        test patient search v3 throwing a 403 when an app is not in the flag
+        TODO - Should be removed when v3_early_adopter flag is deleted and v3 is available for all apps
         '''
         self._call_v3_endpoint_to_assert_403(FHIR_RES_TYPE_PATIENT, settings.DEFAULT_SAMPLE_FHIR_ID_V3, True, '_id=')
 
     @override_switch('v3_endpoints', active=True)
     def test_coverage_search_endpoint_v3_403(self):
         '''
-        test patient read and search v2
+        test coverage search v3 throwing a 403 when an app is not in the flag
+        TODO - Should be removed when v3_early_adopter flag is deleted and v3 is available for all apps
         '''
         self._call_v3_endpoint_to_assert_403(FHIR_RES_TYPE_COVERAGE, settings.DEFAULT_SAMPLE_FHIR_ID_V3, True, 'beneficiary=')
 
     @override_switch('v3_endpoints', active=True)
     def test_eob_search_endpoint_v3_403(self):
         '''
-        test patient read and search v2
+        test eob search v3 throwing a 403 when an app is not in the flag
+        TODO - Should be removed when v3_early_adopter flag is deleted and v3 is available for all apps
         '''
         self._call_v3_endpoint_to_assert_403(FHIR_RES_TYPE_EOB, settings.DEFAULT_SAMPLE_FHIR_ID_V3, True, 'patient=')