ssoid sidam update with or without null (#719)

* ssoid sidam update with or without null

* jrd-lrd-region mapping

* jrd-lrd-region mapping

---------

Co-authored-by: vasthav-patta <112877261+vasthav-patta@users.noreply.github.com>

Author: arshinsalim

config/owasp/suppressions.xml

@@ -31,5 +31,6 @@
         <cve>CVE-2023-36052</cve>
         <cve>CVE-2023-34055</cve>
         <cve>CVE-2023-46589</cve>
+        <cve>CVE-2023-6378</cve>
     </suppress>
 </suppressions>

src/integrationTest/java/uk/gov/hmcts/reform/judicialapi/elinks/DeletedIntegrationTest.java

@@ -126,14 +126,14 @@ void verifyDeletedJrdUserProfile() {
 
         List<UserProfile> userprofile = profileRepository.findAll();
 
-        assertEquals(13, userprofile.size());
-        assertEquals("4913085", userprofile.get(11).getPersonalCode());
-        assertEquals(true, userprofile.get(11).getDeletedFlag());
-        assertEquals("2023-07-13", userprofile.get(11).getDeletedOn().toLocalDate().toString());
+        assertEquals(14, userprofile.size());
+        assertEquals("4913085", userprofile.get(12).getPersonalCode());
+        assertEquals(true, userprofile.get(12).getDeletedFlag());
+        assertEquals("2023-07-13", userprofile.get(12).getDeletedOn().toLocalDate().toString());
 
-        assertEquals("4913086", userprofile.get(12).getPersonalCode());
-        assertEquals(false, userprofile.get(12).getDeletedFlag());
-        assertEquals("2022-07-10", userprofile.get(12).getDeletedOn().toLocalDate().toString());
+        assertEquals("4913086", userprofile.get(13).getPersonalCode());
+        assertEquals(false, userprofile.get(13).getDeletedFlag());
+        assertEquals("2022-07-10", userprofile.get(13).getDeletedOn().toLocalDate().toString());
 
 
 
@@ -152,14 +152,14 @@ void verifyDeletedJrdAuditFunctionality() {
 
         List<UserProfile> userprofile = profileRepository.findAll();
 
-        assertEquals(13, userprofile.size());
-        assertEquals("4913085", userprofile.get(11).getPersonalCode());
-        assertEquals(true, userprofile.get(11).getDeletedFlag());
-        assertEquals("2023-07-13", userprofile.get(11).getDeletedOn().toLocalDate().toString());
+        assertEquals(14, userprofile.size());
+        assertEquals("4913085", userprofile.get(12).getPersonalCode());
+        assertEquals(true, userprofile.get(12).getDeletedFlag());
+        assertEquals("2023-07-13", userprofile.get(12).getDeletedOn().toLocalDate().toString());
 
-        assertEquals("4913086", userprofile.get(12).getPersonalCode());
-        assertEquals(false, userprofile.get(12).getDeletedFlag());
-        assertEquals("2022-07-10", userprofile.get(12).getDeletedOn().toLocalDate().toString());
+        assertEquals("4913086", userprofile.get(13).getPersonalCode());
+        assertEquals(false, userprofile.get(13).getDeletedFlag());
+        assertEquals("2022-07-10", userprofile.get(13).getDeletedOn().toLocalDate().toString());
 
 
         List<ElinkDataSchedularAudit>  elinksAudit = elinkSchedularAuditRepository.findAll();

src/integrationTest/java/uk/gov/hmcts/reform/judicialapi/elinks/ElinksEndToEndIntegrationForExistingObjectId.java

@@ -219,18 +219,18 @@ private void validateRoleType() {
 
     private void validateUserProfile() {
         List<UserProfile> userprofile = profileRepository.findAll();
-        assertEquals(12, userprofile.size());
-        assertEquals("4913085", userprofile.get(11).getPersonalCode());
-        assertEquals("Rachel", userprofile.get(11).getKnownAs());
-        assertEquals("Jones", userprofile.get(11).getSurname());
-        assertEquals("District Judge Rachel Jones", userprofile.get(11).getFullName());
-        assertEquals(null, userprofile.get(11).getPostNominals());
+        assertEquals(13, userprofile.size());
+        assertEquals("4913085", userprofile.get(12).getPersonalCode());
+        assertEquals("Rachel", userprofile.get(12).getKnownAs());
+        assertEquals("Jones", userprofile.get(12).getSurname());
+        assertEquals("District Judge Rachel Jones", userprofile.get(12).getFullName());
+        assertEquals(null, userprofile.get(12).getPostNominals());
         assertEquals("DJ.Rachel.Jones@ejudiciary.net",
-            userprofile.get(11).getEmailId());
-        assertTrue(userprofile.get(11).getActiveFlag());
-        assertEquals("5f8b26ba-0c8b-4192-b5c7-311d737f0cae", userprofile.get(11).getObjectId());
-        assertNull(userprofile.get(11).getSidamId());
-        assertEquals("RJ",userprofile.get(11).getInitials());
+            userprofile.get(12).getEmailId());
+        assertTrue(userprofile.get(12).getActiveFlag());
+        assertEquals("5f8b26ba-0c8b-4192-b5c7-311d737f0cae", userprofile.get(12).getObjectId());
+        assertNull(userprofile.get(12).getSidamId());
+        assertEquals("RJ",userprofile.get(12).getInitials());
     }
 
     private void cleanupData() {

src/integrationTest/java/uk/gov/hmcts/reform/judicialapi/elinks/ElinksEndToEndIntegrationForSidamIdisPresent.java

@@ -196,18 +196,18 @@ private void validateRoleType() {
 
     private void validateUserProfile() {
         List<UserProfile> userprofile = profileRepository.findAll();
-        assertEquals(11, userprofile.size());
-        assertEquals("123454", userprofile.get(10).getPersonalCode());
-        assertEquals("Rachel", userprofile.get(10).getKnownAs());
-        assertEquals("Jones", userprofile.get(10).getSurname());
-        assertEquals("District Judge Rachel Jones", userprofile.get(10).getFullName());
-        assertEquals(null, userprofile.get(10).getPostNominals());
+        assertEquals(12, userprofile.size());
+        assertEquals("123454", userprofile.get(11).getPersonalCode());
+        assertEquals("Rachel", userprofile.get(11).getKnownAs());
+        assertEquals("Jones", userprofile.get(11).getSurname());
+        assertEquals("District Judge Rachel Jones", userprofile.get(11).getFullName());
+        assertEquals(null, userprofile.get(11).getPostNominals());
         assertEquals("DJ.Rachel.Jones@ejudiciary.net",
-            userprofile.get(10).getEmailId());
-        assertTrue(userprofile.get(10).getActiveFlag());
-        assertEquals("5f8b26ba-0c8b-4192-b5c7-311d737f0cae", userprofile.get(10).getObjectId());
-        assertEquals("3333333",userprofile.get(10).getSidamId());
-        assertEquals("RJ",userprofile.get(10).getInitials());
+            userprofile.get(11).getEmailId());
+        assertTrue(userprofile.get(11).getActiveFlag());
+        assertEquals("5f8b26ba-0c8b-4192-b5c7-311d737f0cae", userprofile.get(11).getObjectId());
+        assertEquals("3333333",userprofile.get(11).getSidamId());
+        assertEquals("RJ",userprofile.get(11).getInitials());
     }
 
     private void cleanupData() {