[Fix/#263] 각종 수정 (#264)

Ssamssamukja · web-flow · commit b0d495528766 · 2026-01-23T22:17:41.000+11:00
* refactor: cloth season 관련 오류 해결

* feat: 룩북 개수 반환 필드 추가

* update: application-test.yml

* feat: 기록에 사용자 좋아요 여부 필드 반환 추가

* update: workflows env

* refactor: test 위한 수정

* refactor: Spotless 적용
diff --git a/.github/workflows/dev-cd.yml b/.github/workflows/dev-cd.yml
@@ -63,7 +63,7 @@ jobs:
           username: ubuntu
           host: ${{ secrets.DEV_EC2_HOST }}
           key: ${{ secrets.DEV_EC2_SSH_KEY }}
-          envs: DOCKERHUB_USERNAME,DEV_MYSQL_HOST,MYSQL_PORT,DB_NAME,DB_USERNAME,DB_PASSWORD,REDIS_HOST,REDIS_PORT,REDIS_PASSWORD,DEV_KAKAO_CLIENT_ID,DEV_KAKAO_CLIENT_SECRET,DEV_APPLE_CLIENT_ID,DEV_APPLE_CLIENT_SECRET,JWT_ACCESS_TOKEN_SECRET,JWT_REFRESH_TOKEN_SECRET,JWT_ACCESS_TOKEN_EXPIRATION_TIME,JWT_REFRESH_TOKEN_EXPIRATION_TIME,JWT_ISSUER,DEV_AWS_ACCESS_KEY_ID,DEV_AWS_SECRET_ACCESS_KEY,AWS_REGION,DEV_S3_BUCKET,DEV_S3_ENDPOINT,SWAGGER_USERNAME,SWAGGER_PASSWORD,FIREBASE_SA_JSON_B64
+          envs: DOCKERHUB_USERNAME,DEV_MYSQL_HOST,MYSQL_PORT,DB_NAME,DB_USERNAME,DB_PASSWORD,REDIS_HOST,REDIS_PORT,REDIS_PASSWORD,DEV_KAKAO_CLIENT_ID,DEV_KAKAO_CLIENT_SECRET,DEV_APPLE_CLIENT_ID,DEV_APPLE_CLIENT_SECRET,JWT_ACCESS_TOKEN_SECRET,JWT_REFRESH_TOKEN_SECRET,JWT_ACCESS_TOKEN_EXPIRATION_TIME,JWT_REFRESH_TOKEN_EXPIRATION_TIME,JWT_ISSUER,DEV_AWS_ACCESS_KEY_ID,DEV_AWS_SECRET_ACCESS_KEY,AWS_REGION,DEV_S3_BUCKET,DEV_S3_ENDPOINT,SWAGGER_USERNAME,SWAGGER_PASSWORD,FIREBASE_SA_JSON_B64,MEILISEARCH_ENDPOINT,MEILISEARCH_KEY
           script: |
             export DOCKERHUB_NAME=${{ secrets.DOCKERHUB_USERNAME }}
             export DOCKER_TAG=dev-app
diff --git a/.github/workflows/prod-cd.yml b/.github/workflows/prod-cd.yml
@@ -73,7 +73,7 @@ jobs:
           username: ubuntu
           host: ${{ secrets.PROD_EC2_HOST }}
           key: ${{ secrets.PROD_EC2_SSH_KEY }}
-          envs: DOCKERHUB_USERNAME,SPRING_PROFILES_ACTIVE,PROD_MYSQL_HOST,MYSQL_PORT,DB_NAME,DB_USERNAME,DB_PASSWORD,REDIS_HOST,REDIS_PORT,REDIS_PASSWORD,PROD_KAKAO_CLIENT_ID,PROD_KAKAO_CLIENT_SECRET,PROD_APPLE_CLIENT_ID,PROD_APPLE_CLIENT_SECRET,JWT_ACCESS_TOKEN_SECRET,JWT_REFRESH_TOKEN_SECRET,JWT_ACCESS_TOKEN_EXPIRATION_TIME,JWT_REFRESH_TOKEN_EXPIRATION_TIME,JWT_ISSUER,PROD_AWS_ACCESS_KEY_ID,PROD_AWS_SECRET_ACCESS_KEY,AWS_REGION,PROD_S3_BUCKET,PROD_S3_ENDPOINT,SWAGGER_USERNAME,SWAGGER_PASSWORD,FIREBASE_SA_JSON_B64
+          envs: DOCKERHUB_USERNAME,SPRING_PROFILES_ACTIVE,PROD_MYSQL_HOST,MYSQL_PORT,DB_NAME,DB_USERNAME,DB_PASSWORD,REDIS_HOST,REDIS_PORT,REDIS_PASSWORD,PROD_KAKAO_CLIENT_ID,PROD_KAKAO_CLIENT_SECRET,PROD_APPLE_CLIENT_ID,PROD_APPLE_CLIENT_SECRET,JWT_ACCESS_TOKEN_SECRET,JWT_REFRESH_TOKEN_SECRET,JWT_ACCESS_TOKEN_EXPIRATION_TIME,JWT_REFRESH_TOKEN_EXPIRATION_TIME,JWT_ISSUER,PROD_AWS_ACCESS_KEY_ID,PROD_AWS_SECRET_ACCESS_KEY,AWS_REGION,PROD_S3_BUCKET,PROD_S3_ENDPOINT,SWAGGER_USERNAME,SWAGGER_PASSWORD,FIREBASE_SA_JSON_B64,MEILISEARCH_ENDPOINT,MEILISEARCH_KEY
           script: |
             export DOCKERHUB_NAME=${{ secrets.DOCKERHUB_USERNAME }}
             export DOCKER_TAG=prod-app
diff --git a/clokey-api/src/main/java/org/clokey/domain/history/dto/response/DailyHistoryResponse.java b/clokey-api/src/main/java/org/clokey/domain/history/dto/response/DailyHistoryResponse.java
@@ -11,6 +11,7 @@ public record DailyHistoryResponse(
         @Schema(description = "닉네임", example = "포테토남") String nickname,
         @Schema(description = "기록 이미지 목록") List<DailyHistoryResponse.ImagePayload> images,
         @Schema(description = "좋아요 개수", example = "10") Long likeCount,
+        @Schema(description = "좋아요 여부", example = "true") Boolean liked,
         @Schema(description = "댓글 개수", example = "5") Long commentCount,
         @Schema(description = "기록 날짜", example = "2025-01-01") LocalDate historyDate,
         @Schema(description = "상황 ID", example = "1") Long situationId,
@@ -25,6 +26,7 @@ public static DailyHistoryResponse of(
             String nickname,
             List<ImagePayload> images,
             Long likeCount,
+            boolean liked,
             Long commentCount,
             LocalDate historyDate,
             Long situationId,
@@ -38,6 +40,7 @@ public static DailyHistoryResponse of(
                 nickname,
                 images,
                 likeCount,
+                liked,
                 commentCount,
                 historyDate,
                 situationId,
diff --git a/clokey-api/src/main/java/org/clokey/domain/history/service/HistoryServiceImpl.java b/clokey-api/src/main/java/org/clokey/domain/history/service/HistoryServiceImpl.java
@@ -241,6 +241,10 @@ public DailyHistoryResponse getDailyHistory(Long historyId) {
                         .toList();
 
         long likeCount = memberLikeRepository.countByHistoryId(historyId);
+        boolean liked =
+                memberLikeRepository
+                        .findByMemberIdAndHistoryId(currentMember.getId(), historyId)
+                        .isPresent();
 
         long commentCount = commentRepository.countByHistoryIdAndBannedFalse(historyId);
 
@@ -264,6 +268,7 @@ public DailyHistoryResponse getDailyHistory(Long historyId) {
                 history.getMember().getNickname(),
                 images,
                 likeCount,
+                liked,
                 commentCount,
                 history.getHistoryDate(),
                 history.getSituation().getId(),
diff --git a/clokey-api/src/main/java/org/clokey/domain/lookbook/dto/response/LookBookListResponse.java b/clokey-api/src/main/java/org/clokey/domain/lookbook/dto/response/LookBookListResponse.java
@@ -5,5 +5,6 @@
 public record LookBookListResponse(
         @Schema(description = "룩북 ID", example = "1") Long lookBookId,
         @Schema(description = "룩북 이름", example = "데이트 룩") String lookBookName,
+        @Schema(description = "룩북 개수", example = "3") Long count,
         @Schema(description = "대표 코디 사진 (첫 번째 코디)", example = "https://example.jpg")
                 String imageUrl) {}
diff --git a/clokey-api/src/main/java/org/clokey/domain/lookbook/repository/LookBookRepositoryImpl.java b/clokey-api/src/main/java/org/clokey/domain/lookbook/repository/LookBookRepositoryImpl.java
@@ -32,6 +32,9 @@ public Slice<LookBookListResponse> findAllLookBookByMemberId(
                                         LookBookListResponse.class,
                                         lookBook.id,
                                         lookBook.name,
+                                        JPAExpressions.select(coordinate.count())
+                                                .from(coordinate)
+                                                .where(coordinate.lookBook.id.eq(lookBook.id)),
                                         JPAExpressions.select(coordinate.imageUrl)
                                                 .from(coordinate)
                                                 .where(coordinate.lookBook.id.eq(lookBook.id))
diff --git a/clokey-api/src/main/java/org/clokey/domain/search/repository/MeiliSearchRepositoryImpl.java b/clokey-api/src/main/java/org/clokey/domain/search/repository/MeiliSearchRepositoryImpl.java
@@ -14,12 +14,14 @@
 import org.clokey.domain.search.dto.response.SearchedMemberResponse;
 import org.clokey.domain.search.enums.HistorySearchSortType;
 import org.clokey.response.SliceResponse;
+import org.springframework.context.annotation.Profile;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Repository;
 
 @Repository
 @RequiredArgsConstructor
+@Profile("!test")
 public class MeiliSearchRepositoryImpl implements SearchRepository {
 
     private static final String HISTORY_INDEX = "histories";
diff --git a/clokey-api/src/main/java/org/clokey/domain/search/repository/SearchRepositoryCustomImpl.java b/clokey-api/src/main/java/org/clokey/domain/search/repository/SearchRepositoryCustomImpl.java
@@ -73,7 +73,7 @@ private BooleanExpression seasonsFilter(List<Season> seasons) {
         if (seasons == null || seasons.isEmpty()) {
             return null;
         }
-        return cloth.season.in(seasons);
+        return cloth.seasons.any().in(seasons);
     }
 
     private BooleanExpression lastClothIdCursor(Long lastClothId, SortDirection direction) {
diff --git a/clokey-api/src/test/java/org/clokey/domain/history/controller/HistoryControllerTest.java b/clokey-api/src/test/java/org/clokey/domain/history/controller/HistoryControllerTest.java
@@ -725,6 +725,7 @@ class 일별_기록_조회_요청_시 {
                                     new DailyHistoryResponse.ImagePayload(1L, "testImageUrl1"),
                                     new DailyHistoryResponse.ImagePayload(2L, "testImageUrl2")),
                             10L,
+                            false,
                             5L,
                             java.time.LocalDate.of(2025, 1, 1),
                             1L,
diff --git a/clokey-api/src/test/java/org/clokey/domain/history/service/HistoryServiceImplTest.java b/clokey-api/src/test/java/org/clokey/domain/history/service/HistoryServiceImplTest.java
@@ -1056,9 +1056,17 @@ void setUp() {
                             DailyHistoryResponse::situationName,
                             DailyHistoryResponse::content,
                             DailyHistoryResponse::likeCount,
+                            DailyHistoryResponse::liked,
                             DailyHistoryResponse::commentCount)
                     .containsExactly(
-                            1L, LocalDate.now(), 1L, "testSituation1", "testContent1", 0L, 0L);
+                            1L,
+                            LocalDate.now(),
+                            1L,
+                            "testSituation1",
+                            "testContent1",
+                            0L,
+                            false,
+                            0L);
 
             assertThat(response.images()).hasSize(2);
             assertThat(response.images())
diff --git a/clokey-api/src/test/java/org/clokey/domain/lookbook/controller/LookBookControllerTest.java b/clokey-api/src/test/java/org/clokey/domain/lookbook/controller/LookBookControllerTest.java
@@ -151,9 +151,9 @@ class 룩북_전체_조회_요청_시 {
             // given
             List<LookBookListResponse> responses =
                     List.of(
-                            new LookBookListResponse(1L, "testName", "testImageUrl"),
-                            new LookBookListResponse(2L, "testName", "testImageUrl"),
-                            new LookBookListResponse(3L, "testName", "testImageUrl"));
+                            new LookBookListResponse(1L, "testName", 0L, "testImageUrl"),
+                            new LookBookListResponse(2L, "testName", 0L, "testImageUrl"),
+                            new LookBookListResponse(3L, "testName", 0L, "testImageUrl"));
 
             given(lookBookService.getLookBooks(null, 3, SortDirection.ASC))
                     .willReturn(new SliceResponse<>(responses, true));
@@ -176,9 +176,9 @@ class 룩북_전체_조회_요청_시 {
             // given
             List<LookBookListResponse> responses =
                     List.of(
-                            new LookBookListResponse(3L, "testName", "testImageUrl"),
-                            new LookBookListResponse(2L, "testName", "testImageUrl"),
-                            new LookBookListResponse(1L, "testName", "testImageUrl"));
+                            new LookBookListResponse(3L, "testName", 0L, "testImageUrl"),
+                            new LookBookListResponse(2L, "testName", 0L, "testImageUrl"),
+                            new LookBookListResponse(1L, "testName", 0L, "testImageUrl"));
 
             given(lookBookService.getLookBooks(null, 3, SortDirection.ASC))
                     .willReturn(new SliceResponse<>(responses, true));
@@ -201,9 +201,9 @@ class 룩북_전체_조회_요청_시 {
             // given
             List<LookBookListResponse> responses =
                     List.of(
-                            new LookBookListResponse(1L, "testName", "testImageUrl"),
-                            new LookBookListResponse(2L, "testName", "testImageUrl"),
-                            new LookBookListResponse(3L, "testName", "testImageUrl"));
+                            new LookBookListResponse(1L, "testName", 0L, "testImageUrl"),
+                            new LookBookListResponse(2L, "testName", 0L, "testImageUrl"),
+                            new LookBookListResponse(3L, "testName", 0L, "testImageUrl"));
 
             given(lookBookService.getLookBooks(null, 3, SortDirection.ASC))
                     .willReturn(new SliceResponse<>(responses, true));
@@ -223,9 +223,9 @@ class 룩북_전체_조회_요청_시 {
             // given
             List<LookBookListResponse> responses =
                     List.of(
-                            new LookBookListResponse(1L, "testName", "testImageUrl"),
-                            new LookBookListResponse(2L, "testName", "testImageUrl"),
-                            new LookBookListResponse(3L, "testName", "testImageUrl"));
+                            new LookBookListResponse(1L, "testName", 0L, "testImageUrl"),
+                            new LookBookListResponse(2L, "testName", 0L, "testImageUrl"),
+                            new LookBookListResponse(3L, "testName", 0L, "testImageUrl"));
 
             given(lookBookService.getLookBooks(null, 4, SortDirection.ASC))
                     .willReturn(new SliceResponse<>(responses, false));
diff --git a/clokey-api/src/test/java/org/clokey/domain/lookbook/service/LookBookServiceTest.java b/clokey-api/src/test/java/org/clokey/domain/lookbook/service/LookBookServiceTest.java
@@ -309,7 +309,15 @@ void setUp() {
                     lookBookService.getLookBooks(null, 3, SortDirection.ASC);
 
             // then
-            assertThat(response.content()).extracting("lookBookId").containsExactly(1L, 2L, 3L);
+            Assertions.assertAll(
+                    () ->
+                            assertThat(response.content())
+                                    .extracting("lookBookId")
+                                    .containsExactly(1L, 2L, 3L),
+                    () ->
+                            assertThat(response.content())
+                                    .extracting("count")
+                                    .containsExactly(1L, 1L, 0L));
         }
 
         @Test
diff --git a/clokey-api/src/test/java/org/clokey/domain/search/repository/NoopSearchRepository.java b/clokey-api/src/test/java/org/clokey/domain/search/repository/NoopSearchRepository.java
@@ -0,0 +1,46 @@
+package org.clokey.domain.search.repository;
+
+import java.util.List;
+import org.clokey.domain.search.document.HistoryDocument;
+import org.clokey.domain.search.document.MemberDocument;
+import org.clokey.domain.search.dto.response.SearchedHistoryResponse;
+import org.clokey.domain.search.dto.response.SearchedMemberResponse;
+import org.clokey.domain.search.enums.HistorySearchSortType;
+import org.clokey.response.SliceResponse;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@Profile("test")
+@Primary
+public class NoopSearchRepository implements SearchRepository {
+
+    @Override
+    public void saveAllHistories(List<HistoryDocument> documents) {}
+
+    @Override
+    public void deleteHistory(String id) {}
+
+    @Override
+    public SliceResponse<SearchedMemberResponse> findUsersByKeyword(
+            String keyword, Long page, int size, List<Long> excludedMemberIds) {
+        return new SliceResponse<>(List.of(), true);
+    }
+
+    @Override
+    public void saveAllMembers(List<MemberDocument> documents) {}
+
+    @Override
+    public void deleteMember(String id) {}
+
+    @Override
+    public SliceResponse<SearchedHistoryResponse> findHistoriesByKeyword(
+            String keyword,
+            Long page,
+            int size,
+            HistorySearchSortType sort,
+            List<Long> excludedMemberIds) {
+        return new SliceResponse<>(List.of(), true);
+    }
+}
diff --git a/clokey-api/src/test/resources/application-test.yml b/clokey-api/src/test/resources/application-test.yml
@@ -8,6 +8,9 @@ spring:
       host: ${REDIS_HOST:localhost}
       port: ${REDIS_PORT:6379}
       password: ${REDIS_PASSWORD}
+    meilisearch:
+      url: ${MEILISEARCH_ENDPOINT:http://localhost:7700}
+      api-key: ${MEILISEARCH_KEY:dummy}
 
 aws:
   access-key-id: dummy
@@ -27,4 +30,4 @@ firebase:
   auth-uri: dummy
   token-uri: dummy
   auth-provider-x509-cert-url: dummy
-  client-x509-cert-url: dummy
+  client-x509-cert-url: dummy
diff --git a/clokey-infrastructure/src/main/java/org/clokey/config/MeiliSearchConfig.java b/clokey-infrastructure/src/main/java/org/clokey/config/MeiliSearchConfig.java
@@ -7,10 +7,12 @@
 import org.clokey.properties.MeilisearchProperties;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 
 @Configuration
 @RequiredArgsConstructor
 @EnableMeilisearchRepositories(basePackages = {"org.clokey.domain.search.repository"})
+@Profile("!test")
 public class MeiliSearchConfig extends MeilisearchConfiguration {
 
     private final MeilisearchProperties meilisearchProperties;

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ private BooleanExpression seasonsFilter(List<Season> seasons) {`
`73`	`73`	`if (seasons == null \|\| seasons.isEmpty()) {`
`74`	`74`	`return null;`
`75`	`75`	`}`
`76`		`- return cloth.season.in(seasons);`
	`76`	`+ return cloth.seasons.any().in(seasons);`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`private BooleanExpression lastClothIdCursor(Long lastClothId, SortDirection direction) {`