From 9422851f9734294d8e84d08e013f6e9aa7bfbc43 Mon Sep 17 00:00:00 2001 From: manukundloo-hmcts Date: Tue, 27 Jun 2023 14:41:57 +0100 Subject: [PATCH 1/5] [RDCC-6762]Quick fix for the profile sync for caseworker users --- .../impl/ProfileUpdateServiceImpl.java | 51 +++++++++---------- .../impl/ProfileUpdateServiceImplTest.java | 2 +- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/profilesync/service/impl/ProfileUpdateServiceImpl.java b/src/main/java/uk/gov/hmcts/reform/profilesync/service/impl/ProfileUpdateServiceImpl.java index bf06f832..f368a2e0 100644 --- a/src/main/java/uk/gov/hmcts/reform/profilesync/service/impl/ProfileUpdateServiceImpl.java +++ b/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 = new ArrayList<>(); List caseWorkerSyncAuditDetails = new ArrayList<>(); - - - users.forEach(user -> { Optional 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().equals("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,7 @@ 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"); + /*syncAudit.setSchedulerStatus("fail");*/ } log.info("{}:: CaseWorker Status updated in Case Worker DB::{}", loggingComponentName); diff --git a/src/test/java/uk/gov/hmcts/reform/profilesync/service/impl/ProfileUpdateServiceImplTest.java b/src/test/java/uk/gov/hmcts/reform/profilesync/service/impl/ProfileUpdateServiceImplTest.java index 3e94b7d8..598f4e7f 100644 --- a/src/test/java/uk/gov/hmcts/reform/profilesync/service/impl/ProfileUpdateServiceImplTest.java +++ b/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()); } From 44bc97564856d82a82d926f3a7c698be468ff907 Mon Sep 17 00:00:00 2001 From: manukundloo-hmcts Date: Tue, 27 Jun 2023 14:54:06 +0100 Subject: [PATCH 2/5] [RDCC-6762]Quick fix for the profile sync for caseworker users --- config/owasp/suppressions.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/owasp/suppressions.xml b/config/owasp/suppressions.xml index 04c654b3..645bc9f6 100644 --- a/config/owasp/suppressions.xml +++ b/config/owasp/suppressions.xml @@ -42,6 +42,7 @@ Temporary suppression for commons-fileupload-1.4.jar CVE-2023-24998 CVE-2023-20883 + CVE-2023-35116 Date: Tue, 27 Jun 2023 15:03:02 +0100 Subject: [PATCH 3/5] [RDCC-6762]Quick fix for the profile sync for caseworker users --- config/owasp/suppressions.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/owasp/suppressions.xml b/config/owasp/suppressions.xml index 645bc9f6..bf997ae9 100644 --- a/config/owasp/suppressions.xml +++ b/config/owasp/suppressions.xml @@ -42,7 +42,6 @@ Temporary suppression for commons-fileupload-1.4.jar CVE-2023-24998 CVE-2023-20883 - CVE-2023-35116 Temporary suppression for Spring Boot versions please remove it once cve is fixed CVE-2023-20883 + CVE-2023-35116 From a9189ac60da2285524278034e084b448b5a45177 Mon Sep 17 00:00:00 2001 From: manukundloo-hmcts Date: Tue, 27 Jun 2023 15:12:12 +0100 Subject: [PATCH 4/5] [RDCC-6762]Quick fix for the profile sync for caseworker users --- .../profilesync/service/impl/ProfileUpdateServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/profilesync/service/impl/ProfileUpdateServiceImpl.java b/src/main/java/uk/gov/hmcts/reform/profilesync/service/impl/ProfileUpdateServiceImpl.java index f368a2e0..4621b453 100644 --- a/src/main/java/uk/gov/hmcts/reform/profilesync/service/impl/ProfileUpdateServiceImpl.java +++ b/src/main/java/uk/gov/hmcts/reform/profilesync/service/impl/ProfileUpdateServiceImpl.java @@ -84,7 +84,7 @@ public ProfileSyncAudit updateUserProfile(String searchQuery, String bearerToken }); users.forEach(user -> { - if (user.getRoles().equals("cwd-user")) { + if (user.getRoles().contains("cwd-user")) { StringBuilder sb = new StringBuilder(); sb.append(user.isActive()); sb.append(user.isPending()); From fdfaaf9c9aea273c9617ba18e791e7da9429bc18 Mon Sep 17 00:00:00 2001 From: manukundloo-hmcts Date: Tue, 27 Jun 2023 15:26:38 +0100 Subject: [PATCH 5/5] [RDCC-6762]Quick fix for the profile sync for caseworker users --- .../gov/hmcts/reform/profilesync/RunProfileSyncJobIntTest.java | 2 -- .../profilesync/service/impl/ProfileUpdateServiceImpl.java | 1 - 2 files changed, 3 deletions(-) diff --git a/src/integrationTest/java/uk/gov/hmcts/reform/profilesync/RunProfileSyncJobIntTest.java b/src/integrationTest/java/uk/gov/hmcts/reform/profilesync/RunProfileSyncJobIntTest.java index 7930aa0e..306a9a64 100644 --- a/src/integrationTest/java/uk/gov/hmcts/reform/profilesync/RunProfileSyncJobIntTest.java +++ b/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 -> { diff --git a/src/main/java/uk/gov/hmcts/reform/profilesync/service/impl/ProfileUpdateServiceImpl.java b/src/main/java/uk/gov/hmcts/reform/profilesync/service/impl/ProfileUpdateServiceImpl.java index 4621b453..a88d63a6 100644 --- a/src/main/java/uk/gov/hmcts/reform/profilesync/service/impl/ProfileUpdateServiceImpl.java +++ b/src/main/java/uk/gov/hmcts/reform/profilesync/service/impl/ProfileUpdateServiceImpl.java @@ -149,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);