diff --git a/rdb/src/main/java/org/openmbee/mms/rdb/repositories/BranchGroupPermRepository.java b/rdb/src/main/java/org/openmbee/mms/rdb/repositories/BranchGroupPermRepository.java index b0129ab81..0b09a0227 100644 --- a/rdb/src/main/java/org/openmbee/mms/rdb/repositories/BranchGroupPermRepository.java +++ b/rdb/src/main/java/org/openmbee/mms/rdb/repositories/BranchGroupPermRepository.java @@ -20,6 +20,8 @@ public interface BranchGroupPermRepository extends JpaRepository findByBranchAndGroupAndInheritedIsFalse(Branch b, Group g); + List findAllByGroup_NameAndBranch_Project_ProjectId(String group, String projectId); + boolean existsByBranchAndGroup_NameInAndRoleIn(Branch b, Set groups, Set roles); void deleteByBranchAndGroup_NameInAndInheritedIsFalse(Branch b, Set groups); diff --git a/rdb/src/main/java/org/openmbee/mms/rdb/repositories/BranchRepository.java b/rdb/src/main/java/org/openmbee/mms/rdb/repositories/BranchRepository.java index 44bb6e9a8..65345c1a7 100644 --- a/rdb/src/main/java/org/openmbee/mms/rdb/repositories/BranchRepository.java +++ b/rdb/src/main/java/org/openmbee/mms/rdb/repositories/BranchRepository.java @@ -1,5 +1,6 @@ package org.openmbee.mms.rdb.repositories; +import java.util.List; import java.util.Optional; import org.openmbee.mms.data.domains.global.Branch; import org.springframework.data.jpa.repository.JpaRepository; @@ -10,4 +11,6 @@ public interface BranchRepository extends JpaRepository { Optional findByProject_ProjectIdAndBranchId(String projectId, String branchId); + List findAllByProject_ProjectId(String projectId); + } diff --git a/rdb/src/main/java/org/openmbee/mms/rdb/repositories/BranchUserPermRepository.java b/rdb/src/main/java/org/openmbee/mms/rdb/repositories/BranchUserPermRepository.java index 76a8b33d0..df101debb 100644 --- a/rdb/src/main/java/org/openmbee/mms/rdb/repositories/BranchUserPermRepository.java +++ b/rdb/src/main/java/org/openmbee/mms/rdb/repositories/BranchUserPermRepository.java @@ -1,5 +1,6 @@ package org.openmbee.mms.rdb.repositories; +import java.util.List; import java.util.Optional; import java.util.Set; @@ -19,6 +20,8 @@ public interface BranchUserPermRepository extends JpaRepository findByBranchAndUserAndInheritedIsFalse(Branch b, User u); + List findAllByUser_UsernameAndBranch_Project_ProjectId(String user, String projectId); + boolean existsByBranchAndUser_UsernameAndRoleIn(Branch b, String user, Set roles); void deleteByBranchAndUser_UsernameInAndInheritedIsFalse(Branch b, Set users); diff --git a/rdb/src/main/java/org/openmbee/mms/rdb/repositories/OrgGroupPermRepository.java b/rdb/src/main/java/org/openmbee/mms/rdb/repositories/OrgGroupPermRepository.java index e5975a67d..c352b00f6 100644 --- a/rdb/src/main/java/org/openmbee/mms/rdb/repositories/OrgGroupPermRepository.java +++ b/rdb/src/main/java/org/openmbee/mms/rdb/repositories/OrgGroupPermRepository.java @@ -22,6 +22,8 @@ public interface OrgGroupPermRepository extends JpaRepository findAllByOrganizationAndRole_Name(Organization org, String r); + List findAllByGroup_Name(String group); + boolean existsByOrganizationAndGroup_NameInAndRoleIn(Organization org, Set user, Set roles); void deleteByOrganizationAndGroup_NameIn(Organization org, Set groups); diff --git a/rdb/src/main/java/org/openmbee/mms/rdb/repositories/OrgUserPermRepository.java b/rdb/src/main/java/org/openmbee/mms/rdb/repositories/OrgUserPermRepository.java index ee2690ad3..ee1af231e 100644 --- a/rdb/src/main/java/org/openmbee/mms/rdb/repositories/OrgUserPermRepository.java +++ b/rdb/src/main/java/org/openmbee/mms/rdb/repositories/OrgUserPermRepository.java @@ -22,6 +22,8 @@ public interface OrgUserPermRepository extends JpaRepository List findAllByOrganizationAndRole_Name(Organization org, String r); + List findAllByUser_Username(String username); + boolean existsByOrganizationAndUser_UsernameAndRoleIn(Organization org, String user, Set roles); void deleteByOrganizationAndUser_UsernameIn(Organization org, Set users); diff --git a/rdb/src/main/java/org/openmbee/mms/rdb/repositories/OrganizationRepository.java b/rdb/src/main/java/org/openmbee/mms/rdb/repositories/OrganizationRepository.java index c5d2d716d..60f491ad1 100644 --- a/rdb/src/main/java/org/openmbee/mms/rdb/repositories/OrganizationRepository.java +++ b/rdb/src/main/java/org/openmbee/mms/rdb/repositories/OrganizationRepository.java @@ -1,5 +1,6 @@ package org.openmbee.mms.rdb.repositories; +import java.util.List; import java.util.Optional; import org.openmbee.mms.data.domains.global.Organization; import org.springframework.data.jpa.repository.JpaRepository; @@ -12,4 +13,6 @@ public interface OrganizationRepository extends JpaRepository findByOrganizationName(String name); + List findAllByIsPublicTrue(); + } diff --git a/rdb/src/main/java/org/openmbee/mms/rdb/repositories/ProjectGroupPermRepository.java b/rdb/src/main/java/org/openmbee/mms/rdb/repositories/ProjectGroupPermRepository.java index d8f9f8b97..36c971989 100644 --- a/rdb/src/main/java/org/openmbee/mms/rdb/repositories/ProjectGroupPermRepository.java +++ b/rdb/src/main/java/org/openmbee/mms/rdb/repositories/ProjectGroupPermRepository.java @@ -24,6 +24,8 @@ public interface ProjectGroupPermRepository extends JpaRepository findAllByProjectAndRole_Name(Project proj, String r); + List findAllByGroup_Name(String group); + boolean existsByProjectAndGroup_NameInAndRoleIn(Project proj, Set groups, Set roles); void deleteByProjectAndGroup_NameInAndInheritedIsFalse(Project proj, Set groups); diff --git a/rdb/src/main/java/org/openmbee/mms/rdb/repositories/ProjectRepository.java b/rdb/src/main/java/org/openmbee/mms/rdb/repositories/ProjectRepository.java index be7b12cfc..c5bf01dd2 100644 --- a/rdb/src/main/java/org/openmbee/mms/rdb/repositories/ProjectRepository.java +++ b/rdb/src/main/java/org/openmbee/mms/rdb/repositories/ProjectRepository.java @@ -17,4 +17,5 @@ public interface ProjectRepository extends JpaRepository { List findAllByOrganizationOrganizationId(String id); + List findAllByIsPublicTrue(); } diff --git a/rdb/src/main/java/org/openmbee/mms/rdb/repositories/ProjectUserPermRepository.java b/rdb/src/main/java/org/openmbee/mms/rdb/repositories/ProjectUserPermRepository.java index 216395e7e..da6976213 100644 --- a/rdb/src/main/java/org/openmbee/mms/rdb/repositories/ProjectUserPermRepository.java +++ b/rdb/src/main/java/org/openmbee/mms/rdb/repositories/ProjectUserPermRepository.java @@ -24,6 +24,8 @@ public interface ProjectUserPermRepository extends JpaRepository findAllByProjectAndRole_Name(Project proj, String r); + List findAllByUser_Username(String user); + boolean existsByProjectAndUser_UsernameAndRoleIn(Project proj, String user, Set roles); void deleteByProjectAndUser_UsernameInAndInheritedIsFalse(Project proj, Set users);