check top level military status field in privilege purchase logic

Author: landonshumway-ia

backend/compact-connect/lambdas/python/common/cc_common/data_model/schema/provider/__init__.py

@@ -148,7 +148,7 @@ def currentHomeJurisdiction(self) -> str | None:
         return self._data.get('currentHomeJurisdiction')
 
     @property
-    def militaryStatus(self) -> str:
+    def militaryStatus(self) -> str | None:
         """
         The military audit status of the provider.
 
@@ -158,7 +158,7 @@ def militaryStatus(self) -> str:
         return self._data.get('militaryStatus')
 
     @property
-    def militaryStatusNote(self) -> str:
+    def militaryStatusNote(self) -> str | None:
         """
         The note from the most recent military audit decision (if declined).
 

backend/compact-connect/lambdas/python/purchases/handlers/privileges.py

@@ -9,7 +9,7 @@
     CompactEligibilityStatus,
     HomeJurisdictionChangeStatusEnum,
     LicenseDeactivatedStatusEnum,
-    LicenseEncumberedStatusEnum,
+    LicenseEncumberedStatusEnum, MilitaryAuditStatus,
 )
 from cc_common.data_model.schema.compact import Compact
 from cc_common.data_model.schema.compact.api import CompactOptionsResponseSchema
@@ -339,16 +339,22 @@ def post_purchase_privileges(event: dict, context: LambdaContext):  # noqa: ARG0
             )
 
     license_expiration_date: date = matching_license_record.dateOfExpiration
-    provider_latest_military_status = provider_user_records.get_latest_military_affiliation_status()
-    if provider_latest_military_status == MilitaryAffiliationStatus.INITIALIZING:
+    # make sure latest military file upload was successful
+    provider_latest_military_upload_status = provider_user_records.get_latest_military_affiliation_status()
+    if provider_latest_military_upload_status == MilitaryAffiliationStatus.INITIALIZING:
         # this only occurs if the user's military document was not processed by S3 as expected
         raise CCInvalidRequestException(
             'Your proof of military affiliation documentation was not successfully processed. '
             'Please return to the Military Status page and re-upload your military affiliation '
             'documentation or end your military affiliation.'
         )
 
-    user_active_military = provider_latest_military_status == MilitaryAffiliationStatus.ACTIVE
+    # Get militaryStatus from the provider record
+    # militaryStatus defaults to 'notApplicable' if not present (set in generate_api_response_object)
+    provider_military_status = top_level_provider_record.militaryStatus or MilitaryAuditStatus.NOT_APPLICABLE
+
+    # User is considered active military if their militaryStatus is either 'tentative' or 'approved'
+    user_active_military = provider_military_status in (MilitaryAuditStatus.TENTATIVE, MilitaryAuditStatus.APPROVED)
 
     # Validate attestations are the latest versions before proceeding with the purchase
     _validate_attestations(compact_abbr, body.get('attestations', []), user_active_military)

backend/compact-connect/lambdas/python/purchases/tests/function/test_handlers/test_purchase_privileges.py

@@ -300,10 +300,10 @@ def test_post_purchase_privileges_forbidden_with_recent_encumbrance(self, mock_p
             resp = post_purchase_privileges(event, self.mock_context)
         self.assertEqual(400, resp['statusCode'])
 
-    def _when_testing_military_affiliation_status(
+    def _when_testing_military_status(
         self,
         mock_purchase_client_constructor: MagicMock,
-        military_affiliation_status: str,
+        military_status: str,
         expected_military_parameter: bool,
     ):
         from handlers.privileges import post_purchase_privileges
@@ -312,8 +312,11 @@ def _when_testing_military_affiliation_status(
             mock_purchase_client_constructor
         )
         event = self._when_testing_provider_user_event_with_custom_claims()
-        self._load_military_affiliation_record_data(status=military_affiliation_status)
-        attestations = generate_default_attestation_list(active_military=military_affiliation_status == 'active')
+        # Set militaryStatus on the provider record
+        self.test_data_generator.put_default_provider_record_in_provider_table(
+            value_overrides={'militaryStatus': military_status, 'providerId': TEST_PROVIDER_ID}
+        )
+        attestations = generate_default_attestation_list(active_military=expected_military_parameter)
 
         event['body'] = _generate_test_request_body(attestations=attestations)
 
@@ -324,16 +327,32 @@ def _when_testing_military_affiliation_status(
         self.assertEqual(expected_military_parameter, purchase_client_call_kwargs['user_active_military'])
 
     @patch('handlers.privileges.PurchaseClient')
-    def test_post_purchase_privileges_calls_purchase_client_with_active_military_status(
+    def test_post_purchase_privileges_calls_purchase_client_with_tentative_military_status(
+        self, mock_purchase_client_constructor
+    ):
+        """Test that tentative military status is considered active military."""
+        self._when_testing_military_status(mock_purchase_client_constructor, 'tentative', True)
+
+    @patch('handlers.privileges.PurchaseClient')
+    def test_post_purchase_privileges_calls_purchase_client_with_approved_military_status(
         self, mock_purchase_client_constructor
     ):
-        self._when_testing_military_affiliation_status(mock_purchase_client_constructor, 'active', True)
+        """Test that approved military status is considered active military."""
+        self._when_testing_military_status(mock_purchase_client_constructor, 'approved', True)
 
     @patch('handlers.privileges.PurchaseClient')
-    def test_post_purchase_privileges_calls_purchase_client_with_inactive_military_status(
+    def test_post_purchase_privileges_calls_purchase_client_with_declined_military_status(
         self, mock_purchase_client_constructor
     ):
-        self._when_testing_military_affiliation_status(mock_purchase_client_constructor, 'inactive', False)
+        """Test that declined military status is not considered active military."""
+        self._when_testing_military_status(mock_purchase_client_constructor, 'declined', False)
+
+    @patch('handlers.privileges.PurchaseClient')
+    def test_post_purchase_privileges_calls_purchase_client_with_not_applicable_military_status(
+        self, mock_purchase_client_constructor
+    ):
+        """Test that notApplicable military status is not considered active military."""
+        self._when_testing_military_status(mock_purchase_client_constructor, 'notApplicable', False)
 
     @patch('handlers.privileges.PurchaseClient')
     def test_post_purchase_privileges_raises_exception_when_military_affiliation_in_initializing_status(
@@ -948,14 +967,17 @@ def test_post_purchase_privileges_validates_investigation_attestations(self, moc
 
     @patch('handlers.privileges.PurchaseClient')
     def test_post_purchase_privileges_validates_military_attestation(self, mock_purchase_client_constructor):
-        """Test that military attestation is required when user has active military affiliation."""
+        """Test that military attestation is required when user has active military status (tentative or approved)."""
         from handlers.privileges import post_purchase_privileges
 
         self._when_purchase_client_successfully_processes_request(mock_purchase_client_constructor)
-        self._load_military_affiliation_record_data(status='active')
 
         event = self._when_testing_provider_user_event_with_custom_claims()
         event['body'] = _generate_test_request_body()
+        # Set militaryStatus to 'approved' on the provider record
+        self.test_data_generator.put_default_provider_record_in_provider_table(
+            value_overrides={'militaryStatus': 'approved', 'providerId': TEST_PROVIDER_ID}
+        )
 
         resp = post_purchase_privileges(event, self.mock_context)
         self.assertEqual(400, resp['statusCode'], resp['body'])