wip and resolving commit errors

Author: Andyg79

classes/repositories/user_repository.py

@@ -24,10 +24,10 @@ def get_pio_id_for_role(self, role: "UserRoleType") -> Optional[int]:
             INNER JOIN person prs ON prs.prs_id = pio.prs_id
             INNER JOIN org ON org.org_id = pio.org_id
             WHERE prs.oe_user_code = :user_code
-              AND org.org_code = :org_code
-              AND pio.role_id = :role_id
-              AND pio.is_bcss_user = 1
-              AND TRUNC(SYSDATE) BETWEEN TRUNC(pio.start_date) AND NVL(pio.end_date, SYSDATE)
+            AND org.org_code = :org_code
+            AND pio.role_id = :role_id
+            AND pio.is_bcss_user = 1
+            AND TRUNC(SYSDATE) BETWEEN TRUNC(pio.start_date) AND NVL(pio.end_date, SYSDATE)
         """
         params = {
             "user_code": role.user_code,

tests/regression/regression_tests/fobt_regression_tests/test_scenario_2.py

@@ -254,7 +254,11 @@ def test_scenario_2(page: Page) -> None:
     # Assert subject details in the UI
     summary_page.assert_latest_event_status("S158 Subject Discharge Sent (Normal)")
     logging.info("[UI ASSERTIONS COMPLETE]Updated subject details checked in the UI")
-    # TODO: And there is a "S158" letter batch for my subject with the exact title "GP Result (Normal)"
+    
+    # And there is a "S158" letter batch for my subject with the exact title "GP Result (Normal)"
+    navigate_to_active_batch_list(page)
+    ActiveBatchListPage(page).is_batch_present("S158 - GP Result (Normal)")
+    logging.info("[ASSERTIONS COMPLETE]S158 Letter batch exists")
 
     # When I process the open "S158" letter batch for my subject
     batch_processing(