Role is unique within ORG context

Author: oharsta

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

@@ -31,7 +31,6 @@
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jspecify.annotations.NonNull;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
@@ -261,9 +260,10 @@ private boolean sendInvitation(CRMContact crmContact) {
         return optionalUser.isEmpty();
     }
 
-    private @NonNull List<Role> convertCrmRolesToInviteRoles(CRMContact crmContact, List<CRMRole> newCrmRoles) {
+    private List<Role> convertCrmRolesToInviteRoles(CRMContact crmContact, List<CRMRole> newCrmRoles) {
         return newCrmRoles.stream()
-                .map(crmRole -> roleRepository.findByCrmRoleId(crmRole.getRoleId())
+                .map(crmRole -> roleRepository.findByCrmRoleIdAndCrmOrganisationId(
+                        crmRole.getRoleId(), crmContact.getOrganisation().getOrganisationId())
                         .orElseGet(() -> this.createRole(crmContact.getOrganisation(), crmRole)))
                 .toList();
     }

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

@@ -96,7 +96,7 @@ SELECT COUNT(r.id) FROM roles r WHERE r.organization_guid = ?1
 
     Optional<Role> findByName(String name);
 
-    Optional<Role> findByCrmRoleId(String crmRoleId);
+    Optional<Role> findByCrmRoleIdAndCrmOrganisationId(String crmRoleId, String crmOrganisationId);
 
     @Override
     default String rewrite(String query, Sort sort) {