Skip to content

CLAP-292 댓글 작성 권한 logic 수정 #343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
starboxxxx merged 1 commit into from
Feb 6, 2025
Merged

CLAP-292 댓글 작성 권한 logic 수정 #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/main/java/clap/server/application/service/history/PostCommentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ public void save(Long userId, Long taskId, CreateCommentRequest request) {
Member member = memberService.findActiveMember(userId);

// 일반 회원일 경우 => 요청자인지 확인
// 담당자일 경우 => 처리자인지 확인
if (Member.checkCommenter(task, member)) {
Comment comment = Comment.createComment(member, task, request.content());
Comment savedComment = commandCommentPort.saveComment(comment);
Expand Down Expand Up @@ -77,7 +76,7 @@ public void saveCommentAttachment(Long userId, Long taskId, MultipartFile file)

Member processor = task.getProcessor();
Member requester = task.getRequester();
if (member.getMemberInfo().getRole() == MemberRole.ROLE_USER) {
if (member.getMemberInfo().getRole() == requester.getMemberInfo().getRole()) {
publishNotification(processor, task, fileName + "(첨부파일)", requester.getNickname());
} else {
publishNotification(requester, task, fileName + "(첨부파일)", processor.getNickname());
Expand Down
12 changes: 3 additions & 9 deletions src/main/java/clap/server/application/service/task/UpdateTaskService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,9 @@
import clap.server.domain.model.task.*;
import clap.server.domain.policy.attachment.FilePathPolicy;
import clap.server.exception.ApplicationException;
import clap.server.exception.code.NotificationErrorCode;
import clap.server.exception.code.TaskErrorCode;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.ResponseEntity;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

Expand Down Expand Up @@ -60,12 +55,12 @@ public class UpdateTaskService implements UpdateTaskUsecase, UpdateTaskStatusUse
@Override
@Transactional
public void updateTask(Long requesterId, Long taskId, UpdateTaskRequest updateTaskRequest, List<MultipartFile> files) {
Member requester = memberService.findActiveMember(requesterId);
memberService.findActiveMember(requesterId);
Category category = categoryService.findById(updateTaskRequest.categoryId());
Task task = taskService.findById(taskId);

task.updateTask(requesterId, category, updateTaskRequest.title(), updateTaskRequest.description());
Task updatedTask = taskService.upsert(task);
taskService.upsert(task);

if (!updateTaskRequest.attachmentsToDelete().isEmpty()) {
updateAttachments(updateTaskRequest.attachmentsToDelete(), files, task);
Expand Down Expand Up @@ -105,7 +100,6 @@ public void updateTaskProcessor(Long taskId, Long userId, UpdateTaskProcessorReq
TaskHistory taskHistory = TaskHistory.createTaskHistory(TaskHistoryType.PROCESSOR_CHANGED, task, null, processor,null);
commandTaskHistoryPort.save(taskHistory);

String taskTitle = task.getTitle();
publishNotification(updateTask, NotificationType.PROCESSOR_CHANGED, processor.getNickname());
}

Expand All @@ -118,7 +112,7 @@ public void updateTaskLabel(Long taskId, Long userId, UpdateTaskLabelRequest req
Label label = labelService.findById(request.labelId());

task.updateLabel(label);
Task updatetask = taskService.upsert(task);
taskService.upsert(task);
}

private void updateAttachments(List<Long> attachmentIdsToDelete, List<MultipartFile> files, Task task) {
Expand Down
12 changes: 4 additions & 8 deletions src/main/java/clap/server/domain/model/member/Member.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
import lombok.*;
import lombok.experimental.SuperBuilder;

import java.util.Objects;


@Getter
@SuperBuilder
Expand Down Expand Up @@ -118,14 +120,8 @@ public void updateEmailEnabled() {

public static Boolean checkCommenter(Task task, Member member) {
// 일반 회원일 경우 => 요청자인지 확인
// 담당자일 경우 => 처리자인지 확인
if ((member.getMemberInfo().getRole() == MemberRole.ROLE_MANAGER)
&& !(member.getMemberId() == task.getProcessor().getMemberId())) {
throw new DomainException(MemberErrorCode.NOT_A_COMMENTER);
}

else if ((member.getMemberInfo().getRole() == MemberRole.ROLE_USER)
&& !(member.getMemberId() == task.getRequester().getMemberId())) {
if ((member.getMemberInfo().getRole() == MemberRole.ROLE_USER)
&& !(Objects.equals(member, task.getRequester()))) {
throw new DomainException(MemberErrorCode.NOT_A_COMMENTER);
}
else {
Expand Down