Hotfix/mateboard: 게시글 좋아요, 댓글 좋아요 배열 반영

backend/src/main/java/com/frend/planit/domain/mateboard/comment/controller/MateCommentLikeController.java

@@ -13,7 +13,7 @@
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/api/v1/mates/comments")
+@RequestMapping("/api/v1/mateposts/comments")
 public class MateCommentLikeController {
 
     private final MateCommentLikeService mateCommentLikeService;

backend/src/main/java/com/frend/planit/domain/mateboard/comment/dto/response/CommentLikeInfo.java

@@ -0,0 +1,16 @@
+package com.frend.planit.domain.mateboard.comment.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 댓글 좋아요 정보를 담는 DTO입니다.
+ * <p>authorId(사용자)와 commentId(댓글 ID)를 포함합니다.</p>
+ */
+@Getter
+@AllArgsConstructor
+public class CommentLikeInfo {
+
+    private Long authorId;
+    private Long commentId;
+}

backend/src/main/java/com/frend/planit/domain/mateboard/comment/dto/response/MateCommentResponseDto.java

@@ -1,6 +1,7 @@
 package com.frend.planit.domain.mateboard.comment.dto.response;
 
 import java.time.LocalDateTime;
+import java.util.List;
 import lombok.Builder;
 import lombok.Getter;
 
@@ -30,6 +31,8 @@ public class MateCommentResponseDto {
 
     private final String content;
 
+    private final List<CommentLikeInfo> commentLike;
+
     private final LocalDateTime createdAt;
 
     private final LocalDateTime modifiedAt;

backend/src/main/java/com/frend/planit/domain/mateboard/comment/entity/MateComment.java

@@ -4,12 +4,16 @@
 import com.frend.planit.domain.user.entity.User;
 import com.frend.planit.global.base.BaseTime;
 import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
+import java.util.ArrayList;
+import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -47,4 +51,6 @@ public class MateComment extends BaseTime {
     @Column(nullable = false)
     private String content;
 
+    @OneToMany(mappedBy = "mateComment", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<MateCommentLike> commentLikes = new ArrayList<>();
 }

backend/src/main/java/com/frend/planit/domain/mateboard/comment/mapper/MateCommentMapper.java

@@ -1,7 +1,9 @@
 package com.frend.planit.domain.mateboard.comment.mapper;
 
+import com.frend.planit.domain.mateboard.comment.dto.response.CommentLikeInfo;
 import com.frend.planit.domain.mateboard.comment.dto.response.MateCommentResponseDto;
 import com.frend.planit.domain.mateboard.comment.entity.MateComment;
+import java.util.List;
 
 /**
  * MateComment 엔티티를 MateCommentResponseDto로 변환하는 매퍼 클래스입니다.
@@ -14,7 +16,8 @@
  */
 public class MateCommentMapper {
 
-    public static MateCommentResponseDto toResponseDto(MateComment comment) {
+    public static MateCommentResponseDto toResponseDto(MateComment comment,
+            List<CommentLikeInfo> commentLike) {
         return MateCommentResponseDto.builder()
                 .mateCommentId(comment.getId())
                 .matePostId(comment.getMate().getId())
@@ -23,9 +26,13 @@ public static MateCommentResponseDto toResponseDto(MateComment comment) {
                 .nickname(comment.getUser().getNickname())
                 .profileImageUrl(comment.getUser().getProfileImageUrl())
                 .content(comment.getContent())
+                .commentLike(commentLike)
                 .createdAt(comment.getCreatedAt())
                 .modifiedAt(comment.getModifiedAt())
-                // TODO: 좋아요 수 추가
                 .build();
     }
+
+    public static MateCommentResponseDto toResponseDto(MateComment comment) {
+        return toResponseDto(comment, List.of());
+    }
 }

backend/src/main/java/com/frend/planit/domain/mateboard/comment/service/MateCommentService.java

@@ -5,6 +5,7 @@
 import static com.frend.planit.global.response.ErrorType.USER_NOT_FOUND;
 
 import com.frend.planit.domain.mateboard.comment.dto.request.MateCommentRequestDto;
+import com.frend.planit.domain.mateboard.comment.dto.response.CommentLikeInfo;
 import com.frend.planit.domain.mateboard.comment.dto.response.MateCommentResponseDto;
 import com.frend.planit.domain.mateboard.comment.entity.MateComment;
 import com.frend.planit.domain.mateboard.comment.mapper.MateCommentMapper;
@@ -95,8 +96,17 @@ public PageResponse<MateCommentResponseDto> findAllByMateIdWithPaging(Long mateI
         Mate mate = mateService.findMateOrThrow(mateId);
         // 2. 해당 게시글에 달린 댓글을 페이징하여 조회
         Page<MateComment> comments = mateCommentRepository.findAllByMate(mate, pageable);
-        // 3. Entity -> DTO 변환
-        Page<MateCommentResponseDto> dtoPage = comments.map(MateCommentMapper::toResponseDto);
+        // 3. Entity -> DTO 변환 (commentLike 포함)
+        Page<MateCommentResponseDto> dtoPage = comments.map(comment -> {
+            List<CommentLikeInfo> commentLikes = comment.getCommentLikes().stream()
+                    .map(like -> new CommentLikeInfo(
+                            like.getUser().getId(),
+                            like.getMateComment().getId()
+                    )).toList();
+
+            return MateCommentMapper.toResponseDto(comment, commentLikes);
+        });
+
         // 4. PageResponse로 감싸서 반환
         return new PageResponse<>(dtoPage);
     }

backend/src/main/java/com/frend/planit/domain/mateboard/post/dto/response/CommentLikeInfo.java

@@ -0,0 +1,16 @@
+package com.frend.planit.domain.mateboard.post.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 댓글 좋아요 정보를 담는 DTO입니다.
+ * <p>작성자(authorId)가 어떤 댓글(commentId)에 좋아요를 눌렀는지 나타냅니다.</p>
+ */
+@Getter
+@AllArgsConstructor
+public class CommentLikeInfo {
+
+    private Long authorId;
+    private Long commentId;
+}

backend/src/main/java/com/frend/planit/domain/mateboard/post/dto/response/MateApplicationInfo.java

@@ -0,0 +1,16 @@
+package com.frend.planit.domain.mateboard.post.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 동행 신청 정보를 담는 DTO입니다.
+ * <p>작성자(authorId)가 어떤 동행 신청(applicationId)을 했는지 나타냅니다.</p>
+ */
+@Getter
+@AllArgsConstructor
+public class MateApplicationInfo {
+
+    private Long authorId;
+    private Long applicationId;
+}

backend/src/main/java/com/frend/planit/domain/mateboard/post/dto/response/MateResponseDto.java

@@ -7,17 +7,19 @@
 import com.querydsl.core.annotations.QueryProjection;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 import lombok.Builder;
 import lombok.Getter;
 
 /**
  * 메이트 모집 게시글 조회, 목록 응답 시에 사용하는 Response DTO입니다.
  *
+ * <p>상세 조회 시 postLike, mateApplications, isApplied 등의 정보를 포함합니다.</p>
+ *
  * @author zelly
  * @version 1.0
  * @since 2025-03-28
  */
-@Builder
 @Getter
 public class MateResponseDto {
 
@@ -40,8 +42,10 @@ public class MateResponseDto {
     private final int commentCount;
     private final int likeCount;
     private final LocalDateTime createdAt;
-    private boolean isApplied;
+    private final boolean isApplied;
 
+    private final List<PostLikeInfo> postLike;
+    private final List<MateApplicationInfo> mateApplications;
 
     @QueryProjection
     public MateResponseDto(Long matePostId, Long authorId, String title, String content,
@@ -70,5 +74,40 @@ public MateResponseDto(Long matePostId, Long authorId, String title, String cont
         this.likeCount = likeCount;
         this.createdAt = createdAt;
         this.isApplied = isApplied;
+        this.postLike = null;
+        this.mateApplications = null;
+    }
+
+    @Builder
+    public MateResponseDto(Long matePostId, Long authorId, String title, String content,
+            TravelRegion travelRegion, LocalDate travelStartDate, LocalDate travelEndDate,
+            RecruitmentStatus recruitmentStatus, MateGender mateGender,
+            int recruitCount, int appliedCount, String imageUrl,
+            String nickname, String bio, String profileImage, Gender authorGender,
+            int commentCount, int likeCount, LocalDateTime createdAt,
+            boolean isApplied, List<PostLikeInfo> postLike,
+            List<MateApplicationInfo> mateApplications) {
+        this.matePostId = matePostId;
+        this.authorId = authorId;
+        this.title = title;
+        this.content = content;
+        this.travelRegion = travelRegion;
+        this.travelStartDate = travelStartDate;
+        this.travelEndDate = travelEndDate;
+        this.recruitmentStatus = recruitmentStatus;
+        this.mateGender = mateGender;
+        this.recruitCount = recruitCount;
+        this.appliedCount = appliedCount;
+        this.imageUrl = imageUrl;
+        this.nickname = nickname;
+        this.bio = bio;
+        this.profileImage = profileImage;
+        this.authorGender = authorGender;
+        this.commentCount = commentCount;
+        this.likeCount = likeCount;
+        this.createdAt = createdAt;
+        this.isApplied = isApplied;
+        this.postLike = postLike;
+        this.mateApplications = mateApplications;
     }
-}
+}

backend/src/main/java/com/frend/planit/domain/mateboard/post/dto/response/PostLikeInfo.java

@@ -0,0 +1,16 @@
+package com.frend.planit.domain.mateboard.post.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 게시글 좋아요 정보를 담는 DTO입니다.
+ * <p>작성자(authorId)가 어떤 게시글(matePostId)에 좋아요를 눌렀는지 나타냅니다.</p>
+ */
+@Getter
+@AllArgsConstructor
+public class PostLikeInfo {
+
+    private Long authorId;
+    private Long matePostId;
+}

backend/src/main/java/com/frend/planit/domain/mateboard/post/entity/Mate.java

@@ -124,6 +124,9 @@ public class Mate extends BaseTime {
     @OneToMany(mappedBy = "mate", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<MateApplication> applications = new ArrayList<>();
 
+    @OneToMany(mappedBy = "matePost", fetch = FetchType.LAZY)
+    private List<MatePostLike> postLikes;
+
     /**
      * 게시글 생성 날짜(createdAt), 게시글 수정 날짜(modifiedAt) BaseTime 상속
      */

backend/src/main/java/com/frend/planit/domain/mateboard/post/mapper/MateMapper.java

@@ -1,7 +1,10 @@
 package com.frend.planit.domain.mateboard.post.mapper;
 
+import com.frend.planit.domain.mateboard.post.dto.response.MateApplicationInfo;
 import com.frend.planit.domain.mateboard.post.dto.response.MateResponseDto;
+import com.frend.planit.domain.mateboard.post.dto.response.PostLikeInfo;
 import com.frend.planit.domain.mateboard.post.entity.Mate;
+import java.util.List;
 
 /**
  * Mate 엔티티를 MateResponseDto로 변환하는 매퍼 클래스입니다.
@@ -20,8 +23,11 @@ public class MateMapper {
      * @param mate 변환할 Mate 엔티티
      * @return MateResponseDto 변환 결과
      */
-    public static MateResponseDto toResponseDto(Mate mate, String imageUrl, boolean isApplied) {
+    public static MateResponseDto toResponseDto(Mate mate, String imageUrl) {
+        return toResponseDto(mate, imageUrl, false);
+    }
 
+    public static MateResponseDto toResponseDto(Mate mate, String imageUrl, boolean isApplied) {
         return MateResponseDto.builder()
                 .matePostId(mate.getId())
                 .authorId(mate.getWriter().getId())
@@ -46,7 +52,36 @@ public static MateResponseDto toResponseDto(Mate mate, String imageUrl, boolean
                 .build();
     }
 
-    public static MateResponseDto toResponseDto(Mate mate, String imageUrl) {
-        return toResponseDto(mate, imageUrl, false);
+    public static MateResponseDto toResponseDto(
+            Mate mate,
+            String imageUrl,
+            boolean isApplied,
+            List<PostLikeInfo> postLike,
+            List<MateApplicationInfo> mateApplications
+    ) {
+        return MateResponseDto.builder()
+                .matePostId(mate.getId())
+                .authorId(mate.getWriter().getId())
+                .nickname(mate.getWriter().getNickname())
+                .profileImage(mate.getWriter().getProfileImageUrl())
+                .authorGender(mate.getWriter().getGender())
+                .bio(mate.getWriter().getBio())
+                .title(mate.getTitle())
+                .content(mate.getContent())
+                .recruitCount(mate.getRecruitCount())
+                .travelRegion(mate.getTravelRegion())
+                .travelStartDate(mate.getTravelStartDate())
+                .travelEndDate(mate.getTravelEndDate())
+                .recruitmentStatus(mate.getRecruitmentStatus())
+                .mateGender(mate.getMateGender())
+                .appliedCount((int) mate.getApplications().stream()
+                        .filter(a -> a.getStatus().isAccepted())
+                        .count())
+                .imageUrl(imageUrl)
+                .createdAt(mate.getCreatedAt())
+                .isApplied(isApplied)
+                .postLike(postLike)
+                .mateApplications(mateApplications)
+                .build();
     }
 }

backend/src/main/java/com/frend/planit/domain/mateboard/post/service/MateService.java

@@ -8,7 +8,9 @@
 import com.frend.planit.domain.image.type.HolderType;
 import com.frend.planit.domain.mateboard.application.repository.MateApplicationRepository;
 import com.frend.planit.domain.mateboard.post.dto.request.MateRequestDto;
+import com.frend.planit.domain.mateboard.post.dto.response.MateApplicationInfo;
 import com.frend.planit.domain.mateboard.post.dto.response.MateResponseDto;
+import com.frend.planit.domain.mateboard.post.dto.response.PostLikeInfo;
 import com.frend.planit.domain.mateboard.post.entity.Mate;
 import com.frend.planit.domain.mateboard.post.mapper.MateMapper;
 import com.frend.planit.domain.mateboard.post.repository.MateQueryRepository;
@@ -99,8 +101,18 @@ public MateResponseDto getMate(Long id, Long userId) {
 
         boolean isApplied = mateApplicationRepository.existsByMateIdAndApplicantId(id, userId);
 
+        // 1. 게시글 좋아요 정보 → PostLikeInfo 리스트 생성
+        List<PostLikeInfo> postLike = mate.getPostLikes().stream()
+                .map(like -> new PostLikeInfo(like.getUser().getId(), mate.getId()))
+                .toList();
+
+        // 2. 동행 신청 정보 → MateApplicationInfo 리스트 생성
+        List<MateApplicationInfo> mateApplications = mate.getApplications().stream()
+                .map(app -> new MateApplicationInfo(app.getApplicant().getId(), app.getId()))
+                .toList();
+
         // DTO 변환 시 이미지 URL 포함
-        return MateMapper.toResponseDto(mate, imageUrl, isApplied);
+        return MateMapper.toResponseDto(mate, imageUrl, isApplied, postLike, mateApplications);
     }
 
     /**