PR feedback

- removed blocksFuturePrivileges field from API request body
- using enum for AA action against values
- removed unneeded linter suppressions

Author: landonshumway-ia

backend/compact-connect/lambdas/python/common/cc_common/data_model/data_client.py

@@ -13,7 +13,7 @@
 from cc_common.data_model.schema import PrivilegeRecordSchema
 from cc_common.data_model.schema.adverse_action import AdverseActionData
 from cc_common.data_model.schema.base_record import SSNIndexRecordSchema
-from cc_common.data_model.schema.common import ActiveInactiveStatus, CompactEligibilityStatus
+from cc_common.data_model.schema.common import ActiveInactiveStatus, CompactEligibilityStatus, UpdateCategory
 from cc_common.data_model.schema.home_jurisdiction.record import ProviderHomeJurisdictionSelectionRecordSchema
 from cc_common.data_model.schema.license import LicenseData, LicenseUpdateData
 from cc_common.data_model.schema.military_affiliation.common import (
@@ -1018,7 +1018,7 @@ def encumber_privilege(self, adverse_action: AdverseActionData) -> None:
             privilege_update_record = PrivilegeUpdateData.create_new(
                 {
                     'type': 'privilegeUpdate',
-                    'updateType': 'encumbrance',
+                    'updateType': UpdateCategory.ENCUMBRANCE,
                     'providerId': adverse_action.provider_id,
                     'compact': adverse_action.compact,
                     'jurisdiction': adverse_action.jurisdiction,

backend/compact-connect/lambdas/python/common/cc_common/data_model/provider_record_util.py

@@ -2,7 +2,7 @@
 from enum import StrEnum
 
 from cc_common.config import logger
-from cc_common.data_model.schema.common import ActiveInactiveStatus, CompactEligibilityStatus
+from cc_common.data_model.schema.common import ActiveInactiveStatus, AdverseActionAgainstEnum, CompactEligibilityStatus
 from cc_common.data_model.schema.license.api import LicenseUpdatePreviousResponseSchema
 from cc_common.data_model.schema.military_affiliation.common import MilitaryAffiliationStatus
 from cc_common.data_model.schema.privilege.api import PrivilegeUpdatePreviousGeneralResponseSchema
@@ -146,8 +146,8 @@ def populate_provider_record(provider_id: str, license_record: dict, privilege_r
             }
         )
 
-    @classmethod
-    def assemble_provider_records_into_object(cls, provider_records: list[dict]) -> dict:
+    @staticmethod
+    def assemble_provider_records_into_object(provider_records: list[dict]) -> dict:
         """
         Assemble a list of provider records into a single object.
 
@@ -193,9 +193,9 @@ def assemble_provider_records_into_object(cls, provider_records: list[dict]) ->
                     privileges[f'{record["jurisdiction"]}-{record["licenseType"]}']['history'].append(record)
                 case 'adverseAction':
                     logger.debug('Identified adverse action record')
-                    if record['actionAgainst'] == 'privilege':
+                    if record['actionAgainst'] == AdverseActionAgainstEnum.PRIVILEGE:
                         privileges[f'{record["jurisdiction"]}-{record["licenseType"]}']['adverseActions'].append(record)
-                    elif record['actionAgainst'] == 'license':
+                    elif record['actionAgainst'] == AdverseActionAgainstEnum.LICENSE:
                         licenses[f'{record["jurisdiction"]}-{record["licenseType"]}']['adverseActions'].append(record)
 
         if provider is None:

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

@@ -65,14 +65,6 @@ def action_against(self) -> str:
     def action_against(self, action_against_enum: AdverseActionAgainstEnum) -> None:
         self._data['actionAgainst'] = action_against_enum.value
 
-    @property
-    def blocks_future_privileges(self) -> bool:
-        return self._data['blocksFuturePrivileges']
-
-    @blocks_future_privileges.setter
-    def blocks_future_privileges(self, value: bool) -> None:
-        self._data['blocksFuturePrivileges'] = value
-
     @property
     def clinical_privilege_action_category(self) -> str:
         return self._data['clinicalPrivilegeActionCategory']

backend/compact-connect/lambdas/python/common/cc_common/data_model/schema/adverse_action/api.py

@@ -1,8 +1,9 @@
 # ruff: noqa: N801, N815  invalid-name
-from marshmallow.fields import Boolean, Date, Raw, String
+from marshmallow.fields import Date, Raw, String
 from marshmallow.validate import OneOf
 
 from cc_common.data_model.schema.base_record import ForgivingSchema
+from cc_common.data_model.schema.common import AdverseActionAgainstEnum
 from cc_common.data_model.schema.fields import ClinicalPrivilegeActionCategoryField, Compact, Jurisdiction
 
 
@@ -18,7 +19,6 @@ class AdverseActionPostRequestSchema(ForgivingSchema):
 
     encumbranceEffectiveDate = Date(required=True, allow_none=False)
     clinicalPrivilegeActionCategory = ClinicalPrivilegeActionCategoryField(required=True, allow_none=False)
-    blocksFuturePrivileges = Boolean(required=True, allow_none=False)
 
 
 class AdverseActionPublicResponseSchema(ForgivingSchema):
@@ -35,10 +35,9 @@ class AdverseActionPublicResponseSchema(ForgivingSchema):
     jurisdiction = Jurisdiction(required=True, allow_none=False)
     licenseTypeAbbreviation = String(required=True, allow_none=False)
     licenseType = String(required=True, allow_none=False)
-    actionAgainst = String(required=True, allow_none=False, validate=OneOf(['privilege', 'license']))
+    actionAgainst = String(required=True, allow_none=False, validate=OneOf([e for e in AdverseActionAgainstEnum]))
 
     # Populated on creation
-    blocksFuturePrivileges = Boolean(required=True, allow_none=False)
     creationEffectiveDate = Raw(required=True, allow_none=False)
     creationDate = Raw(required=True, allow_none=False)
     adverseActionId = Raw(required=True, allow_none=False)

backend/compact-connect/lambdas/python/common/cc_common/data_model/schema/adverse_action/record.py

@@ -30,7 +30,7 @@ class AdverseActionRecordSchema(BaseRecordSchema):
     actionAgainst = String(required=True, allow_none=False, validate=OneOf([e.value for e in AdverseActionAgainstEnum]))
 
     # Populated on creation
-    blocksFuturePrivileges = Boolean(required=True, allow_none=False)
+    blocksFuturePrivileges = Boolean(required=True, allow_none=False, default=True)
     clinicalPrivilegeActionCategory = ClinicalPrivilegeActionCategoryField(required=True, allow_none=False)
     creationEffectiveDate = Date(required=True, allow_none=False)
     submittingUser = UUID(required=True, allow_none=False)
@@ -42,7 +42,7 @@ class AdverseActionRecordSchema(BaseRecordSchema):
     liftingUser = UUID(required=False, allow_none=False)
 
     @pre_dump
-    def generate_pk_sk(self, in_data, **_kwargs):  # noqa: ARG001 unused-argument
+    def generate_pk_sk(self, in_data, **_kwargs):
         in_data = self._populate_adverse_action_id(in_data)
         in_data['pk'] = f'{in_data["compact"]}#PROVIDER#{in_data["providerId"]}'
         # ensure this is passed in lowercase

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

@@ -47,20 +47,20 @@ class BaseRecordSchema(ForgivingSchema, ABC):
     type = String(required=True, allow_none=False)
 
     @post_load
-    def drop_base_gen_fields(self, in_data, **_kwargs):  # noqa: ARG001 unused-argument
+    def drop_base_gen_fields(self, in_data, **_kwargs):
         """Drop the db-specific pk and sk fields before returning loaded data"""
         del in_data['pk']
         del in_data['sk']
         return in_data
 
     @pre_dump
-    def populate_type(self, in_data, **_kwargs):  # noqa: ARG001 unused-argument
+    def populate_type(self, in_data, **_kwargs):
         """Populate db-specific fields before dumping to the database"""
         in_data['type'] = self._record_type
         return in_data
 
     @pre_dump
-    def populate_date_of_update(self, in_data, **_kwargs):  # noqa: ARG001 unused-argument
+    def populate_date_of_update(self, in_data, **_kwargs):
         """Populate db-specific fields before dumping to the database"""
         # set the dateOfUpdate field to the current UTC time
         in_data['dateOfUpdate'] = config.current_standard_datetime

backend/compact-connect/lambdas/python/common/tests/resources/api/adverse-action-post.json

@@ -1,5 +1,4 @@
 {
   "encumbranceEffectiveDate": "2023-01-15",
-  "clinicalPrivilegeActionCategory": "Unsafe Practice or Substandard Care",
-  "blocksFuturePrivileges": true
+  "clinicalPrivilegeActionCategory": "Unsafe Practice or Substandard Care"
 }

backend/compact-connect/lambdas/python/common/tests/unit/test_data_model/test_schema/test_adverse_action.py

@@ -106,7 +106,6 @@ def test_adverse_action_data_class_getters_return_expected_values(self):
         self.assertEqual(adverse_action.jurisdiction, adverse_action_data['jurisdiction'])
         self.assertEqual(adverse_action.license_type_abbreviation, adverse_action_data['licenseTypeAbbreviation'])
         self.assertEqual(adverse_action.action_against, adverse_action_data['actionAgainst'])
-        self.assertEqual(adverse_action.blocks_future_privileges, adverse_action_data['blocksFuturePrivileges'])
         self.assertEqual(
             adverse_action.clinical_privilege_action_category, adverse_action_data['clinicalPrivilegeActionCategory']
         )

backend/compact-connect/lambdas/python/provider-data-v1/handlers/encumbrance.py

@@ -85,7 +85,6 @@ def _generate_adverse_action_for_record_type(
     adverse_action.license_type_abbreviation = adverse_action_license_type_abbreviation
     adverse_action.license_type = adverse_action_license_type
     adverse_action.action_against = adverse_action_against_record_type
-    adverse_action.blocks_future_privileges = adverse_action_request['blocksFuturePrivileges']
     adverse_action.clinical_privilege_action_category = ClinicalPrivilegeActionCategory(
         adverse_action_request['clinicalPrivilegeActionCategory']
     )

backend/compact-connect/lambdas/python/provider-data-v1/tests/function/test_handlers/test_encumbrance.py

@@ -31,7 +31,6 @@ def _generate_test_body():
     return {
         'encumbranceEffectiveDate': TEST_ENCUMBRANCE_EFFECTIVE_DATE,
         'clinicalPrivilegeActionCategory': ClinicalPrivilegeActionCategory.UNSAFE_PRACTICE,
-        'blocksFuturePrivileges': True,
     }