Draft
Conversation
SWhyteAnswer
temporarily deployed
to
development
GitHub Actions
Inactive
| @override_error_check | ||
| @ensure_environment_variables( | ||
| names=[ | ||
| "USER_RESTRICTIONS_TABLE_NAME", |
Contributor
There was a problem hiding this comment.
double check this is the right var from the terraform
Comment on lines
30
to
52
| body = event.get("body") | ||
| if not body: | ||
| logger.error("Missing request body") | ||
| return ApiGatewayResponse( | ||
| 400, "Missing request body", "POST" | ||
| ).create_api_gateway_response() | ||
|
|
||
| try: | ||
| payload = json.loads(body) | ||
| except json.JSONDecodeError as exc: | ||
| logger.error(exc) | ||
| return ApiGatewayResponse( | ||
| 400, "Invalid request body", "POST" | ||
| ).create_api_gateway_response() | ||
|
|
||
| # Required fields for creating a restriction. | ||
| smart_card_id = payload.get("smart_card_id") | ||
| nhs_number = payload.get("nhs_number") | ||
| if not smart_card_id or not nhs_number: | ||
| logger.error("Missing required fields") | ||
| return ApiGatewayResponse( | ||
| 400, "Missing required fields", "POST" | ||
| ).create_api_gateway_response() |
Contributor
There was a problem hiding this comment.
this could be extracted into a separate function, parse_body?
think the body should always be valid JSON so might not need to handle this error
do we want a model to validate the request body against?
body will be coming from front end so probably camel case
Comment on lines
55
to
62
| authorization = request_context.authorization or {} | ||
| creator = authorization.get("nhs_user_id") | ||
| ods_code = authorization.get("selected_organisation", {}).get("org_ods_code") | ||
| if not creator or not ods_code: | ||
| logger.error("Missing user context") | ||
| return ApiGatewayResponse( | ||
| 400, "Missing user context", "POST" | ||
| ).create_api_gateway_response() |
Contributor
There was a problem hiding this comment.
we could use the ods_util here, or create a new one that does both the creator and ods to be used with the other lambdas too?
| creator: str, | ||
| ) -> UserRestriction: | ||
| if smart_card_id == creator: | ||
| raise ValueError("You cannot create a restriction for yourself") |
Contributor
There was a problem hiding this comment.
create custom exception
| nhs_number=nhs_number, | ||
| custodian=ods_code, | ||
| creator=creator, | ||
| restricted_user_name=restricted_user_name, |
Contributor
There was a problem hiding this comment.
not on the model, no need to write to db
| restriction = service.create_restriction( | ||
| smart_card_id=smart_card_id, | ||
| nhs_number=nhs_number, | ||
| ods_code=ods_code, |
| raise ValueError("You cannot create a restriction for yourself") | ||
|
|
||
| practitioner = self.healthcare_service.get_practitioner(smart_card_id) | ||
| restricted_user_name = f"{practitioner.first_name} {practitioner.last_name}" |
Contributor
There was a problem hiding this comment.
believe we are returning this the the frontend, may need to change what is returned from this function
Comment on lines
26
to
31
| @pytest.fixture | ||
| def set_env(monkeypatch, set_env): | ||
| monkeypatch.setenv("USER_RESTRICTIONS_TABLE_NAME", MOCK_RESTRICTIONS_TABLE) | ||
| monkeypatch.setenv("HEALTHCARE_WORKER_API_URL", HEALTHCARE_WORKER_API_URL) | ||
| yield | ||
|
|
Comment on lines
+16
to
+18
| MOCK_SMART_CARD_ID = "smartcard-uuid-1234" | ||
| MOCK_CREATOR_ID = "creator-uuid-5678" | ||
| MOCK_RESTRICTIONS_TABLE = "test-user-restrictions-table" |
SWhyteAnswer
force-pushed
the
PRMP-1465
branch
from
5d7ec4e to
8f6b18c
Compare
SWhyteAnswer
temporarily deployed
to
development
GitHub Actions
Inactive
SWhyteAnswer
force-pushed
the
PRMP-1465
branch
from
8f6b18c to
5af470e
Compare
SWhyteAnswer
temporarily deployed
to
development
GitHub Actions
Inactive
SWhyteAnswer
temporarily deployed
to
development
GitHub Actions
Inactive
SWhyteAnswer
temporarily deployed
to
development
GitHub Actions
Inactive
SWhyteAnswer
temporarily deployed
to
development
GitHub Actions
Inactive
SWhyteAnswer
temporarily deployed
to
development
GitHub Actions
Inactive
SWhyteAnswer
temporarily deployed
to
development
GitHub Actions
Inactive
SWhyteAnswer
temporarily deployed
to
development
GitHub Actions
Inactive
Code security issues foundView full details here. |
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Overview
Jira ticket: TBC
Description
Context
Checklist
Tasks for all changes:
I have run git pre-commits.(WIP)Deploy - Sandbox- workflow run - TBCSANDBOX Full- Deploy feature branch to sandbox- workflow run - TBCSANDBOX - UI Smoke Test- workflow run - TBCAdditional tasks for UI changes (delete if not applicable):