From 1b559179a0cb227a462ef4f0f6a6b07e5101f752 Mon Sep 17 00:00:00 2001 From: Doug Lovett Date: Wed, 9 Oct 2024 09:58:36 -0700 Subject: [PATCH] Include REG_103 when setting current reg changePermit (#2033) Signed-off-by: Doug Lovett --- mhr_api/src/mhr_api/models/registration_json_utils.py | 3 +++ mhr_api/src/mhr_api/resources/v1/registrations.py | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mhr_api/src/mhr_api/models/registration_json_utils.py b/mhr_api/src/mhr_api/models/registration_json_utils.py index b341a9781..50a615247 100644 --- a/mhr_api/src/mhr_api/models/registration_json_utils.py +++ b/mhr_api/src/mhr_api/models/registration_json_utils.py @@ -87,6 +87,7 @@ def set_permit_json(registration, reg_json: dict) -> dict: # pylint: disable=to expiry_ts = None permit_status = None permit_reg_id: int = 0 + permit_doc_type: str = None for reg in registration.change_registrations: if reg.documents[0].document_type == MhrDocumentTypes.REG_103: permit_number = reg.documents[0].document_registration_number @@ -98,6 +99,7 @@ def set_permit_json(registration, reg_json: dict) -> dict: # pylint: disable=to if reg.notes: permit_status = reg.notes[0].status_type expiry_ts = reg.notes[0].expiry_date + permit_doc_type = reg.documents[0].document_type # current_app.logger.debug(f'set permit reg id {reg.id} set_permit status {permit_status}') permit_reg_id = reg.id if permit_number: @@ -118,6 +120,7 @@ def set_permit_json(registration, reg_json: dict) -> dict: # pylint: disable=to reg_json['permitLandStatusConfirmation'] = reg.draft.draft.get('landStatusConfirmation', False) if 'permitLandStatusConfirmation' not in reg_json: reg_json['permitLandStatusConfirmation'] = False + reg_json['permitExtended'] = permit_doc_type and permit_doc_type == MhrDocumentTypes.REG_103E if permit_status and permit_status == MhrNoteStatusTypes.ACTIVE: reg_json['previousLocation'] = get_permit_previous_location_json(registration) return reg_json diff --git a/mhr_api/src/mhr_api/resources/v1/registrations.py b/mhr_api/src/mhr_api/resources/v1/registrations.py index 309975d21..eec73610f 100755 --- a/mhr_api/src/mhr_api/resources/v1/registrations.py +++ b/mhr_api/src/mhr_api/resources/v1/registrations.py @@ -556,7 +556,9 @@ def get_change_permit(registration: MhrRegistration, account_id: str) -> bool: can_edit: bool = False if registration.change_registrations: for reg in registration.change_registrations: - if reg.registration_type in (MhrRegistrationTypes.PERMIT, MhrRegistrationTypes.AMENDMENT): + if reg.registration_type in (MhrRegistrationTypes.PERMIT, + MhrRegistrationTypes.PERMIT_EXTENSION, + MhrRegistrationTypes.AMENDMENT): if reg.notes and reg.notes[0].status_type == MhrNoteStatusTypes.ACTIVE and \ account_id == reg.account_id: can_edit = True