fix: 상위 태그 내 하위 태그 조회 API 로직 수정(#121)

KUSITMS-29th-TEAM-B · May 21, 2024 · bd6b922 · bd6b922
1 parent a4d2515
commit bd6b922
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 18 deletions.
diff --git a/.../main/kotlin/com/bamyanggang/apimodule/domain/tag/application/service/TagCreateService.kt b/.../main/kotlin/com/bamyanggang/apimodule/domain/tag/application/service/TagCreateService.kt
@@ -19,7 +19,7 @@ class TagCreateService(
     fun createChildTag(request: CreateTag.Request, parentTagId: UUID): CreateTag.Response {
         return getAuthenticationPrincipal()
             .also {
-                val userChildTags = tagReader.readAllChildTagsByUserId(it, parentTagId)
+                val userChildTags = tagReader.readAllChildTagsByUserIdAndParentTagId(it, parentTagId)
                 validateTagCountLimit(userChildTags.size)
                 validateDuplicatedName(userChildTags, request.name)
             }.let {

diff --git a/...src/main/kotlin/com/bamyanggang/apimodule/domain/tag/application/service/TagGetService.kt b/...src/main/kotlin/com/bamyanggang/apimodule/domain/tag/application/service/TagGetService.kt
@@ -28,7 +28,7 @@ class TagGetService(
     @Transactional(readOnly = true)
     fun getAllChildTagsByParentTagId(parentTagId: UUID): GetChildTag.Response {
         val tagDetails = getAuthenticationPrincipal().let {
-            tagReader.readAllChildTagsByUserId(it, parentTagId).map { tag ->
+            tagReader.readAllChildTagsByUserIdAndParentTagId(it, parentTagId).map { tag ->
                 GetParentTag.TagDetail(tag.id, tag.name)
             }
         }
@@ -84,23 +84,22 @@ class TagGetService(
 
     @Transactional(readOnly = true)
     fun getAllChildTagsByYearAndParentTagId(year: Int, parentTagId: UUID): GetChildTag.TotalTagInfo {
-        val currentUserId = getAuthenticationPrincipal()
-        val experiences = experienceReader.readByUserIDAndYearDesc(year, currentUserId)
-        val experienceGroup = experiences.groupBy { it.childTagId }
-
-        val tagSummaries = experienceGroup.map {
-            val childTag = tagReader.readById(it.key)
+        val childTags = getAllChildTagsByParentTagId(parentTagId).tags.map { tagReader.readById(it.id) }
+        var totalExperienceCount = 0
 
+        val childTagDetails = childTags.map {
+            val experiences = experienceReader.readByChildTagIdAndYear(it.id, year)
+            totalExperienceCount += experiences.size
             GetChildTag.ChildTagSummary(
-                childTag.id,
-                childTag.name,
-                it.value.size
+                it.id,
+                it.name,
+                experiences.size
             )
         }
 
         return GetChildTag.TotalTagInfo(
-            experiences.size,
-            tagSummaries
+            totalExperienceCount,
+            childTagDetails
         )
     }
 

diff --git a/...odule/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/repository/TagRepository.kt b/...odule/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/repository/TagRepository.kt
@@ -7,7 +7,7 @@ interface TagRepository {
     fun save(newTag : Tag)
     fun findById(id : UUID) : Tag
     fun findAllParentTagsByUserId(userId: UUID): List<Tag>
-    fun findAllChildTagsByUserId(userId: UUID, parentId: UUID): List<Tag>
+    fun findAllChildTagsByUserIdAndParentTagId(userId: UUID, parentId: UUID): List<Tag>
     fun deleteByTagId(tagId: UUID)
     fun isExistById(tagId: UUID): Boolean
     fun findByParentTagIds(tagParentTagIds: List<UUID>): List<Tag>

diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/service/TagReader.kt b/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/service/TagReader.kt
@@ -13,8 +13,8 @@ class TagReader(
         return tagRepository.findAllParentTagsByUserId(userId)
     }
 
-    fun readAllChildTagsByUserId(userId: UUID, parentId: UUID): List<Tag> {
-        return tagRepository.findAllChildTagsByUserId(userId, parentId)
+    fun readAllChildTagsByUserIdAndParentTagId(userId: UUID, parentId: UUID): List<Tag> {
+        return tagRepository.findAllChildTagsByUserIdAndParentTagId(userId, parentId)
     }
 
     fun readById(tagId: UUID): Tag {

diff --git a/...e-Module/persistence/src/main/java/com/bamyanggang/persistence/tag/TagRepositoryImpl.java b/...e-Module/persistence/src/main/java/com/bamyanggang/persistence/tag/TagRepositoryImpl.java
@@ -3,7 +3,6 @@
 import com.bamyanggang.domainmodule.domain.tag.aggregate.Tag;
 import com.bamyanggang.domainmodule.domain.tag.exception.TagException.NotFoundTag;
 import com.bamyanggang.domainmodule.domain.tag.repository.TagRepository;
-import com.bamyanggang.persistence.common.exception.PersistenceException.NotFound;
 import com.bamyanggang.persistence.tag.jpa.entity.TagJpaEntity;
 import com.bamyanggang.persistence.tag.jpa.repository.TagJpaRepository;
 import com.bamyanggang.persistence.tag.mapper.TagMapper;
@@ -31,7 +30,7 @@ public List<Tag> findAllParentTagsByUserId(UUID userId) {
     }
 
     @Override
-    public List<Tag> findAllChildTagsByUserId(UUID userId, UUID parentTagId) {
+    public List<Tag> findAllChildTagsByUserIdAndParentTagId(UUID userId, UUID parentTagId) {
         List<TagJpaEntity> childTagJpaEntities = tagJpaRepository.findAllByUserIdAndParentTagId(userId, parentTagId);
         return childTagJpaEntities.stream().map(tagMapper::toDomainEntity).toList();
     }