refactor: 최근 추가 경험 순 정렬 기능 추가

.deploy/Dockerfile

@@ -7,4 +7,4 @@ ARG JAR_FILE=/Api-Module/build/libs/Api-Module-0.0.1-SNAPSHOT.jar
 COPY ${JAR_FILE} app.jar
 
 # 빌드된 이미지가 run될 때 실행할 명령어
-ENTRYPOINT ["java","-jar","app.jar"]
+ENTRYPOINT ["java","-jar","app.jar"]

.deploy/docker-compose-dev.yml

@@ -13,4 +13,5 @@ services:
       - JWT_SECRET=${JWT_SECRET}
       - JWT_ACCESS_TOKEN_EXPIRATION_TIME=${JWT_ACCESS_TOKEN_EXPIRATION_TIME}
       - JWT_REFRESH_TOKEN_EXPIRATION_TIME=${JWT_REFRESH_TOKEN_EXPIRATION_TIME}
-      - JWT_REGISTRATION_TOKEN_EXPIRATION_TIME=${JWT_REGISTRATION_TOKEN_EXPIRATION_TIME}
+      - JWT_REGISTRATION_TOKEN_EXPIRATION_TIME=${JWT_REGISTRATION_TOKEN_EXPIRATION_TIME}
+      - KEY_STORE_PASSWORD=${KEY_STORE_PASSWORD}

.github/workflows/CD-dev.yml

@@ -48,6 +48,7 @@ jobs:
             echo "JWT_ACCESS_TOKEN_EXPIRATION_TIME=${{ secrets.JWT_ACCESS_TOKEN_EXPIRATION_TIME }}" >> ./.env
             echo "JWT_REFRESH_TOKEN_EXPIRATION_TIME=${{ secrets.JWT_REFRESH_TOKEN_EXPIRATION_TIME }}" >> ./.env
             echo "JWT_REGISTRATION_TOKEN_EXPIRATION_TIME=${{ secrets.JWT_REGISTRATION_TOKEN_EXPIRATION_TIME }}" >> ./.env
+            echo "KEY_STORE_PASSWORD=${{ secrets.KEY_STORE_PASSWORD }}" >> ./.env
 
       # gradle build
       - name: Grant execute permission for gradlew

Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/experience/application/service/ExperienceGetService.kt

@@ -40,7 +40,7 @@ class ExperienceGetService(
                 .distinctBy { it.parentTagId }
                 .map { it.parentTagId }
 
-            val tagDetails = tagReader.readByParentTagIds(parentTagIds).map {
+            val tagDetails = tagReader.readByParentTagIdsAndYearAndExperienceCreatedAtDesc(parentTagIds, year).map {
                 ExperienceYear.TagDetail(
                     id = it.id,
                     name = it.name
@@ -111,7 +111,7 @@ class ExperienceGetService(
         val bookmarkExperienceIds =
             bookMarkReader.readByBookmarkStatusAndExperienceIds(experiencesIds, BookmarkStatus.ON)
                 .map { it.experienceId }
-        println(bookmarkExperienceIds)
+
         val bookmarkExperienceDetails = searchExperiences.map {
             when {
                 it.id in bookmarkExperienceIds -> createBookmarkExperienceDetailResponse(it, BookmarkStatus.ON)
@@ -249,7 +249,6 @@ class ExperienceGetService(
     private fun convertStrongPoints(strongPoints: List<ExperienceStrongPoint>) : List<GetExperience.DetailStrongPoint> {
         val strongPointIds = strongPoints.map { it.strongPointId }
         val defaultStrongPoints = keywordReader.readByIds(strongPointIds)
-        println(defaultStrongPoints)
         val targetStrongPointIds = strongPointIds.union(defaultStrongPoints.map { it.id }).toList()
 
         val customStrongPointDetails = strongPointReader.readByIds(targetStrongPointIds).map { strongPoint ->

Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/experience/presentation/ExperienceController.kt

@@ -8,8 +8,6 @@ import com.bamyanggang.apimodule.domain.experience.application.service.Experienc
 import com.bamyanggang.apimodule.domain.experience.application.service.ExperienceDeleteService
 import com.bamyanggang.apimodule.domain.experience.application.service.ExperienceEditService
 import com.bamyanggang.apimodule.domain.experience.application.service.ExperienceGetService
-import com.bamyanggang.persistence.strongpoint.jpa.repository.KeywordJpaRepository
-import com.bamyanggang.persistence.strongpoint.mapper.KeywordMapper
 import org.springframework.web.bind.annotation.*
 import java.util.*
 

Api-Module/src/main/resources/application.yml

@@ -1,8 +1,13 @@
 server:
   shutdown: graceful
+  port: 8080
+  ssl:
+    key-store: /ssl/keystore.p12
+    key-store-type: PKCS12
+    key-store-password: ${KEY_STORE_PASSWORD}
 
 spring:
   profiles:
     include:
       - db
-      - jwt
+      - jwt

Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/repository/TagRepository.kt

@@ -13,4 +13,5 @@ interface TagRepository {
     fun findByParentTagIds(tagParentTagIds: List<UUID>): List<Tag>
     fun findByUserIdAndNameContains(userId: UUID, search: String): List<Tag>
     fun findAllChildTagsByParentTagId(parentTagId: UUID) : List<Tag>
+    fun findByParentTagIdsAndYearAndExperienceCreatedAtDesc(parentTagIds: List<UUID>, year: Int): List<Tag>
 }

Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/service/TagReader.kt

@@ -30,4 +30,8 @@ class TagReader(
     fun readChildTagsByParentTagId(parentTagId: UUID) : List<Tag> {
         return tagRepository.findAllChildTagsByParentTagId(parentTagId)
     }
+
+    fun readByParentTagIdsAndYearAndExperienceCreatedAtDesc(parentTagIds: List<UUID>, year: Int): List<Tag> {
+        return tagRepository.findByParentTagIdsAndYearAndExperienceCreatedAtDesc(parentTagIds, year)
+    }
 }

Infrastructure-Module/persistence/src/main/java/com/bamyanggang/persistence/tag/TagRepositoryImpl.java

@@ -6,6 +6,7 @@
 import com.bamyanggang.persistence.tag.jpa.entity.TagJpaEntity;
 import com.bamyanggang.persistence.tag.jpa.repository.TagJpaRepository;
 import com.bamyanggang.persistence.tag.mapper.TagMapper;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
@@ -69,4 +70,15 @@ public List<Tag> findAllChildTagsByParentTagId(UUID parentTagId) {
 
         return tagJpaEntities.stream().map(tagMapper::toDomainEntity).toList();
     }
+
+    @Override
+    public List<Tag> findByParentTagIdsAndYearAndExperienceCreatedAtDesc(List<UUID> parentTagIds, int year) {
+        LocalDateTime startYear = LocalDateTime.of(year, 1, 1, 0, 0);
+        LocalDateTime endYear = LocalDateTime.of(year, 12, 31, 23, 59);
+
+        List<TagJpaEntity> tagJpaEntities = tagJpaRepository.findByParentTagIdAndYearAndExperienceCreatedAtDesc(
+                parentTagIds, startYear, endYear);
+
+        return tagJpaEntities.stream().map(tagMapper::toDomainEntity).toList();
+    }
 }

Infrastructure-Module/persistence/src/main/java/com/bamyanggang/persistence/tag/jpa/repository/TagJpaRepository.java

@@ -1,13 +1,28 @@
 package com.bamyanggang.persistence.tag.jpa.repository;
 
 import com.bamyanggang.persistence.tag.jpa.entity.TagJpaEntity;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.UUID;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface TagJpaRepository extends JpaRepository<TagJpaEntity, UUID> {
     List<TagJpaEntity> findAllByUserIdAndParentTagIdIsNull(UUID userId);
     List<TagJpaEntity> findAllByUserIdAndParentTagId(UUID parentTagId, UUID parentId);
     List<TagJpaEntity> findByUserIdAndNameContaining(UUID userId, String name);
     List<TagJpaEntity> findAllByParentTagId(UUID parentTagId);
+
+    @Query("""
+            select t from TagJpaEntity t, ExperienceJpaEntity e
+            where e.parentTagId in :parentTagIds
+                and e.startedAt between :startYear and :endYear
+                and e.parentTagId = t.tagId
+                order by e.createdAt desc
+            """
+    )
+    List<TagJpaEntity> findByParentTagIdAndYearAndExperienceCreatedAtDesc(@Param("parentTagIds") List<UUID> parentTagIds,
+                                                                          @Param("startYear") LocalDateTime startYear,
+                                                                          @Param("endYear") LocalDateTime endYear);
 }