Merge pull request #24 from KUSITMS-MOAMOA/chore/#23

KUSITMS-MOAMOA · Feb 19, 2025 · 23d05c2 · 23d05c2
2 parents 57ed73a + e98a2ff
commit 23d05c2
Show file tree

Hide file tree

Showing 12 changed files with 61 additions and 20 deletions.
diff --git a/src/main/java/corecord/dev/domain/ability/application/AbilityServiceImpl.java b/src/main/java/corecord/dev/domain/ability/application/AbilityServiceImpl.java
@@ -71,9 +71,8 @@ public void parseAndSaveAbilities(Map<String, String> keywordList, Analysis anal
 
             Ability ability = AbilityConverter.toAbility(keyword, entry.getValue(), analysis, user);
             abilityDbService.saveAbility(ability);
+            analysis.addAbility(ability);
 
-            if (analysis.getAbilityList() != null)
-                analysis.addAbility(ability);
             abilityCount++;
         }
         validAbilityCount(abilityCount);

diff --git a/src/main/java/corecord/dev/domain/analysis/domain/entity/Analysis.java b/src/main/java/corecord/dev/domain/analysis/domain/entity/Analysis.java
@@ -10,6 +10,7 @@
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.BatchSize;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Entity
@@ -37,8 +38,8 @@ public class Analysis extends BaseEntity {
     private Record record;
 
     @BatchSize(size = 3)
-    @OneToMany(mappedBy = "analysis", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-    private List<Ability> abilityList;
+    @OneToMany(mappedBy = "analysis", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    private List<Ability> abilityList = new ArrayList<>();
 
     public void updateContent(String content) {
         if (content != null && !content.isEmpty())
@@ -52,9 +53,11 @@ public void updateComment(String comment) {
     }
 
     public void addAbility(Ability ability) {
+        if (abilityList == null)
+            abilityList = new ArrayList<>();
+
         if (ability != null) {
             this.abilityList.add(ability);
         }
     }
-
 }
diff --git a/src/main/java/corecord/dev/domain/record/application/RecordDbService.java b/src/main/java/corecord/dev/domain/record/application/RecordDbService.java
@@ -43,8 +43,12 @@ public void deleteRecordByFolder(Folder folder) {
         recordRepository.deleteRecordByFolder(folder);
     }
 
-    public int getRecordCount(User user) {
-        return recordRepository.getRecordCount(user);
+    public int getRecordCount(Long userId) {
+        return recordRepository.getRecordCount(userId);
+    }
+
+    public int getRecordCountByChatType(Long userId) {
+        return recordRepository.getRecordCountByType(userId);
     }
 
     @Transactional

diff --git a/src/main/java/corecord/dev/domain/record/application/RecordService.java b/src/main/java/corecord/dev/domain/record/application/RecordService.java
@@ -7,7 +7,7 @@
 public interface RecordService {
 
     // record
-    RecordResponse.MemoRecordDto createMemoRecord(Long userId, RecordRequest.RecordDto recordDto);
+    RecordResponse.RecordAnalysisDto createRecord(Long userId, RecordRequest.RecordDto recordDto);
     RecordResponse.MemoRecordDto getMemoRecordDetail(Long userId, Long recordId);
 
     // tmp record

diff --git a/src/main/java/corecord/dev/domain/record/application/RecordServiceImpl.java b/src/main/java/corecord/dev/domain/record/application/RecordServiceImpl.java
@@ -4,6 +4,7 @@
 import corecord.dev.domain.ability.exception.AbilityException;
 import corecord.dev.domain.ability.status.AbilityErrorStatus;
 import corecord.dev.domain.analysis.application.AnalysisService;
+import corecord.dev.domain.analysis.domain.entity.Analysis;
 import corecord.dev.domain.chat.application.ChatDbService;
 import corecord.dev.domain.chat.domain.entity.ChatRoom;
 import corecord.dev.domain.folder.application.FolderDbService;
@@ -37,13 +38,13 @@ public class RecordServiceImpl implements RecordService {
     private final int listSize = 30;
 
     /**
-     * user의 MEMO ver. 경험을 기록하고 폴더를 지정한 후 생성된 경험 기록 정보를 반환합니다.
+     * user의 경험을 기록하고 폴더를 지정한 후 생성된 경험 기록 정보를 반환합니다.
      *
      * @param userId, recordDto
      * @return recordId, title, content, folderName, createdAt
      */
     @Override
-    public RecordResponse.MemoRecordDto createMemoRecord(Long userId, RecordRequest.RecordDto recordDto) {
+    public RecordResponse.RecordAnalysisDto createRecord(Long userId, RecordRequest.RecordDto recordDto) {
         User user = userDbService.findUserById(userId);
         String title = recordDto.getTitle();
         String content = recordDto.getContent();
@@ -56,10 +57,12 @@ public RecordResponse.MemoRecordDto createMemoRecord(Long userId, RecordRequest.
         Record record = createRecordBasedOnType(recordDto, user, folder);
 
         // 역량 분석 레포트 생성
-        analysisService.createAnalysis(record, user);
+        Analysis analysis = analysisService.createAnalysis(record, user);
         recordDbService.saveRecord(record);
 
-        return RecordConverter.toMemoRecordDto(record);
+        // Chat 경험 기록 개수 카운트
+        int chatRecordCount = getChatRecordCount(record, userId);
+        return RecordConverter.toRecordAnalysisDto(analysis, chatRecordCount);
     }
 
     private Record createRecordBasedOnType(RecordRequest.RecordDto recordDto, User user, Folder folder) {
@@ -70,6 +73,12 @@ private Record createRecordBasedOnType(RecordRequest.RecordDto recordDto, User u
         return RecordConverter.toChatRecordEntity(recordDto.getTitle(), recordDto.getContent(), user, folder, chatRoom);
     }
 
+    private int getChatRecordCount(Record record, Long userId) {
+        return record.isMemoType()
+                ? 0
+                : recordDbService.getRecordCountByChatType(userId);
+    }
+
     /**
      * recordId를 받아 MEMO ver. 경험 기록의 상세 정보를 반환합니다.
      *

diff --git a/src/main/java/corecord/dev/domain/record/domain/converter/RecordConverter.java b/src/main/java/corecord/dev/domain/record/domain/converter/RecordConverter.java
@@ -2,6 +2,8 @@
 
 import corecord.dev.domain.ability.domain.enums.Keyword;
 import corecord.dev.domain.ability.domain.entity.Ability;
+import corecord.dev.domain.analysis.domain.converter.AnalysisConverter;
+import corecord.dev.domain.analysis.domain.entity.Analysis;
 import corecord.dev.domain.chat.domain.entity.ChatRoom;
 import corecord.dev.domain.folder.domain.entity.Folder;
 import corecord.dev.domain.record.domain.enums.RecordType;
@@ -59,6 +61,13 @@ public static RecordResponse.TmpMemoRecordDto toNotExistingTmpMemoRecordDto() {
                 .build();
     }
 
+    public static RecordResponse.RecordAnalysisDto toRecordAnalysisDto(Analysis analysis, int chatRecordCount) {
+        return RecordResponse.RecordAnalysisDto.builder()
+                .analysisDto(AnalysisConverter.toAnalysisDto(analysis))
+                .chatRecordCount(chatRecordCount)
+                .build();
+    }
+
     public static RecordResponse.RecordDto toRecordDto(Record record) {
         List<String> keywordList = record.getAnalysis().getAbilityList().stream()
                 .map(Ability::getKeyword)

diff --git a/src/main/java/corecord/dev/domain/record/domain/dto/response/RecordResponse.java b/src/main/java/corecord/dev/domain/record/domain/dto/response/RecordResponse.java
@@ -1,5 +1,6 @@
 package corecord.dev.domain.record.domain.dto.response;
 
+import corecord.dev.domain.analysis.domain.dto.response.AnalysisResponse;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -30,6 +31,15 @@ public static class TmpMemoRecordDto {
         private String content;
     }
 
+    @Builder
+    @Getter
+    @AllArgsConstructor
+    @Data
+    public static class RecordAnalysisDto {
+        private AnalysisResponse.AnalysisDto analysisDto;
+        private int chatRecordCount;
+    }
+
     @Builder
     @Getter
     @AllArgsConstructor

diff --git a/src/main/java/corecord/dev/domain/record/domain/repository/RecordRepository.java b/src/main/java/corecord/dev/domain/record/domain/repository/RecordRepository.java
@@ -69,9 +69,16 @@ List<Record> findRecordsByKeyword(
 
     @Query("SELECT COUNT(r) " +
             "FROM Record r " +
-            "WHERE r.user = :user " +
+            "WHERE r.user.userId = :userId " +
             "AND r.folder is not null") // 임시 저장 기록 제외
-    int getRecordCount(@Param(value = "user") User user);
+    int getRecordCount(@Param(value = "userId") Long userId);
+
+    @Query("SELECT COUNT(r) " +
+            "FROM Record r " +
+            "WHERE r.user.userId = :userId " +
+            "AND r.folder is not null " +
+            "AND r.type = 'CHAT' ")
+    int getRecordCountByType(@Param(value = "userId") Long userId);
 
     @Modifying
     @Query("DELETE " +

diff --git a/src/main/java/corecord/dev/domain/record/presentation/RecordController.java b/src/main/java/corecord/dev/domain/record/presentation/RecordController.java
@@ -18,12 +18,12 @@ public class RecordController {
     private final RecordService recordService;
 
     @PostMapping("")
-    public ResponseEntity<ApiResponse<RecordResponse.MemoRecordDto>> createMemoRecord(
+    public ResponseEntity<ApiResponse<RecordResponse.RecordAnalysisDto>> createRecord(
             @UserId Long userId,
             @RequestBody RecordRequest.RecordDto recordDto
     ) {
-        RecordResponse.MemoRecordDto recordResponse = recordService.createMemoRecord(userId, recordDto);
-        return ApiResponse.success(RecordSuccessStatus.MEMO_RECORD_CREATE_SUCCESS, recordResponse);
+        RecordResponse.RecordAnalysisDto recordResponse = recordService.createRecord(userId, recordDto);
+        return ApiResponse.success(RecordSuccessStatus.RECORD_CREATE_SUCCESS, recordResponse);
     }
 
     @GetMapping("/memo/{recordId}")

diff --git a/src/main/java/corecord/dev/domain/record/status/RecordSuccessStatus.java b/src/main/java/corecord/dev/domain/record/status/RecordSuccessStatus.java
@@ -9,7 +9,7 @@
 @AllArgsConstructor
 public enum RecordSuccessStatus implements BaseSuccessStatus {
 
-    MEMO_RECORD_CREATE_SUCCESS(HttpStatus.CREATED, "S404", "경험 기록이 성공적으로 완료되었습니다."),
+    RECORD_CREATE_SUCCESS(HttpStatus.CREATED, "S404", "경험 기록이 성공적으로 완료되었습니다."),
     MEMO_RECORD_DETAIL_GET_SUCCESS(HttpStatus.OK, "S401", "메모 경험 기록 세부 조회가 성공적으로 완료되었습니다."),
     MEMO_RECORD_TMP_CREATE_SUCCESS(HttpStatus.OK, "S403", "메모 경험 기록 임시 저장이 성공적으로 완료되었습니다."),
     MEMO_RECORD_TMP_GET_SUCCESS(HttpStatus.OK, "S402", "메모 경험 기록 임시 저장 내역 조회가 성공적으로 완료되었습니다."),

diff --git a/src/main/java/corecord/dev/domain/user/application/UserServiceImpl.java b/src/main/java/corecord/dev/domain/user/application/UserServiceImpl.java
@@ -166,7 +166,7 @@ private void validateUserInfo(String nickName) {
     public UserResponse.UserInfoDto getUserInfo(Long userId) {
         User user = userDbService.getUser(userId);
 
-        int recordCount = recordDbService.getRecordCount(user);;
+        int recordCount = recordDbService.getRecordCount(user.getUserId());;
         return UserConverter.toUserInfoDto(user, recordCount);
     }
 

diff --git a/src/test/java/corecord/dev/user/service/UserServiceTest.java b/src/test/java/corecord/dev/user/service/UserServiceTest.java
@@ -82,7 +82,7 @@ void registerUser() {
     void getUserInfo() {
         // Given
         when(userDbService.getUser(newUser.getUserId())).thenReturn(newUser);
-        when(recordDbService.getRecordCount(newUser)).thenReturn(0);
+        when(recordDbService.getRecordCount(newUser.getUserId())).thenReturn(0);
 
         // When
         UserResponse.UserInfoDto userInfoDto = userService.getUserInfo(newUser.getUserId());