Part of ##656

Author: oharsta

server/src/main/java/invite/api/InvitationController.java

@@ -4,8 +4,8 @@
 import invite.exception.InvitationEmailMatchingException;
 import invite.exception.InvitationExpiredException;
 import invite.exception.InvitationStatusException;
-import invite.exception.InvitationUniqueCrmOrganisationException;
 import invite.exception.NotFoundException;
+import invite.exception.RemoteException;
 import invite.logging.AccessLogger;
 import invite.logging.Event;
 import invite.mail.MailBox;
@@ -574,12 +574,12 @@ private void checkCrmUniqueOrganisation(User user, Invitation invitation) {
                 }
             });
             if (throwException.get()) {
-                throw new InvitationUniqueCrmOrganisationException(
-                        String.format("User %s is not allowed to accept an invitation from Organisation %s, because it already has roles for Organisation %s",
+                throw new RemoteException(HttpStatus.NOT_ACCEPTABLE,
+                        String.format("User %s with CRM contactID %s is not allowed to accept an invitation from Organisation %s, check the database for constraint violations",
                                 user.getEmail(),
-                                invitation.getCrmOrganisationId(),
-                                userCrmOrganisationId
-                        ));
+                                user.getCrmContactId(),
+                                invitation.getCrmOrganisationId()
+                        ), null);
             }
         }
     }

server/src/main/java/invite/exception/InvitationUniqueCrmOrganisationException.java

@@ -355,7 +355,7 @@ void acceptWithCRMConstraint() throws Exception {
                 .body(acceptInvitation)
                 .post("/api/v1/invitations/accept")
                 .then()
-                .statusCode(HttpStatus.NOT_ACCEPTABLE.value());
+                .statusCode(HttpStatus.BAD_REQUEST.value());
     }
 
     @Test
@@ -378,7 +378,7 @@ void acceptWithCRMConstraintDuplicateProfile() throws Exception {
                 .body(acceptInvitation)
                 .post("/api/v1/invitations/accept")
                 .then()
-                .statusCode(HttpStatus.NOT_ACCEPTABLE.value());
+                .statusCode(HttpStatus.BAD_REQUEST.value());
     }
 
     @Test