Merge branch 'main' of https://github.com/prgrms-web-devcourse-final-project/WEB6_8_HaeDokCoding_BE

Author: seungwookc97

src/main/java/com/back/domain/chatbot/service/ChatbotService.java

@@ -299,7 +299,7 @@ private List<String> analyzeCocktailRequest(String userQuestion) {
                     .user(analysisPrompt)
                     .options(OpenAiChatOptions.builder()
                             .withTemperature(0.7)
-                            .withMaxTokens(150)
+                            .withMaxTokens(400)
                             .build())
                     .call()
                     .content();
@@ -345,7 +345,7 @@ private String generateRecommendationMessage(String userQuestion, List<CocktailS
                     .user(messagePrompt)
                     .options(OpenAiChatOptions.builder()
                             .withTemperature(0.8)
-                            .withMaxTokens(100)
+                            .withMaxTokens(150)
                             .build())
                     .call()
                     .content();
@@ -610,11 +610,11 @@ private OpenAiChatOptions getOptionsForMessageType(InternalMessageType type) {
                     .build();
             case RECOMMENDATION -> OpenAiChatOptions.builder()
                     .withTemperature(0.9)
-                    .withMaxTokens(250)
+                    .withMaxTokens(400)
                     .build();
             case QUESTION -> OpenAiChatOptions.builder()
                     .withTemperature(0.7)
-                    .withMaxTokens(200)
+                    .withMaxTokens(maxTokens)
                     .build();
             default -> OpenAiChatOptions.builder()
                     .withTemperature(temperature)

src/main/java/com/back/domain/cocktail/controller/CocktailShareController.java

@@ -26,7 +26,7 @@ public ResponseEntity<RsData<CocktailShareResponseDto>> getShareLink(@PathVariab
         Cocktail cocktail = cocktailService.getCocktailById(id);
 
         CocktailShareResponseDto responseDto = new CocktailShareResponseDto(
-                frontUrl + "/cocktails/" + cocktail.getId(),
+                frontUrl + "/recipe/" + cocktail.getId(),
                 cocktail.getCocktailNameKo(),
                 cocktail.getCocktailImgUrl()
         );

src/main/java/com/back/domain/myhistory/dto/MyHistoryLikedPostItemDto.java

@@ -3,32 +3,54 @@
 import com.back.domain.post.post.entity.Post;
 import com.back.domain.post.post.entity.PostImage;
 import com.back.domain.post.post.entity.PostLike;
-import java.time.LocalDateTime;
-import java.util.List;
+import com.back.domain.post.post.enums.PostStatus;
 import lombok.Builder;
 import lombok.Getter;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 @Getter
 @Builder
 public class MyHistoryLikedPostItemDto {
     private Long id;
+    private Long postId;
+    private String categoryName;
+    private String userNickName;
     private String title;
+    private String content;
     private List<String> imageUrls;
-    private LocalDateTime likedAt;
+    private LocalDateTime createdAt;
+    private LocalDateTime updatedAt;
+    private PostStatus status;
     private Integer likeCount;
     private Integer commentCount;
+    private Integer viewCount;
+    private LocalDateTime likedAt;
 
     public static MyHistoryLikedPostItemDto from(PostLike pl) {
         Post p = pl.getPost();
+        List<String> imageUrls = p.getImages() == null
+                ? List.of()
+                : p.getImages().stream()
+                .map(PostImage::getUrl)
+                .toList();
+
         return MyHistoryLikedPostItemDto.builder()
-                .id(p.getId())
+                .id(pl.getId())
+                .postId(p.getId())
+                .categoryName(p.getCategory() != null ? p.getCategory().getName() : null)
+                .userNickName(p.getUser() != null ? p.getUser().getNickname() : null)
                 .title(p.getTitle())
-                .imageUrls(p.getImages().stream()
-                    .map(PostImage::getUrl)
-                    .toList())
-                .likedAt(pl.getCreatedAt())
+                .content(p.getContent())
+                .imageUrls(imageUrls)
+                .createdAt(p.getCreatedAt())
+                .updatedAt(p.getUpdatedAt())
+                .status(p.getStatus())
                 .likeCount(p.getLikeCount())
                 .commentCount(p.getCommentCount())
+                .viewCount(p.getViewCount())
+                .likedAt(pl.getCreatedAt())
                 .build();
     }
 }