diff --git a/server/src/main/java/com/soopgyeol/api/domain/enums/Category.java b/server/src/main/java/com/soopgyeol/api/domain/enums/Category.java index 66ae6c7..742534a 100644 --- a/server/src/main/java/com/soopgyeol/api/domain/enums/Category.java +++ b/server/src/main/java/com/soopgyeol/api/domain/enums/Category.java @@ -1,28 +1,34 @@ package com.soopgyeol.api.domain.enums; public enum Category { - FOOD("음식", "https://soopgyeolbucket.s3.ap-northeast-2.amazonaws.com/FOOD.jpg"), - TRANSPORT("교통", "https://soopgyeolbucket.s3.ap-northeast-2.amazonaws.com/TRANSPORTATION.jpg"), - CLOTHING("의류", "https://soopgyeolbucket.s3.ap-northeast-2.amazonaws.com/CLOTHING.jpg"), - HOUSING_ENERGY("주거 및 에너지", "https://soopgyeolbucket.s3.ap-northeast-2.amazonaws.com/HOUSING_ENERGY.jpg"), - RECYCLE_WASTE("리사이클 & 폐기물", "https://soopgyeolbucket.s3.ap-northeast-2.amazonaws.com/RECYCLE.jpg"), - LIFESTYLE_CONSUMPTION("라이프스타일 & 소비", "https://soopgyeolbucket.s3.ap-northeast-2.amazonaws.com/LIFESTYLE.jpg"), - ETC("기타", "https://soopgyeolbucket.s3.ap-northeast-2.amazonaws.com/ETC.JPG"); + FOOD("음식", "https://soopgyeolbucket.s3.ap-northeast-2.amazonaws.com/FOOD.png","https://soopgyeolbucket.s3.ap-northeast-2.amazonaws.com/CHALLENGE_FOOD.png"), + TRANSPORT("교통", "https://soopgyeolbucket.s3.ap-northeast-2.amazonaws.com/TRANSPORTATION.png", "https://soopgyeolbucket.s3.ap-northeast-2.amazonaws.com/CHALLENGE_TRANSPORTATION.png"), + CLOTHING("의류", "https://soopgyeolbucket.s3.ap-northeast-2.amazonaws.com/CLOTHING.png", "https://soopgyeolbucket.s3.ap-northeast-2.amazonaws.com/CHALLENGE_CLOTHING.png"), + HOUSING_ENERGY("주거 및 에너지", "https://soopgyeolbucket.s3.ap-northeast-2.amazonaws.com/HOUSING_ENERGY.png", "https://soopgyeolbucket.s3.ap-northeast-2.amazonaws.com/CHALLENGE_HOUSING_ENERGY.png"), + RECYCLE_WASTE("리사이클 & 폐기물", "https://soopgyeolbucket.s3.ap-northeast-2.amazonaws.com/RECYCLE.png", "https://soopgyeolbucket.s3.ap-northeast-2.amazonaws.com/CHALLENGE_RECYCLE.png"), + LIFESTYLE_CONSUMPTION("라이프스타일 & 소비", "https://soopgyeolbucket.s3.ap-northeast-2.amazonaws.com/LIFESTYLE.png", "https://soopgyeolbucket.s3.ap-northeast-2.amazonaws.com/CHALLENGE_LIFESTYLE.png"), + ETC("기타", "https://soopgyeolbucket.s3.ap-northeast-2.amazonaws.com/ETC.png", "https://soopgyeolbucket.s3.ap-northeast-2.amazonaws.com/CHALLENGE_ETC.png"); private final String description; - private final String imageUrl; + private final String searchImageUrl; + private final String challengeImageUrl; - Category(String description, String imageUrl) { + Category(String description, String searchImageUrl, String challengeImageUrl) { this.description = description; - this.imageUrl = imageUrl; + this.searchImageUrl = searchImageUrl; + this.challengeImageUrl = challengeImageUrl; } public String getDescription() { return description; } - public String getImageUrl() { - return imageUrl; + public String getSearchImageUrl() { + return searchImageUrl; + } + + public String getChallengeImageUrl() { + return challengeImageUrl; } public static Category fromString(String value) { diff --git a/server/src/main/java/com/soopgyeol/api/service/carbon/CarbonAnalysisServiceImpl.java b/server/src/main/java/com/soopgyeol/api/service/carbon/CarbonAnalysisServiceImpl.java index af48f9e..6fe9939 100644 --- a/server/src/main/java/com/soopgyeol/api/service/carbon/CarbonAnalysisServiceImpl.java +++ b/server/src/main/java/com/soopgyeol/api/service/carbon/CarbonAnalysisServiceImpl.java @@ -44,7 +44,7 @@ public CarbonAnalysisResponse analyzeAndSave(String userInput) { .carbonGrams(savedItem.getCarbonValue()) .growthPoint(savedItem.getGrowthPoint()) .explanation(savedItem.getExplanation()) - .categoryImageUrl(savedItem.getCategory().getImageUrl()) + .categoryImageUrl(savedItem.getCategory().getSearchImageUrl()) .build(); } @@ -77,7 +77,7 @@ public CarbonAnalysisResponse analyzeByKeyword(String keyword, Category category .carbonGrams(savedItem.getCarbonValue()) .growthPoint(savedItem.getGrowthPoint()) .explanation(savedItem.getExplanation()) - .categoryImageUrl(savedItem.getCategory().getImageUrl()) + .categoryImageUrl(savedItem.getCategory().getSearchImageUrl()) .challengeId(challengeId) .build(); } diff --git a/server/src/main/java/com/soopgyeol/api/service/dailychallenge/UserChallengeServiceImpl.java b/server/src/main/java/com/soopgyeol/api/service/dailychallenge/UserChallengeServiceImpl.java index 95b740e..3757f7e 100644 --- a/server/src/main/java/com/soopgyeol/api/service/dailychallenge/UserChallengeServiceImpl.java +++ b/server/src/main/java/com/soopgyeol/api/service/dailychallenge/UserChallengeServiceImpl.java @@ -78,7 +78,7 @@ public ChallengeTodayResponse getTodayChallengeForUser(Long userId) { .category(dailyChallenge.getCategory()) .progressCount(userChallenge.getProgressCount()) .isCompleted(userChallenge.isCompleted()) - .categoryImageUrl(dailyChallenge.getCategory().getImageUrl()) + .categoryImageUrl(dailyChallenge.getCategory().getChallengeImageUrl()) .build(); } diff --git a/server/src/main/java/com/soopgyeol/api/service/gpt/AIChallengePromptServiceImpl.java b/server/src/main/java/com/soopgyeol/api/service/gpt/AIChallengePromptServiceImpl.java index d925056..790cbc3 100644 --- a/server/src/main/java/com/soopgyeol/api/service/gpt/AIChallengePromptServiceImpl.java +++ b/server/src/main/java/com/soopgyeol/api/service/gpt/AIChallengePromptServiceImpl.java @@ -34,7 +34,7 @@ public AIChallengePromptResult generateChallenge() { - challengeTitle은 15자 이내의 짧고 명확한 챌린지 제목 - rewardMoney는 너가 판단하기에 챌린지 난이도에 따라 5 ~ 20으로 줘! - carbonKeyword는 기존 탄소 소비 분석 기능에서 사용하는 실생활 소비 키워드여야 해 (예: 다회용컵, 채식, 대중교통, 전기차, 에너지 절약, 음식물 쓰레기 줄이기 등) - - category는 FOOD, TRANSPORTATION, CLOTHING, HOUSING_ENERGY, RECYCLE_WASTE, LIFESTYLE_CONSUMPTION 중 하나 + - category는 FOOD, TRANSPORT, CLOTHING, HOUSING_ENERGY, RECYCLE_WASTE, LIFESTYLE_CONSUMPTION 중 하나 { "challengeTitle": (챌린지명), "category": (위 category 중 하나), diff --git a/server/src/main/java/com/soopgyeol/api/service/gpt/OpenAiServiceImpl.java b/server/src/main/java/com/soopgyeol/api/service/gpt/OpenAiServiceImpl.java index 1a08ad1..346147d 100644 --- a/server/src/main/java/com/soopgyeol/api/service/gpt/OpenAiServiceImpl.java +++ b/server/src/main/java/com/soopgyeol/api/service/gpt/OpenAiServiceImpl.java @@ -32,7 +32,7 @@ public CarbonAnalysisResponse analyzeCarbon(String userInput) { 품목명과, 탄소량 설명은 반드시 한글로 대답해줘. - FOOD, TRANSPORTATION, CLOTHING, HOUSING_ENERGY, RECYCLE_WASTE, LIFESTYLE_CONSUMPTION, ETC 중 하나 + FOOD, TRANSPORT, CLOTHING, HOUSING_ENERGY, RECYCLE_WASTE, LIFESTYLE_CONSUMPTION, ETC 중 하나 "growthPoint"는 사용자의 해당 활동 또는 소비에 따라서 탄소가 절감되는 정도를 너가 판단해서 0~20점 사이로 점수를 줘. ETC는 탄소량, growthPoint 모두 0점으로 줘. diff --git a/server/src/main/resources/static/images/CHALLENGE_CLOTHING.jpg b/server/src/main/resources/static/images/CHALLENGE_CLOTHING.jpg new file mode 100644 index 0000000..8fcbeff Binary files /dev/null and b/server/src/main/resources/static/images/CHALLENGE_CLOTHING.jpg differ diff --git a/server/src/main/resources/static/images/CHALLENGE_ETC.jpg b/server/src/main/resources/static/images/CHALLENGE_ETC.jpg new file mode 100644 index 0000000..8fcbeff Binary files /dev/null and b/server/src/main/resources/static/images/CHALLENGE_ETC.jpg differ diff --git a/server/src/main/resources/static/images/CHALLENGE_FOOD.jpg b/server/src/main/resources/static/images/CHALLENGE_FOOD.jpg new file mode 100644 index 0000000..8fcbeff Binary files /dev/null and b/server/src/main/resources/static/images/CHALLENGE_FOOD.jpg differ diff --git a/server/src/main/resources/static/images/CHALLENGE_HOUSING_ENERGY.jpg b/server/src/main/resources/static/images/CHALLENGE_HOUSING_ENERGY.jpg new file mode 100644 index 0000000..8fcbeff Binary files /dev/null and b/server/src/main/resources/static/images/CHALLENGE_HOUSING_ENERGY.jpg differ diff --git a/server/src/main/resources/static/images/CHALLENGE_LIFESTYLE.jpg b/server/src/main/resources/static/images/CHALLENGE_LIFESTYLE.jpg new file mode 100644 index 0000000..8fcbeff Binary files /dev/null and b/server/src/main/resources/static/images/CHALLENGE_LIFESTYLE.jpg differ diff --git a/server/src/main/resources/static/images/CHALLENGE_RECYCLE.jpg b/server/src/main/resources/static/images/CHALLENGE_RECYCLE.jpg new file mode 100644 index 0000000..8fcbeff Binary files /dev/null and b/server/src/main/resources/static/images/CHALLENGE_RECYCLE.jpg differ diff --git a/server/src/main/resources/static/images/CHALLENGE_TRANSPORTATION.jpg b/server/src/main/resources/static/images/CHALLENGE_TRANSPORTATION.jpg new file mode 100644 index 0000000..8fcbeff Binary files /dev/null and b/server/src/main/resources/static/images/CHALLENGE_TRANSPORTATION.jpg differ