Merge pull request #158 from Team-Shaka/develop

브리핑 목록 조회 방식 변경
Team-Shaka · Jan 11, 2024 · db5c682 · db5c682
2 parents 1acc546 + 4b9d34e
commit db5c682
Show file tree

Hide file tree

Showing 25 changed files with 24 additions and 740 deletions.
diff --git a/src/main/generated/briefing/briefing/domain/QBriefing.java b/src/main/generated/briefing/briefing/domain/QBriefing.java
@@ -29,7 +29,7 @@ public class QBriefing extends EntityPathBase<Briefing> {
     //inherited
     public final DateTimePath<java.time.LocalDateTime> createdAt = _super.createdAt;
 
-    public final EnumPath<briefing.chatting.domain.GptModel> gptModel = createEnum("gptModel", briefing.chatting.domain.GptModel.class);
+    public final EnumPath<briefing.common.enums.GptModel> gptModel = createEnum("gptModel", briefing.common.enums.GptModel.class);
 
     public final NumberPath<Long> id = createNumber("id", Long.class);
 

diff --git a/src/main/generated/briefing/chatting/domain/QChatting.java b/src/main/generated/briefing/chatting/domain/QChatting.java
diff --git a/src/main/generated/briefing/chatting/domain/QMessage.java b/src/main/generated/briefing/chatting/domain/QMessage.java
diff --git a/src/main/java/briefing/briefing/application/dto/BriefingRequestDTO.java b/src/main/java/briefing/briefing/application/dto/BriefingRequestDTO.java
@@ -6,7 +6,7 @@
 
 import briefing.briefing.domain.BriefingType;
 import briefing.briefing.domain.TimeOfDay;
-import briefing.chatting.domain.GptModel;
+import briefing.common.enums.GptModel;
 import lombok.Getter;
 
 public class BriefingRequestDTO {

diff --git a/src/main/java/briefing/briefing/application/dto/BriefingResponseDTO.java b/src/main/java/briefing/briefing/application/dto/BriefingResponseDTO.java
@@ -6,7 +6,7 @@
 
 import briefing.briefing.domain.BriefingType;
 import briefing.briefing.domain.TimeOfDay;
-import briefing.chatting.domain.GptModel;
+import briefing.common.enums.GptModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;

diff --git a/src/main/java/briefing/briefing/domain/Briefing.java b/src/main/java/briefing/briefing/domain/Briefing.java
@@ -7,7 +7,7 @@
 import jakarta.persistence.*;
 
 import briefing.base.BaseDateTimeEntity;
-import briefing.chatting.domain.GptModel;
+import briefing.common.enums.GptModel;
 import lombok.*;
 
 @Entity

diff --git a/src/main/java/briefing/briefing/domain/repository/BriefingCustomRepositoryImpl.java b/src/main/java/briefing/briefing/domain/repository/BriefingCustomRepositoryImpl.java
@@ -2,9 +2,7 @@
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import org.springframework.stereotype.Repository;
@@ -79,17 +77,23 @@ public List<Briefing> findTop10ByTypeOrderByCreatedAtDesc(BriefingType type) {
                         .where(briefing.type.eq(type))
                         .groupBy(briefing)
                         .orderBy(date.desc(), briefing.ranks.asc())
-                        .limit(10)
+                        .limit(20)
                         .fetch();
 
-        return results.stream()
-                .map(
-                        tuple -> {
-                            Briefing b = tuple.get(briefing);
-                            b.setScrapCount(Math.toIntExact(tuple.get(scrap.count())));
-                            return b;
-                        })
-                .collect(Collectors.toCollection(ArrayList::new));
+        List<Briefing> briefingList =
+                results.stream()
+                        .map(
+                                tuple -> {
+                                    Briefing b = tuple.get(briefing);
+                                    b.setScrapCount(Math.toIntExact(tuple.get(scrap.count())));
+                                    return b;
+                                })
+                        .collect(Collectors.toCollection(ArrayList::new));
+
+        Map<Integer, Briefing> briefingMap = new HashMap<>();
+        briefingList.forEach(candidate -> briefingMap.putIfAbsent(candidate.getRanks(), candidate));
+
+        return briefingMap.values().stream().toList();
     }
 
     @Override

diff --git a/src/main/java/briefing/chatting/api/ChattingApi.java b/src/main/java/briefing/chatting/api/ChattingApi.java
diff --git a/src/main/java/briefing/chatting/api/ChattingConverter.java b/src/main/java/briefing/chatting/api/ChattingConverter.java