Merge branch 'dev' of https://github.com/prgrms-web-devcourse-final-project/WEB6_8_HaeDokCoding_BE into chore#118

seungwookc97 · seungwookc97 · commit fb585071de61 · 2025-09-24T16:31:56.000+09:00
diff --git a/src/main/java/com/back/domain/cocktail/comment/dto/CocktailCommentCreateRequestDto.java b/src/main/java/com/back/domain/cocktail/comment/dto/CocktailCommentCreateRequestDto.java
@@ -0,0 +1,11 @@
+package com.back.domain.cocktail.comment.dto;
+
+import com.back.domain.post.comment.enums.CommentStatus;
+import jakarta.validation.constraints.NotBlank;
+
+public record CocktailCommentCreateRequestDto(
+        CommentStatus status,
+        @NotBlank(message = "내용은 필수입니다.")
+        String content
+) {
+}
diff --git a/src/main/java/com/back/domain/cocktail/comment/dto/CocktailCommentResponseDto.java b/src/main/java/com/back/domain/cocktail/comment/dto/CocktailCommentResponseDto.java
@@ -0,0 +1,28 @@
+package com.back.domain.cocktail.comment.dto;
+
+import com.back.domain.cocktail.comment.entity.CocktailComment;
+import com.back.domain.post.comment.enums.CommentStatus;
+
+import java.time.LocalDateTime;
+
+public record CocktailCommentResponseDto(
+        Long commentId,
+        Long postId,
+        String userNickName,
+        LocalDateTime createdAt,
+        LocalDateTime updatedAt,
+        CommentStatus status,
+        String content
+) {
+    public CocktailCommentResponseDto(CocktailComment cocktailcomment) {
+        this(
+                cocktailcomment.getId(),
+                cocktailcomment.getCocktail().getId(),
+                cocktailcomment.getUser().getNickname(),
+                cocktailcomment.getCreatedAt(),
+                cocktailcomment.getUpdatedAt(),
+                cocktailcomment.getStatus(),
+                cocktailcomment.getContent()
+        );
+    }
+}
diff --git a/src/main/java/com/back/domain/cocktail/comment/dto/CocktailCommentUpdateRequestDto.java b/src/main/java/com/back/domain/cocktail/comment/dto/CocktailCommentUpdateRequestDto.java
@@ -0,0 +1,9 @@
+package com.back.domain.cocktail.comment.dto;
+
+import com.back.domain.post.comment.enums.CommentStatus;
+
+public record CocktailCommentUpdateRequestDto(
+        CommentStatus status,
+        String content
+) {
+}
diff --git a/src/main/java/com/back/domain/cocktail/comment/entity/CocktailComment.java b/src/main/java/com/back/domain/cocktail/comment/entity/CocktailComment.java
@@ -0,0 +1,66 @@
+package com.back.domain.cocktail.comment.entity;
+
+import com.back.domain.cocktail.entity.Cocktail;
+import com.back.domain.post.comment.enums.CommentStatus;
+import com.back.domain.user.entity.User;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Getter
+@Table(name = "cocktailcomment")
+@EntityListeners(AuditingEntityListener.class)
+@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
+@AllArgsConstructor
+@Builder
+public class CocktailComment {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    // 해당 칵테일댓글이 작성된 게시글의 고유 식별자
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "cocktail_id")
+    private Cocktail cocktail;
+
+    // 해당 칵테일댓글을 작성한 유저의 고유 식별자
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id")
+    private User user;
+
+    // 칵테일댓글 작성 날짜
+    @CreatedDate
+    private LocalDateTime createdAt;
+
+    // 칵테일댓글 수정 날짜
+    @LastModifiedDate
+    private LocalDateTime updatedAt;
+
+    // 칵테일댓글 게시 상태 (기본값: 공개)
+    @Builder.Default
+    @Enumerated(EnumType.STRING)
+    @Column(name = "status", nullable = false)
+    private CommentStatus status = CommentStatus.PUBLIC;
+
+    // 칵테일댓글 내용
+    @Column(name = "content", nullable = false, columnDefinition = "TEXT")
+    private String content;
+
+    public void updateStatus(CommentStatus status) {
+        this.status = status;
+    }
+
+    public void updateContent(String content) {
+        this.content = content;
+    }
+}
diff --git a/src/main/java/com/back/domain/cocktail/comment/repository/CocktailCommentRepository.java b/src/main/java/com/back/domain/cocktail/comment/repository/CocktailCommentRepository.java
@@ -0,0 +1,8 @@
+package com.back.domain.cocktail.comment.repository;
+
+import com.back.domain.post.comment.entity.Comment;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface CocktailCommentRepository extends JpaRepository<Comment, Long> {
+
+}
diff --git a/src/main/java/com/back/domain/cocktail/controller/CocktailShareController.java b/src/main/java/com/back/domain/cocktail/controller/CocktailShareController.java
@@ -24,7 +24,7 @@ public ResponseEntity<RsData<Map<String, String>>> getShareLink(@PathVariable Lo
                 .map(cocktail -> {
                     Map<String, String> response = Map.of(
                             // 공유 URL
-                            "url", "https://www.ssoul.or/cocktails/" + cocktail.getCocktailId(),
+                            "url", "https://www.ssoul.or/cocktails/" + cocktail.getId(),
                             // 공유 제목
                             "title", cocktail.getCocktailName(),
                             // 공유 이미지 (선택)
diff --git a/src/main/java/com/back/domain/cocktail/dto/CocktailDetailResponseDto.java b/src/main/java/com/back/domain/cocktail/dto/CocktailDetailResponseDto.java
@@ -39,7 +39,7 @@ public CocktailDetailResponseDto(
     }
 
     public CocktailDetailResponseDto(Cocktail cocktail) {
-        this.cocktailId = cocktail.getCocktailId();
+        this.cocktailId = cocktail.getId();
         this.cocktailName = cocktail.getCocktailName();
         this.alcoholStrength = cocktail.getAlcoholStrength();
         this.cocktailType = cocktail.getCocktailType();
diff --git a/src/main/java/com/back/domain/cocktail/entity/Cocktail.java b/src/main/java/com/back/domain/cocktail/entity/Cocktail.java
@@ -5,7 +5,11 @@
 import com.back.domain.cocktail.enums.CocktailType;
 import jakarta.persistence.*;
 import lombok.*;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+
 import java.time.LocalDateTime;
+
 import static jakarta.persistence.GenerationType.IDENTITY;
 
 
@@ -19,7 +23,7 @@
 public class Cocktail {
     @Id
     @GeneratedValue(strategy = IDENTITY)
-    private long cocktailId;
+    private long id;
 
     private String cocktailName;
 
@@ -40,7 +44,9 @@ public class Cocktail {
 
     private String cocktailImgUrl;
 
+    @CreatedDate
     private LocalDateTime createdAt;
 
+    @LastModifiedDate
     private LocalDateTime updatedAt;
 }
diff --git a/src/main/java/com/back/domain/cocktail/repository/CocktailRepository.java b/src/main/java/com/back/domain/cocktail/repository/CocktailRepository.java
@@ -17,10 +17,10 @@
 public interface CocktailRepository extends JpaRepository<Cocktail, Long> {
 
     // 첫 요청 → 최신순(내림차순)으로 정렬해서 가져오기
-    List<Cocktail> findAllByOrderByCocktailIdDesc(Pageable pageable);
+    List<Cocktail> findAllByOrderByIdDesc(Pageable pageable);
 
     // 무한스크롤 → lastId보다 작은 ID들 가져오기
-    List<Cocktail> findByCocktailIdLessThanOrderByCocktailIdDesc(Long lastId, Pageable pageable);
+    List<Cocktail> findByIdLessThanOrderByIdDesc(Long lastId, Pageable pageable);
 
     List<Cocktail> findByCocktailNameContainingIgnoreCaseOrIngredientContainingIgnoreCase(String cocktailName, String ingredient);
 
diff --git a/src/main/java/com/back/domain/cocktail/service/CocktailService.java b/src/main/java/com/back/domain/cocktail/service/CocktailService.java
@@ -45,13 +45,13 @@ public List<CocktailSummaryResponseDto> getCocktails (Long lastId, Integer size)
             List<Cocktail> cocktails;
             if (lastId == null) {
                 // 첫 요청 → 최신 데이터부터
-                cocktails = cocktailRepository.findAllByOrderByCocktailIdDesc(PageRequest.of(0, fetchSize));
+                cocktails = cocktailRepository.findAllByOrderByIdDesc(PageRequest.of(0, fetchSize));
             } else {
                 // 무한스크롤 → 마지막 ID보다 작은 데이터 조회
-                cocktails = cocktailRepository.findByCocktailIdLessThanOrderByCocktailIdDesc(lastId, PageRequest.of(0, fetchSize));
+                cocktails = cocktailRepository.findByIdLessThanOrderByIdDesc(lastId, PageRequest.of(0, fetchSize));
             }
             return cocktails.stream()
-                    .map(c -> new CocktailSummaryResponseDto(c.getCocktailId(), c.getCocktailName(), c.getCocktailImgUrl()))
+                    .map(c -> new CocktailSummaryResponseDto(c.getId(), c.getCocktailName(), c.getCocktailImgUrl()))
                     .collect(Collectors.toList());
         }
 
@@ -106,7 +106,7 @@ public List<CocktailSearchResponseDto> searchAndFilter (CocktailSearchRequestDto
             //Cocktail 엔티티 → CocktailResponseDto 응답 DTO로 바꿔주는 과정
             List<CocktailSearchResponseDto> resultDtos = pageResult.stream()
                     .map(c -> new CocktailSearchResponseDto(
-                            c.getCocktailId(),
+                            c.getId(),
                             c.getCocktailName(),
                             c.getAlcoholStrength(),
                             c.getCocktailType(),
diff --git a/src/main/java/com/back/domain/mybar/dto/MyBarItemResponseDto.java b/src/main/java/com/back/domain/mybar/dto/MyBarItemResponseDto.java
@@ -19,7 +19,7 @@ public class MyBarItemResponseDto {
     public static MyBarItemResponseDto from(MyBar m) {
         return MyBarItemResponseDto.builder()
                 .id(m.getId())
-                .cocktailId(m.getCocktail().getCocktailId())
+                .cocktailId(m.getCocktail().getId())
                 .cocktailName(m.getCocktail().getCocktailName())
                 .imageUrl(m.getCocktail().getCocktailImgUrl())
                 .createdAt(m.getCreatedAt())
diff --git a/src/main/java/com/back/domain/mybar/repository/MyBarRepository.java b/src/main/java/com/back/domain/mybar/repository/MyBarRepository.java
@@ -31,17 +31,17 @@ public interface MyBarRepository extends JpaRepository<MyBar, Long> {
     long countByUser_IdAndStatus(Long userId, KeepStatus status);
 
     /** 현재 킵 상태 확인(아이콘 등): ACTIVE 존재 여부 */
-    boolean existsByUser_IdAndCocktail_CocktailIdAndStatus(Long userId, Long cocktailId, KeepStatus status);
+    boolean existsByUser_IdAndCocktail_IdAndStatus(Long userId, Long cocktailId, KeepStatus status);
 
     /** 복원/재킵을 위해 status 무시하고 한 건 찾기 (없으면 Optional.empty) */
-    Optional<MyBar> findByUser_IdAndCocktail_CocktailId(Long userId, Long cocktailId);
+    Optional<MyBar> findByUser_IdAndCocktail_Id(Long userId, Long cocktailId);
 
     @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query("""
         update MyBar m
            set m.status = 'DELETED', m.deletedAt = CURRENT_TIMESTAMP
          where m.user.id = :userId
-           and m.cocktail.cocktailId = :cocktailId
+           and m.cocktail.id = :cocktailId
            and m.status = 'ACTIVE'
     """)
     int softDeleteByUserAndCocktail(Long userId, Long cocktailId);
diff --git a/src/main/java/com/back/domain/mybar/service/MyBarService.java b/src/main/java/com/back/domain/mybar/service/MyBarService.java
@@ -64,7 +64,7 @@ public MyBarListResponseDto getMyBar(Long userId, LocalDateTime lastKeptAt, Long
     @Transactional
     public void keep(Long userId, Long cocktailId) {
         Optional<MyBar> existingMyBar =
-                myBarRepository.findByUser_IdAndCocktail_CocktailId(userId, cocktailId);
+                myBarRepository.findByUser_IdAndCocktail_Id(userId, cocktailId);
 
         LocalDateTime now = LocalDateTime.now();
 
diff --git a/src/main/java/com/back/domain/myhistory/controller/MyHistoryController.java b/src/main/java/com/back/domain/myhistory/controller/MyHistoryController.java
@@ -3,6 +3,7 @@
 import com.back.domain.myhistory.dto.MyHistoryCommentGoResponseDto;
 import com.back.domain.myhistory.dto.MyHistoryCommentListDto;
 import com.back.domain.myhistory.dto.MyHistoryPostListDto;
+import com.back.domain.myhistory.dto.MyHistoryLikedPostListDto;
 import com.back.domain.myhistory.service.MyHistoryService;
 import com.back.global.rsData.RsData;
 import jakarta.validation.constraints.Max;
@@ -54,6 +55,17 @@ public RsData<MyHistoryCommentListDto> getMyComments(
         return RsData.successOf(body);
     }
 
+    @GetMapping("/likes")
+    public RsData<MyHistoryLikedPostListDto> getMyLikedPosts(
+            @AuthenticationPrincipal(expression = "id") Long userId,
+            @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime lastCreatedAt,
+            @RequestParam(required = false) Long lastId,
+            @RequestParam(defaultValue = "20") @Min(1) @Max(100) int limit
+    ) {
+        MyHistoryLikedPostListDto body = myHistoryService.getMyLikedPosts(userId, lastCreatedAt, lastId, limit);
+        return RsData.successOf(body);
+    }
+
     @GetMapping("/comments/{id}")
     public RsData<MyHistoryCommentGoResponseDto> goFromComment(
             @AuthenticationPrincipal(expression = "id") Long userId,
@@ -62,5 +74,14 @@ public RsData<MyHistoryCommentGoResponseDto> goFromComment(
         var body = myHistoryService.getPostLinkFromMyComment(userId, commentId);
         return RsData.successOf(body);
     }
+
+    @GetMapping("/likes/{id}")
+    public RsData<com.back.domain.myhistory.dto.MyHistoryPostGoResponseDto> goFromLikedPost(
+            @AuthenticationPrincipal(expression = "id") Long userId,
+            @PathVariable("id") Long postId
+    ) {
+        var body = myHistoryService.getPostLinkFromMyLikedPost(userId, postId);
+        return RsData.successOf(body);
+    }
 }
 
diff --git a/src/main/java/com/back/domain/myhistory/dto/MyHistoryLikedPostItemDto.java b/src/main/java/com/back/domain/myhistory/dto/MyHistoryLikedPostItemDto.java
@@ -0,0 +1,31 @@
+package com.back.domain.myhistory.dto;
+
+import com.back.domain.post.post.entity.Post;
+import com.back.domain.post.post.entity.PostLike;
+import java.time.LocalDateTime;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class MyHistoryLikedPostItemDto {
+    private Long id;
+    private String title;
+    private String imageUrl;
+    private LocalDateTime likedAt;
+    private Integer likeCount;
+    private Integer commentCount;
+
+    public static MyHistoryLikedPostItemDto from(PostLike pl) {
+        Post p = pl.getPost();
+        return MyHistoryLikedPostItemDto.builder()
+                .id(p.getId())
+                .title(p.getTitle())
+                .imageUrl(p.getImageUrl())
+                .likedAt(pl.getCreatedAt())
+                .likeCount(p.getLikeCount())
+                .commentCount(p.getCommentCount())
+                .build();
+    }
+}
+
diff --git a/src/main/java/com/back/domain/myhistory/dto/MyHistoryLikedPostListDto.java b/src/main/java/com/back/domain/myhistory/dto/MyHistoryLikedPostListDto.java
@@ -0,0 +1,16 @@
+package com.back.domain.myhistory.dto;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class MyHistoryLikedPostListDto {
+    private List<MyHistoryLikedPostItemDto> items;
+    private boolean hasNext;
+    private LocalDateTime nextCreatedAt;
+    private Long nextId;
+}
+
diff --git a/src/main/java/com/back/domain/myhistory/repository/MyHistoryLikedPostRepository.java b/src/main/java/com/back/domain/myhistory/repository/MyHistoryLikedPostRepository.java
diff --git a/src/main/java/com/back/domain/myhistory/service/MyHistoryService.java b/src/main/java/com/back/domain/myhistory/service/MyHistoryService.java
diff --git a/src/main/java/com/back/domain/notification/controller/NotificationController.java b/src/main/java/com/back/domain/notification/controller/NotificationController.java
diff --git a/src/main/java/com/back/domain/notification/entity/Notification.java b/src/main/java/com/back/domain/notification/entity/Notification.java
diff --git a/src/main/java/com/back/domain/notification/service/NotificationService.java b/src/main/java/com/back/domain/notification/service/NotificationService.java
diff --git a/src/main/java/com/back/domain/post/comment/service/CommentService.java b/src/main/java/com/back/domain/post/comment/service/CommentService.java
diff --git a/src/main/java/com/back/domain/post/post/service/PostService.java b/src/main/java/com/back/domain/post/post/service/PostService.java
diff --git a/src/test/java/com/back/domain/cocktail/controller/CocktailControllerTest.java b/src/test/java/com/back/domain/cocktail/controller/CocktailControllerTest.java

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public CocktailDetailResponseDto(`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public CocktailDetailResponseDto(Cocktail cocktail) {`
`42`		`- this.cocktailId = cocktail.getCocktailId();`
	`42`	`+ this.cocktailId = cocktail.getId();`
`43`	`43`	`this.cocktailName = cocktail.getCocktailName();`
`44`	`44`	`this.alcoholStrength = cocktail.getAlcoholStrength();`
`45`	`45`	`this.cocktailType = cocktail.getCocktailType();`