Merge pull request #436 from Hi-lingual/feat/435

[feat] #435 단어장 목록 조회API에 외움 상태 반영 및 한글 뜻 노출

Author: kimbap1001

hilingual-api/src/main/java/org/sopt/controller/voca/api/VocaController.java

@@ -23,10 +23,11 @@ public class VocaController {
     @GetMapping
     public ResponseEntity<VocaListRes> getVocaList(
             @UserId Long userId,
-            @RequestParam(value = "sort", required = false, defaultValue = "1") final String sortStr
+            @RequestParam(value = "sort", required = false, defaultValue = "1") final String sortStr,
+            @RequestParam(value = "unmemorizedOnly", required = false, defaultValue = "false") final boolean unmemorizedOnly
     ) {
         int sort = parseAndValidateSortType(sortStr);
-        return ResponseEntity.ok(vocaService.getVocaList(userId, sort));
+        return ResponseEntity.ok(vocaService.getVocaList(userId, sort, unmemorizedOnly));
     }
 
     // 단어장 검색

hilingual-api/src/main/java/org/sopt/controller/voca/service/VocaService.java

@@ -30,8 +30,8 @@ public class VocaService {
     private final VocaFacade vocaFacade;
 
     // 단어장 목록 조회
-    public VocaListRes getVocaList(final Long userId, final int sort) {
-        return vocaRetriever.findGroupedVoca(userId, sort);
+    public VocaListRes getVocaList(final Long userId, final int sort, final boolean unmemorizedOnly) {
+        return vocaRetriever.findGroupedVoca(userId, sort, unmemorizedOnly);
     }
 
     // 단어장 검색

hilingual-api/src/main/resources/db/migration/V19__add_is_memorized_to_voca.sql

@@ -0,0 +1,4 @@
+-- V19__add_is_memorized_to_voca.sql
+
+ALTER TABLE voca
+    ADD COLUMN is_memorized BOOLEAN NOT NULL DEFAULT FALSE;

hilingual-domain/src/main/java/org/sopt/voca/domain/Voca.java

@@ -63,6 +63,9 @@ public class Voca extends BaseTimeEntity {
     @Column(name = COLUMN_WRITTEN_DATE, nullable = true)
     private LocalDate writtenDate;
 
+    @Column(name = COLUMN_IS_MEMORIZED, nullable = false)
+    private boolean isMemorized;
+
     public static Voca fromMyDiary(User user, Recommend recommend, String writtenFrom) {
         return new Voca(
                 null, SavedRoot.MY, user,
@@ -71,7 +74,8 @@ public static Voca fromMyDiary(User user, Recommend recommend, String writtenFro
                 recommend.getPhraseType(),
                 recommend.getExplanation(),
                 writtenFrom,
-                recommend.getDiary().getWrittenDate()
+                recommend.getDiary().getWrittenDate(),
+                false
         );
     }
 
@@ -83,7 +87,8 @@ public static Voca fromFeed(User user, Recommend recommend, String writtenFrom)
                 recommend.getPhraseType(),
                 recommend.getExplanation(),
                 writtenFrom,
-                null
+                null,
+                false
         );
     }
 }

hilingual-domain/src/main/java/org/sopt/voca/domain/VocaTableConstants.java

@@ -16,4 +16,5 @@ public class VocaTableConstants {
     public static final String COLUMN_EXPLANATION = "explanation";
     public static final String COLUMN_WRITTEN_FROM = "written_from";
     public static final String COLUMN_WRITTEN_DATE = "written_date";
+    public static final String COLUMN_IS_MEMORIZED = "is_memorized";
 }

hilingual-domain/src/main/java/org/sopt/voca/dto/VocaItemRes.java

@@ -9,14 +9,18 @@ public record VocaItemRes(
         Long phraseId,
         String phrase,
         List<String> phraseType,
-        Boolean isBookmarked
+        String explanation,
+        Boolean isBookmarked,
+        Boolean isMemorized
 ) {
     public static VocaItemRes from(final Voca voca) {
         return new VocaItemRes(
                 voca.getRecommendId(),
                 voca.getPhrase(),
                 parsePhraseTypes(voca.getPhraseType()),
-                Boolean.TRUE
+                voca.getExplanation(),
+                Boolean.TRUE,
+                voca.isMemorized()
         );
     }
 

hilingual-domain/src/main/java/org/sopt/voca/facade/VocaRetriever.java

@@ -16,10 +16,10 @@ public class VocaRetriever {
     private final VocaRepository vocaRepository;
     private final VocaGroupFactory vocaGroupFactory;
 
-    public VocaListRes findGroupedVoca(final Long userId, final int sort) {
+    public VocaListRes findGroupedVoca(final Long userId, final int sort, final boolean unmemorizedOnly) {
         List<Voca> vocas = (sort == 1)
-                ? vocaRepository.findAllByUserIdOrderByCreatedAtDesc(userId)
-                : vocaRepository.findAllByUserIdOrderByPhraseAsc(userId);
+                ? vocaRepository.findAllByUserIdOrderByCreatedAtDesc(userId, unmemorizedOnly)
+                : vocaRepository.findAllByUserIdOrderByPhraseAsc(userId, unmemorizedOnly);
 
         return (sort == 1)
                 ? vocaGroupFactory.createByDateGroup(vocas)

hilingual-domain/src/main/java/org/sopt/voca/repository/VocaRepository.java

@@ -31,17 +31,21 @@ int deleteByUserIdAndRecommendId(@Param("userId") long userId,
     @Query("""
         SELECT v FROM Voca v
         WHERE v.user.id = :userId
+            AND (:unmemorizedOnly = false OR v.isMemorized = false)
         ORDER BY LOWER(v.phrase)
     """)
-    List<Voca> findAllByUserIdOrderByPhraseAsc(@Param("userId") Long userId);
+    List<Voca> findAllByUserIdOrderByPhraseAsc(@Param("userId") Long userId,
+                                               @Param("unmemorizedOnly") Boolean unmemorizedOnly);
 
     // 최신순 정렬 (Voca.createdAt 기반)
     @Query("""
         SELECT v FROM Voca v
         WHERE v.user.id = :userId
+            AND (:unmemorizedOnly = false OR v.isMemorized = false)
         ORDER BY v.createdAt DESC
     """)
-    List<Voca> findAllByUserIdOrderByCreatedAtDesc(@Param("userId") Long userId);
+    List<Voca> findAllByUserIdOrderByCreatedAtDesc(@Param("userId") Long userId,
+                                                   @Param("unmemorizedOnly") Boolean unmemorizedOnly);
 
     // 검색 (Prefix 기반)
     @Query("""