Merge branch 'develop' into develop

Author: 2ghrms

.github/workflows/dev-cd.yml

@@ -125,6 +125,8 @@ jobs:
             export CLOTH_INFERENCE_PATH=${{ secrets.CLOTH_INFERENCE_PATH }}
             export STYLE_INFERENCE_PATH=${{ secrets.STYLE_INFERENCE_PATH }}
             export HISTORY_CLOTH_DETECT_PATH=${{ secrets.HISTORY_CLOTH_DETECT_PATH }}
+            export DEFAULT_PROFILE_IMAGE_URL=${{ secrets.DEFAULT_PROFILE_IMAGE_URL }}
+            export TODAY_TEMPERATURE_IMAGE_URL=${{ secrets.TODAY_TEMPERATURE_IMAGE_URL }}
 
             mkdir -p /home/ubuntu/secrets
             echo "${{ secrets.FIREBASE_SA_JSON_B64 }}" | base64 -d | tee /home/ubuntu/secrets/firebase-sa.json > /dev/null

.github/workflows/prod-cd.yml

@@ -131,6 +131,8 @@ jobs:
             export CLOTH_INFERENCE_PATH=${{ secrets.CLOTH_INFERENCE_PATH }}
             export STYLE_INFERENCE_PATH=${{ secrets.STYLE_INFERENCE_PATH }}
             export HISTORY_CLOTH_DETECT_PATH=${{ secrets.HISTORY_CLOTH_DETECT_PATH }}
+            export DEFAULT_PROFILE_IMAGE_URL=${{ secrets.DEFAULT_PROFILE_IMAGE_URL }}
+            export TODAY_TEMPERATURE_IMAGE_URL=${{ secrets.TODAY_TEMPERATURE_IMAGE_URL }}
 
             mkdir -p /home/ubuntu/secrets
             echo "${{ secrets.FIREBASE_SA_JSON_B64 }}" | base64 -d | tee /home/ubuntu/secrets/firebase-sa.json > /dev/null

.github/workflows/prod-openapi.yml

@@ -16,12 +16,14 @@ concurrency:
 jobs:
   sync:
     runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
 
     env:
       CODIVEAPI_BRANCH: main
       PROD_OPENAPI_URL: "${{ secrets.CODIVE_PROD_BASE_URL }}/v3/api-docs"
       TARGET_PATH: Sources/CodiveAPI/openapi.yaml
+      SWAGGER_USERNAME: ${{ secrets.SWAGGER_USERNAME }}
+      SWAGGER_PASSWORD: ${{ secrets.SWAGGER_PASSWORD }}
 
     steps:
       - name: Checkout backend repo (for context only)
@@ -35,7 +37,9 @@ jobs:
           echo "Waiting for production OpenAPI to be ready..."
 
           for i in {1..30}; do
-            if curl -fsS --connect-timeout 5 "$PROD_OPENAPI_URL" > /dev/null; then
+            if curl -fsS --connect-timeout 5 \
+              -u "$SWAGGER_USERNAME:$SWAGGER_PASSWORD" \
+              "$PROD_OPENAPI_URL" > /dev/null; then
               echo "Server is ready."
               exit 0
             fi
@@ -52,6 +56,7 @@ jobs:
           set -euo pipefail
           echo "Fetching OpenAPI from: $PROD_OPENAPI_URL"
           curl -fsSL --retry 5 --retry-delay 2 --connect-timeout 10 --max-time 30 \
+            -u "$SWAGGER_USERNAME:$SWAGGER_PASSWORD" \
             "$PROD_OPENAPI_URL" -o openapi.json
           test -s openapi.json
           head -c 1 openapi.json | grep -q '{'

clokey-api/dev-compose.yml

@@ -55,6 +55,8 @@ services:
 
       # Firebase
       FIREBASE_CREDENTIALS_PATH: /run/secrets/firebase-sa.json
+      DEFAULT_PROFILE_IMAGE_URL: ${DEFAULT_PROFILE_IMAGE_URL}
+      TODAY_TEMPERATURE_IMAGE_URL: ${TODAY_TEMPERATURE_IMAGE_URL}
 
       # JWT
       JWT_ACCESS_TOKEN_SECRET: ${JWT_ACCESS_TOKEN_SECRET}

clokey-api/prod-compose.yml

@@ -55,6 +55,8 @@ services:
 
       # Firebase
       FIREBASE_CREDENTIALS_PATH: /run/secrets/firebase-sa.json
+      DEFAULT_PROFILE_IMAGE_URL: ${DEFAULT_PROFILE_IMAGE_URL}
+      TODAY_TEMPERATURE_IMAGE_URL: ${TODAY_TEMPERATURE_IMAGE_URL}
 
       # JWT
       JWT_ACCESS_TOKEN_SECRET: ${JWT_ACCESS_TOKEN_SECRET}

clokey-api/src/main/java/org/clokey/domain/cloth/dto/response/ClothListResponse.java

@@ -8,4 +8,22 @@ public record ClothListResponse(
         @Schema(description = "옷 브랜드 이름", example = "나이키") String brand,
         @Schema(description = "옷 이름", example = "파란색 후드") String name,
         @Schema(description = "상위 카테고리 이름", example = "상의") String parentCategory,
-        @Schema(description = "하위 카테고리 이름", example = "후드티") String category) {}
+        @Schema(description = "하위 카테고리 이름", example = "후드티") String category,
+        @Schema(description = "오늘의 코디에 포함된 옷인지 여부", example = "true")
+                boolean isTodayCoordinateCloth) {
+
+    public ClothListResponse(
+            Long clothId,
+            String ImageUrl,
+            String brand,
+            String name,
+            String parentCategory,
+            String category) {
+        this(clothId, ImageUrl, brand, name, parentCategory, category, false);
+    }
+
+    public ClothListResponse withTodayCoordinateCloth(boolean isTodayCoordinateCloth) {
+        return new ClothListResponse(
+                clothId, ImageUrl, brand, name, parentCategory, category, isTodayCoordinateCloth);
+    }
+}

clokey-api/src/main/java/org/clokey/domain/cloth/service/ClothServiceImpl.java

@@ -1,5 +1,7 @@
 package org.clokey.domain.cloth.service;
 
+import java.time.LocalDate;
+import java.time.ZoneId;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -17,6 +19,7 @@
 import org.clokey.domain.cloth.exception.ClothErrorCode;
 import org.clokey.domain.cloth.repository.ClothRepository;
 import org.clokey.domain.coordinate.repository.CoordinateClothRepository;
+import org.clokey.domain.coordinate.repository.CoordinateRepository;
 import org.clokey.domain.history.repository.HistoryClothTagRepository;
 import org.clokey.domain.image.event.ImageDeleteEvent;
 import org.clokey.domain.search.event.ClothDeleteEvent;
@@ -28,19 +31,24 @@
 import org.clokey.response.SliceResponse;
 import org.clokey.util.StorageUtil;
 import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Slice;
+import org.springframework.data.domain.SliceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @RequiredArgsConstructor
 public class ClothServiceImpl implements ClothService {
 
+    private static final ZoneId KST = ZoneId.of("Asia/Seoul");
+
     private final MemberUtil memberUtil;
 
     private final ClothRepository clothRepository;
     private final CategoryRepository categoryRepository;
     private final HistoryClothTagRepository historyClothTagRepository;
+    private final CoordinateRepository coordinateRepository;
 
     private final ApplicationEventPublisher eventPublisher;
     private final CoordinateClothRepository coordinateClothRepository;
@@ -115,7 +123,27 @@ public SliceResponse<ClothListResponse> getClothes(
                 clothRepository.findAllMemberClothesByCategoriesAndSeasons(
                         lastClothId, size, direction, categoryIds, currentMember.getId(), seasons);
 
-        return SliceResponse.from(result);
+        Set<Long> todayCoordinateClothIds =
+                coordinateRepository
+                        .findDailyCoordinateByDateAndMemberId(
+                                LocalDate.now(KST), currentMember.getId())
+                        .map(
+                                coordinate ->
+                                        coordinate.getCoordinateClothes().stream()
+                                                .map(cc -> cc.getCloth().getId())
+                                                .collect(Collectors.toSet()))
+                        .orElse(Set.of());
+
+        List<ClothListResponse> content =
+                result.getContent().stream()
+                        .map(
+                                cloth ->
+                                        cloth.withTodayCoordinateCloth(
+                                                todayCoordinateClothIds.contains(cloth.clothId())))
+                        .toList();
+
+        return SliceResponse.from(
+                new SliceImpl<>(content, PageRequest.of(0, size), result.hasNext()));
     }
 
     @Override

clokey-api/src/main/java/org/clokey/domain/history/controller/HistoryController.java

@@ -16,6 +16,7 @@
 import org.clokey.domain.history.dto.response.MonthlyHistoryResponse;
 import org.clokey.domain.history.dto.response.SituationListResponse;
 import org.clokey.domain.history.dto.response.StyleListResponse;
+import org.clokey.domain.history.dto.response.TodayHistoryExistenceResponse;
 import org.clokey.domain.history.service.HistoryService;
 import org.clokey.response.BaseResponse;
 import org.springframework.validation.annotation.Validated;
@@ -127,6 +128,16 @@ public BaseResponse<HistoryOwnershipCheckResponse> checkHistoryOwnership(
         return BaseResponse.onSuccess(GlobalBaseSuccessCode.OK, response);
     }
 
+    @GetMapping("/today/existence")
+    @Operation(
+            operationId = "History_checkTodayHistoryExistence",
+            summary = "오늘 기록 존재 여부 확인",
+            description = "현재 사용자가 오늘 작성한 기록이 존재하는지 확인합니다.")
+    public BaseResponse<TodayHistoryExistenceResponse> checkTodayHistoryExistence() {
+        TodayHistoryExistenceResponse response = historyService.checkTodayHistoryExistence();
+        return BaseResponse.onSuccess(GlobalBaseSuccessCode.OK, response);
+    }
+
     @DeleteMapping("/{historyId}")
     @Operation(
             operationId = "History_deleteHistory",

clokey-api/src/main/java/org/clokey/domain/history/dto/request/HistoryCreateRequest.java

@@ -4,6 +4,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.*;
+import java.time.LocalDate;
 import java.util.List;
 
 @Schema(description = "기록 생성 요청")
@@ -13,6 +14,9 @@ public record HistoryCreateRequest(
                         description = "기록의 내용",
                         example = "안녕 오늘 오지게 덥다 ㄷㄷ;; 근데 한달 뒤면 가을임 벌써 가을 기대 만발ㅋ")
                 String content,
+        @NotNull(message = "기록 작성 날짜는 비워둘 수 없습니다.")
+                @Schema(description = "기록 작성 날짜", example = "2026-04-12")
+                LocalDate historyDate,
         @NotNull(message = "상황 ID는 비워둘 수 없습니다.") @Schema(description = "상황 ID", example = "7")
                 Long situationId,
         @NotNull(message = "스타일 목록은 비워둘 수 없습니다.")

clokey-api/src/main/java/org/clokey/domain/history/dto/response/TodayHistoryExistenceResponse.java

@@ -0,0 +1,10 @@
+package org.clokey.domain.history.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public record TodayHistoryExistenceResponse(
+        @Schema(description = "오늘 기록 존재 여부", example = "true") boolean exists) {
+    public static TodayHistoryExistenceResponse of(boolean exists) {
+        return new TodayHistoryExistenceResponse(exists);
+    }
+}