chore: 깃 충돌 문제 해결(#115)

KUSITMS-29th-TEAM-B · May 21, 2024 · 96aafc9 · 96aafc9
1 parent 036e217
commit 96aafc9
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/...n/com/bamyanggang/apimodule/domain/experience/application/service/ExperienceGetService.kt b/...n/com/bamyanggang/apimodule/domain/experience/application/service/ExperienceGetService.kt
@@ -100,7 +100,6 @@ class ExperienceGetService(
                 tagReader.readIdsByNameContains(search) +
                 strongPointReader.readIdsByNameContains(search)
 
-        println(experiencesIds.filter {  })
         val searchExperiences = experienceReader.readByIds(experiencesIds)
         val bookmarkExperienceIds = bookMarkReader.readByExperienceIds(experiencesIds).map { it.experienceId }
 

diff --git a/...rc/main/kotlin/com/bamyanggang/domainmodule/domain/experience/service/ExperienceReader.kt b/...rc/main/kotlin/com/bamyanggang/domainmodule/domain/experience/service/ExperienceReader.kt
@@ -60,8 +60,9 @@ class ExperienceReader(
         return experiences.filter {
             it.contents.map { content ->
                 content.question.contains(search) || content.answer.contains(search)
-            }.contains(true) }.map { it.id }
-
+            }.contains(true)
+        }.map { it.id }
+    }
     fun readByYear(year: Int): List<Experience> {
         return experienceRepository.findByYear(year)
     }

diff --git a/...stence/src/main/java/com/bamyanggang/persistence/experience/ExperienceRepositoryImpl.java b/...stence/src/main/java/com/bamyanggang/persistence/experience/ExperienceRepositoryImpl.java
@@ -84,6 +84,7 @@ public List<Experience> findByIds(List<UUID> experienceIds) {
 
     public List<Experience> findByTitleContains(String search) {
         List<ExperienceJpaEntity> experienceJpaEntities = experienceJpaRepository.findByTitleContaining(search);
+        return experienceJpaEntities.stream().map(experienceMapper::toExperienceDomainEntity).toList();
     }
 
     public List<Experience> findByUserIdAndParentTagId(UUID userId, UUID parentTagId) {

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
@@ -60,6 +60,7 @@ public Tag findById(UUID tagId) {
     @Override
     public List<Tag> findByNameContains(String search) {
         List<TagJpaEntity> tagJpaEntities = tagJpaRepository.findByNameContaining(search);
+        return tagJpaEntities.stream().map(tagMapper::toDomainEntity).toList();
     }
 
     public List<Tag> findAllChildTagsByParentTagId(UUID parentTagId) {

diff --git a/...stence/src/main/java/com/bamyanggang/persistence/tag/jpa/repository/TagJpaRepository.java b/...stence/src/main/java/com/bamyanggang/persistence/tag/jpa/repository/TagJpaRepository.java
@@ -9,6 +9,5 @@ public interface TagJpaRepository extends JpaRepository<TagJpaEntity, UUID> {
     List<TagJpaEntity> findAllByUserIdAndParentTagIdIsNull(UUID userId);
     List<TagJpaEntity> findAllByUserIdAndParentTagId(UUID parentTagId, UUID parentId);
     List<TagJpaEntity> findByNameContaining(String search);
-    List<TagJpaEntity> findAllByUserIdAndParentTagId(UUID userId, UUID parentId);
     List<TagJpaEntity> findAllByParentTagId(UUID parentTagId);
 }