[BE] Feat/#587 핀 댓글 기능 추가 구현

backend/src/main/java/com/mapbefine/mapbefine/auth/domain/member/Admin.java

@@ -54,4 +54,4 @@ public boolean isGuest() {
         return false;
     }
 
-}
+}

backend/src/main/java/com/mapbefine/mapbefine/auth/domain/member/Guest.java

@@ -56,4 +56,4 @@ public boolean isGuest() {
         return true;
     }
 
-}
+}

backend/src/main/java/com/mapbefine/mapbefine/auth/domain/member/User.java

@@ -1,7 +1,6 @@
 package com.mapbefine.mapbefine.auth.domain.member;
 
 import com.mapbefine.mapbefine.auth.domain.AuthMember;
-import com.mapbefine.mapbefine.topic.domain.Publicity;
 import com.mapbefine.mapbefine.topic.domain.Topic;
 import com.mapbefine.mapbefine.topic.domain.TopicStatus;
 import java.util.List;
@@ -23,12 +22,14 @@ public User(
     @Override
     public boolean canRead(Topic topic) {
         TopicStatus topicStatus = topic.getTopicStatus();
-        return topicStatus.isPublic() || isGroup(topic.getId());
+
+        return topicStatus.isPublic() || hasPermission(topic.getId());
     }
 
     @Override
     public boolean canDelete(Topic topic) {
         TopicStatus topicStatus = topic.getTopicStatus();
+
         return topicStatus.isPrivate() && isCreator(topic.getId());
     }
 
@@ -40,14 +41,13 @@ public boolean canTopicUpdate(Topic topic) {
     @Override
     public boolean canPinCreateOrUpdate(Topic topic) {
         TopicStatus topicStatus = topic.getTopicStatus();
+
         return topicStatus.isAllMembers() || hasPermission(topic.getId());
     }
 
     @Override
     public boolean canPinCommentCreate(Topic topic) {
-        Publicity publicity = topic.getPublicity();
-
-        return publicity == Publicity.PUBLIC || isGroup(topic.getId());
+        return canRead(topic);
     }
 
     @Override
@@ -69,12 +69,8 @@ private boolean isCreator(Long topicId) {
         return createdTopic.contains(topicId);
     }
 
-    private boolean isGroup(Long topicId) {
-        return isCreator(topicId) || hasPermission(topicId);
-    }
-
     private boolean hasPermission(Long topicId) {
-        return createdTopic.contains(topicId) || topicsWithPermission.contains(topicId);
+        return isCreator(topicId) || topicsWithPermission.contains(topicId);
     }
 
 }

backend/src/main/java/com/mapbefine/mapbefine/pin/application/PinCommandService.java

@@ -50,29 +50,29 @@ public class PinCommandService {
 
     private static final double DUPLICATE_LOCATION_DISTANCE_METERS = 10.0;
 
+    private final ImageService imageService;
     private final PinRepository pinRepository;
     private final LocationRepository locationRepository;
     private final TopicRepository topicRepository;
     private final MemberRepository memberRepository;
     private final PinImageRepository pinImageRepository;
-    private final ImageService imageService;
     private final PinCommentRepository pinCommentRepository;
 
     public PinCommandService(
+            ImageService imageService,
             PinRepository pinRepository,
             LocationRepository locationRepository,
             TopicRepository topicRepository,
             MemberRepository memberRepository,
             PinImageRepository pinImageRepository,
-            ImageService imageService,
             PinCommentRepository pinCommentRepository
     ) {
+        this.imageService = imageService;
         this.pinRepository = pinRepository;
         this.locationRepository = locationRepository;
         this.topicRepository = topicRepository;
         this.memberRepository = memberRepository;
         this.pinImageRepository = pinImageRepository;
-        this.imageService = imageService;
         this.pinCommentRepository = pinCommentRepository;
     }
 
@@ -211,9 +211,12 @@ public Long savePinComment(AuthMember authMember, PinCommentCreateRequest reques
         Pin pin = findPin(request.pinId());
         validatePinCommentCreate(authMember, pin);
         Member member = findMember(authMember.getMemberId());
-        PinComment parentPinComment = findParentPinComment(request.parentPinCommentId());
-
-        PinComment pinComment = PinComment.of(pin, parentPinComment, member, request.content());
+        PinComment pinComment = createPinComment(
+                pin,
+                member,
+                request.parentPinCommentId(),
+                request.content()
+        );
         pinCommentRepository.save(pinComment);
 
         return pinComment.getId();
@@ -227,13 +230,19 @@ private void validatePinCommentCreate(AuthMember authMember, Pin pin) {
         throw new PinCommentForbiddenException(FORBIDDEN_PIN_COMMENT_CREATE);
     }
 
-    private PinComment findParentPinComment(Long parentPinComment) {
-        if (Objects.isNull(parentPinComment)) {
-            return null;
+    private PinComment createPinComment(
+            Pin pin,
+            Member member,
+            Long parentPinCommentId,
+            String content
+    ) {
+        if (Objects.isNull(parentPinCommentId)) {
+            return PinComment.ofParentPinComment(pin, member, content);
         }
 
-        return pinCommentRepository.findById(parentPinComment)
-                .orElseThrow(() -> new PinCommentNotFoundException(PIN_COMMENT_NOT_FOUND, parentPinComment));
+        PinComment parentPinComment = findPinComment(parentPinCommentId);
+
+        return PinComment.ofChildPinComment(pin, parentPinComment, member, content);
     }
 
     public void updatePinComment(

backend/src/main/java/com/mapbefine/mapbefine/pin/application/PinQueryService.java

@@ -63,14 +63,14 @@ public List<PinResponse> findAllPinsByMemberId(AuthMember authMember, Long membe
                 .toList();
     }
 
-    public List<PinCommentResponse> findAllPinCommentByPinId(AuthMember member, Long pinId) {
+    public List<PinCommentResponse> findAllPinCommentsByPinId(AuthMember member, Long pinId) {
         Pin pin = findPin(pinId);
         validateReadAuth(member, pin.getTopic());
 
         List<PinComment> pinComments = pinCommentRepository.findAllByPinId(pinId);
 
         return pinComments.stream()
-                .map(pinComment -> pinCommentToResponse(member, pinComment))
+                .map(pinComment -> PinCommentResponse.of(pinComment, isCanChangePinComment(member, pinComment)))
                 .toList();
     }
 
@@ -79,18 +79,12 @@ private Pin findPin(Long pinId) {
                 .orElseThrow(() -> new PinNotFoundException(PIN_NOT_FOUND, pinId));
     }
 
-    private PinCommentResponse pinCommentToResponse(AuthMember member, PinComment pinComment) {
+    private boolean isCanChangePinComment(AuthMember member, PinComment pinComment) {
         Long creatorId = pinComment.getCreator().getId();
 
-        boolean canChange = (Objects.nonNull(member.getMemberId())
+        return (Objects.nonNull(member.getMemberId())
                 && member.isSameMember(creatorId))
                 || member.isAdmin();
-
-        if (pinComment.isParentComment()) {
-            return PinCommentResponse.ofParentComment(pinComment, canChange);
-        }
-
-        return PinCommentResponse.ofChildComment(pinComment, canChange);
     }
 
 }

backend/src/main/java/com/mapbefine/mapbefine/pin/domain/PinComment.java

@@ -2,6 +2,7 @@
 
 import static com.mapbefine.mapbefine.pin.exception.PinCommentErrorCode.ILLEGAL_CONTENT_LENGTH;
 import static com.mapbefine.mapbefine.pin.exception.PinCommentErrorCode.ILLEGAL_CONTENT_NULL;
+import static com.mapbefine.mapbefine.pin.exception.PinCommentErrorCode.ILLEGAL_PIN_COMMENT_DEPTH;
 import static lombok.AccessLevel.PROTECTED;
 
 import com.mapbefine.mapbefine.common.entity.BaseTimeEntity;
@@ -16,6 +17,7 @@
 import jakarta.persistence.Lob;
 import jakarta.persistence.ManyToOne;
 import java.util.Objects;
+import java.util.Optional;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.OnDelete;
@@ -49,7 +51,7 @@ public class PinComment extends BaseTimeEntity {
     @Column(nullable = false, length = 1000)
     private String content;
 
-    public PinComment(
+    private PinComment(
             Pin pin,
             PinComment parentPinComment,
             Member creator,
@@ -61,17 +63,37 @@ public PinComment(
         this.content = content;
     }
 
-    public static PinComment of(
+    public static PinComment ofParentPinComment(
+            Pin pin,
+            Member creator,
+            String content
+    ) {
+        validateContent(content);
+
+        return new PinComment(pin, null, creator, content);
+    }
+
+    public static PinComment ofChildPinComment(
             Pin pin,
             PinComment parentPinComment,
             Member creator,
             String content
     ) {
+        validatePinCommentDepth(parentPinComment);
         validateContent(content);
 
+
         return new PinComment(pin, parentPinComment, creator, content);
     }
 
+    private static void validatePinCommentDepth(PinComment parentPinComment) {
+        if (parentPinComment.isParentComment()) {
+            return;
+        }
+
+        throw new PinCommentBadRequestException(ILLEGAL_PIN_COMMENT_DEPTH);
+    }
+
     private static void validateContent(String content) {
         if (Objects.isNull(content)) {
             throw new PinCommentBadRequestException(ILLEGAL_CONTENT_NULL);
@@ -90,4 +112,9 @@ public boolean isParentComment() {
         return Objects.isNull(parentPinComment);
     }
 
+    public Optional<Long> getParentPinCommentId() {
+        return Optional.ofNullable(parentPinComment)
+                .map(PinComment::getId);
+    }
+
 }

backend/src/main/java/com/mapbefine/mapbefine/pin/dto/response/PinCommentResponse.java

@@ -3,6 +3,7 @@
 import com.mapbefine.mapbefine.member.domain.MemberInfo;
 import com.mapbefine.mapbefine.pin.domain.PinComment;
 import java.time.LocalDateTime;
+import java.util.Optional;
 
 public record PinCommentResponse(
         Long id,
@@ -14,32 +15,19 @@ public record PinCommentResponse(
         LocalDateTime updatedAt
 ) {
 
-    public static PinCommentResponse ofParentComment(PinComment pinComment, boolean canChange) {
-        MemberInfo memberInfo = pinComment.getCreator().getMemberInfo();
-
-       return new PinCommentResponse(
-                pinComment.getId(),
-                pinComment.getContent(),
-                memberInfo.getNickName(),
-                memberInfo.getImageUrl(),
-                null,
-                canChange,
-                pinComment.getUpdatedAt()
-        );
-    }
-
-    public static PinCommentResponse ofChildComment(PinComment pinComment, boolean canChange) {
+    public static PinCommentResponse of(PinComment pinComment, boolean canChange) {
         MemberInfo memberInfo = pinComment.getCreator().getMemberInfo();
+        Optional<Long> parentPinCommentId = pinComment.getParentPinCommentId();
 
         return new PinCommentResponse(
-                pinComment.getId(),
-                pinComment.getContent(),
-                memberInfo.getNickName(),
-                memberInfo.getImageUrl(),
-                pinComment.getParentPinComment().getId(),
-                canChange,
-                pinComment.getUpdatedAt()
-        );
+                 pinComment.getId(),
+                 pinComment.getContent(),
+                 memberInfo.getNickName(),
+                 memberInfo.getImageUrl(),
+                 parentPinCommentId.orElse(null),
+                 canChange,
+                 pinComment.getUpdatedAt()
+         );
     }
 
 }

backend/src/main/java/com/mapbefine/mapbefine/pin/exception/PinCommentErrorCode.java

@@ -7,10 +7,11 @@ public enum PinCommentErrorCode {
 
     ILLEGAL_CONTENT_NULL("11000", "핀 댓글의 내용은 필수로 입력해야합니다."),
     ILLEGAL_CONTENT_LENGTH("11001", "핀 댓글의 내용이 최소 1 자에서 최대 1000 자여야 합니다."),
-    FORBIDDEN_PIN_COMMENT_CREATE("11002", "핀 댓글을 추가할 권한이 없습니다."),
-    FORBIDDEN_PIN_COMMENT_UPDATE("11003", "핀 댓글을 수정할 권한이 없습니다."),
-    FORBIDDEN_PIN_COMMENT_DELETE("11004", "핀 댓글을 삭제할 권한이 없습니다."),
-    PIN_COMMENT_NOT_FOUND("11005", "존재하지 않는 핀 댓글입니다."),
+    ILLEGAL_PIN_COMMENT_DEPTH("11002", "핀 대댓글에는 대댓글을 달 수 없습니다."),
+    FORBIDDEN_PIN_COMMENT_CREATE("11003", "핀 댓글을 추가할 권한이 없습니다."),
+    FORBIDDEN_PIN_COMMENT_UPDATE("11004", "핀 댓글을 수정할 권한이 없습니다."),
+    FORBIDDEN_PIN_COMMENT_DELETE("11005", "핀 댓글을 삭제할 권한이 없습니다."),
+    PIN_COMMENT_NOT_FOUND("11006", "존재하지 않는 핀 댓글입니다."),
     ;
 
     private final String code;

backend/src/main/java/com/mapbefine/mapbefine/pin/presentation/PinController.java

@@ -134,9 +134,9 @@ public ResponseEntity<Void> addPinComment(AuthMember member, @RequestBody PinCom
                 .build();
     }
 
-    @GetMapping("/comments/{pinId}")
+    @GetMapping("/{pinId}/comments")
     public ResponseEntity<List<PinCommentResponse>> findPinCommentByPinId(AuthMember member, @PathVariable Long pinId) {
-        List<PinCommentResponse> allResponse = pinQueryService.findAllPinCommentByPinId(member, pinId);
+        List<PinCommentResponse> allResponse = pinQueryService.findAllPinCommentsByPinId(member, pinId);
 
         return ResponseEntity.ok(allResponse);
     }

backend/src/test/java/com/mapbefine/mapbefine/pin/PinCommentFixture.java

@@ -10,9 +10,8 @@ public static PinComment createParentComment(
             Pin pin,
             Member creator
     ) {
-        return PinComment.of(
+        return PinComment.ofParentPinComment(
                 pin,
-                null,
                 creator,
                 "댓글"
         );
@@ -23,7 +22,7 @@ public static PinComment createChildComment(
             Member creator,
             PinComment savedParentPinComment
     ) {
-        return PinComment.of(
+        return PinComment.ofChildPinComment(
                 pin,
                 savedParentPinComment,
                 creator,

backend/src/test/java/com/mapbefine/mapbefine/pin/PinIntegrationTest.java

@@ -32,7 +32,6 @@
 import java.io.File;
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -299,7 +298,6 @@
     void findPinCommentPinId_Success() {
         //given
         long pinId = createPinAndGetId(createRequestDuplicateLocation);
-
         Pin pin = pinRepository.findById(pinId).get();
         PinComment parentPinComment = pinCommentRepository.save(
                 PinCommentFixture.createParentComment(pin, member)
@@ -308,8 +306,8 @@
                 PinCommentFixture.createChildComment(pin, member, parentPinComment)
         );
         List<PinCommentResponse> expected = List.of(
-                PinCommentResponse.ofParentComment(parentPinComment, true),
-                PinCommentResponse.ofChildComment(childPinComment, true)
+                PinCommentResponse.of(parentPinComment, true),
+                PinCommentResponse.of(childPinComment, true)
         );
 
         // when
@@ -321,12 +319,11 @@
                 .then().log().all()
                 .extract();
 
-        List<PinCommentResponse> pinResponses = response.as(new TypeRef<>() {});
-
         // then
+        List<PinCommentResponse> pinCommentResponses = response.as(new TypeRef<>() {});
         assertThat(response.statusCode()).isEqualTo(HttpStatus.OK.value());
-        assertThat(pinResponses).hasSize(2);
-        assertThat(pinResponses).usingRecursiveComparison()
+        assertThat(pinCommentResponses).hasSize(2);
+        assertThat(pinCommentResponses).usingRecursiveComparison()
                 .ignoringFieldsOfTypes(LocalDateTime.class)
                 .isEqualTo(expected);
     }