Fix for duplicate CRM roles

Author: oharsta

server/src/main/java/invite/crm/CRMController.java

@@ -58,12 +58,15 @@
 import java.time.LocalDateTime;
 import java.time.Period;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;
@@ -145,6 +148,13 @@ public CRMController(@Value("${crm.collab-person-prefix}") String collabPersonPr
     public ResponseEntity<String> contact(@RequestBody CRMContact crmContact) {
         LOG.debug("POST /api/external/v1/crm: " + crmContact);
 
+        List<CRMRole> distinctRoles = crmContact.getRoles().stream()
+                .filter(Objects::nonNull)
+                .collect(Collectors.toMap(CRMRole::getRoleId, r -> r, (a, b) -> a, LinkedHashMap::new))
+                .values().stream()
+                .collect(Collectors.toCollection(ArrayList::new));
+        crmContact.setRoles(distinctRoles);
+
         boolean created;
         CRMOrganisation crmOrganisation = crmContact.getOrganisation();
         Organisation organisation = organisationRepository.findByCrmOrganisationId(crmOrganisation.getOrganisationId())

server/src/test/java/invite/crm/CRMControllerTest.java

@@ -1142,6 +1142,50 @@ void sendInvitationUnknownOrganisation() {
                 .statusCode(HttpStatus.NOT_FOUND.value());
     }
 
+    @Test
+    void contactDeduplicateRoles() throws JsonProcessingException {
+        CRMRole crmRole = new CRMRole("roleId", "BVW", "Super");
+        CRMRole duplicateRole = new CRMRole("roleId", "BVW", "Super");
+        String crmContactID = UUID.randomUUID().toString();
+        String crmOrganisationID = UUID.randomUUID().toString();
+        CRMContact crmContact = new CRMContact(
+                "new_user",
+                "hardewijk.org",
+                true,
+                crmContactID,
+                "John",
+                "from",
+                "Doe",
+                "jdoe@example.com",
+                new CRMOrganisation(crmOrganisationID, "abbrec", "Inc. Corporated"),
+                List.of(crmRole, duplicateRole, duplicateRole)
+        );
+
+        stubForManageProviderByEntityID(EntityType.OIDC10_RP, "https://calendar");
+        stubForManageProviderByEntityID(EntityType.SAML20_SP, "https://storage");
+        stubForManageProvisioning(List.of("5"));
+        stubForCreateScimRole();
+        stubForCreateScimUser();
+        stubForUpdateScimRole();
+
+        String response = given()
+                .when()
+                .accept(ContentType.JSON)
+                .header(API_KEY_HEADER, "secret")
+                .contentType(ContentType.JSON)
+                .body(crmContact)
+                .post("/crm/profile")
+                .then()
+                .extract()
+                .asString();
+        assertEquals("created", response);
+
+        Organisation organisation = organisationRepository.findByCrmOrganisationId(crmOrganisationID)
+                .orElseThrow(() -> new NotFoundException("Organisation not found: " + crmOrganisationID));
+        User user = userRepository.findByCrmContactIdAndOrganisation(crmContactID, organisation).get();
+        assertEquals(1, user.getUserRoles().size());
+    }
+
     private void seedCRMData() {
         Organisation organisation = organisationRepository.findByCrmOrganisationId(CRM_ORGANIZATION_ID).get();
         Role role = new Role();