Index: docs/versioning/er_models/ER_BUILD_BOARD_v5.xml =================================================================== --- docs/versioning/er_models/ER_BUILD_BOARD_v5.xml (revision fcb331336ea9c1d1908c977aa183995407d83dfc) +++ docs/versioning/er_models/ER_BUILD_BOARD_v5.xml (revision fcb331336ea9c1d1908c977aa183995407d83dfc) @@ -0,0 +1,1 @@ +

RECIEVESPROJECT_THREAD

IS_MODERATED_BYStarted_atTHREADtrue16dTOPIC_THREADUSER

33DEVELOPER

true16oPROJECT_OWNER

PERMISSIONSDOUBLE3PROJECT_ROLEDOUBLE3VALID_IN

3NDOUBLE3HAS

DOUBLE3CHANNEL

3NCONSTRUCTS

3N

IS_CREATED_BY

3N

MODERATOR

3trueNametruetrueName

Password

Content

ASSOCIATED_WITH

NRegister_at

3trueName

SENDS_MESSAGE_IN

NContent

Started_at

Ended_at

Sent_at

TAGCREATES

ASSISGNED_TO

NtruetrueName

Description

LIKES

NIs_active

3NSexDescription

SUBBMITTED_BYSUBMISSION3M

ABOUTREPORT3N

FOR_MISCONDUCTtruetrueId

PROJECT_REQUEST3NStatus

Description

ReasonIS_ASSIGNED

M

PDISCUSSION_THREADTitle

Title

P

3NRepo_url

DOUBLE3BLACKLISTED_USERDOUBLE3BLACKLISTED_BY

DOUBLE3REFERS_TO

DOUBLE3BLACKLISTED_FROM

3N3trueStart_dateEnd_date

3N

3N

QtruetrueId

DOUBLE3FEEDBACKDescriptionSubmission_typeCreated_atWRITTEN_BY

truetrueId

DOUBLE3SUBBMITED_FOR

3

DOUBLE3Guidelines

Created_at

Created_atEmail

Name

Uername

true16d

33

3N

3M

EMBEDDABLEREFERENCED_BY

M

CONTAINED_IN

3N

true16d

3M

3N

3M

33PROJECT_RESOURCEtruetrueid

IS_A_CHANNEL

3

DOUBLE3PROJECT_ROLE_PERMISSIONDOUBLE3FOR_ROLE

N

3DOUBLE3FOR_PERMISSION

3

Noverride_type

FOR_RESOURCE

N

MIS_A_DEVELOPER

3

IS_TOPIC

3

Index: src/main/java/com/db/finki/www/build_board/common/enums/PermissionValue.java =================================================================== --- src/main/java/com/db/finki/www/build_board/common/enums/PermissionValue.java (revision fcb331336ea9c1d1908c977aa183995407d83dfc) +++ src/main/java/com/db/finki/www/build_board/common/enums/PermissionValue.java (revision fcb331336ea9c1d1908c977aa183995407d83dfc) @@ -0,0 +1,9 @@ +package com.db.finki.www.build_board.common.enums; + +public enum PermissionValue { + READ, + WRITE, + CREATE, + DELETE; + +} Index: src/main/java/com/db/finki/www/build_board/controller/thread_controller/ProjectController.java =================================================================== --- src/main/java/com/db/finki/www/build_board/controller/thread_controller/ProjectController.java (revision 3e47966b86c3c00ee83e0e16eba37fac387ab5ad) +++ src/main/java/com/db/finki/www/build_board/controller/thread_controller/ProjectController.java (revision fcb331336ea9c1d1908c977aa183995407d83dfc) @@ -1,4 +1,5 @@ package com.db.finki.www.build_board.controller.thread_controller; +import com.db.finki.www.build_board.common.enums.PermissionValue; import com.db.finki.www.build_board.dto.AddRoleDTO; import com.db.finki.www.build_board.entity.thread.Project; @@ -15,4 +16,8 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.mvc.support.RedirectAttributes; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; @@ -38,5 +43,4 @@ model.addAttribute("tags", tagService.getAll()); model.addAttribute("developers",projectService.getAllDevelopersForProject(project)); - model.addAttribute("developersRoles",projectAccessManagementService.getRolesForMembersInProject(project)); String error = (String) redirectAttributes.getAttribute("error"); @@ -53,8 +57,10 @@ } -// @PostMapping("/{title}/roles/add") -// public String addProjectRole(@PathVariable(name = "title") String title, @RequestBody AddRoleDTO addRoleDTO, RedirectAttributes redirectAttributes) { -// -// } + @PostMapping("/{title}/roles/add") + public String addProjectRole(@PathVariable(name = "title") String title, @RequestBody AddRoleDTO addRoleDTO, RedirectAttributes redirectAttributes) { + projectAccessManagementService.addRole(addRoleDTO); + + return "redirect:/projects/" + title + "/roles"; + } @GetMapping("/create") @@ -66,4 +72,17 @@ model.addAttribute("isCreatingProject", tagService.getAll()); return "project_pages/project-create"; + } + + + @GetMapping("{title}/roles") + public String getRolesPage(@PathVariable(name = "title") Project project, Model model){ + + model.addAttribute("project", project); + model.addAttribute("developersRoles",projectAccessManagementService.getRolesForMembersInProject(project)); + model.addAttribute("perResourcePermissions", List.of("READ","WRITE")); + model.addAttribute("globalPermissions", List.of("CREATE","DELETE")); + model.addAttribute("errMsg",null); + model.addAttribute("overrideTypeDefault","INCLUDE"); + return "project_pages/project-roles"; } Index: src/main/java/com/db/finki/www/build_board/dto/AddRoleDTO.java =================================================================== --- src/main/java/com/db/finki/www/build_board/dto/AddRoleDTO.java (revision 3e47966b86c3c00ee83e0e16eba37fac387ab5ad) +++ src/main/java/com/db/finki/www/build_board/dto/AddRoleDTO.java (revision fcb331336ea9c1d1908c977aa183995407d83dfc) @@ -1,7 +1,6 @@ package com.db.finki.www.build_board.dto; -import com.db.finki.www.build_board.common.enums.ProjectResourcePermissionOverrideType; -import com.db.finki.www.build_board.entity.access_managment.Permission; -import com.db.finki.www.build_board.entity.thread.Project; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; @@ -12,8 +11,13 @@ @AllArgsConstructor @NoArgsConstructor +@JsonIgnoreProperties(ignoreUnknown = true) public class AddRoleDTO { + @JsonProperty String name; - Project project; - List permissions; - ProjectResourcePermissionOverrideType projectResourcePermissionOverrideType; + @JsonProperty + String projectTitle; + @JsonProperty + List permissionResourceDTOS; + @JsonProperty + String permissionOverrideType; } Index: src/main/java/com/db/finki/www/build_board/dto/PermissionResourceDTO.java =================================================================== --- src/main/java/com/db/finki/www/build_board/dto/PermissionResourceDTO.java (revision fcb331336ea9c1d1908c977aa183995407d83dfc) +++ src/main/java/com/db/finki/www/build_board/dto/PermissionResourceDTO.java (revision fcb331336ea9c1d1908c977aa183995407d83dfc) @@ -0,0 +1,15 @@ +package com.db.finki.www.build_board.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@AllArgsConstructor +@NoArgsConstructor +@Getter +@Setter +public class PermissionResourceDTO { + String permissionName; + int projectResourceID; +} Index: src/main/java/com/db/finki/www/build_board/dto/PermissionResourceWrapper.java =================================================================== --- src/main/java/com/db/finki/www/build_board/dto/PermissionResourceWrapper.java (revision fcb331336ea9c1d1908c977aa183995407d83dfc) +++ src/main/java/com/db/finki/www/build_board/dto/PermissionResourceWrapper.java (revision fcb331336ea9c1d1908c977aa183995407d83dfc) @@ -0,0 +1,20 @@ +package com.db.finki.www.build_board.dto; + +import com.db.finki.www.build_board.entity.access_managment.Permission; +import com.db.finki.www.build_board.entity.access_managment.ProjectResource; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +public class PermissionResourceWrapper { + Permission permission; + ProjectResource resource; + +} + + Index: src/main/java/com/db/finki/www/build_board/entity/access_managment/ProjectRolePermission.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/access_managment/ProjectRolePermission.java (revision 3e47966b86c3c00ee83e0e16eba37fac387ab5ad) +++ src/main/java/com/db/finki/www/build_board/entity/access_managment/ProjectRolePermission.java (revision fcb331336ea9c1d1908c977aa183995407d83dfc) @@ -25,4 +25,8 @@ private String overrideType; + public ProjectRolePermission(ProjectRolePermissionId projectRolePermissionId) { + this.id = projectRolePermissionId; + } + public Permission getPermission() { return id.getPermission(); Index: src/main/java/com/db/finki/www/build_board/entity/access_managment/ProjectRolePermissionResourceOverride.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/access_managment/ProjectRolePermissionResourceOverride.java (revision 3e47966b86c3c00ee83e0e16eba37fac387ab5ad) +++ src/main/java/com/db/finki/www/build_board/entity/access_managment/ProjectRolePermissionResourceOverride.java (revision fcb331336ea9c1d1908c977aa183995407d83dfc) @@ -22,4 +22,5 @@ private ProjectRolePermissionResourceOverrideId projectRolePermissionResourceOverrideId; + public ProjectRolePermission getProjectRolePermission() { return projectRolePermissionResourceOverrideId.getProjectRolePermission(); Index: src/main/java/com/db/finki/www/build_board/repository/access_managment/ProjectRolePermissionRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/access_managment/ProjectRolePermissionRepository.java (revision 3e47966b86c3c00ee83e0e16eba37fac387ab5ad) +++ src/main/java/com/db/finki/www/build_board/repository/access_managment/ProjectRolePermissionRepository.java (revision fcb331336ea9c1d1908c977aa183995407d83dfc) @@ -14,16 +14,4 @@ List findByIdProjectRole(ProjectRole projectRole); - @Query(nativeQuery = true,value = """ - SELECT EXISTS ( - SELECT upr.role_name,upr.project_id FROM users_project_roles upr - JOIN role_permissions prp - ON prp.project_id = upr.project_id AND prp.role_name = upr.role_name - WHERE upr.user_id = :userId - AND prp.project_id = :projectId - AND prp.permission_name = :permissionName - AND prp.project_resource_id = :resourceId - ) - """) - boolean isAuthorizedToPerformActionOnResource(int projectId,int userId,String permissionName,int resourceId); } Index: src/main/java/com/db/finki/www/build_board/service/access_managment/ProjectAccessManagementService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/access_managment/ProjectAccessManagementService.java (revision 3e47966b86c3c00ee83e0e16eba37fac387ab5ad) +++ src/main/java/com/db/finki/www/build_board/service/access_managment/ProjectAccessManagementService.java (revision fcb331336ea9c1d1908c977aa183995407d83dfc) @@ -3,9 +3,12 @@ import com.db.finki.www.build_board.dto.AddRoleDTO; import com.db.finki.www.build_board.dto.MembersPerRoleWrapper; +import com.db.finki.www.build_board.dto.PermissionResourceWrapper; import com.db.finki.www.build_board.entity.access_managment.ProjectRole; import com.db.finki.www.build_board.entity.access_managment.ProjectRolePermission; +import com.db.finki.www.build_board.entity.access_managment.ProjectRolePermissionResourceOverride; import com.db.finki.www.build_board.entity.access_managment.UsersProjectRoles; import com.db.finki.www.build_board.entity.compositeId.ProjectRoleId; import com.db.finki.www.build_board.entity.compositeId.ProjectRolePermissionId; +import com.db.finki.www.build_board.entity.compositeId.ProjectRolePermissionResourceOverrideId; import com.db.finki.www.build_board.entity.thread.Project; import com.db.finki.www.build_board.repository.DeveloperRepository; @@ -39,9 +42,9 @@ public boolean hasPermissionToAccessResource(int userId, String permission, int resourceId, int projectId) { - return projectRolePermissionResourceOverrideRepository.hasPermissionForResource(projectId,userId, permission, resourceId); + return projectRolePermissionResourceOverrideRepository.hasPermissionForResource(projectId, userId, permission, resourceId); } - public List getRolesForMembersInProject(Project project){ - return userProjectRoleRepository.findByIdRoleIdProject(project); + public List getRolesForMembersInProject(Project project) { + return userProjectRoleRepository.findByIdRoleIdProject(project); } @@ -49,16 +52,23 @@ @Transactional public void addRole(AddRoleDTO addRoleDTO) { - ProjectRole projectRole = new ProjectRole(new ProjectRoleId(addRoleDTO.getName(),addRoleDTO.getProject())); + ProjectRole projectRole = new ProjectRole(new ProjectRoleId(addRoleDTO.getName(), addRoleDTO.getProject())); projectRoleRepository.save(projectRole); - List projectRolePermissions = addRoleDTO - .getPermissions() - .stream() - .map(permission -> - new ProjectRolePermission(new ProjectRolePermissionId(permission,projectRole), - addRoleDTO.getProjectResourcePermissionOverrideType().name())).toList(); + List permissionResourceWrapperList = addRoleDTO.getPermissionResource(); + List projectRolePermissions = permissionResourceWrapperList.stream().map(PermissionResourceWrapper::getPermission) + .map(permission -> new ProjectRolePermission(new ProjectRolePermissionId(permission, projectRole), + addRoleDTO.getProjectResourcePermissionOverrideType().name())).toList(); projectRolePermissionRepository.saveAll(projectRolePermissions); + List permissionOverrides = permissionResourceWrapperList.stream().map(pr -> + new ProjectRolePermissionResourceOverride( + new ProjectRolePermissionResourceOverrideId(new ProjectRolePermission(new ProjectRolePermissionId(pr.getPermission(), projectRole)), + pr.getResource() + ) + )).toList(); + + projectRolePermissionResourceOverrideRepository.saveAll(permissionOverrides); + } } Index: src/main/resources/templates/project_pages/project-roles.html =================================================================== --- src/main/resources/templates/project_pages/project-roles.html (revision fcb331336ea9c1d1908c977aa183995407d83dfc) +++ src/main/resources/templates/project_pages/project-roles.html (revision fcb331336ea9c1d1908c977aa183995407d83dfc) @@ -0,0 +1,244 @@ + + + + + + Project Roles + + + + +

+ +
+
+
+
Error
+

+
+
+ +
+
+
+

Roles for Project Title

+
+ +
+
+ +
+
+ No roles defined for this project yet. +
+ +
+
+
Role Name
+ +
+
+ +
+ +
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: src/main/resources/templates/project_pages/show-project.html =================================================================== --- src/main/resources/templates/project_pages/show-project.html (revision 3e47966b86c3c00ee83e0e16eba37fac387ab5ad) +++ src/main/resources/templates/project_pages/show-project.html (revision fcb331336ea9c1d1908c977aa183995407d83dfc) @@ -47,4 +47,7 @@ th:href="@{/projects/{pr_title}/requests(pr_title=${project.getTitle()})}">View project requests + Roles +