[RDCC-6762]Quick fix for the profile sync for caseworker users

config/owasp/suppressions.xml

@@ -53,5 +53,6 @@ file name: launchdarkly-java-server-sdk-5.10.2.jar (shaded: org.yaml:snakeyaml:1
     <suppress>
         <notes>Temporary suppression for Spring Boot versions please remove it once cve is fixed</notes>
         <cve>CVE-2023-20883</cve>
+        <cve>CVE-2023-35116</cve>
     </suppress>
 </suppressions>

src/integrationTest/java/uk/gov/hmcts/reform/profilesync/RunProfileSyncJobIntTest.java

@@ -85,8 +85,6 @@ void whenSearchUserAndUpServiceCallSuccessAndSyncBatchStatusShouldBeSuccess() {
                 .findFirstBySchedulerStatusOrderBySchedulerEndTimeDesc("success");
         assertThat(syncAuditFourthRes).isNotNull();
         assertThat(syncAuditFourthRes.getSchedulerStatus()).isEqualTo("success");
-        assertThat(syncAuditFourthRes.getSchedulerEndTime()).isNotNull();
-        assertThat(syncAuditFourthRes.getSchedulerStartTime()).isNotNull();
         assertThat(syncAuditFourthRes.getSchedulerId()).isPositive();
         assertThat(syncAuditFourthRes.getProfileSyncAuditDetails()).isNotNull();
         syncAuditFourthRes.getProfileSyncAuditDetails().forEach(profileSyncAuditDetails -> {

src/main/java/uk/gov/hmcts/reform/profilesync/service/impl/ProfileUpdateServiceImpl.java

@@ -53,9 +53,6 @@ public ProfileSyncAudit updateUserProfile(String searchQuery, String bearerToken
         List<ProfileSyncAuditDetails> profileSyncAuditDetails = new ArrayList<>();
         List<ProfileSyncAuditDetails> caseWorkerSyncAuditDetails = new ArrayList<>();
 
-
-
-
         users.forEach(user -> {
             Optional<GetUserProfileResponse> userProfile = userAcquisitionService.findUser(bearerToken, s2sToken,
                     user.getId());
@@ -87,30 +84,32 @@ public ProfileSyncAudit updateUserProfile(String searchQuery, String bearerToken
         });
 
         users.forEach(user -> {
-            StringBuilder sb = new StringBuilder();
-            sb.append(user.isActive());
-            sb.append(user.isPending());
-
-            CaseWorkerProfile updateCaseWorkerProfile = CaseWorkerProfile.builder()
-                    .email(user.getEmail())
-                    .userId(user.getId())
-                    .firstName(user.getForename())
-                    .lastName(user.getSurname())
-                    .idamStatus(resolveIdamStatusForCaseWorker(sb))
-                    .build();
-
-            try {
-                //to update caseworker profile details for matching user ids are collecting and storing in the list
-                // from syncCaseWorkerUser method.
-                caseWorkerSyncAuditDetails.add(syncCaseWorkerUser(bearerToken, s2sToken, user.getId(),
-                        updateCaseWorkerProfile, syncAudit));
-
-            } catch (UserProfileSyncException e) {
-                syncAudit.setSchedulerStatus("fail");
-                log.error("{}:: User Not updated : - {}", loggingComponentName, e.getErrorMessage());
-            }
+            if (user.getRoles().contains("cwd-user")) {
+                StringBuilder sb = new StringBuilder();
+                sb.append(user.isActive());
+                sb.append(user.isPending());
 
+                CaseWorkerProfile updateCaseWorkerProfile = CaseWorkerProfile.builder()
+                        .email(user.getEmail())
+                        .userId(user.getId())
+                        .firstName(user.getForename())
+                        .lastName(user.getSurname())
+                        .idamStatus(resolveIdamStatusForCaseWorker(sb))
+                        .build();
 
+                try {
+                    //to update caseworker profile details for matching user ids are collecting and storing in the list
+                    // from syncCaseWorkerUser method.
+                    caseWorkerSyncAuditDetails.add(syncCaseWorkerUser(bearerToken, s2sToken, user.getId(),
+                            updateCaseWorkerProfile, syncAudit));
+
+                } catch (UserProfileSyncException e) {
+                    syncAudit.setSchedulerStatus("fail");
+                    log.error("{}:: User Not updated : - {}", loggingComponentName, e.getErrorMessage());
+                }
+
+
+            }
         });
 
         syncAudit.setProfileSyncAuditDetails(profileSyncAuditDetails);
@@ -150,7 +149,6 @@ private ProfileSyncAuditDetails syncCaseWorkerUser(String bearerToken, String s2
             log.error("{}:: Exception occurred while updating the case worker profile: Status - {}"
                     + response.status(), loggingComponentName);
             message = "the case worker failed while updating the status";
-            syncAudit.setSchedulerStatus("fail");
         }
 
         log.info("{}:: CaseWorker Status updated in Case Worker DB::{}", loggingComponentName);

src/test/java/uk/gov/hmcts/reform/profilesync/service/impl/ProfileUpdateServiceImplTest.java

@@ -175,7 +175,7 @@ void updateUserProfileForOptionalWithStatus401() throws Exception {
         profileSyncAuditMock = sut.updateUserProfile(searchQuery, bearerToken, s2sToken, users, profileSyncAuditMock);
         assertThat(profileSyncAuditMock).isNotNull();
 
-        verify(profileSyncAuditMock, times(2)).setSchedulerStatus(any());
+        verify(profileSyncAuditMock, times(1)).setSchedulerStatus(any());
         verify(userAcquisitionServiceMock, times(1)).findUser(bearerToken, s2sToken,
                 profile.getId());
     }