Change AcsService getUserRoleCodeAndId() to throw a BadRequestException

if we are unable to retrieve the users job role code

Author: stuartmcneill1-nhs

.gitignore

@@ -13,3 +13,5 @@ __pycache__/
 .venv/
 smoketest-report.xml
 *.code-workspace
+.python-version
+

docker/service/src/main/java/uk/nhs/adaptors/scr/services/AcsService.java

@@ -90,12 +90,22 @@ private Pair<String, String> getUserRoleCodeAndId(String authorisation, String n
 
         }
 
+        // if we haven't retrieved a role code from openID we try the SDS service
         try {
-            return Pair.of(sdsService.getUserRoleCode(nhsdSessionUrid), nhsdIdentity);
+            var roleCode = sdsService.getUserRoleCode(nhsdSessionUrid);
+            if (roleCode != null && !roleCode.isEmpty()) {
+                return Pair.of(roleCode, nhsdIdentity);
+            }
         } catch (BadRequestException | URISyntaxException e) {
+            LOGGER.info(String.format("Unable to determine Job Role Code for "
+                + "the given RoleID via the SDS Service: %s", nhsdSessionUrid));
             throw new BadRequestException(String.format("Unable to determine SDS Job Role Code for "
                 + "the given RoleID: %s", nhsdSessionUrid));
         }
+        LOGGER.info(String.format("Unable to determine Job Role Code for "
+            + "the given RoleID via the SDS Service: %s", nhsdSessionUrid));
+        throw new BadRequestException(String.format("Unable to determine SDS Job Role Code for "
+            + "the given RoleID: %s", nhsdSessionUrid));
     }
 
     private String prepareAcsRequest(ParametersParameterComponent parameter, RequestData requestData, String sdsJobRoleCode,