Skip to content

Commit 7b42dd4

Browse files
committed
fix lint issues
1 parent 2b42e30 commit 7b42dd4

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

recordprocessor/src/constants.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""Constants for recordprocessor"""
22

33
import os
4-
from enum import Enum, auto
4+
from enum import Enum
55

66
SOURCE_BUCKET_NAME = os.getenv("SOURCE_BUCKET_NAME")
77
ACK_BUCKET_NAME = os.getenv("ACK_BUCKET_NAME")
@@ -86,13 +86,13 @@ class Urls:
8686
NULL_FLAVOUR_CODES = "http://terminology.hl7.org/CodeSystem/v3-NullFlavor"
8787
VACCINATION_PROCEDURE = "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-VaccinationProcedure"
8888

89+
8990
class Permission(Enum):
9091
CREATE = "C"
9192
UPDATE = "U"
9293
DELETE = "D"
9394

9495

95-
9696
class ActionFlag(Enum):
9797
NEW = Permission.CREATE
9898
UPDATE = Permission.UPDATE

recordprocessor/src/file_level_validation.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,16 @@ def validate_action_flag_permissions(
3232
operations_requested = get_unique_action_flags_from_s3(csv_data)
3333

3434
# Map ACTION_FLAGs to single-letter permissions
35-
requested_permissions = {ActionFlag[flag].value.value for flag in operations_requested if flag in ActionFlag.__members__}
36-
35+
requested_permissions = {
36+
ActionFlag[flag].value.value
37+
for flag in operations_requested
38+
if flag in ActionFlag.__members__
39+
}
40+
3741
if not requested_permissions:
3842
logger.warning("No valid ACTION_FLAGs found in file. Skipping permission validation.")
3943
return set()
4044

41-
4245
# Get allowed permission in single letters from allowed_permissions_list
4346
allowed_ops = set()
4447
for perm in allowed_permissions_list:
@@ -57,10 +60,11 @@ def validate_action_flag_permissions(
5760
allowed_ops.update({"C", "R", "U", "D", "S"})
5861
else:
5962
allowed_ops.add(op_code)
60-
61-
if not requested_permissions.intersection(allowed_ops):
62-
raise NoOperationPermissions(f"{supplier} does not have permissions to perform any of the requested actions.")
6363

64+
if not requested_permissions.intersection(allowed_ops):
65+
raise NoOperationPermissions(
66+
f"{supplier} does not have permissions to perform any of the requested actions."
67+
)
6468

6569
logger.info(
6670
"%s permissions %s match one of the requested permissions required to %s",
@@ -70,7 +74,7 @@ def validate_action_flag_permissions(
7074
)
7175

7276
# Return allowed ops in full-word format for downstream logic
73-
return {perm.name for perm in Permission if perm.value in allowed_ops }
77+
return {perm.name for perm in Permission if perm.value in allowed_ops}
7478

7579

7680
def move_file(bucket_name: str, source_file_key: str, destination_file_key: str) -> None:

recordprocessor/tests/test_recordprocessor_main.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@ def make_inf_ack_assertions(self, file_details: FileDetails, passed_validation:
9191
"created_at_formatted_string", file_details.created_at_formatted_string
9292
)
9393

94-
print(f"actual_rows: {actual_rows,}")
95-
print(f"expected_rows: {expected_row}")
96-
9794
self.assertEqual(actual_rows, [InfAckFileRows.HEADERS, expected_row])
9895

9996
def make_kinesis_assertions(self, test_cases):

0 commit comments

Comments
 (0)