Index: src/main/java/com/db/finki/www/build_board/config/WebSecurityConfig.java =================================================================== --- src/main/java/com/db/finki/www/build_board/config/WebSecurityConfig.java (revision af4af82cc617f8fbc2b81f85fe772c9a4e0fa159) +++ src/main/java/com/db/finki/www/build_board/config/WebSecurityConfig.java (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -54,6 +54,8 @@ ).permitAll() .requestMatchers( - new AntPathRequestMatcher("/topic/*", HttpMethod.GET.name()), - new AntPathRequestMatcher("/project/*",HttpMethod.GET.name()), + new AntPathRequestMatcher("/topics/*", + HttpMethod.GET.name()), + new AntPathRequestMatcher("/projects/*", + HttpMethod.GET.name()), new AntPathRequestMatcher("/avatars/**",HttpMethod.GET.name()) ).permitAll() 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 af4af82cc617f8fbc2b81f85fe772c9a4e0fa159) +++ src/main/java/com/db/finki/www/build_board/controller/home_page/UserProfileController.java (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -3,4 +3,5 @@ import com.db.finki.www.build_board.entity.entity_enum.Status; import com.db.finki.www.build_board.entity.user_type.BBUser; +import com.db.finki.www.build_board.service.ReportService; import com.db.finki.www.build_board.service.user.BBUserDetailsService; import com.db.finki.www.build_board.service.request.ProjectRequestService; @@ -24,9 +25,11 @@ private final FileUploadService fileUploadService; private final ProjectRequestService projectRequestService; + private final ReportService reportService; - public UserProfileController(BBUserDetailsService userService, FileUploadService fileUploadService, ProjectRequestService projectRequestService) { + public UserProfileController(BBUserDetailsService userService, FileUploadService fileUploadService, ProjectRequestService projectRequestService, ReportService reportService) { this.userService = userService; this.fileUploadService = fileUploadService; this.projectRequestService = projectRequestService; + this.reportService = reportService; } @@ -53,4 +56,15 @@ } + @GetMapping("/reports") + public String getReportsByUser(@PathVariable String username, + @SessionAttribute @P("user") BBUser user, + @RequestParam(required = false) Status status, + Model model) { + BBUser byUser = (BBUser) userService.loadUserByUsername(username); + model.addAttribute("user", byUser); + model.addAttribute("requests", reportService.getByStatusAndUser(status,byUser)); + model.addAttribute("status", Status.values()); + return "/show-user-reports"; + } @GetMapping("/project-requests") 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 af4af82cc617f8fbc2b81f85fe772c9a4e0fa159) +++ src/main/java/com/db/finki/www/build_board/controller/thread_controller/TopicController.java (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -1,6 +1,13 @@ package com.db.finki.www.build_board.controller.thread_controller; +import com.db.finki.www.build_board.entity.blacklisted_user.BlacklistedUser; +import com.db.finki.www.build_board.entity.entity_enum.Status; +import com.db.finki.www.build_board.entity.thread.Project; import com.db.finki.www.build_board.entity.user_type.BBUser; import com.db.finki.www.build_board.entity.thread.Topic; +import com.db.finki.www.build_board.entity.user_type.Moderator; +import com.db.finki.www.build_board.service.BlacklistedUserService; +import com.db.finki.www.build_board.service.BlacklistedUserType; +import com.db.finki.www.build_board.service.ReportService; import com.db.finki.www.build_board.service.thread.impl.DiscussionService; import com.db.finki.www.build_board.service.thread.itf.TagService; @@ -13,4 +20,8 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import org.springframework.web.servlet.view.RedirectView; + +import java.util.List; +import java.util.Map; @Controller @@ -22,9 +33,23 @@ private final DiscussionService discussionService; private final String DUPLICATE_TITTLE = "There already exists a topic with title"; - - public TopicController(TopicService topicService, TagService tagService, DiscussionService discussionService) { + private final ReportService reportService; + private final BlacklistedUserService blacklistedUserService; + + public TopicController(TopicService topicService, TagService tagService, DiscussionService discussionService, ReportService reportService, BlacklistedUserService blacklistedUserService) { this.topicService = topicService; this.tagService = tagService; this.discussionService = discussionService; + this.reportService = reportService; + this.blacklistedUserService = blacklistedUserService; + } + + private String bootstartTopic(long topicId, Model model){ + Topic t = topicService.getById((long)topicId); + + model.addAttribute("topic", t); + model.addAttribute("tags", tagService.getAllNotUsed(t)); + model.addAttribute("replies", discussionService.getByTopic(t.getId())); + + return "show-topic"; } @@ -38,13 +63,17 @@ @GetMapping("/{topic-id}") public String showTopic(@PathVariable(name = "topic-id") int topicId, Model model, - @RequestParam(required = false) Boolean duplicateTittle) { + @RequestParam(required = false) Boolean duplicateTittle, + @SessionAttribute(required = false) BBUser user) { + if (duplicateTittle != null) { model.addAttribute("errMsg", "There already exists a thread with the same title in that parent"); } - Topic t = topicService.getById((long)topicId); - model.addAttribute("topic", t); - model.addAttribute("tags", tagService.getAllNotUsed(t)); - model.addAttribute("replies", discussionService.getByTopic(t.getId())); - return "show-topic"; + + if(user != null && blacklistedUserService.isBlacklisted(user.getId(), topicId)) { + return "blacklisted"; + } + + model.addAttribute("blacklisted", blacklistedUserService.findForTopic(topicId)); + return bootstartTopic(topicId, model); } @@ -87,4 +116,15 @@ } + @PostMapping("{id}/report") + public String reportUser( + @PathVariable(name = "id") @P("topicId") long topicId, + @RequestParam String reason + , @SessionAttribute @P("user") BBUser user, + @RequestParam(name = "report-username") String reportingUser){ + + reportService.createReport(topicId,reason,user, reportingUser); + return "redirect:/topics/" + topicId; + } + public String handleDuplicatedTitle(org.springframework.orm.jpa.JpaSystemException e, RedirectAttributes attr, String redirectPath) { @@ -96,3 +136,70 @@ } + @GetMapping("{id}/reports") + @PreAuthorize("@topicServiceImpl.getById(#topicId).user.id.equals(#user.id)") + public String getReports(@PathVariable(name = "id") @P("topicId") long topicId, Model model, + @RequestParam(required = false) Status status, + @RequestParam(required = false, name = "checkSearchLatest") String isSearForLatestActive, + @SessionAttribute @P("user") BBUser user + ){ + Topic t = topicService.getById(topicId); + + model.addAttribute("topic", t); + model.addAttribute("reports", reportService.getByStatusAndProjectAndLatest(status, + (int) topicId, isSearForLatestActive)); + + model.addAttribute("status", Status.values()); + model.addAttribute("isSearForLatestActive", isSearForLatestActive); + + return "show-reports"; + } + + @PostMapping("{id}/reports/{req-id}/accept") + @PreAuthorize("@topicServiceImpl.getById(#topicId).user.id.equals(#user.id)") + public RedirectView acceptRequest( + @PathVariable(name = "req-id") Integer reqId, + @PathVariable(name = "id") @P("topicId") long topicId, + @RequestParam(name = "feedback-desc") String feedbackDesc, + @SessionAttribute @P("user") BBUser user + ) { + reportService.accept(reqId, feedbackDesc, user); + return new RedirectView( + String.format("/topics/%s/reports", topicId) + ); + } + + @PostMapping("{id}/reports/{req-id}/deny") + @PreAuthorize("@topicServiceImpl.getById(#topicId).user.id.equals(#user.id)") + public RedirectView denyRequest( + @PathVariable(name = "req-id") Integer reqId, + @PathVariable(name = "id") @P("topicId") long topicId, + @RequestParam(name = "feedback-desc") String feedbackDesc, + @SessionAttribute @P("user") BBUser user + ) { + reportService.deny(reqId, feedbackDesc, user); + return new RedirectView( + String.format("/topics/%s/reports", topicId) + ); + } + + @GetMapping("{id}/blacklisted") + public String getBlacklistedUsers(@PathVariable(name = "id") long topicId, Model model){ + Map> tmp = topicService.getBlacklistedUsersForTopicById(topicId); + + model.addAttribute("current", tmp.get(BlacklistedUserType.CURRENT)); + model.addAttribute("previous", tmp.get(BlacklistedUserType.PREVIOUS)); + + return "show-blacklisted-users"; + } + + @PostMapping("{id}/blacklisted/{userId}") + public RedirectView revokeBlacklistedUser( + @PathVariable(name = "id") long topicId, + @PathVariable(name = "userId") int blacklistedUserId + ){ + blacklistedUserService.revoke(topicId,blacklistedUserId); + return new RedirectView( + String.format("/topics/%s/blacklisted", topicId) + ); + } } 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 dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) +++ src/main/java/com/db/finki/www/build_board/entity/blacklisted_user/BlacklistedUser.java (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -0,0 +1,56 @@ +package com.db.finki.www.build_board.entity.blacklisted_user; + +import com.db.finki.www.build_board.entity.thread.Topic; +import com.db.finki.www.build_board.entity.user_type.BBUser; +import com.db.finki.www.build_board.entity.user_type.Moderator; +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; + +@Entity +@Getter +@Setter +@IdClass(BlacklistedUserId.class) +public class BlacklistedUser { + @ManyToOne + @Id + @JoinColumn(name = "topic_id") + Topic topic; + + @ManyToOne + @Id + @JoinColumn(name = "moderator_id") + Moderator moderator; + + @Id + @Column(name = "start_date") + LocalDateTime startTime; + + @ManyToOne + @Id + @JoinColumn(name = "user_id") + BBUser refersTo; + + String reason; + + @Column(name = "end_date") + LocalDateTime endTime; + + public BlacklistedUser( + Topic topic, + Moderator moderator, + LocalDateTime startTime, + BBUser refersTo, + String reason + ) { + setTopic(topic); + setModerator(moderator); + setStartTime(startTime); + setRefersTo(refersTo); + setReason(reason); + } + + public BlacklistedUser(){} +} Index: src/main/java/com/db/finki/www/build_board/entity/blacklisted_user/BlacklistedUserId.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/blacklisted_user/BlacklistedUserId.java (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) +++ src/main/java/com/db/finki/www/build_board/entity/blacklisted_user/BlacklistedUserId.java (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -0,0 +1,14 @@ +package com.db.finki.www.build_board.entity.blacklisted_user; + +import com.db.finki.www.build_board.entity.thread.Topic; +import com.db.finki.www.build_board.entity.user_type.BBUser; +import com.db.finki.www.build_board.entity.user_type.Moderator; + +import java.time.LocalDateTime; + +public class BlacklistedUserId { + Topic topic; + Moderator moderator; + LocalDateTime startTime; + BBUser refersTo; +} 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 dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) +++ src/main/java/com/db/finki/www/build_board/entity/request/Report.java (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -0,0 +1,38 @@ +package com.db.finki.www.build_board.entity.request; + +import com.db.finki.www.build_board.entity.entity_enum.Status; +import com.db.finki.www.build_board.entity.thread.Topic; +import com.db.finki.www.build_board.entity.user_type.BBUser; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.time.LocalDateTime; + +@Entity +@Getter +@Setter +@NoArgsConstructor +@Table(name = "report") +public class Report extends Submission { + @ManyToOne + @JoinColumn(name = "for_user_id") + BBUser user; + + @ManyToOne + @JoinColumn(name = "thread_id") + Topic topic; + + public Report(Topic topic, BBUser creator, String description, BBUser misconductedUser) { + setDescription(description); + setCreator(creator); + setTopic(topic); + setStatus(Status.PENDING); + setCreatedAt(LocalDateTime.now()); + setUser(misconductedUser); + } +} 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 af4af82cc617f8fbc2b81f85fe772c9a4e0fa159) +++ src/main/java/com/db/finki/www/build_board/entity/thread/Topic.java (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -1,4 +1,5 @@ package com.db.finki.www.build_board.entity.thread; +import com.db.finki.www.build_board.entity.blacklisted_user.BlacklistedUser; import com.db.finki.www.build_board.entity.thread.itf.NamedThread; import com.db.finki.www.build_board.entity.thread.multi_valued_attribute.Guideline; @@ -26,8 +27,10 @@ private Project parent; + @OneToMany(mappedBy = "topic") + private List blacklistedUsers; + @Override public String getTypeName() { return "topics"; } - } 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 dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) +++ src/main/java/com/db/finki/www/build_board/repository/BlacklistedUserRepo.java (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -0,0 +1,35 @@ +package com.db.finki.www.build_board.repository; + +import com.db.finki.www.build_board.entity.blacklisted_user.BlacklistedUser; +import com.db.finki.www.build_board.entity.blacklisted_user.BlacklistedUserId; +import jakarta.transaction.Transactional; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; + +public interface BlacklistedUserRepo extends JpaRepository { + @Query(nativeQuery = true, + value = """ + select exists( + select * + from blacklisted_user bu + where bu.end_date is NULL and bu.user_id=:userId and bu.topic_id = :topicId + ) + """) + boolean isUserInBlacklist(@Param("userId") long userId, @Param("topicId") long topicId); + + @Modifying + @Transactional + @Query(nativeQuery = true, + value = """ + update blacklisted_user + set end_date = now() + where topic_id=:topic and user_id = :user +""") + void revoke(@Param("topic") long topicId, @Param("user") int blacklistedUserId); + + List findAllByTopicId(Integer topicId); +} Index: src/main/java/com/db/finki/www/build_board/repository/ModeratorRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/ModeratorRepository.java (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) +++ src/main/java/com/db/finki/www/build_board/repository/ModeratorRepository.java (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -0,0 +1,7 @@ +package com.db.finki.www.build_board.repository; + +import com.db.finki.www.build_board.entity.user_type.Moderator; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ModeratorRepository extends JpaRepository { +} 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 dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) +++ src/main/java/com/db/finki/www/build_board/repository/ReportRepository.java (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -0,0 +1,40 @@ +package com.db.finki.www.build_board.repository; + +import com.db.finki.www.build_board.entity.request.Report; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; + +public interface ReportRepository extends JpaRepository { + @Query(value = """ + select * + from report r + 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 + and (:status is null or s.status=:status) + """, + nativeQuery = true + ) + List getLatestRequestByTopicAndStatus( + @Param("topicId") Integer topicId, + @Param("status") String status, + @Param("latest") String forLatest + ); + + @Query( + nativeQuery = true, + value = """ + select * + from report r + join submission s + on s.id = r.id + where s.created_by = :user_id and (:status is null or s.status= :status) + """ + ) + List findAllBySendByUsernameAndStatus(@Param("user_id") long userId, + @Param("status") String status); +} Index: src/main/java/com/db/finki/www/build_board/service/BlacklistedUserService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/BlacklistedUserService.java (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) +++ src/main/java/com/db/finki/www/build_board/service/BlacklistedUserService.java (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -0,0 +1,29 @@ +package com.db.finki.www.build_board.service; + +import com.db.finki.www.build_board.entity.blacklisted_user.BlacklistedUser; +import com.db.finki.www.build_board.repository.BlacklistedUserRepo; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +@Service +public class BlacklistedUserService { + private final BlacklistedUserRepo blacklistedUserRepo; + + public BlacklistedUserService(BlacklistedUserRepo blacklistedUserRepo) {this.blacklistedUserRepo = blacklistedUserRepo;} + + public boolean isBlacklisted(long userId, long topicId) { + return blacklistedUserRepo.isUserInBlacklist(userId, topicId); + } + + public void revoke(long topicId, int blacklistedUserId) { + blacklistedUserRepo.revoke(topicId,blacklistedUserId); + } + + public Set findForTopic(int topicId) { + return blacklistedUserRepo.findAllByTopicId(topicId).stream().map(b -> b.getRefersTo() + .getId()).collect(Collectors.toSet()); + } +} Index: src/main/java/com/db/finki/www/build_board/service/BlacklistedUserType.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/BlacklistedUserType.java (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) +++ src/main/java/com/db/finki/www/build_board/service/BlacklistedUserType.java (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -0,0 +1,6 @@ +package com.db.finki.www.build_board.service; + +public enum BlacklistedUserType { + CURRENT, + PREVIOUS +} Index: src/main/java/com/db/finki/www/build_board/service/ReportService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/ReportService.java (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) +++ src/main/java/com/db/finki/www/build_board/service/ReportService.java (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -0,0 +1,137 @@ +package com.db.finki.www.build_board.service; + +import com.db.finki.www.build_board.entity.blacklisted_user.BlacklistedUser; +import com.db.finki.www.build_board.entity.entity_enum.FeedbackFor; +import com.db.finki.www.build_board.entity.entity_enum.Status; +import com.db.finki.www.build_board.entity.request.ProjectRequests; +import com.db.finki.www.build_board.entity.request.Report; +import com.db.finki.www.build_board.entity.thread.Project; +import com.db.finki.www.build_board.entity.thread.Topic; +import com.db.finki.www.build_board.entity.user_type.BBUser; +import com.db.finki.www.build_board.entity.user_type.Moderator; +import com.db.finki.www.build_board.repository.BlacklistedUserRepo; +import com.db.finki.www.build_board.repository.ModeratorRepository; +import com.db.finki.www.build_board.repository.ReportRepository; +import com.db.finki.www.build_board.service.request.FeedbackService; +import com.db.finki.www.build_board.service.thread.itf.TopicService; +import org.apache.coyote.Request; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; + +@Service +public class ReportService { + private final ReportRepository reportRepository; + private final TopicService topicService; + private final UserDetailsService userDetailsService; + private final FeedbackService feedbackService; + private final BlacklistedUserRepo blacklistedUserRepo; + private final ModeratorRepository moderatorRepository; + + + public ReportService( + ReportRepository reportRepository, TopicService topicService, + UserDetailsService userDetailsService, FeedbackService feedbackService, + BlacklistedUserRepo blacklistedUserRepo, ModeratorRepository moderatorRepository + ) { + this.reportRepository = reportRepository; + this.topicService = topicService; + this.userDetailsService = userDetailsService; + this.feedbackService = feedbackService; + this.blacklistedUserRepo = blacklistedUserRepo; + this.moderatorRepository = moderatorRepository; + } + + public void createReport( + long topicId, String reason, BBUser creator, + String reportingUsername + ) { + Topic topic = topicService.getById(topicId); + BBUser reportedUser = (BBUser) userDetailsService.loadUserByUsername(reportingUsername); + + if(blacklistedUserRepo.isUserInBlacklist(reportedUser.getId(), topicId)){ + return; + } + + reportRepository.save( + new Report(topic, + creator, + reason, + reportedUser) + ); + } + + public List getByStatusAndProjectAndLatest( + Status status, Integer topicId, + String isLatest + ) { + return reportRepository.getLatestRequestByTopicAndStatus( + topicId, + status == null ? null : status.name(), + isLatest + ); + } + + @Transactional + public void accept(long reqId, String feedbackDesc, BBUser moderatorAsAUser) { + Report reqForReqId = + reportRepository + .findById(reqId) + .orElseThrow(() -> new RuntimeException("The id " + + "is invalid")); + String reason = reqForReqId.getDescription(); + Moderator moderator = + moderatorRepository + .findById(moderatorAsAUser.getId()) + .orElseThrow(() -> new RuntimeException("The user is not a moderator")); + + reqForReqId.setStatus(Status.ACCEPTED); + + feedbackService.create( + feedbackDesc, + moderator, + FeedbackFor.R, + reqForReqId + ); + + blacklistedUserRepo.save( + new BlacklistedUser( + reqForReqId.getTopic(), + moderator, + LocalDateTime.now(), + reqForReqId.getUser(), + reason + ) + ); + } + + @Transactional + public void deny(long reqId, String feedbackDesc, BBUser creator) { + Report report = + reportRepository + .findById(reqId) + .orElseThrow(() -> new RuntimeException("The " + + "report doesn't exist")); + report.setStatus(Status.DENIED); + + feedbackService.create( + feedbackDesc, + creator, + FeedbackFor.R, + report); + + reportRepository.save(report); + } + + public List getByStatusAndUser(Status status, BBUser byUser) { + return reportRepository.findAllBySendByUsernameAndStatus(byUser.getId(), + Optional + .ofNullable(status) + .map(Status::name) + .orElse(null)); + } +} 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 af4af82cc617f8fbc2b81f85fe772c9a4e0fa159) +++ src/main/java/com/db/finki/www/build_board/service/request/ProjectRequestService.java (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -31,4 +31,5 @@ } + @Transactional public void deny(Integer reqId, String desc, BBUser creator) { ProjectRequests prReq = getRequestById(reqId); Index: src/main/java/com/db/finki/www/build_board/service/thread/impl/TopicServiceImpl.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/thread/impl/TopicServiceImpl.java (revision af4af82cc617f8fbc2b81f85fe772c9a4e0fa159) +++ src/main/java/com/db/finki/www/build_board/service/thread/impl/TopicServiceImpl.java (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -1,4 +1,5 @@ package com.db.finki.www.build_board.service.thread.impl; +import com.db.finki.www.build_board.entity.blacklisted_user.BlacklistedUser; import com.db.finki.www.build_board.entity.thread.Project; import com.db.finki.www.build_board.entity.user_type.BBUser; @@ -8,9 +9,14 @@ import com.db.finki.www.build_board.repository.thread.TagRepository; import com.db.finki.www.build_board.repository.thread.TopicRepository; +import com.db.finki.www.build_board.service.BlacklistedUserType; import com.db.finki.www.build_board.service.thread.itf.TopicService; import jakarta.transaction.Transactional; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; @Service @@ -28,15 +34,15 @@ public Topic create(String title, String description, BBUser user) { Topic topic = new Topic(); - + topic.setTitle(title); topic.setContent(description); topic.setUser(user); - + return topicRepository.save(topic); } - public Topic create(String title, String description, BBUser user, Project parent){ + public Topic create(String title, String description, BBUser user, Project parent) { Topic topic = new Topic(); - + topic.setTitle(title); topic.setContent(description); @@ -69,5 +75,7 @@ @Override public Topic getById(Long id) { - return topicRepository.findById(id).orElse(null); + return topicRepository + .findById(id) + .orElse(null); } @@ -75,16 +83,28 @@ @Transactional public void addTagToTopic(Topic topic, String tagName, BBUser user) { - tagRepository.findByName(tagName).ifPresentOrElse(tag -> { - topic.getTags().add(tag); - tag.getThreads().add(topic); - topicRepository.save(topic); - tagRepository.save(tag); - },() -> { - Tag tag = new Tag(tagName,user); - tagRepository.save(tag); - topic.getTags().add(tag); - tag.getThreads().add(topic); - topicRepository.save(topic); - }); + tagRepository + .findByName(tagName) + .ifPresentOrElse(tag -> { + topic + .getTags() + .add(tag); + tag + .getThreads() + .add(topic); + topicRepository.save(topic); + tagRepository.save(tag); + }, + () -> { + Tag tag = new Tag(tagName, + user); + tagRepository.save(tag); + topic + .getTags() + .add(tag); + tag + .getThreads() + .add(topic); + topicRepository.save(topic); + }); } @@ -100,8 +120,23 @@ public Topic deleteTagFromTopic(long id, String tagName) { Topic t = getById(id); - boolean removed = t.getTags().removeIf(tag -> tag.getName().equals(tagName)); - if(!removed) throw new IllegalArgumentException("Tag not found"); + boolean removed = t + .getTags() + .removeIf(tag -> tag + .getName() + .equals(tagName)); + if (!removed) throw new IllegalArgumentException("Tag not found"); return topicRepository.save(t); } + public Map> getBlacklistedUsersForTopicById(long id) { + return topicRepository + .findById(id) + .getBlacklistedUsers() + .stream() + .collect(Collectors.groupingBy( + b -> b.getEndTime() == null + ? BlacklistedUserType.CURRENT + : BlacklistedUserType.PREVIOUS + )); + } } Index: src/main/java/com/db/finki/www/build_board/service/thread/itf/TopicService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/thread/itf/TopicService.java (revision af4af82cc617f8fbc2b81f85fe772c9a4e0fa159) +++ src/main/java/com/db/finki/www/build_board/service/thread/itf/TopicService.java (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -1,10 +1,14 @@ package com.db.finki.www.build_board.service.thread.itf; +import com.db.finki.www.build_board.entity.blacklisted_user.BlacklistedUser; import com.db.finki.www.build_board.entity.thread.Project; import com.db.finki.www.build_board.entity.user_type.BBUser; import com.db.finki.www.build_board.entity.thread.BBThread; import com.db.finki.www.build_board.entity.thread.Topic; +import com.db.finki.www.build_board.service.BlacklistedUserType; import java.util.List; +import java.util.Map; + public interface TopicService { Topic create(String title, String description, BBUser user); @@ -18,3 +22,4 @@ Topic edit(Topic t, String title, String description); Topic deleteTagFromTopic(long id, String tagName); + Map> getBlacklistedUsersForTopicById(long id); } Index: src/main/resources/db/migration/V1__init_ddl.sql =================================================================== --- src/main/resources/db/migration/V1__init_ddl.sql (revision af4af82cc617f8fbc2b81f85fe772c9a4e0fa159) +++ src/main/resources/db/migration/V1__init_ddl.sql (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -22,5 +22,5 @@ DROP TABLE IF EXISTS project_roles CASCADE; DROP TABLE IF EXISTS users_project_roles CASCADE; -DROP TABLE IF EXISTS role_permissions CASCADE; +DROP TABLE IF EXISTS project_roles_permissions CASCADE; DROP TABLE IF EXISTS project_request CASCADE; DROP TABLE IF EXISTS report CASCADE; Index: src/main/resources/db/migration/V2__triggers_ddl.sql =================================================================== --- src/main/resources/db/migration/V2__triggers_ddl.sql (revision af4af82cc617f8fbc2b81f85fe772c9a4e0fa159) +++ src/main/resources/db/migration/V2__triggers_ddl.sql (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -183,4 +183,39 @@ $$; +CREATE OR REPLACE FUNCTION fn_change_status_on_pending_reports() + RETURNS TRIGGER + LANGUAGE plpgsql +AS $$ +BEGIN + RAISE NOTICE 'user_id: %, topic_id: %', NEW.user_id, NEW.topic_id; + +UPDATE submission +SET status = 'ACCEPTED' +WHERE id in ( + select id + from report r + where r.for_user_id = NEW.user_id and r.thread_id = NEW.topic_id +); + +RETURN NEW; +END; +$$; + +create or replace function fn_add_blacklisted_user() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +BEGIN + IF NOT EXISTS( + select 1 + from blacklisted_user + where topic_id = NEW.topic_id and user_id = NEW.user_id and end_date is NULL + ) + THEN + RETURN NEW; +END IF; +RETURN NULL; +END; +$$; ------------------------------------------------------------ @@ -196,5 +231,5 @@ FOR EACH ROW EXECUTE FUNCTION fn_insert_topics_creator_as_moderator(); ----- + CREATE OR REPLACE TRIGGER tr_remove_orphan_moderator --RADI AFTER DELETE @@ -203,5 +238,4 @@ EXECUTE FUNCTION fn_remove_orphan_moderator(); - CREATE OR REPLACE TRIGGER tr_a_insert_project_manager --RADI AFTER INSERT @@ -232,10 +266,4 @@ execute function fn_aa_rm_orphan_dics(); -create or replace trigger tr_rm_orphan_disc - after delete - on topic_thread - for each row -execute function fn_aa_rm_orphan_dics(); - create or replace trigger tr_add_project_resource_channel before insert @@ -243,2 +271,13 @@ for each row execute function fn_add_project_resource(); + +create or replace trigger tr_add_blacklisted_user +before insert on blacklisted_user +for each row +execute function fn_add_blacklisted_user(); + +CREATE OR REPLACE TRIGGER tr_change_status_on_pending_reports + AFTER INSERT + ON blacklisted_user + FOR EACH ROW +EXECUTE FUNCTION fn_change_status_on_pending_reports(); Index: src/main/resources/templates/blacklisted.html =================================================================== --- src/main/resources/templates/blacklisted.html (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) +++ src/main/resources/templates/blacklisted.html (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -0,0 +1,31 @@ + + + + + + + Add + Topic + + + + +
+
+

+ The moderators have blacklisted you from this site +

+
+ Index: src/main/resources/templates/fragments/discussion.html =================================================================== --- src/main/resources/templates/fragments/discussion.html (revision af4af82cc617f8fbc2b81f85fe772c9a4e0fa159) +++ src/main/resources/templates/fragments/discussion.html (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -1,11 +1,15 @@ - +
- Profile Picture @@ -16,5 +20,4 @@ -
@@ -29,13 +33,33 @@
- + },discussionId=${reply.getId()})}" + method="post"> + -
+
+
+
@@ -43,18 +67,39 @@
-
-

Reply content goes here.

+
+

+ Reply + content + goes + here.

-
+
- - + + - - - + Save + Changes + + +
@@ -65,18 +110,29 @@
-
- + +
-
- + +
@@ -85,5 +141,6 @@
@@ -93,17 +150,31 @@ -
-
+
+
- - + +
- - + +
@@ -112,4 +183,4 @@
-
+
Index: src/main/resources/templates/fragments/user_fields.html =================================================================== --- src/main/resources/templates/fragments/user_fields.html (revision af4af82cc617f8fbc2b81f85fe772c9a4e0fa159) +++ src/main/resources/templates/fragments/user_fields.html (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -27,5 +27,4 @@ - View project requests Index: src/main/resources/templates/home_pages/public-profile.html =================================================================== --- src/main/resources/templates/home_pages/public-profile.html (revision af4af82cc617f8fbc2b81f85fe772c9a4e0fa159) +++ src/main/resources/templates/home_pages/public-profile.html (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -112,4 +112,13 @@
Projects worked in:
+ + View project requests + + + View submitted reports + +
Index: src/main/resources/templates/project_pages/requests/show-requests.html =================================================================== --- src/main/resources/templates/project_pages/requests/show-requests.html (revision af4af82cc617f8fbc2b81f85fe772c9a4e0fa159) +++ src/main/resources/templates/project_pages/requests/show-requests.html (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -70,8 +70,7 @@
Index: src/main/resources/templates/show-blacklisted-users.html =================================================================== --- src/main/resources/templates/show-blacklisted-users.html (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) +++ src/main/resources/templates/show-blacklisted-users.html (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -0,0 +1,145 @@ + + + + + Reports + + + +
+
+
+
+
+

+ Latest

+
+
+
+ Start time +
+
+
+
+
+ +
+ + +
+
+
+

+ Reason

+ + + +

+ Start + time

+
+
+ +
+
+
+

+ Previous

+
+
+ Start time + End time +
+
+
+
+ +
+ +
+
+
+

+ Reason

+

+ Start + time

+

+ End + time

+
+
+ +
+
+
+
+ + + Index: src/main/resources/templates/show-reports.html =================================================================== --- src/main/resources/templates/show-reports.html (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) +++ src/main/resources/templates/show-reports.html (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -0,0 +1,221 @@ + + + + + + Requests + + + +
+
+
+
+
+ + + + +
+
+
+
+
+

+ Creator + of + request

+

+ Status: + +

+
+
+
+

+ Description

+

+ Description + of + the + project + goes + here.

+

+

+ Created by: + Created by +

+
+ + + +
+ + +
+
+ + +

+
+
+ +
+
+ + + + + Index: src/main/resources/templates/show-topic.html =================================================================== --- src/main/resources/templates/show-topic.html (revision af4af82cc617f8fbc2b81f85fe772c9a4e0fa159) +++ src/main/resources/templates/show-topic.html (revision dafe07c8bb8ac0f724dca47cc925cd4d8c449a9b) @@ -3,7 +3,9 @@ - + - + - +
-
-
Error
-

+
+
+ Error
+

@@ -48,9 +54,36 @@
-

Topic Title

+

+ Topic + Title

- +
+ + + + + Show + reports + + + Show blacklisted users + +
@@ -58,15 +91,25 @@
-

Description of the topic goes here.

+

+ Description + of + the + topic + goes + here.

    -
  • +
  • Tag Name
    - @@ -84,5 +127,6 @@
@@ -90,16 +134,27 @@
- - + + -
- + +
@@ -110,52 +165,153 @@ -
-
- +
+ + - - - - + +
+
+
+
+ + + +
+ + + - - - -
- - -