Fixes #687

Author: oharsta

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

@@ -21,6 +21,7 @@
 import invite.model.Organisation;
 import invite.model.Provisionable;
 import invite.model.Role;
+import invite.model.Status;
 import invite.model.User;
 import invite.model.UserRole;
 import invite.model.UserRoleAudit;
@@ -448,6 +449,20 @@ private boolean sendInvitation(CRMContact crmContact, Organisation organisation)
         Optional<User> optionalUser =
                 userRepository.findByCrmContactIdAndOrganisation(
                         crmContact.getContactId(), organisation);
+        //Idempotency - if there is already an open invitation with the same roles for this contact / organisation then do nothing
+        List<Invitation> invitations = invitationRepository
+                .findByCrmContactIdAndCrmOrganisationId(crmContact.getContactId(), organisation.getCrmOrganisationId());
+        boolean duplicateInvitation = invitations.stream().anyMatch(invitation -> invitation.getStatus().equals(Status.OPEN) &&
+                invitation.getRoles().stream()
+                        .allMatch(invitationRole -> crmContact.getRoles().stream()
+                                .anyMatch(crmRole -> crmRole.getRoleId().equals(invitationRole.getRole().getCrmRoleId()))));
+        if (duplicateInvitation) {
+            LOG.info(String.format("Not sending invitation to %s as there is already an outstanding invitation with roles %s",
+                    crmContact.getEmail(),
+                    crmContact.getRoles().stream().map(crmRole -> crmRole.getName()).collect(Collectors.joining(", "))));
+            return false;
+        }
+
         List<CRMRole> newCrmRoles = syncCrmRoles(crmContact, optionalUser.orElse(new User()));
         //Only save the user when the user already existed
         optionalUser.ifPresent(user -> userRepository.save(user));

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

@@ -180,6 +180,23 @@ void contactInviteNewUser() throws Exception {
         Invitation invitation = invitations.getFirst();
         assertEquals("SURF CRM", invitation.getRemoteApiUser());
 
+        //Now we send the same POST again, and because of idenpotentcy no new invitation should be created
+        String newResponse = given()
+                .when()
+                .accept(ContentType.JSON)
+                .header(API_KEY_HEADER, "secret")
+                .contentType(ContentType.JSON)
+                .body(crmContact)
+                .post("/crm/profile")
+                .then()
+                .extract()
+                .asString();
+        assertEquals("updated", newResponse);
+        List<Invitation> invitationsAfterSyncs = invitationRepository.findByCrmContactIdAndCrmOrganisationId(
+                crmContactID, crmOrganisationID);
+        assertEquals(1, invitationsAfterSyncs.size());
+        assertEquals(invitations.getFirst().getId(), invitationsAfterSyncs.getFirst().getId());
+
         response = given()
                 .when()
                 .accept(ContentType.JSON)