Merge remote-tracking branch 'origin/develop' into CLAP-324

# Conflicts:
#	src/main/java/clap/server/application/service/history/CommandCommentService.java

Author: joowojr

src/main/java/clap/server/adapter/inbound/web/dto/member/request/UpdateMemberInfoRequest.java

@@ -2,10 +2,13 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 public record UpdateMemberInfoRequest(
         @NotBlank @Schema(description = "이름")
         String name,
+        @NotNull @Schema(description = "이미지 수정이 있을 시에는 false을, 이미지를 삭제할 때에는 true을 보냅니다.")
+        Boolean isProfileImageDeleted,
         @Schema(description = "아지트 알림 수신 여부")
         boolean agitNotification,
         @Schema(description = "이메일 알림 수신 여부")

src/main/java/clap/server/adapter/outbound/persistense/entity/task/CommentEntity.java

@@ -17,7 +17,6 @@
 @Getter
 @SuperBuilder
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-@SQLDelete(sql = "UPDATE comment SET is_deleted = true WHERE comment_id = ?")
 @SQLRestriction("is_deleted = false")
 public class CommentEntity extends BaseTimeEntity {
     @Id

src/main/java/clap/server/adapter/outbound/persistense/repository/history/TaskHistoryRepository.java

@@ -9,7 +9,7 @@
 
 @Repository
 public interface TaskHistoryRepository extends JpaRepository<TaskHistoryEntity, Long>, TaskHistoryCustomRepository {
-    @Modifying
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query("UPDATE TaskHistoryEntity t SET t.isDeleted = true WHERE t.comment.commentId = :commentId")
     void updateByComment_CommentId(@Param("commentId") Long commentId);
 }

src/main/java/clap/server/application/service/history/CommandCommentService.java

@@ -2,23 +2,28 @@
 
 import clap.server.adapter.inbound.web.dto.history.request.EditCommentRequest;
 import clap.server.application.port.inbound.domain.CommentService;
-import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.inbound.history.DeleteCommentUsecase;
 import clap.server.application.port.inbound.history.EditCommentUsecase;
+import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.outbound.task.CommandAttachmentPort;
 import clap.server.application.port.outbound.task.CommandCommentPort;
 import clap.server.application.port.outbound.task.LoadAttachmentPort;
+import clap.server.application.port.outbound.task.LoadCommentPort;
 import clap.server.application.port.outbound.taskhistory.CommandTaskHistoryPort;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Attachment;
 import clap.server.domain.model.task.Comment;
 import clap.server.exception.ApplicationException;
+import clap.server.exception.DomainException;
 import clap.server.exception.code.CommentErrorCode;
+import clap.server.exception.code.MemberErrorCode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Objects;
+
 @ApplicationService
 @RequiredArgsConstructor
 @Slf4j
@@ -34,32 +39,31 @@ public class CommandCommentService implements EditCommentUsecase, DeleteCommentU
 
     @Transactional
     @Override
-    public void editComment(Long memberId, Long commentId, EditCommentRequest request) {
-        Member member = memberService.findActiveMember(memberId);
+    public void editComment(Long userId, Long commentId, EditCommentRequest request) {
+        Member member = memberService.findActiveMember(userId);
         Comment comment = commentService.findById(commentId);
 
-        if (comment.getMember().getMemberId().equals(member.getMemberId())) {
+        if (Member.checkCommenter(comment.getTask(), member)) {
             comment.updateComment(request.content());
             commandCommentPort.saveComment(comment);
-        }
-        else throw new ApplicationException(CommentErrorCode.NOT_A_COMMENT_WRITER);
-
+        };
     }
 
     @Transactional
     @Override
-    public void deleteComment(Long memberId, Long commentId) {
-        Member member = memberService.findActiveMember(memberId);
+    public void deleteComment(Long userId, Long commentId) {
+        Member member = memberService.findActiveMember(userId);
         Comment comment = commentService.findById(commentId);
 
-        if (comment.getMember().getMemberId().equals(member.getMemberId())) {
+
+        if (Objects.equals(comment.getMember().getMemberId(), member.getMemberId())) {
             if (loadAttachmentPort.exitsByCommentId(commentId)) {
                 deleteAttachments(commentId);
             }
-            commandCommentPort.deleteComment(comment);
-            commandTaskHistoryPort.deleteTaskHistoryByCommentId(commentId);
+            commandCommentPort.deleteCommentWithTaskHistory(commentId);
+        }else{
+            throw new DomainException(MemberErrorCode.NOT_A_COMMENTER);
         }
-        else throw new ApplicationException(CommentErrorCode.NOT_A_COMMENT_WRITER);
     }
 
     private void deleteAttachments(Long commentId) {

src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java

@@ -23,11 +23,17 @@ class UpdateMemberInfoService implements UpdateMemberInfoUsecase {
     private final CommandMemberPort commandMemberPort;
 
     @Override
-    public void updateMemberInfo(Long memberId, UpdateMemberInfoRequest request, MultipartFile profileImage) throws IOException {
+    public void updateMemberInfo(Long memberId, UpdateMemberInfoRequest request, MultipartFile profileImage) {
         Member member = memberService.findActiveMember(memberId);
-        String profileImageUrl = profileImage != null ? s3UploadPort.uploadSingleFile(FilePathPolicyConstants.MEMBER_IMAGE, profileImage) : null;
+        if(request.isProfileImageDeleted()){
+            member.setImageUrl(null);
+        }
+        else {
+            String profileImageUrl = profileImage != null ? s3UploadPort.uploadSingleFile(FilePathPolicyConstants.MEMBER_IMAGE, profileImage) : member.getImageUrl();
+            member.setImageUrl(profileImageUrl);
+        }
         member.updateMemberInfo(request.name(), request.agitNotification(), request.emailNotification(),
-                request.kakaoWorkNotification(), profileImageUrl);
+                request.kakaoWorkNotification());
         commandMemberPort.save(member);
     }
 }

src/main/java/clap/server/domain/model/member/Member.java

@@ -78,15 +78,17 @@ public void changeToApproveRequested() {
         this.status = MemberStatus.APPROVAL_REQUEST;
     }
 
-    public void updateMemberInfo(String name, Boolean agitNotificationEnabled, Boolean emailNotificationEnabled, Boolean kakaoWorkNotificationEnabled, String imageUrl) {
+    public void updateMemberInfo(String name, Boolean agitNotificationEnabled, Boolean emailNotificationEnabled, Boolean kakaoWorkNotificationEnabled) {
         this.memberInfo.updateName(name);
         this.agitNotificationEnabled = agitNotificationEnabled;
         this.emailNotificationEnabled = emailNotificationEnabled;
         this.kakaoworkNotificationEnabled = kakaoWorkNotificationEnabled;
-        if (imageUrl != null) {
-            this.imageUrl = imageUrl;
-        }
     }
+
+    public void setImageUrl(String imageUrl) {
+        this.imageUrl = imageUrl;
+    }
+
     public void setStatusDeleted() {
         this.status = MemberStatus.DELETED;
     }