Fixe for duplicate key exception for CRM invitations

Author: oharsta

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

@@ -286,7 +286,8 @@ public ResponseEntity<Map<String, ConnectionStatusResponse>> connectionStatus(@R
                     ));
             return ResponseEntity.ok(responseMap);
         } else {
-            Map<String, ConnectionStatusResponse> responseMap = invitationRepository.findByCrmOrganisationId(crmOrganisationId)
+            Map<String, ConnectionStatusResponse> responseMap = invitationRepository
+                    .findByCrmOrganisationIdAndStatus(crmOrganisationId, Status.OPEN)
                     .stream()
                     .collect(Collectors.toMap(
                             invitation -> invitation.getCrmContactId(),
@@ -306,7 +307,8 @@ public ResponseEntity<Map<String, ConnectionStatusResponse>> connectionStatus(@R
                                                 Map.of(),
                                                 crmStatusCode.getStatus(), crmStatusCode.getStatusCode()
                                         ));
-                            }
+                            },
+                            (existing, replacement) -> replacement
                     ));
             return ResponseEntity.ok(responseMap);
         }

server/src/main/java/invite/repository/InvitationRepository.java

@@ -1,11 +1,8 @@
 package invite.repository;
 
-import invite.model.Authority;
 import invite.model.Invitation;
-import invite.model.Organisation;
 import invite.model.Role;
 import invite.model.Status;
-import invite.model.User;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -31,7 +28,7 @@ public interface InvitationRepository extends JpaRepository<Invitation, Long>, Q
 
     List<Invitation> findByCrmContactIdAndCrmOrganisationIdAndStatus(String crmContactId, String crmOrganisationId, Status status);
 
-    List<Invitation> findByCrmOrganisationId(String crmOrganisationId);
+    List<Invitation> findByCrmOrganisationIdAndStatus(String crmOrganisationId, Status status);
 
     Optional<Invitation> findTopBySubInviteeOrderByCreatedAtDesc(String email);