Skip to content

Commit 200e96a

Browse files
LeoKHowardLeoKHoward
committed
NPA-4824: Revert formatting
1 parent 6050211 commit 200e96a

File tree

3 files changed

+35
-87
lines changed

3 files changed

+35
-87
lines changed

‎sandbox/api/constants.py‎

Lines changed: 29 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010

1111
# Common examples
1212
INTERNAL_SERVER_ERROR_EXAMPLE = "./api/examples/errors/internal-server-error.yaml"
13-
BAD_REQUEST_INCLUDE_PARAM_INVALID = (
14-
"./api/examples/errors/invalid-include-parameter.yaml"
15-
)
13+
BAD_REQUEST_INCLUDE_PARAM_INVALID = "./api/examples/errors/invalid-include-parameter.yaml"
1614
INVALIDATED_RESOURCE = "./api/examples/errors/invalidated-resource.yaml"
1715
MISSING_IDENTIFIER = "./api/examples/errors/missing-identifier.yaml"
1816
INVALID_IDENTIFIER = "./api/examples/errors/invalid-identifier.yaml"
@@ -28,9 +26,7 @@
2826
GET_CONSENT__FILTERED_RELATIONSHIPS_STATUS_PROPOSED_ACTIVE = (
2927
f"{GET_CONSENT__DIRECTORY}filtered-relationships-status-proposed-active.yaml"
3028
)
31-
GET_CONSENT__MULTIPLE_RELATIONSHIPS = (
32-
f"{GET_CONSENT__DIRECTORY}multiple-relationships.yaml"
33-
)
29+
GET_CONSENT__MULTIPLE_RELATIONSHIPS = f"{GET_CONSENT__DIRECTORY}multiple-relationships.yaml"
3430
GET_CONSENT__MULTIPLE_RELATIONSHIPS_INCLUDE_BOTH = (
3531
f"{GET_CONSENT__DIRECTORY}multiple-relationships-include-performer-patient.yaml"
3632
)
@@ -41,91 +37,55 @@
4137
f"{GET_CONSENT__DIRECTORY}multiple-relationships-include-performer.yaml"
4238
)
4339
GET_CONSENT__NO_RELATIONSHIPS = f"{GET_CONSENT__DIRECTORY}no-relationships.yaml"
44-
GET_CONSENT__SINGLE_CONSENTING_ADULT_RELATIONSHIP = (
45-
f"{GET_CONSENT__DIRECTORY}single-consenting-adult-relationship.yaml"
46-
)
47-
GET_CONSENT__SINGLE_CONSENTING_ADULT_RELATIONSHIP_INCLUDE_BOTH = f"{GET_CONSENT__DIRECTORY}single-consenting-adult-relationship-include-performer-patient.yaml"
48-
GET_CONSENT__SINGLE_MOTHER_CHILD_RELATIONSHIP = (
49-
f"{GET_CONSENT__DIRECTORY}single-mother-child-relationship.yaml"
40+
GET_CONSENT__SINGLE_CONSENTING_ADULT_RELATIONSHIP = f"{GET_CONSENT__DIRECTORY}single-consenting-adult-relationship.yaml"
41+
GET_CONSENT__SINGLE_CONSENTING_ADULT_RELATIONSHIP_INCLUDE_BOTH = (
42+
f"{GET_CONSENT__DIRECTORY}single-consenting-adult-relationship-include-performer-patient.yaml"
5043
)
51-
GET_CONSENT__SINGLE_MOTHER_CHILD_RELATIONSHIP_INCLUDE_BOTH = f"{GET_CONSENT__DIRECTORY}single-mother-child-relationship-include-performer-patient.yaml"
52-
GET_CONSENT__STATUS_PARAM_INVALID = (
53-
f"{GET_CONSENT__DIRECTORY}errors/invalid-status-parameter.yaml"
44+
GET_CONSENT__SINGLE_MOTHER_CHILD_RELATIONSHIP = f"{GET_CONSENT__DIRECTORY}single-mother-child-relationship.yaml"
45+
GET_CONSENT__SINGLE_MOTHER_CHILD_RELATIONSHIP_INCLUDE_BOTH = (
46+
f"{GET_CONSENT__DIRECTORY}single-mother-child-relationship-include-performer-patient.yaml"
5447
)
48+
GET_CONSENT__STATUS_PARAM_INVALID = f"{GET_CONSENT__DIRECTORY}errors/invalid-status-parameter.yaml"
5549

5650
# POST Consent
5751
POST_CONSENT__DIRECTORY = "./api/examples/POST_Consent/"
5852
POST_CONSENT__SUCCESS = f"{POST_CONSENT__DIRECTORY}success.yaml"
59-
POST_CONSENT__DUPLICATE_RELATIONSHIP_ERROR = (
60-
f"{POST_CONSENT__DIRECTORY}errors/duplicate_relationship_error.yaml"
61-
)
62-
POST_CONSENT__PERFORMER_IDENTIFIER_ERROR = (
63-
f"{POST_CONSENT__DIRECTORY}errors/invalid_performer_identifier_error.yaml"
64-
)
53+
POST_CONSENT__DUPLICATE_RELATIONSHIP_ERROR = f"{POST_CONSENT__DIRECTORY}errors/duplicate_relationship_error.yaml"
54+
POST_CONSENT__PERFORMER_IDENTIFIER_ERROR = f"{POST_CONSENT__DIRECTORY}errors/invalid_performer_identifier_error.yaml"
6555

6656
# PATCH Consent
6757
PATCH_CONSENT__DIRECTORY = "./api/examples/PATCH_Consent/"
6858
PATCH_CONSENT__SUCCESS = f"{PATCH_CONSENT__DIRECTORY}success.yaml"
69-
PATCH_CONSENT__INVALID_PATCH_FORMAT = (
70-
f"{PATCH_CONSENT__DIRECTORY}errors/invalid_patch_format.yaml"
71-
)
59+
PATCH_CONSENT__INVALID_PATCH_FORMAT = f"{PATCH_CONSENT__DIRECTORY}errors/invalid_patch_format.yaml"
7260
PATCH_CONSENT__INVALID_PATH = f"{PATCH_CONSENT__DIRECTORY}errors/invalid_path.yaml"
73-
PATCH_CONSENT__INVALID_STATUS_CODE = (
74-
f"{PATCH_CONSENT__DIRECTORY}errors/invalid_status_code.yaml"
75-
)
76-
PATCH_CONSENT__INVALID_STATUS_REASON = (
77-
f"{PATCH_CONSENT__DIRECTORY}errors/invalid_status_reason.yaml"
78-
)
79-
PATCH_CONSENT__RESOURCE_NOT_FOUND = (
80-
f"{PATCH_CONSENT__DIRECTORY}errors/resource_not_found.yaml"
81-
)
82-
PATCH_CONSENT__INVALID_STATE_TRANSITION = (
83-
f"{PATCH_CONSENT__DIRECTORY}errors/invalid_state_transition.yaml"
84-
)
61+
PATCH_CONSENT__INVALID_STATUS_CODE = f"{PATCH_CONSENT__DIRECTORY}errors/invalid_status_code.yaml"
62+
PATCH_CONSENT__INVALID_STATUS_REASON = f"{PATCH_CONSENT__DIRECTORY}errors/invalid_status_reason.yaml"
63+
PATCH_CONSENT__RESOURCE_NOT_FOUND = f"{PATCH_CONSENT__DIRECTORY}errors/resource_not_found.yaml"
64+
PATCH_CONSENT__INVALID_STATE_TRANSITION = f"{PATCH_CONSENT__DIRECTORY}errors/invalid_state_transition.yaml"
8565

8666
# POST QuestionnaireResponse
8767
POST_QUESTIONNAIRE_RESPONSE_DIRECTORY = "./api/examples/POST_QuestionnaireResponse/"
88-
POST_QUESTIONNAIRE_RESPONSE__SUCCESS = (
89-
f"{POST_QUESTIONNAIRE_RESPONSE_DIRECTORY}success.yaml"
90-
)
68+
POST_QUESTIONNAIRE_RESPONSE__SUCCESS = f"{POST_QUESTIONNAIRE_RESPONSE_DIRECTORY}success.yaml"
9169

9270
# GET QuestionnaireResponse
9371
GET_QUESTIONNAIRE_RESPONSE_DIRECTORY = "./api/examples/GET_QuestionnaireResponse/"
94-
GET_QUESTIONNAIRE_RESPONSE__SUCCESS = (
95-
f"{GET_QUESTIONNAIRE_RESPONSE_DIRECTORY}success.yaml"
96-
)
97-
GET_QUESTIONNAIRE_RESPONSE__INVALID = (
98-
f"{GET_QUESTIONNAIRE_RESPONSE_DIRECTORY}errors/invalid_reference_code.yaml"
99-
)
100-
GET_QUESTIONNAIRE_RESPONSE__MISSING = (
101-
f"{GET_QUESTIONNAIRE_RESPONSE_DIRECTORY}errors/missing_reference_code.yaml"
72+
GET_QUESTIONNAIRE_RESPONSE__SUCCESS = f"{GET_QUESTIONNAIRE_RESPONSE_DIRECTORY}success.yaml"
73+
GET_QUESTIONNAIRE_RESPONSE__INVALID = f"{GET_QUESTIONNAIRE_RESPONSE_DIRECTORY}errors/invalid_reference_code.yaml"
74+
GET_QUESTIONNAIRE_RESPONSE__MISSING = f"{GET_QUESTIONNAIRE_RESPONSE_DIRECTORY}errors/missing_reference_code.yaml"
75+
GET_QUESTIONNAIRE_RESPONSE__NOT_FOUND = (
76+
f"{GET_QUESTIONNAIRE_RESPONSE_DIRECTORY}errors/questionnaire_response_not_found.yaml"
10277
)
103-
GET_QUESTIONNAIRE_RESPONSE__NOT_FOUND = f"{GET_QUESTIONNAIRE_RESPONSE_DIRECTORY}errors/questionnaire_response_not_found.yaml"
10478

10579
# GET RelatedPerson
10680
RELATED_DIRECTORY = "./api/examples/GET_RelatedPerson/"
107-
RELATED__ERROR_IDENTIFIER_MISSING = (
108-
f"{RELATED_DIRECTORY}errors/invalid-identifier-missing.yaml"
109-
)
110-
RELATED__ERROR_IDENTIFIER_SYSTEM = (
111-
f"{RELATED_DIRECTORY}errors/invalid-identifier-system.yaml"
112-
)
81+
RELATED__ERROR_IDENTIFIER_MISSING = f"{RELATED_DIRECTORY}errors/invalid-identifier-missing.yaml"
82+
RELATED__ERROR_IDENTIFIER_SYSTEM = f"{RELATED_DIRECTORY}errors/invalid-identifier-system.yaml"
11383
RELATED__ERROR_IDENTIFIER = f"{RELATED_DIRECTORY}errors/invalid-identifier.yaml"
11484
RELATED__EMPTY_RESPONSE = f"{RELATED_DIRECTORY}empty_response.yaml"
11585
RELATED__LIST_RELATIONSHIP = f"{RELATED_DIRECTORY}list_relationship_9000000017.yaml"
116-
RELATED__LIST_RELATIONSHIP_WITH_INCLUDE = (
117-
f"{RELATED_DIRECTORY}list_relationship_9000000017_include.yaml"
118-
)
119-
RELATED__VERIFY_RELATIONSHIP_09 = (
120-
f"{RELATED_DIRECTORY}verify_relationship_9000000009.yaml"
121-
)
122-
RELATED__VERIFY_RELATIONSHIP_09_WITH_INCLUDE = (
123-
f"{RELATED_DIRECTORY}verify_relationship_9000000009_include.yaml"
124-
)
125-
RELATED__VERIFY_RELATIONSHIP_25 = (
126-
f"{RELATED_DIRECTORY}verify_relationship_9000000025.yaml"
127-
)
128-
RELATED__VERIFY_RELATIONSHIP_25_WITH_INCLUDE = (
129-
f"{RELATED_DIRECTORY}verify_relationship_9000000025_include.yaml"
130-
)
86+
RELATED__LIST_RELATIONSHIP_WITH_INCLUDE = f"{RELATED_DIRECTORY}list_relationship_9000000017_include.yaml"
87+
RELATED__VERIFY_RELATIONSHIP_09 = f"{RELATED_DIRECTORY}verify_relationship_9000000009.yaml"
88+
RELATED__VERIFY_RELATIONSHIP_09_WITH_INCLUDE = f"{RELATED_DIRECTORY}verify_relationship_9000000009_include.yaml"
89+
RELATED__VERIFY_RELATIONSHIP_25 = f"{RELATED_DIRECTORY}verify_relationship_9000000025.yaml"
90+
RELATED__VERIFY_RELATIONSHIP_25_WITH_INCLUDE = f"{RELATED_DIRECTORY}verify_relationship_9000000025_include.yaml"
13191
RELATED__EMPTY_RESPONSE = f"{RELATED_DIRECTORY}empty_response_9000000033.yaml"

‎sandbox/api/patch_consent.py‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,37 +45,27 @@ def patch_consent_response(identifier: str) -> Union[dict, tuple]:
4545

4646
elif identifier == "3a2679eb":
4747
# Invalid patch format
48-
return generate_response_from_example(
49-
PATCH_CONSENT__INVALID_PATCH_FORMAT, 400
50-
)
48+
return generate_response_from_example(PATCH_CONSENT__INVALID_PATCH_FORMAT, 400)
5149

5250
elif identifier == "94df7c8f":
5351
# Invalid path
5452
return generate_response_from_example(PATCH_CONSENT__INVALID_PATH, 400)
5553

5654
elif identifier == "2a7b736d":
5755
# Invalid status code
58-
return generate_response_from_example(
59-
PATCH_CONSENT__INVALID_STATUS_CODE, 422
60-
)
56+
return generate_response_from_example(PATCH_CONSENT__INVALID_STATUS_CODE, 422)
6157

6258
elif identifier == "6fb4361b":
6359
# Invalid state transition
64-
return generate_response_from_example(
65-
PATCH_CONSENT__INVALID_STATE_TRANSITION, 422
66-
)
60+
return generate_response_from_example(PATCH_CONSENT__INVALID_STATE_TRANSITION, 422)
6761

6862
elif identifier == "4b6792be":
6963
# Invalid status reason
70-
return generate_response_from_example(
71-
PATCH_CONSENT__INVALID_STATUS_REASON, 422
72-
)
64+
return generate_response_from_example(PATCH_CONSENT__INVALID_STATUS_REASON, 422)
7365

7466
else:
7567
# Resource not found
76-
return generate_response_from_example(
77-
PATCH_CONSENT__RESOURCE_NOT_FOUND, 404
78-
)
68+
return generate_response_from_example(PATCH_CONSENT__RESOURCE_NOT_FOUND, 404)
7969

8070
except Exception:
8171
# Handle any general error

‎sandbox/api/tests/test_patch_consent.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ def test_patch_consent_on_request_returns_expected_response(
5555
json = [{"op": "replace", "path": "/status", "value": "inactive"}]
5656
response = client.patch(CONSENT_API_ENDPOINT + f"/{nhs_num}", json=json)
5757
# Assert
58-
mock_generate_response_from_example.assert_called_once_with(
59-
response_file_name, status_code
60-
)
58+
mock_generate_response_from_example.assert_called_once_with(response_file_name, status_code)
6159
assert response.status_code == status_code
6260
assert response.json == loads(mocked_response.get_data(as_text=True))

0 commit comments

Comments
 (0)