From df2f479a0c2a7ab8c21507fc852c5ac6f4c28a54 Mon Sep 17 00:00:00 2001 From: Shaanjot Gill Date: Thu, 10 Apr 2025 19:04:23 -0700 Subject: [PATCH 1/2] 26347 - allow assign & unassign for application of all statuses except draft Signed-off-by: Shaanjot Gill --- .../src/strr_api/services/application_service.py | 15 ++++++++++++++- .../resources/test_registration_applications.py | 3 +++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/strr-api/src/strr_api/services/application_service.py b/strr-api/src/strr_api/services/application_service.py index d27684099..4151b5ba6 100644 --- a/strr-api/src/strr_api/services/application_service.py +++ b/strr-api/src/strr_api/services/application_service.py @@ -62,7 +62,20 @@ Application.Status.ADDITIONAL_INFO_REQUESTED, ] APPLICATION_UNPAID_STATES = [Application.Status.DRAFT, Application.Status.PAYMENT_DUE] -APPLICATION_ASSIGN_STATES = [Application.Status.FULL_REVIEW, Application.Status.PROVISIONAL_REVIEW] +APPLICATION_ASSIGN_STATES = [ + Application.Status.FULL_REVIEW, + Application.Status.PROVISIONAL_REVIEW, + Application.Status.PROVISIONAL, + Application.Status.NOC_PENDING, + Application.Status.NOC_EXPIRED, + Application.Status.ADDITIONAL_INFO_REQUESTED, + Application.Status.PAYMENT_DUE, + Application.Status.PAID, + Application.Status.FULL_REVIEW_APPROVED, + Application.Status.PROVISIONALLY_APPROVED, + Application.Status.AUTO_APPROVED, + Application.Status.DECLINED, +] class ApplicationService: diff --git a/strr-api/tests/unit/resources/test_registration_applications.py b/strr-api/tests/unit/resources/test_registration_applications.py index 9e7251ee5..ff4e7135c 100644 --- a/strr-api/tests/unit/resources/test_registration_applications.py +++ b/strr-api/tests/unit/resources/test_registration_applications.py @@ -854,6 +854,9 @@ def test_assign_and_unassign_application(session, client, jwt): rv = client.post("/applications", json=json_data, headers=headers) assert HTTPStatus.OK == rv.status_code application_number = rv.json.get("header").get("applicationNumber") + application = Application.find_by_application_number(application_number=application_number) + application.status = Application.Status.DRAFT + application.save() staff_headers = create_header(jwt, [STRR_EXAMINER], "Account-Id") rv = client.put(f"/applications/{application_number}/assign", headers=staff_headers) From 8ba8e6c16e81d4ca3f8e8a2ad47fec5c872c7cee Mon Sep 17 00:00:00 2001 From: Shaanjot Gill Date: Fri, 11 Apr 2025 11:35:20 -0700 Subject: [PATCH 2/2] 26347 - update status list Signed-off-by: Shaanjot Gill --- strr-api/src/strr_api/services/application_service.py | 2 -- strr-api/tests/unit/resources/test_registration_applications.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/strr-api/src/strr_api/services/application_service.py b/strr-api/src/strr_api/services/application_service.py index 4151b5ba6..d5dd11085 100644 --- a/strr-api/src/strr_api/services/application_service.py +++ b/strr-api/src/strr_api/services/application_service.py @@ -69,8 +69,6 @@ Application.Status.NOC_PENDING, Application.Status.NOC_EXPIRED, Application.Status.ADDITIONAL_INFO_REQUESTED, - Application.Status.PAYMENT_DUE, - Application.Status.PAID, Application.Status.FULL_REVIEW_APPROVED, Application.Status.PROVISIONALLY_APPROVED, Application.Status.AUTO_APPROVED, diff --git a/strr-api/tests/unit/resources/test_registration_applications.py b/strr-api/tests/unit/resources/test_registration_applications.py index ff4e7135c..6d108570e 100644 --- a/strr-api/tests/unit/resources/test_registration_applications.py +++ b/strr-api/tests/unit/resources/test_registration_applications.py @@ -855,7 +855,7 @@ def test_assign_and_unassign_application(session, client, jwt): assert HTTPStatus.OK == rv.status_code application_number = rv.json.get("header").get("applicationNumber") application = Application.find_by_application_number(application_number=application_number) - application.status = Application.Status.DRAFT + application.status = Application.Status.PAYMENT_DUE application.save() staff_headers = create_header(jwt, [STRR_EXAMINER], "Account-Id")