Index: src/main/java/com/db/finki/www/build_board/entity/access_managment/ProjectRole.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/access_managment/ProjectRole.java (revision 0a97dcffc15df5c25429f2b43f4fe9720b6b0322) +++ src/main/java/com/db/finki/www/build_board/entity/access_managment/ProjectRole.java (revision 30dd87b6718c755e42034f25fa3f036670ba396c) @@ -20,8 +20,11 @@ @SequenceGenerator(name = "project_role_id_gen",sequenceName = "project_role_id_seq",allocationSize=1) private Integer id; + String name; + @ManyToOne - @JoinColumn(name = "project_id",referencedColumnName = "id") + @JoinColumn(name = "valid_in",referencedColumnName = "id") Project project; + @Column(name = "override_type",nullable = false) private String overrideType = "EXCLUDE"; Index: src/main/java/com/db/finki/www/build_board/entity/blacklisted_user/BlacklistedUser.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/blacklisted_user/BlacklistedUser.java (revision 0a97dcffc15df5c25429f2b43f4fe9720b6b0322) +++ src/main/java/com/db/finki/www/build_board/entity/blacklisted_user/BlacklistedUser.java (revision 30dd87b6718c755e42034f25fa3f036670ba396c) @@ -19,10 +19,11 @@ @SequenceGenerator(name = "blacklisted_user_id_gen",sequenceName = "blacklisted_user_id_seq",allocationSize=1) private Integer id; + @ManyToOne - @JoinColumn(name = "topic_id") + @JoinColumn(name = "blacklisted_from") Topic topic; @ManyToOne - @JoinColumn(name = "moderator_id") + @JoinColumn(name = "blacklisted_by") Moderator moderator; @@ -31,5 +32,5 @@ @ManyToOne - @JoinColumn(name = "user_id") + @JoinColumn(name = "refers_to") BBUser refersTo; Index: src/main/java/com/db/finki/www/build_board/entity/channel/Channel.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/channel/Channel.java (revision 0a97dcffc15df5c25429f2b43f4fe9720b6b0322) +++ src/main/java/com/db/finki/www/build_board/entity/channel/Channel.java (revision 30dd87b6718c755e42034f25fa3f036670ba396c) @@ -17,5 +17,4 @@ public class Channel { - @Id @GeneratedValue @@ -25,5 +24,5 @@ @ManyToOne - @JoinColumn(name = "project_id",referencedColumnName = "id",nullable = false) + @JoinColumn(name = "project_has",referencedColumnName = "id",nullable = false) private Project project; @@ -31,5 +30,5 @@ @ManyToOne - @JoinColumn(name = "developer_id",referencedColumnName = "id",nullable = false) + @JoinColumn(name = "constructed_by",referencedColumnName = "id",nullable = false) private Developer developer; Index: src/main/java/com/db/finki/www/build_board/entity/channel/Message.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/channel/Message.java (revision 0a97dcffc15df5c25429f2b43f4fe9720b6b0322) +++ src/main/java/com/db/finki/www/build_board/entity/channel/Message.java (revision 30dd87b6718c755e42034f25fa3f036670ba396c) @@ -23,10 +23,12 @@ @Id @ManyToOne - @JoinColumn(name = "channel_id",referencedColumnName = "id") + @JoinColumn(name = "sent_in",referencedColumnName = "id") private Channel channel; + @Id @ManyToOne @JoinColumn(name = "sent_by",referencedColumnName = "id",nullable = false) private Developer sentBy; + @Id @Column(name = "sent_at") Index: src/main/java/com/db/finki/www/build_board/entity/compositeId/ProjectRolePermissionId.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/compositeId/ProjectRolePermissionId.java (revision 0a97dcffc15df5c25429f2b43f4fe9720b6b0322) +++ src/main/java/com/db/finki/www/build_board/entity/compositeId/ProjectRolePermissionId.java (revision 30dd87b6718c755e42034f25fa3f036670ba396c) @@ -22,9 +22,9 @@ @ManyToOne - @JoinColumn(name = "permission_name", referencedColumnName = "name") + @JoinColumn(name = "for_permission", referencedColumnName = "name") private Permission permission; @ManyToOne - @JoinColumn(name = "role_id", referencedColumnName = "id") + @JoinColumn(name = "for_role", referencedColumnName = "id") private ProjectRole role; Index: src/main/java/com/db/finki/www/build_board/entity/compositeId/ProjectRolePermissionResourceOverrideId.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/compositeId/ProjectRolePermissionResourceOverrideId.java (revision 0a97dcffc15df5c25429f2b43f4fe9720b6b0322) +++ src/main/java/com/db/finki/www/build_board/entity/compositeId/ProjectRolePermissionResourceOverrideId.java (revision 30dd87b6718c755e42034f25fa3f036670ba396c) @@ -19,10 +19,11 @@ @ManyToOne(optional = false) @JoinColumns({ - @JoinColumn(name = "role_id",referencedColumnName = "role_id"), - @JoinColumn(name = "permission_name",referencedColumnName = "permission_name") + @JoinColumn(name = "for_role_permission_role_id",referencedColumnName = "for_role"), + @JoinColumn(name = "for_role_permission_permission_name",referencedColumnName = "for_permission") }) private ProjectRolePermission projectRolePermission; + @ManyToOne(optional = false) - @JoinColumn(name = "channel_id",referencedColumnName = "id") + @JoinColumn(name = "for_resource",referencedColumnName = "id") private Channel channel; Index: src/main/java/com/db/finki/www/build_board/entity/request/Feedback.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/request/Feedback.java (revision 0a97dcffc15df5c25429f2b43f4fe9720b6b0322) +++ src/main/java/com/db/finki/www/build_board/entity/request/Feedback.java (revision 30dd87b6718c755e42034f25fa3f036670ba396c) @@ -20,5 +20,5 @@ @OneToOne - @JoinColumn(name = "submission_id") + @JoinColumn(name = "submitted_for") @MapsId private Submission forSubmission; @@ -30,5 +30,5 @@ @ManyToOne - @JoinColumn(name = "created_by") + @JoinColumn(name = "written_by") private BBUser creator; Index: src/main/java/com/db/finki/www/build_board/entity/request/ProjectRequests.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/request/ProjectRequests.java (revision 0a97dcffc15df5c25429f2b43f4fe9720b6b0322) +++ src/main/java/com/db/finki/www/build_board/entity/request/ProjectRequests.java (revision 30dd87b6718c755e42034f25fa3f036670ba396c) @@ -18,5 +18,5 @@ public class ProjectRequests extends Submission { @ManyToOne - @JoinColumn(name = "project_id") + @JoinColumn(name = "project_receives") private Project project; Index: src/main/java/com/db/finki/www/build_board/entity/request/Report.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/request/Report.java (revision 0a97dcffc15df5c25429f2b43f4fe9720b6b0322) +++ src/main/java/com/db/finki/www/build_board/entity/request/Report.java (revision 30dd87b6718c755e42034f25fa3f036670ba396c) @@ -21,9 +21,9 @@ public class Report extends Submission { @ManyToOne - @JoinColumn(name = "for_user_id") + @JoinColumn(name = "about") BBUser user; @ManyToOne - @JoinColumn(name = "thread_id") + @JoinColumn(name = "for_misconduct_in") Topic topic; Index: src/main/java/com/db/finki/www/build_board/entity/request/Submission.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/request/Submission.java (revision 0a97dcffc15df5c25429f2b43f4fe9720b6b0322) +++ src/main/java/com/db/finki/www/build_board/entity/request/Submission.java (revision 30dd87b6718c755e42034f25fa3f036670ba396c) @@ -33,5 +33,5 @@ @ManyToOne - @JoinColumn(name = "created_by") + @JoinColumn(name = "submitted_by") BBUser creator; } Index: src/main/java/com/db/finki/www/build_board/entity/thread/BBThread.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/thread/BBThread.java (revision 0a97dcffc15df5c25429f2b43f4fe9720b6b0322) +++ src/main/java/com/db/finki/www/build_board/entity/thread/BBThread.java (revision 30dd87b6718c755e42034f25fa3f036670ba396c) @@ -24,5 +24,5 @@ @ManyToOne - @JoinColumn(name="user_id") + @JoinColumn(name="is_created_by") protected BBUser user; Index: src/main/java/com/db/finki/www/build_board/entity/thread/Project.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/thread/Project.java (revision 0a97dcffc15df5c25429f2b43f4fe9720b6b0322) +++ src/main/java/com/db/finki/www/build_board/entity/thread/Project.java (revision 30dd87b6718c755e42034f25fa3f036670ba396c) @@ -39,6 +39,6 @@ @JoinTable( name ="developer_associated_with_project", - joinColumns = @JoinColumn(name = "project_id"), - inverseJoinColumns = @JoinColumn(name = "developer_id") + joinColumns = @JoinColumn(name = "in_project"), + inverseJoinColumns = @JoinColumn(name = "about_dev") ) private Set developers = new HashSet<>(); // NE GO KORISTI GETTEROT OVDE Index: src/main/java/com/db/finki/www/build_board/entity/thread/Topic.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/thread/Topic.java (revision 0a97dcffc15df5c25429f2b43f4fe9720b6b0322) +++ src/main/java/com/db/finki/www/build_board/entity/thread/Topic.java (revision 30dd87b6718c755e42034f25fa3f036670ba396c) @@ -24,5 +24,5 @@ @ManyToOne - @JoinColumn(name = "parent_id") + @JoinColumn(name = "referenced_by") private Project parent; Index: src/main/java/com/db/finki/www/build_board/entity/thread/discussion_thread/Discussion.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/thread/discussion_thread/Discussion.java (revision 0a97dcffc15df5c25429f2b43f4fe9720b6b0322) +++ src/main/java/com/db/finki/www/build_board/entity/thread/discussion_thread/Discussion.java (revision 30dd87b6718c755e42034f25fa3f036670ba396c) @@ -12,5 +12,5 @@ public class Discussion extends EmbeddableThread { @ManyToOne - @JoinColumn(name = "parent_id") + @JoinColumn(name = "contained_in") private EmbeddableThread parent; } Index: src/main/java/com/db/finki/www/build_board/entity/user_type/BBUser.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/user_type/BBUser.java (revision 0a97dcffc15df5c25429f2b43f4fe9720b6b0322) +++ src/main/java/com/db/finki/www/build_board/entity/user_type/BBUser.java (revision 30dd87b6718c755e42034f25fa3f036670ba396c) @@ -52,5 +52,6 @@ @ManyToMany(mappedBy = "developers") -private List projects = new ArrayList<>(); + private List projects = new ArrayList<>(); + @Override public boolean isEnabled() { Index: src/main/java/com/db/finki/www/build_board/entity/user_type/DeveloperAssociatedWithProject.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/user_type/DeveloperAssociatedWithProject.java (revision 0a97dcffc15df5c25429f2b43f4fe9720b6b0322) +++ src/main/java/com/db/finki/www/build_board/entity/user_type/DeveloperAssociatedWithProject.java (revision 30dd87b6718c755e42034f25fa3f036670ba396c) @@ -11,14 +11,18 @@ @IdClass(DeveloperAssociatedWithProjectId.class) public class DeveloperAssociatedWithProject { + @Id + @ManyToOne + @JoinColumn(name = "about_dev") + private BBUser developer; @Id @ManyToOne - private BBUser developer; - @Id - @ManyToOne + @JoinColumn(name = "in_project") private Project project; + @Id @Column(name = "started_at") private LocalDateTime startedAt; + @Column(name = "ended_at") private LocalDateTime endedAt; Index: src/main/java/com/db/finki/www/build_board/repository/BlacklistedUserRepo.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/BlacklistedUserRepo.java (revision 0a97dcffc15df5c25429f2b43f4fe9720b6b0322) +++ src/main/java/com/db/finki/www/build_board/repository/BlacklistedUserRepo.java (revision 30dd87b6718c755e42034f25fa3f036670ba396c) @@ -18,5 +18,5 @@ select * from blacklisted_user bu - where bu.end_date is NULL and bu.user_id=:userId and bu.topic_id = :topicId + where bu.end_date is NULL and bu.refers_to=:userId and bu.blacklisted_from = :topicId ) """) @@ -29,5 +29,5 @@ update blacklisted_user set end_date = now() - where topic_id=:topic and user_id = :user + where blacklisted_from=:topic and refers_to = :user """) void revoke(@Param("topic") long topicId, @Param("user") int blacklistedUserId); Index: src/main/java/com/db/finki/www/build_board/repository/ReportRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/ReportRepository.java (revision 0a97dcffc15df5c25429f2b43f4fe9720b6b0322) +++ src/main/java/com/db/finki/www/build_board/repository/ReportRepository.java (revision 30dd87b6718c755e42034f25fa3f036670ba396c) @@ -14,6 +14,6 @@ join submission s on s.id = r.id - where (:latest is null or (s.created_by,s.created_at) IN ( select created_by,max(created_at) from submission r group by created_by)) - and r.thread_id =:topicId + where (:latest is null or (s.submitted_by ,s.created_at) IN ( select submitted_by,max(created_at) from submission r group by submitted_by)) + and r.for_misconduct_in =:topicId and (:status is null or s.status=:status) """, @@ -33,5 +33,5 @@ join submission s on s.id = r.id - where s.created_by = :user_id and (:status is null or s.status= :status) + where s.submitted_by = :user_id and (:status is null or s.status= :status) """ ) Index: src/main/java/com/db/finki/www/build_board/repository/access_managment/ProjectRolePermissionResourceOverrideRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/access_managment/ProjectRolePermissionResourceOverrideRepository.java (revision 0a97dcffc15df5c25429f2b43f4fe9720b6b0322) +++ src/main/java/com/db/finki/www/build_board/repository/access_managment/ProjectRolePermissionResourceOverrideRepository.java (revision 30dd87b6718c755e42034f25fa3f036670ba396c) @@ -21,23 +21,23 @@ @Query(value = """ SELECT COALESCE( - EXISTS (SELECT 1 - FROM users_project_roles upr - JOIN project_role pr - ON upr.role_id = pr.id - JOIN role_permissions rp - ON pr.id = rp.role_id - LEFT JOIN role_permissions_overrides rpo - ON pr.id = rpo.role_id - AND rpo.permission_name = rp.permission_name - AND rpo.channel_id = :resourceId - - WHERE upr.user_id = :userId - AND pr.project_id = :projectId - AND rp.permission_name = :permissionName - AND ( - (pr.override_type = 'INCLUDE' AND rpo.channel_id IS NOT NULL) - OR (pr.override_type = 'EXCLUDE' AND rpo.channel_id IS NULL) - )), FALSE - ) AS has_access; + EXISTS (SELECT 1 + FROM project_role_is_assigned_to_developer upr + JOIN project_role pr + ON upr.role_id = pr.id + JOIN role_permissions rp + ON pr.id = rp.for_role + LEFT JOIN role_permissions_overrides rpo + ON pr.id = rpo.for_role_permission_role_id + AND rpo.for_role_permission_permission_name = rp.for_permission + AND rpo.for_resource = :resourceId + + WHERE upr.user_id = :userId + AND pr.valid_in = :projectId + AND rp.for_permission = :permissionName + AND ( + (pr.override_type = 'INCLUDE' AND rpo.for_resource IS NOT NULL) + OR (pr.override_type = 'EXCLUDE' AND rpo.for_resource IS NULL) + )), FALSE + ) AS has_acces """, nativeQuery = true) boolean hasPermissionForResource(int projectId, int userId, String permissionName, UUID resourceId); @@ -45,18 +45,18 @@ @Query(nativeQuery = true,value = """ - SELECT COALESCE( - EXISTS (SELECT 1 - FROM users_project_roles upr - JOIN project_role pr - ON upr.role_id = pr.id - LEFT JOIN role_permissions rp - ON pr.id = rp.role_id AND rp.permission_name = :permissionName - WHERE upr.user_id = :userId - AND pr.project_id = :projectId - AND ( - (pr.override_type = 'INCLUDE' AND rp.permission_name IS NOT NULL) - OR (pr.override_type = 'EXCLUDE' AND rp.permission_name IS NULL) - )), FALSE - ) AS has_access; + SELECT COALESCE( + EXISTS (SELECT 1 + FROM project_role_is_assigned_to_developer upr + JOIN project_role pr + ON upr.role_id = pr.id + LEFT JOIN role_permissions rp + ON pr.id = rp.for_role AND rp.for_permission = :permissionName + WHERE upr.user_id = :userId + AND pr.valid_in = :projectId + AND ( + (pr.override_type = 'INCLUDE' AND rp.for_permission IS NOT NULL) + OR (pr.override_type = 'EXCLUDE' AND rp.for_permission IS NULL) + )), FALSE + ) AS has_access; """) boolean hasGlobalPermission(String permissionName,int projectId,int userId); Index: src/main/java/com/db/finki/www/build_board/repository/request/ProjectRequestRepo.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/request/ProjectRequestRepo.java (revision 0a97dcffc15df5c25429f2b43f4fe9720b6b0322) +++ src/main/java/com/db/finki/www/build_board/repository/request/ProjectRequestRepo.java (revision 30dd87b6718c755e42034f25fa3f036670ba396c) @@ -17,11 +17,11 @@ @Query(value = """ - select * - from project_request pr - join submission s - on s.id = pr.id - where (:latest is null or (s.created_by,s.created_at) IN ( select created_by,max(created_at) from submission pr group by created_by)) - and pr.project_id=:projectId - and (:status is null or s.status=:status) + select * + from project_request pr + join submission s + on s.id = pr.id + where (:latest is null or (s.submitted_by,s.created_at) IN ( select submitted_by,max(created_at) from submission pr group by submitted_by)) + and pr.project_receives =:projectId + and (:status is null or s.status=:status) """, nativeQuery = true Index: src/main/java/com/db/finki/www/build_board/repository/thread/ProjectRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/thread/ProjectRepository.java (revision 0a97dcffc15df5c25429f2b43f4fe9720b6b0322) +++ src/main/java/com/db/finki/www/build_board/repository/thread/ProjectRepository.java (revision 30dd87b6718c755e42034f25fa3f036670ba396c) @@ -18,10 +18,12 @@ @Modifying @Query(nativeQuery = true, - value = "UPDATE developer_associated_with_project dap set ended_at=now() where dap.developer_id=:uid AND dap.project_id=:pid") + value = "UPDATE developer_associated_with_project dap set ended_at=now() where dap" + + ".about_dev=:uid AND dap.in_project =:pid") void removeUserFromProject(int pid,int uid); @Modifying @Query(nativeQuery = true, - value = "INSERT INTO developer_associated_with_project (project_id, developer_id, started_at, ended_at) VALUES (:pid,:uid,now(),null)") + value = "INSERT INTO developer_associated_with_project (in_project, about_dev, " + + "started_at, ended_at) VALUES (:pid,:uid,now(),null)") void addUserToProject(int pid,int uid);