Merge pull request #103 from TEAM-Cherrish/develop

[Deploy] demo 변경사항 배포

Author: Kimgyuilli

.github/workflows/cd-dev.yml

@@ -3,7 +3,8 @@ name: CD Dev
 on:
   push:
     branches:
-      - develop
+      - release
+      - main
 
 permissions:
   id-token: write

.github/workflows/ci.yml

@@ -3,6 +3,7 @@ name: CI
 on:
   pull_request:
     branches:
+      - release
       - develop
       - main
 

src/main/java/com/sopt/cherrish/domain/challenge/core/domain/model/ChallengeStatistics.java

@@ -83,12 +83,11 @@ public void adjustCompletedCount(int delta) {
 		}
 	}
 
-	public double getProgressPercentage() {
+	public int getProgressPercentage() {
 		if (totalRoutineCount == 0) {
-			return 0.0;
+			return 0;
 		}
-		double percentage = (double) completedCount / totalRoutineCount * 100;
-		return Math.round(percentage * 10.0) / 10.0;  // 소수점 1자리까지 반올림
+		return (int) Math.round((double) completedCount / totalRoutineCount * 100);
 	}
 
 	/**

src/main/java/com/sopt/cherrish/domain/challenge/core/presentation/dto/response/ChallengeDetailResponseDto.java

@@ -23,8 +23,8 @@ public record ChallengeDetailResponseDto(
 	@Schema(description = "현재 일차", example = "3")
 	int currentDay,
 
-	@Schema(description = "전체 진행률 (%)", example = "37.5")
-	double progressPercentage,
+	@Schema(description = "전체 진행률 (%)", example = "38")
+	int progressPercentage,
 
 	@Schema(description = "체리 레벨 (1-4)", example = "2")
 	int cherryLevel,

src/main/java/com/sopt/cherrish/domain/challenge/demo/domain/model/DemoChallengeStatistics.java

@@ -77,12 +77,11 @@ public void updateCherryLevel() {
 		this.cherryLevel = calculateCherryLevel();
 	}
 
-	public double getProgressPercentage() {
+	public int getProgressPercentage() {
 		if (totalRoutineCount == 0) {
-			return 0.0;
+			return 0;
 		}
-		double percentage = (double) completedCount / totalRoutineCount * 100;
-		return Math.round(percentage * 10.0) / 10.0;
+		return (int) Math.round((double) completedCount / totalRoutineCount * 100);
 	}
 
 	/**

src/main/java/com/sopt/cherrish/domain/challenge/recommendation/application/service/AiChallengeRecommendationService.java

@@ -51,11 +51,8 @@ public AiRecommendationResponseDto generateRecommendation(Integer homecareRoutin
 			OpenAiChallengeRecommendationResponseDto.class
 		);
 
-		log.info("AI 챌린지 추천 생성 완료: title={}", aiResponse.challengeTitle());
+		log.info("AI 챌린지 추천 생성 완료: routines={}", aiResponse.routines());
 
-		return AiRecommendationResponseDto.of(
-			aiResponse.challengeTitle(),
-			aiResponse.routines()
-		);
+		return AiRecommendationResponseDto.of(aiResponse.routines());
 	}
 }

src/main/java/com/sopt/cherrish/domain/challenge/recommendation/infrastructure/openai/OpenAiChallengeRecommendationResponseDto.java

@@ -9,9 +9,6 @@
  * Infrastructure 계층의 외부 API 응답 DTO
  */
 public record OpenAiChallengeRecommendationResponseDto(
-	@JsonProperty("challenge_title")
-	String challengeTitle,
-
 	@JsonProperty("routines")
 	List<String> routines
 ) {

src/main/java/com/sopt/cherrish/domain/challenge/recommendation/infrastructure/prompt/ChallengePromptTemplate.java

@@ -11,16 +11,13 @@ public class ChallengePromptTemplate {
 	private static final String CHALLENGE_RECOMMENDATION_TEMPLATE = """
 		당신은 피부 홈케어 전문가입니다.
 		사용자가 선택한 홈케어 루틴 카테고리: "{homecareContent}"
-		
-		위 카테고리에 맞는 7일 챌린지를 설계해주세요.
-		
-		응답 형식:
-		1. 챌린지 제목: 흥미롭고 동기부여가 되는 한글 제목 (최대 30자)
-		2. 실천 루틴 리스트: 하루 3-5개의 구체적인 실천 항목 (각 최대 50자)
-		
+
+		위 카테고리에 맞는 7일 챌린지 실천 루틴을 추천해주세요.
+
+		답 형식: routines 배열에 하루 3-5개의 구체적인 실천 항목(각 최대 50자)
+
 		응답은 반드시 다음 JSON 형식으로만 답변하세요:
 		{{
-		  "challenge_title": "챌린지 제목",
 		  "routines": ["루틴1", "루틴2", "루틴3", "루틴4", "루틴5"]
 		}}
 		""";

src/main/java/com/sopt/cherrish/domain/challenge/recommendation/presentation/dto/response/AiRecommendationResponseDto.java

@@ -6,13 +6,10 @@
 
 @Schema(description = "AI 챌린지 추천 응답")
 public record AiRecommendationResponseDto(
-	@Schema(description = "AI가 생성한 챌린지 제목", example = "피부 보습 7일 챌린지")
-	String challengeTitle,
-
 	@Schema(description = "추천 루틴 리스트 (3-5개)")
 	List<String> routines
 ) {
-	public static AiRecommendationResponseDto of(String challengeTitle, List<String> routines) {
-		return new AiRecommendationResponseDto(challengeTitle, routines);
+	public static AiRecommendationResponseDto of(List<String> routines) {
+		return new AiRecommendationResponseDto(routines);
 	}
 }

src/main/java/com/sopt/cherrish/domain/maindashboard/application/facade/MainDashboardFacade.java

@@ -53,7 +53,7 @@ public MainDashboardResponseDto getMainDashboard(Long userId) {
 
 		// 3. 챌린지 데이터 (활성 챌린지 없으면 0)
 		Integer cherryLevel = 0;
-		Double challengeRate = 0.0;
+		Integer challengeRate = 0;
 		String challengeName = null;
 
 		var challengeOpt = challengeService.findActiveChallengeWithStatistics(userId);