WIP for #672

Author: oharsta

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

@@ -260,7 +260,7 @@ public ResponseEntity<Map<String, ConnectionStatusResponse>> connectionStatus(@R
                             user -> user.getCrmContactId(),
                             user -> new ConnectionStatusResponse(
                                     user.getName(), user.getEmail(), user.getSchacHomeOrganization(), user.getUid(),
-                                    "Paired", "paired"
+                                    CRMStatusCode.Paired.getStatus(), CRMStatusCode.Paired.getStatusCode()
                             )
                     ));
             return ResponseEntity.ok(responseMap);
@@ -269,19 +269,26 @@ public ResponseEntity<Map<String, ConnectionStatusResponse>> connectionStatus(@R
                     .stream()
                     .collect(Collectors.toMap(
                             invitation -> invitation.getCrmContactId(),
-                            invitation -> userRepository.findByCrmContactIdAndOrganisation(crmOrganisationId, organisation)
-                                    .map(user -> new ConnectionStatusResponse(
-                                            user.getName(), user.getEmail(), user.getSchacHomeOrganization(), user.getUid(),
-                                            "In process", "in_process"
-                                    )).orElse(new ConnectionStatusResponse(
-                                            null, invitation.getEmail(), null, null,
-                                            "In process", "in_process"
-                                    ))
+                            invitation -> {
+                                CRMStatusCode crmStatusCode = crmStatusCode(invitation);
+                                return userRepository.findByCrmContactIdAndOrganisation(invitation.getCrmContactId(), organisation)
+                                        .map(user -> new ConnectionStatusResponse(
+                                                user.getName(), user.getEmail(), user.getSchacHomeOrganization(), user.getUid(),
+                                                crmStatusCode.getStatus(), crmStatusCode.getStatusCode()
+                                        )).orElse(new ConnectionStatusResponse(
+                                                null, invitation.getEmail(), null, null,
+                                                crmStatusCode.getStatus(), crmStatusCode.getStatusCode()
+                                        ));
+                            }
                     ));
             return ResponseEntity.ok(responseMap);
         }
     }
 
+    private CRMStatusCode crmStatusCode(Invitation invitation) {
+        return invitation.getExpiryDate().isBefore(Instant.now()) ? CRMStatusCode.NotPaired : CRMStatusCode.InProcess;
+    }
+
     @PostMapping(value = "/crm/api/v1/invite/resend", produces = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "Resend an invitation",
             description = "Resend an invitation based on the CRM OrganisationID and CRM ContactID")
@@ -426,18 +433,12 @@ private List<Role> convertCrmRolesToInviteRoles(CRMContact crmContact, List<CRMR
         return newCrmRoles.stream()
                 .map(crmRole -> roleRepository.findByCrmRoleIdAndOrganisation(
                                 crmRole.getRoleId(), organisation)
-                        .or(() -> this.createRole(crmContact.getOrganisation(), crmRole)))
+                        .or(() -> this.createRole(crmContact.getOrganisation(), crmRole, organisation)))
                 .flatMap(Optional::stream)
                 .toList();
     }
 
-    private Optional<Role> createRole(CRMOrganisation crmOrganisation, CRMRole crmRole) {
-        Organisation organisation = organisationRepository.findByCrmOrganisationId(crmOrganisation.getOrganisationId())
-                .orElseGet(() -> organisationRepository.save(new Organisation(
-                        crmOrganisation.getOrganisationId(),
-                        crmOrganisation.getName(),
-                        crmOrganisation.getAbbrev()
-                )));
+    private Optional<Role> createRole(CRMOrganisation crmOrganisation, CRMRole crmRole, Organisation organisation) {
         CrmConfigEntry crmConfigEntry = this.crmConfig.get(crmRole.getSabCode());
         if (crmConfigEntry == null) {
             throw new InvalidInputException("CRM sabCode is not configured: " + crmRole.getSabCode());

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

@@ -455,6 +455,86 @@ void resendInviteMail() throws Exception {
         assertEquals("Invitation for Mail at SURFconext Invite", mailMessage.getSubject());
     }
 
+    @Test
+    void connectionStatusWithInvitationExistingUser() {
+        Invitation invitation = invitationRepository.findByHash(Authority.GUEST.name()).get();
+        invitation.setCrmContactId(CRM_CONTACT_ID);
+        invitation.setCrmOrganisationId(CRM_ORGANIZATION_ID);
+        //This will cause the CRMStatusCode.NotPaired
+        invitation.setExpiryDate(Instant.now().minus(600, ChronoUnit.DAYS));
+        invitationRepository.save(invitation);
+
+        Map<String, ConnectionStatusResponse> response = given()
+                .when()
+                .accept(ContentType.JSON)
+                .header(API_KEY_HEADER, "secret")
+                .contentType(ContentType.JSON)
+                .body(new ConnectionStatus(CRM_ORGANIZATION_ID, false))
+                .get("/crm/api/v1/profiles")
+                .as(new TypeRef<>() {
+                });
+        assertEquals(1, response.size());
+        ConnectionStatusResponse connectionStatusResponse = response.get(CRM_CONTACT_ID);
+        assertEquals("gb@kb.nl", connectionStatusResponse.email());
+        assertEquals("George Best", connectionStatusResponse.fullname());
+        assertEquals(CRMStatusCode.NotPaired.getStatusCode(), connectionStatusResponse.statusCode());
+    }
+
+    @Test
+    void connectionStatusWithInvitationNewUser() {
+        Invitation invitation = invitationRepository.findByHash(Authority.GUEST.name()).get();
+        //No user with this contactID exists
+        String crmContactId = UUID.randomUUID().toString();
+        invitation.setCrmContactId(crmContactId);
+        invitation.setCrmOrganisationId(CRM_ORGANIZATION_ID);
+        invitationRepository.save(invitation);
+
+        Map<String, ConnectionStatusResponse> response = given()
+                .when()
+                .accept(ContentType.JSON)
+                .header(API_KEY_HEADER, "secret")
+                .contentType(ContentType.JSON)
+                .body(new ConnectionStatus(CRM_ORGANIZATION_ID, false))
+                .get("/crm/api/v1/profiles")
+                .as(new TypeRef<>() {
+                });
+        assertEquals(1, response.size());
+        ConnectionStatusResponse connectionStatusResponse = response.get(crmContactId);
+        assertEquals(invitation.getEmail(), connectionStatusResponse.email());
+        assertNull(connectionStatusResponse.fullname());
+        assertEquals(CRMStatusCode.InProcess.getStatusCode(), connectionStatusResponse.statusCode());
+    }
+
+    @Test
+    void connectionStatusWithUser() {
+        Map<String, ConnectionStatusResponse> response = given()
+                .when()
+                .accept(ContentType.JSON)
+                .header(API_KEY_HEADER, "secret")
+                .contentType(ContentType.JSON)
+                .body(new ConnectionStatus(CRM_ORGANIZATION_ID, true))
+                .get("/crm/api/v1/profiles")
+                .as(new TypeRef<>() {
+                });
+        assertEquals(1, response.size());
+        ConnectionStatusResponse connectionStatusResponse = response.get(CRM_CONTACT_ID);
+        assertEquals(CRMStatusCode.Paired.getStatusCode(), connectionStatusResponse.statusCode());
+    }
+
+    @Test
+    void connectionStatusWithUnknownOrganisation() {
+        Map<String, ConnectionStatusResponse> response = given()
+                .when()
+                .accept(ContentType.JSON)
+                .header(API_KEY_HEADER, "secret")
+                .contentType(ContentType.JSON)
+                .body(new ConnectionStatus("nope", true))
+                .get("/crm/api/v1/profiles")
+                .as(new TypeRef<>() {
+                });
+        assertEquals(0, response.size());
+    }
+
     @Test
     void profileWithUidIdp() {
         this.seedCRMData();