Index: src/main/java/com/db/finki/www/build_board/controller/home_page/UserProfileController.java =================================================================== --- src/main/java/com/db/finki/www/build_board/controller/home_page/UserProfileController.java (revision 614955ca024aa3fd97dc7644a4cdc7307b70e9b9) +++ src/main/java/com/db/finki/www/build_board/controller/home_page/UserProfileController.java (revision 792bb1117c37e418520180f04af06a108a7da308) @@ -17,5 +17,4 @@ import java.io.IOException; -//TODO: napraj poseben za edit i poseben samo za geldanje @Controller 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 614955ca024aa3fd97dc7644a4cdc7307b70e9b9) +++ src/main/java/com/db/finki/www/build_board/controller/thread_controller/ProjectController.java (revision 792bb1117c37e418520180f04af06a108a7da308) @@ -14,5 +14,4 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; -//TODO: confirm pred kick @Controller @@ -78,6 +77,6 @@ } @PreAuthorize("#project.getUser().equals(#user)") - @PostMapping("/{pr-title}/members/kick") - public String kickMember(@PathVariable(name = "pr-title") @P("project") Project project,@RequestParam int memberId,@SessionAttribute @P("user") BBUser user){ + @PostMapping("/{pr-title}/members/{mem-id}/kick") + public String kickMember(@PathVariable(name = "pr-title") @P("project") Project project,@PathVariable(name = "mem-id") int memberId,@SessionAttribute @P("user") BBUser user){ projectService.deleteMember(project, memberId); return "redirect:/projects/" + project.getTitle() + "/members"; Index: src/main/java/com/db/finki/www/build_board/controller/thread_controller/TopicController.java =================================================================== --- src/main/java/com/db/finki/www/build_board/controller/thread_controller/TopicController.java (revision 614955ca024aa3fd97dc7644a4cdc7307b70e9b9) +++ src/main/java/com/db/finki/www/build_board/controller/thread_controller/TopicController.java (revision 792bb1117c37e418520180f04af06a108a7da308) @@ -13,5 +13,4 @@ import org.springframework.web.bind.annotation.*; -//TODO: trgni go toj trigerot da developer sho brishit @Controller Index: src/main/java/com/db/finki/www/build_board/controller/thread_controller/request/ProjectRequestController.java =================================================================== --- src/main/java/com/db/finki/www/build_board/controller/thread_controller/request/ProjectRequestController.java (revision 614955ca024aa3fd97dc7644a4cdc7307b70e9b9) +++ src/main/java/com/db/finki/www/build_board/controller/thread_controller/request/ProjectRequestController.java (revision 792bb1117c37e418520180f04af06a108a7da308) @@ -12,6 +12,4 @@ import org.springframework.web.servlet.view.RedirectView; -//TODO: filter za najnov request spored user i po mozhnost po user da se searchvit -//TODO: da se prikazvit date na requestot @Controller @@ -29,9 +27,11 @@ Model model, @PathVariable(name = "pr-title") Project project, - @RequestParam(required = false) Status status + @RequestParam(required = false) Status status, + @RequestParam(required = false, name = "checkSearchLatest") String isSearForLatestActive ) { model.addAttribute("project", project); - model.addAttribute("requests", projectRequestService.getByStatusAndProject(status,project)); + model.addAttribute("requests", projectRequestService.getByStatusAndProjectAndLatest(status,project,isSearForLatestActive)); model.addAttribute("status", Status.values()); + model.addAttribute("isSearForLatestActive", isSearForLatestActive); return "project_pages/requests/show-requests"; } @@ -41,8 +41,7 @@ public RedirectView acceptRequest(@PathVariable(name = "req-id") Integer reqId, @PathVariable(name = "pr-title") @P("project") Project project, - @RequestParam(name = "feedback-desc") String feedbackDesc, @SessionAttribute @P("user") BBUser user ) { - projectRequestService.accept(feedbackDesc,user,reqId); + projectRequestService.accept(user,reqId); return new RedirectView( String.format("/projects/%s/requests", project.getTitle()) 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 614955ca024aa3fd97dc7644a4cdc7307b70e9b9) +++ src/main/java/com/db/finki/www/build_board/entity/request/Feedback.java (revision 792bb1117c37e418520180f04af06a108a7da308) @@ -30,9 +30,17 @@ private LocalDateTime createdAt; - public Feedback(FeedbackFor submissionType, BBUser creator, String description, Integer reqId) { + public Feedback(FeedbackFor submissionType, BBUser creator, String description, Integer subId) { setDescription(description); setSubmissionType(submissionType); setCreator(creator); - setId(reqId); + setId(subId); + setCreatedAt(LocalDateTime.now()); + } + + public Feedback(FeedbackFor feedbackFor, BBUser creator, Integer subId) { + setSubmissionType(feedbackFor); + setCreator(creator); + setId(subId); + setCreatedAt(LocalDateTime.now()); } } 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 614955ca024aa3fd97dc7644a4cdc7307b70e9b9) +++ src/main/java/com/db/finki/www/build_board/entity/request/ProjectRequests.java (revision 792bb1117c37e418520180f04af06a108a7da308) @@ -40,4 +40,5 @@ private Feedback feedback; + public ProjectRequests(Project project, BBUser creator, String description) { setDescription(description); @@ -45,4 +46,5 @@ setProject(project); setStatus(Status.PENDING); + setCreatedAt(LocalDateTime.now()); } } 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 614955ca024aa3fd97dc7644a4cdc7307b70e9b9) +++ src/main/java/com/db/finki/www/build_board/entity/user_type/BBUser.java (revision 792bb1117c37e418520180f04af06a108a7da308) @@ -96,6 +96,6 @@ } - public Collection getAuthority(){ - return Collections.singleton(new SimpleGrantedAuthority("ROLE_USER")); + public List getAuthority(){ + return List.of(new SimpleGrantedAuthority("ROLE_USER")); } } Index: src/main/java/com/db/finki/www/build_board/entity/user_type/Developer.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/user_type/Developer.java (revision 614955ca024aa3fd97dc7644a4cdc7307b70e9b9) +++ src/main/java/com/db/finki/www/build_board/entity/user_type/Developer.java (revision 792bb1117c37e418520180f04af06a108a7da308) @@ -11,4 +11,5 @@ import java.util.Collection; import java.util.Collections; +import java.util.List; @Entity @@ -19,6 +20,6 @@ public class Developer extends BBUser{ @Override - public Collection getAuthority(){ - return Collections.singleton(new SimpleGrantedAuthority("ROLE_DEVELOPER")); + public List getAuthority(){ + return List.of(new SimpleGrantedAuthority("ROLE_DEVELOPER")); } } Index: src/main/java/com/db/finki/www/build_board/entity/user_type/Moderator.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/user_type/Moderator.java (revision 614955ca024aa3fd97dc7644a4cdc7307b70e9b9) +++ src/main/java/com/db/finki/www/build_board/entity/user_type/Moderator.java (revision 792bb1117c37e418520180f04af06a108a7da308) @@ -11,4 +11,5 @@ import java.util.Collection; import java.util.Collections; +import java.util.List; @Entity @@ -19,6 +20,6 @@ public class Moderator extends BBUser { @Override - public Collection getAuthority(){ - return Collections.singleton(new SimpleGrantedAuthority("ROLE_MODERATOR")); + public List getAuthority(){ + return List.of(new SimpleGrantedAuthority("ROLE_MODERATOR")); } } Index: src/main/java/com/db/finki/www/build_board/entity/user_type/ProjectOwner.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/user_type/ProjectOwner.java (revision 614955ca024aa3fd97dc7644a4cdc7307b70e9b9) +++ src/main/java/com/db/finki/www/build_board/entity/user_type/ProjectOwner.java (revision 792bb1117c37e418520180f04af06a108a7da308) @@ -11,4 +11,5 @@ import java.util.Collection; import java.util.Collections; +import java.util.List; @Getter @@ -19,6 +20,6 @@ public class ProjectOwner extends Developer{ @Override - public Collection getAuthority(){ - return Collections.singleton(new SimpleGrantedAuthority("ROLE_PROJECT_OWNER")); + public List getAuthority(){ + return List.of(new SimpleGrantedAuthority("ROLE_PROJECT_OWNER")); } } 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 614955ca024aa3fd97dc7644a4cdc7307b70e9b9) +++ src/main/java/com/db/finki/www/build_board/repository/request/ProjectRequestRepo.java (revision 792bb1117c37e418520180f04af06a108a7da308) @@ -6,4 +6,6 @@ import com.db.finki.www.build_board.entity.user_type.BBUser; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; @@ -12,8 +14,20 @@ @Repository public interface ProjectRequestRepo extends JpaRepository { - List findByStatusOrderByCreatedAtDesc(Status status); List findByStatusAndCreatorOrderByCreatedAtDesc(Status status, BBUser forUser); List findByCreatorOrderByCreatedAtDesc(BBUser forUser); - List findByProjectOrderByCreatedAtDesc(Project project); - List findByStatusAndProjectOrderByCreatedAtDesc(Status status, Project project); + + @Query(value = """ + select * + from project_request pr + where (:latest is null or (pr.user_id,pr.created_at) IN ( select user_id,max(created_at) from project_request pr group by user_id)) + and pr.project_id=:projectId + and (:status is null or pr.status=:status) + """, + nativeQuery = true + ) + List getLatestRequestByProjectAndStatus( + @Param("projectId") Integer projectId, + @Param("status") String status, + @Param("latest") String forLatest + ); } Index: src/main/java/com/db/finki/www/build_board/service/request/FeedbackService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/request/FeedbackService.java (revision 614955ca024aa3fd97dc7644a4cdc7307b70e9b9) +++ src/main/java/com/db/finki/www/build_board/service/request/FeedbackService.java (revision 792bb1117c37e418520180f04af06a108a7da308) @@ -16,3 +16,6 @@ return feedbackRepo.save(new Feedback(feedbackFor, creator, description,reqId)); } + public Feedback create(BBUser creator, FeedbackFor feedbackFor, Integer reqId){ + return feedbackRepo.save(new Feedback(feedbackFor, creator,reqId)); + } } Index: src/main/java/com/db/finki/www/build_board/service/request/ProjectRequestService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/request/ProjectRequestService.java (revision 614955ca024aa3fd97dc7644a4cdc7307b70e9b9) +++ src/main/java/com/db/finki/www/build_board/service/request/ProjectRequestService.java (revision 792bb1117c37e418520180f04af06a108a7da308) @@ -7,5 +7,8 @@ import com.db.finki.www.build_board.entity.user_type.BBUser; import com.db.finki.www.build_board.repository.request.ProjectRequestRepo; +import com.db.finki.www.build_board.service.thread.impl.ProjectService; +import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; + import java.util.List; @@ -21,38 +24,42 @@ private ProjectRequests getRequestById(Integer id) { - return prReqRepo.findById((long)id).get() ; + return prReqRepo.findById((long) id) + .get(); } - public void deny(Integer reqId,String desc,BBUser creator){ + public void deny(Integer reqId, String desc, BBUser creator) { ProjectRequests prReq = getRequestById(reqId); prReq.setStatus(Status.DENIED); - prReq.setFeedback(feedbackService.create(desc,creator,FeedbackFor.P,reqId)); + prReq.setFeedback(feedbackService.create(desc, creator, FeedbackFor.P, reqId)); prReqRepo.save(prReq); } - public void accept(String desc,BBUser creator,Integer reqId) { + public void accept(BBUser creator, Integer reqId) { ProjectRequests prReq = getRequestById(reqId); prReq.setStatus(Status.ACCEPTED); - prReq.setFeedback(feedbackService.create(desc,creator,FeedbackFor.P,reqId)); - prReq.getProject().getDevelopers().add(prReq.getCreator()); + prReq.setFeedback(feedbackService.create(creator, FeedbackFor.P, reqId)); + prReq.getProject() + .getDevelopers() + .add(prReq.getCreator()); prReqRepo.save(prReq); } - public List getByStatusAndProject(Status status,Project project) { - if(status == null){ - return prReqRepo.findByProjectOrderByCreatedAtDesc(project); - } - return prReqRepo.findByStatusAndProjectOrderByCreatedAtDesc(status,project); + public List getByStatusAndProjectAndLatest(Status status, Project project, String isLatest) { + return prReqRepo.getLatestRequestByProjectAndStatus( + project.getId(), + status == null ? null : status.name(), + isLatest + ); } public List getByStatusAndUser(Status status, BBUser forUser) { - if(status == null){ + if (status == null) { return prReqRepo.findByCreatorOrderByCreatedAtDesc(forUser); } - return prReqRepo.findByStatusAndCreatorOrderByCreatedAtDesc(status,forUser); + return prReqRepo.findByStatusAndCreatorOrderByCreatedAtDesc(status, forUser); } public ProjectRequests createRequestFor(Project project, String reason, BBUser creator) { - return prReqRepo.save(new ProjectRequests(project,creator,reason)); + return prReqRepo.save(new ProjectRequests(project, creator, reason)); } } Index: src/main/resources/db/migration/V1__init_ddl.sql =================================================================== --- src/main/resources/db/migration/V1__init_ddl.sql (revision 614955ca024aa3fd97dc7644a4cdc7307b70e9b9) +++ src/main/resources/db/migration/V1__init_ddl.sql (revision 792bb1117c37e418520180f04af06a108a7da308) @@ -189,5 +189,5 @@ user_id INT REFERENCES users (id) ON DELETE CASCADE NOT NULL , project_id INT REFERENCES thread (id) ON DELETE CASCADE NOT NULL, - created_at timestamp default now(), + created_at timestamp default now() not null, submission_id int references submission(id) ON DELETE CASCADE ); @@ -198,5 +198,5 @@ submission_type varchar(1), created_by int references users(id), - created_at timestamp default now(), + created_at timestamp default now() not null, submission_id int PRIMARY KEY references submission(id) on delete cascade ); @@ -205,5 +205,5 @@ ( id SERIAL, - created_at TIMESTAMP default now(), + created_at TIMESTAMP default now() not null, description VARCHAR(200) NOT NULL, status varchar(32) default 'PENDING', @@ -397,43 +397,4 @@ end; $$; -create or replace function fn_remove_not_active_project_manager() - returns trigger - language plpgsql -as -$$ -DECLARE - creator_id int; -begin - select user_id - into creator_id - from thread t - where t.id = old.id; - - IF NOT EXISTS(select 1 - from thread t - where t.id in (select id from project_thread) - and t.user_id = creator_id) THEN - delete from project_manager where id = creator_id; - end if; - return new; -end -$$; - -create or replace function fn_remove_not_active_developer() - returns trigger - language plpgsql -as -$$ -begin - IF not check_if_user_exists_in('developer_associated_with_project','developer_id',old.developer_id::text) - THEN - delete from developer d - where d.id=old.developer_id; - end if; - return new; -end -$$; - - create or replace function fn_add_sub_pr_request() returns trigger @@ -453,5 +414,5 @@ $$ BEGIN - insert into submission default values returning id into NEW.id; + insert into submission default values returning id into NEW.submission_id; return new; END; @@ -486,4 +447,23 @@ values ('General','General',NEW.id,developer_id); + return new; +end; +$$; +create or replace function fn_replace_id_with_submission_id() + returns trigger + language plpgsql +as $$ +BEGIN + IF NEW.submission_type = 'P' THEN + select submission_id + into NEW.submission_id + from project_request + where id=NEW.submission_id; + ELSE + select submission_id + into NEW.submission_id + from report + where id=NEW.submission_id; + end if; return new; end; @@ -513,16 +493,4 @@ execute function fn_remove_unused_tags(); -create trigger tr_remove_not_project_managers - after delete - on project_thread - for each row -execute function fn_remove_not_active_project_manager(); - -create trigger tr_remove_not_active_developer - after delete - on developer_associated_with_project - for each row -execute function fn_remove_not_active_developer(); - create or replace trigger tr_add_sub_pr_request before insert @@ -546,3 +514,7 @@ execute function fn_insert_general_for_project(); - +create or replace trigger tr_replace_id_with_submission_id + before insert on feedback + for each row +execute function fn_replace_id_with_submission_id(); + Index: src/main/resources/templates/home_pages/home.html =================================================================== --- src/main/resources/templates/home_pages/home.html (revision 614955ca024aa3fd97dc7644a4cdc7307b70e9b9) +++ src/main/resources/templates/home_pages/home.html (revision 792bb1117c37e418520180f04af06a108a7da308) @@ -8,4 +8,5 @@ Home Page + - +
@@ -58,20 +58,56 @@ -
Developer
-
Owner
-
- kick user image -
- - -
+
+
Developer
+
Owner
+ + + +
- -
+ + + Index: src/main/resources/templates/project_pages/requests/show-requests.html =================================================================== --- src/main/resources/templates/project_pages/requests/show-requests.html (revision 614955ca024aa3fd97dc7644a4cdc7307b70e9b9) +++ src/main/resources/templates/project_pages/requests/show-requests.html (revision 792bb1117c37e418520180f04af06a108a7da308) @@ -11,5 +11,5 @@
-
@@ -21,6 +21,10 @@ th:value="${st}" > - + +
@@ -28,5 +32,6 @@
+ th:each="req:${requests}" + >
Description

Description of the project goes here.

+

+
+
+
+ +
+ +
+
+ + +

-
- - -
-
- - -
- -
@@ -119,8 +132,6 @@ const projectTitle = btn.dataset.prTitle const reqId = btn.dataset.reqId - if (btn.classList.contains("accept-btn")) { - formModal.action = `/project/${projectTitle}/request/${reqId}/accept` - } else { - formModal.action = `/project/${projectTitle}/request/${reqId}/deny` + if (btn.classList.contains("deny-btn")) { + formModal.action = `/projects/${projectTitle}/requests/${reqId}/deny` } } else if (ev.target.classList.contains("btn-feedback-open")) { Index: src/main/resources/templates/project_pages/requests/show-user-requests.html =================================================================== --- src/main/resources/templates/project_pages/requests/show-user-requests.html (revision 614955ca024aa3fd97dc7644a4cdc7307b70e9b9) +++ src/main/resources/templates/project_pages/requests/show-user-requests.html (revision 792bb1117c37e418520180f04af06a108a7da308) @@ -44,7 +44,8 @@

Description

Description of the project goes here.

+

-
+