1차 MVP 피드백 기능 수정 및 구현

#31 mvp feedback1

Author: seonghoo1217

.github/workflows/deploy-gcp.yml

@@ -58,8 +58,8 @@ jobs:
     name: Deploy to GCP VM
     needs: build-and-push
     runs-on: ubuntu-latest
-    steps:
 
+    steps:
       - name: Authenticate to GCP for Deploy
         uses: google-github-actions/auth@v2
         with:
@@ -86,3 +86,11 @@ jobs:
               -p 8080:8080 \
               -e JASYPT_ENCRYPTOR_PASSWORD="${{ secrets.JASYPT_PASSWORD }}" \
               "$IMAGE_URI"
+
+      - name: Notify Discord
+        if: ${{ success() }}
+        run: |
+          curl -H "Content-Type: application/json" \
+               -X POST \
+               -d '{"content":"서버 정상배포되었습니다 🎉"}' \
+               ${{ secrets.DISCORD_SERVER_NOTIFY_WEBHOOK}}

build.gradle

@@ -78,6 +78,10 @@ dependencies {
     annotationProcessor "jakarta.persistence:jakarta.persistence-api"
 
     implementation 'com.github.ulisesbocchio:jasypt-spring-boot-starter:3.0.5'
+
+    //mapper
+    implementation 'org.mapstruct:mapstruct:1.5.5.Final'
+    annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
 }
 
 def querydslSrcDir = 'build/generated/querydsl'

src/main/java/be/ddd/api/cafe/CafeBeverageAPI.java

@@ -9,11 +9,15 @@
 import be.ddd.domain.entity.crawling.CafeBrand;
 import be.ddd.domain.entity.crawling.SugarLevel;
 import jakarta.validation.constraints.Positive;
+import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
+@Slf4j
 @RestController
 @RequestMapping("/api/cafe-beverages")
 @RequiredArgsConstructor
@@ -75,9 +79,18 @@ public ApiResponse<BeverageLikeDto> unlikeBeverage(@PathVariable UUID productId)
     }
 
     @GetMapping("/search")
-    public ApiResponse<BeverageSearchResultDto> searchBeverages(@RequestParam String keyword) {
+    public ApiResponse<BeverageSearchResultDto> searchBeverages(
+            @RequestParam(required = false) String keyword) {
+
+        String targetKeyword = (keyword == null ? "" : keyword).trim();
+
+        if (!StringUtils.hasText(targetKeyword)) {
+            log.info("Empty keyword");
+            return ApiResponse.success(new BeverageSearchResultDto(List.of(), 0));
+        }
+
         BeverageSearchResultDto beverageSearchResultDto =
-                cafeBeverageQueryService.searchBeverages(keyword, MEMBER_ID);
+                cafeBeverageQueryService.searchBeverages(targetKeyword, MEMBER_ID);
         return ApiResponse.success(beverageSearchResultDto);
     }
 }

src/main/java/be/ddd/api/dto/req/IntakeHistoryDeleteReqDto.java

@@ -0,0 +1,5 @@
+package be.ddd.api.dto.req;
+
+import java.time.LocalDateTime;
+
+public record IntakeHistoryDeleteReqDto(LocalDateTime intakeTime) {}

src/main/java/be/ddd/api/dto/req/MemberProfileModifyDto.java

@@ -0,0 +1,22 @@
+package be.ddd.api.dto.req;
+
+import be.ddd.domain.entity.member.ActivityRange;
+import be.ddd.domain.entity.member.Gender;
+import be.ddd.domain.entity.member.SugarIntakeLevel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import jakarta.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.UUID;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record MemberProfileModifyDto(
+        @NotNull UUID fakeId,
+        String nickname,
+        @JsonFormat(pattern = "yyyy-MM-dd") LocalDate birthDay,
+        Gender gender,
+        Integer heightCm,
+        BigDecimal weightKg,
+        ActivityRange activityRange,
+        SugarIntakeLevel sugarIntakeLevel) {}

src/main/java/be/ddd/api/dto/req/MemberProfileRegistrationDto.java

@@ -0,0 +1,22 @@
+package be.ddd.api.dto.req;
+
+import be.ddd.domain.entity.member.ActivityRange;
+import be.ddd.domain.entity.member.Gender;
+import be.ddd.domain.entity.member.SugarIntakeLevel;
+import io.micrometer.common.lang.NonNullApi;
+import io.micrometer.common.lang.NonNullFields;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.UUID;
+
+@NonNullApi
+@NonNullFields
+public record MemberProfileRegistrationDto(
+        UUID fakeId,
+        String nickname,
+        LocalDate birthDay,
+        Gender gender,
+        Integer heightCm,
+        BigDecimal weightKg,
+        ActivityRange activityRange,
+        SugarIntakeLevel sugarIntakeLevel) {}

src/main/java/be/ddd/api/dto/res/BeverageSizeDetailDto.java

@@ -0,0 +1,6 @@
+package be.ddd.api.dto.res;
+
+import be.ddd.domain.entity.crawling.BeverageNutrition;
+import be.ddd.domain.entity.crawling.BeverageSize;
+
+public record BeverageSizeDetailDto(BeverageSize sizeType, BeverageNutrition nutrition) {}

src/main/java/be/ddd/api/dto/res/CafeBeverageDetailsDto.java

@@ -3,24 +3,27 @@
 import be.ddd.application.beverage.dto.CafeStoreDto;
 import be.ddd.domain.entity.crawling.BeverageNutrition;
 import be.ddd.domain.entity.crawling.BeverageType;
+import java.util.List;
 import java.util.UUID;
 
 public record CafeBeverageDetailsDto(
         String name,
         UUID productId,
         String imgUrl,
         BeverageType beverageType,
-        BeverageNutrition beverageNutrition,
+        BeverageNutrition defaultNutrition,
+        List<BeverageSizeDetailDto> sizes,
         CafeStoreDto cafeStoreDto) {
 
     public static CafeBeverageDetailsDto from(
             String name,
             UUID productId,
             String imgUrl,
             BeverageType beverageType,
-            BeverageNutrition beverageNutrition,
+            BeverageNutrition defaultNutrition,
+            List<BeverageSizeDetailDto> sizes,
             CafeStoreDto cafeStoreDto) {
         return new CafeBeverageDetailsDto(
-                name, productId, imgUrl, beverageType, beverageNutrition, cafeStoreDto);
+                name, productId, imgUrl, beverageType, defaultNutrition, sizes, cafeStoreDto);
     }
 }

src/main/java/be/ddd/api/dto/res/IntakeRecordDto.java

@@ -13,6 +13,7 @@ public record IntakeRecordDto(
         CafeBrand cafeBrand,
         LocalDateTime intakeTime,
         BeverageNutrition nutrition,
+        String imgUrl,
         SugarLevel sugarLevel) {
 
     @QueryProjection

src/main/java/be/ddd/api/dto/res/MemberModifyDetailsDto.java

@@ -0,0 +1,29 @@
+package be.ddd.api.dto.res;
+
+import be.ddd.domain.entity.member.ActivityRange;
+import be.ddd.domain.entity.member.Gender;
+import be.ddd.domain.entity.member.Member;
+import be.ddd.domain.entity.member.SugarIntakeLevel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+public record MemberModifyDetailsDto(
+        String nickname,
+        @JsonFormat(pattern = "yyyy-MM-dd") LocalDate birthDay,
+        Gender gender,
+        Integer heightCm,
+        BigDecimal weightKg,
+        ActivityRange activityRange,
+        SugarIntakeLevel sugarIntakeLevel) {
+    public static MemberModifyDetailsDto from(Member member) {
+        return new MemberModifyDetailsDto(
+                member.getNickname(),
+                member.getBirthDay(),
+                member.getMemberHealthMetric().getGender(),
+                member.getMemberHealthMetric().getHeightCm(),
+                member.getMemberHealthMetric().getWeightKg(),
+                member.getMemberHealthMetric().getActivityRange(),
+                member.getMemberHealthMetric().getSugarIntakeLevel());
+    }
+}