adding latest versions and changes to the offset math test

Author: bwang-icf

apps/fhir/bluebutton/tests/test_utils.py

@@ -235,7 +235,7 @@ def setUp(self):
     def test_crosswalk_fhir_id(self):
         """ Get the Crosswalk FHIR_Id """
 
-        for version in [Versions.V2, Versions.V3]:
+        for version in Versions.latest_versions():
             u = User.objects.create_user(username=f"billybob-{version}",
                                          first_name="Billybob",
                                          last_name="Button",
@@ -258,7 +258,7 @@ def test_crosswalk_fhir_id(self):
 
     def test_crosswalk_not_fhir_id(self):
         """ Get no Crosswalk id """
-        for version in [Versions.V2, Versions.V3]:
+        for version in Versions.latest_versions():
             u = User.objects.create_user(username=f"bobnobob-{version}",
                                          first_name="bob",
                                          last_name="Button",

apps/logging/tests/test_audit_loggers.py

@@ -295,7 +295,7 @@ def catchall(url, request):
             fhir_log_content = get_log_content(self.logger_registry, logging.AUDIT_DATA_FHIR_LOGGER)
             log_entries = fhir_log_content.splitlines()
 
-            self.assertEqual(len(log_entries), 6)
+            self.assertEqual(len(log_entries), 4)
 
             # Validate fhir_auth_pre_fetch entry
             self.assertTrue(

apps/mymedicare_cb/models.py

@@ -17,7 +17,6 @@
 
 MAX_HICN_HASH_LENGTH = 64
 MAX_MBI_LENGTH = 11
-FHIR_ID_VERSIONS_TO_CHECK = [2, 3]
 
 
 class BBMyMedicareCallbackCrosswalkCreateException(APIException):
@@ -69,7 +68,7 @@ def get_and_update_user(slsx_client: OAuth2ConfigSLSx, request):
     # If the lookup for the requested version fails, raise the exception
     # This is wrapped in the case that if the requested version fails, match_fhir_id
     # will still bubble up UpstreamServerException
-    for supported_version in FHIR_ID_VERSIONS_TO_CHECK:
+    for supported_version in Versions.latest_versions():
         try:
             fhir_id, hash_lookup_type = match_fhir_id(
                 mbi=slsx_client.mbi,

apps/testclient/tests.py

@@ -279,7 +279,9 @@ def test_offset_math(self):
         # our control, then these unit tests will always be suspect (including offsets and pagination values).
         # This seems to have been the case 7mo ago with the "total" test, above.
         # self.assertEqual(len(response_data["entry"]), 7)
-        self.assertEqual(len(response_data["entry"]), 5)
+        # From commit f6d4d7dcc91cea27288d4bc280cf0c395c60e6be, there was a change to 12 here.
+        # The changes in that commit are around the logging of fhir_id_v2/fhir_id_v3.
+        self.assertEqual(len(response_data["entry"]), 12)
         previous_links = [
             data["url"]
             for data in response_data["link"]
@@ -292,7 +294,7 @@ def test_offset_math(self):
             data["url"] for data in response_data["link"] if data["relation"] == "first"
         ]
         self.assertEqual(len(previous_links), 1)
-        self.assertEqual(len(next_links), 0)
+        self.assertEqual(len(next_links), 1)
         self.assertEqual(len(first_links), 1)
         self.assertIn("startIndex=13", previous_links[0])
         self.assertIn("startIndex=0", first_links[0])

apps/versions.py

@@ -40,6 +40,9 @@ def as_int(version: int) -> int:
     def supported_versions():
         return [Versions.V1, Versions.V2, Versions.V3]
 
+    def latest_versions():
+        return [Versions.V2, Versions.V3]
+
 
 class AccessType:
     ONE_TIME = 'ONE_TIME'