Adding org codes to all relevant users

Author: adrianoaru-nhs

classes/repositories/user_repository.py

@@ -95,7 +95,7 @@ def get_role_id_for_role(self, role: "UserRoleType") -> int:
         df = self.general_query(role)
         return int(df["role_id"].iloc[0])
 
-    def get_org_codefor_role(self, role: "UserRoleType") -> int:
+    def get_org_code_for_role(self, role: "UserRoleType") -> int:
         """
         Get the ORG CODE for the role.
 

users.json

@@ -12,27 +12,31 @@
   "Hub Manager at BCS01": {
     "username": "BCSS402",
     "role_id": 309007,
+    "org_code": "BCS01",
     "roles": [
       "Hub Manager, Midlands and North West"
     ]
   },
   "Screening Centre Manager at BCS001": {
     "username": "BCSS118",
     "role_id": 5039,
+    "org_code": "BCS001",
     "roles": [
       "Screening Centre Manager for Wolverhampton, Midlands and North West"
     ]
   },
   "ScreeningAssistant at BCS02": {
     "username": "BCSS412",
     "role_id": 309003,
+    "org_code": "BCS02",
     "roles": [
       "Screening Assistant"
     ]
 },
   "Team Leader at BCS01": {
     "username": "BCSS403",
     "role_id": 309005,
+    "org_code": "BCS01",
     "roles": [
       "Team Leader"
     ]
@@ -47,13 +51,15 @@
     "username": "BCSS409",
     "hub_code": "BCS02",
     "role_id": 309007,
+    "org_code": "BCS02",
     "roles": [
       "Hub Manager, Southern Bowel Cancer Screening Programme Hub"
     ]
   },
   "Specialist Screening Practitioner at BCS009 & BCS001": {
     "username": "BCSS120",
     "role_id": 5041,
+    "org_code": "BCS001",
     "roles": [
       "Coventry and Warwickshire Bowel Cancer Screening Centre, MultiOrgUser",
       "Wolverhampton Bowel Cancer Screening Centre, MultiOrgUser"
@@ -62,76 +68,87 @@
   "Hub Director State Registered at BCS03": {
     "username": "BCSS414",
     "role_id": 309009,
+    "org_code": "BCS03",
     "roles": [
       "Hub Director State Registered, England"
     ]
   },
   "Senior Screening Assistant at BCS01": {
     "username": "BCSS404",
     "role_id": 309004,
+    "org_code": "BCS01",
     "roles": [
       "Senior Screening Assistant, England"
     ]
   },
   "Screening Assistant at BCS02": {
     "username": "BCSS412",
     "role_id": 309003,
+    "org_code": "BCS02",
     "roles": [
       "Senior Screening Assistant, England"
     ]
   },
   "Assistant Screening Practitioner at BCS001": {
     "username": "BCSS324",
     "role_id": 202254,
+    "org_code": "BCS001",
     "roles": [
       "Assistant Screening Practitioner, England"
     ]
   },
   "Screening Coordinator at BCS001": {
     "username": "BCSS121",
     "role_id": 5073,
+    "org_code": "BCS001",
     "roles": [
       "Screening Coordinator at BCS001, England"
     ]
   },
   "Screening Practitioner at BCS001": {
     "username": "BCSS121",
     "role_id": 5073,
+    "org_code": "BCS001",
     "roles": [
       "Screening Practioner at BCS001, England"
     ]
   },
   "Screening Centre Clerk at BCS001": {
     "username": "BCSS119",
     "role_id": 5040,
+    "org_code": "BCS001",
     "roles": [
       "Screening Centre Clerk, England"
     ]
   },
   "National Data Analyst at BCS0": {
     "username": "BCSS212",
     "role_id": 5064,
+    "org_code": "BCS0",
     "roles": [
       "National Data Analyst, England"
     ]
   },
   "National QA User at BCS0": {
     "username": "BCSS263",
     "role_id": 202193,
+    "org_code": "BCS0",
     "roles": [
       "National QA User, England"
     ]
   },
   "BCSS Support - SC at BCS001": {
     "username": "BCSS307",
     "role_id": 202246,
+    "org_code": "BCS001",
     "roles": [
       "Wolverhampton SC"
     ]
   },
   "BCSS Bureau Staff at X26": {
     "username": "BCSS33",
     "role_id": 5042,
+    "org_code": "X26",
     "roles": [
       "BCSS Bureau Staff at X26"
     ]

utils/fit_kit.py

@@ -18,15 +18,14 @@
 from classes.repositories.kit_service_management_repository import (
     KitServiceManagementRepository,
 )
-from classes.kit_service_management_record import KitServiceManagementRecord
 from classes.kit_status import KitStatus
 from oracle.oracle_specific_functions import execute_fit_kit_stored_procedures
 
 
 class FitKitGeneration:
     """
     This class is responsible for generating FIT Device IDs from test kit data.
-    It is also used to retreive a kit belonging to a subject
+    It is also used to retrieve a kit belonging to a subject
     """
 
     def create_fit_id_df(
@@ -114,7 +113,7 @@ def get_fit_kit_for_subject_sql(self, nhs_no: str, logged: bool, read: bool) ->
         """
         Constructs SQL for requesting the kit ID of the latest FIT kit for a subject.
         This then gets the subject's subject id from the DB and runs the query to return their FIT kit
-        It then calculates the checkdigit and extra info to append at the end of the FIT Kit
+        It then calculates the check digit and extra info to append at the end of the FIT Kit
 
         Args:
             nhs_no (str): The subject's NHS number.
@@ -302,7 +301,7 @@ def read_latest_logged_kit(
 
     def log_fit_kits(self, page, fit_kit: str, sample_date: datetime) -> None:
         """
-        Navigates to the log devicves page and logs FIT kits
+        Navigates to the log devices page and logs FIT kits
         Args:
             fit_kit (str): The device id of the FIT kit
             sample_date (datetime): The date you want to select for the sameple date field