Skip to content

Sync Hotfix 23756 to Main #712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dimak1 merged 5 commits into from
May 1, 2025
Merged

Sync Hotfix 23756 to Main #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0e20191
status label updates (#700)
shaangill025 Apr 24, 2025
395624b
Allow Image Upload for Hosts (#701)
dimak1 Apr 25, 2025
0165c99
23756 - status update (#702)
shaangill025 Apr 25, 2025
f012cee
Merge branch 'hotfix-23756' into sync-hotfix
dimak1 May 1, 2025
4674673
Update tests
dimak1 May 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions strr-api/src/strr_api/models/application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,8 +424,8 @@ class ApplicationSerializer:
Application.Status.PROVISIONAL_REVIEW: "Approved – Provisional",
Application.Status.FULL_REVIEW: "Pending Approval",
Application.Status.DECLINED: "Declined",
Application.Status.NOC_PENDING: "Notice of Consideration - Pending",
Application.Status.NOC_EXPIRED: "Notice of Consideration - Expired",
Application.Status.NOC_PENDING: "Notice of Consideration",
Application.Status.NOC_EXPIRED: "Pending Review",
Application.Status.PROVISIONAL_REVIEW_NOC_PENDING: "Notice of Consideration - Pending",
Application.Status.PROVISIONAL_REVIEW_NOC_EXPIRED: "Notice of Consideration - Expired",
}
Expand All @@ -442,8 +442,8 @@ class ApplicationSerializer:
Application.Status.PROVISIONAL_REVIEW: "Provisional Examination",
Application.Status.FULL_REVIEW: "Full Examination",
Application.Status.DECLINED: "Declined",
Application.Status.NOC_PENDING: "Notice of Consideration - Pending",
Application.Status.NOC_EXPIRED: "Notice of Consideration - Expired",
Application.Status.NOC_PENDING: "NOC - Pending",
Application.Status.NOC_EXPIRED: "NOC - Expired",
Application.Status.PROVISIONAL_REVIEW_NOC_PENDING: "Notice of Consideration - Pending",
Application.Status.PROVISIONAL_REVIEW_NOC_EXPIRED: "Notice of Consideration - Expired",
}
Expand Down
4 changes: 2 additions & 2 deletions strr-api/tests/unit/resources/test_registration_applications.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,8 +788,8 @@ def test_examiner_send_notice_of_consideration(mock_noc, mock_invoice, session,
assert HTTPStatus.OK == rv.status_code
response_json = rv.json
assert response_json.get("header").get("status") == Application.Status.NOC_PENDING
assert response_json.get("header").get("hostStatus") == "Notice of Consideration - Pending"
assert response_json.get("header").get("examinerStatus") == "Notice of Consideration - Pending"
assert response_json.get("header").get("hostStatus") == "Notice of Consideration"
assert response_json.get("header").get("examinerStatus") == "NOC - Pending"
assert response_json.get("header").get("examinerActions") == ["APPROVE", "REJECT"]
assert response_json.get("header").get("hostActions") == []
assert response_json.get("header").get("nocStartDate") is not None
Expand Down