Updated the test and user.json-bcss 19933 (#14)

<!-- markdownlint-disable-next-line first-line-heading -->
## Description

<!-- Describe your changes in detail. -->
Refactoring users.json to include the organisation for the primary key,
e.g. - "Hub Manager State Registered at BCS01"

## Context
This makes it easier to identify exactly which user is being used per
test.

<!-- Why is this change required? What problem does it solve? -->

## Type of changes
This was done followed by Kate comments during playwright demo and it
will be helpful to recognise the users when we add more.

<!-- What types of changes does your code introduce? Put an `x` in all
the boxes that apply. -->

- [x ] Refactoring (non-breaking change)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would change existing
functionality)
- [ ] Bug fix (non-breaking change which fixes an issue)

## Checklist

<!-- Go over all the following points, and put an `x` in all the boxes
that apply. -->

- [ x] I am familiar with the [contributing
guidelines](https://github.com/nhs-england-tools/playwright-python-blueprint/blob/main/CONTRIBUTING.md)
- [x ] I have followed the code style of the project
- [ ] I have added tests to cover my changes (where appropriate)
- [ ] I have updated the documentation accordingly
- [ ] This PR is a result of pair or mob programming

---

## Sensitive Information Declaration

To ensure the utmost confidentiality and protect your and others
privacy, we kindly ask you to NOT including [PII (Personal Identifiable
Information) / PID (Personal Identifiable
Data)](https://digital.nhs.uk/data-and-information/keeping-data-safe-and-benefitting-the-public)
or any other sensitive data in this PR (Pull Request) and the codebase
changes. We will remove any PR that do contain any sensitive
information. We really appreciate your cooperation in this matter.

- [x ] I confirm that neither PII/PID nor sensitive data are included in
this PR and the codebase changes.

Author: mepr1

tests/smokescreen/test_compartment_1.py

@@ -43,7 +43,7 @@ def test_create_invitations_plan(page: Page, smokescreen_properties: dict) -> No
     This is used to create the invitations plan. As it is not always needed it is separate to the main Compartment 1 function
     """
     logging.info("Compartment 1 - Create Invitations Plan")
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
     # Create plan - England
     BasePage(page).go_to_call_and_recall_page()
     CallAndRecall(page).go_to_planning_and_monitoring_page()
@@ -77,7 +77,7 @@ def test_compartment_1(page: Page) -> None:
     - Processes S10 (FIT) batches
     """
     logging.info("Compartment 1 - Generate Invitations")
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     # Generate Invitations
     BasePage(page).click_main_menu_link()

tests/smokescreen/test_compartment_2.py

@@ -47,7 +47,7 @@ def test_compartment_2(page: Page, smokescreen_properties: dict) -> None:
     - Logging FIT Devices as Spoilt
     - Processing the generated S3 batch
     """
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     BasePage(page).go_to_fit_test_kits_page()
     FITTestKits(page).go_to_log_devices_page()

tests/smokescreen/test_compartment_3.py

@@ -46,7 +46,7 @@ def test_compartment_3(page: Page, smokescreen_properties: dict) -> None:
     It then checks that the status of the subject is as expected using the subject screening summary page
     Then it process two batches performing checks on the subjects to ensure they always have the correct event status
     """
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     # Find data , separate it into normal and abnormal, Add results to the test records in the KIT_QUEUE table (i.e. mimic receiving results from the middleware)
     # and get device IDs and their flags

tests/test_bcss_19181_users_permit_list.py

@@ -13,12 +13,12 @@ def before_test(page: Page):
     This fixture confirms that users can log in successfully in to BCSS whilst the approved users list is empty
     """
     # Log in to BCSS as bcss401 user, then log out
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
     bcss_home.BasePage(page).bowel_cancer_screening_system_header_is_displayed()
     bcss_home.BasePage(page).click_log_out_link()
     logout.Logout(page).verify_log_out_page()
     # Log in to BCSS as bcss118 user, then log out
-    UserTools.user_login(page, "Screening Centre Manager")
+    UserTools.user_login(page, "Screening Centre Manager at BCS001")
     bcss_home.BasePage(page).bowel_cancer_screening_system_header_is_displayed()
     bcss_home.BasePage(page).click_log_out_link()
     logout.Logout(page).verify_log_out_page()
@@ -32,14 +32,14 @@ def test_only_users_on_approved_can_login_to_bcss(page: Page) -> None:
     # Add bcss401 user to approved users list table
     OracleDB().populate_ui_approved_users_table("BCSS401")
     # BCSS401 user successfully logs in to BCSS whilst on the approved list
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
     bcss_home.BasePage(page).bowel_cancer_screening_system_header_is_displayed()
     # BCSS401 user logs out
     bcss_home.BasePage(page).click_log_out_link()
     logout.Logout(page).verify_log_out_page()
 
     # BCSS118 user fails to logs in to BCSS as they are not on the approved list
-    UserTools.user_login(page, "Screening Centre Manager")
+    UserTools.user_login(page, "Screening Centre Manager at BCS001")
     # Verify relevant error message is displayed
     login_failure.LoginFailureScreen(page).verify_login_failure_screen_is_displayed()
     page.close()

tests/test_bowel_scope_page.py

@@ -12,7 +12,7 @@ def before_each(page: Page):
     Before every test is executed, this fixture logs in to BCSS as a test user and navigates to the bowel scope page
     """
     # Log in to BCSS
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     # Go to bowel scope page
     BasePage(page).go_to_bowel_scope_page()

tests/test_call_and_recall_page.py

@@ -38,7 +38,7 @@ def before_each(page: Page):
     Before every test is executed, this fixture logs in to BCSS as a test user and navigates to the call and recall page
     """
     # Log in to BCSS
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     # Go to call and recall page
     BasePage(page).go_to_call_and_recall_page()

tests/test_communications_production_page.py

@@ -16,7 +16,7 @@ def before_each(page: Page):
     production page
     """
     # Log in to BCSS
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     # Go to communications production page
     BasePage(page).go_to_communications_production_page()

tests/test_contacts_list_page.py

@@ -15,7 +15,7 @@ def before_each(page: Page):
     Before every test is executed, this fixture logs in to BCSS as a test user and navigates to the contacts list page
     """
     # Log in to BCSS
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     # Go to contacts list page
     BasePage(page).go_to_contacts_list_page()

tests/test_download_page.py

@@ -18,7 +18,7 @@ def before_each(page: Page):
     Before every test is executed, this fixture logs in to BCSS as a test user and navigates to the download page
     """
     # Log in to BCSS
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     # Go to download page
     BasePage(page).go_to_download_page()

tests/test_fit_test_kits_page.py

@@ -24,7 +24,7 @@ def before_each(page: Page):
     fit test kits page
     """
     # Log in to BCSS
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     # Go to fit test kits page
     BasePage(page).go_to_fit_test_kits_page()