🔨 Refactor/#77 - 4.7 동참하기 requestBody 필드에 필요없는 eventId 값 삭제

9oormthon-univ · Nov 22, 2024 · 0bebe3a · 0bebe3a
1 parent 502f01a
commit 0bebe3a
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 14 deletions.
diff --git a/http/onjung/OnjungControllerHttpRequest.http b/http/onjung/OnjungControllerHttpRequest.http
@@ -50,6 +50,5 @@ Authorization: Bearer {{access_token}}
 Content-Type: application/json
 
 {
-  "event_id": {{onjung.API_4_7.event_id}},
   "donation_amount": {{onjung.API_4_7.donation_amount}}
 }
diff --git a/...ain/java/com/daon/onjung/account/application/dto/response/ReadStoreDetailResponseDto.java b/...ain/java/com/daon/onjung/account/application/dto/response/ReadStoreDetailResponseDto.java
@@ -131,10 +131,6 @@ public static StoreInfoDto fromEntity(Store store) {
     @Getter
     public static class EventInfoDto {
 
-        @NotNull(message = "id는 null일 수 없습니다.")
-        @JsonProperty("id")
-        private final Long id;
-
         @NotNull(message = "total_amount는 null일 수 없습니다.")
         @JsonProperty("total_amount")
         private final Integer totalAmount;
@@ -144,15 +140,13 @@ public static class EventInfoDto {
         private final Integer restOfDate;
 
         @Builder
-        public EventInfoDto(Integer totalAmount, Integer restOfDate, Long id) {
-            this.id = id;
+        public EventInfoDto(Integer totalAmount, Integer restOfDate) {
             this.totalAmount = totalAmount;
             this.restOfDate = restOfDate;
         }
 
-        public static EventInfoDto of(Long id, Integer totalAmount, Integer restOfDate) {
+        public static EventInfoDto of(Integer totalAmount, Integer restOfDate) {
             return EventInfoDto.builder()
-                    .id(id)
                     .totalAmount(totalAmount)
                     .restOfDate(restOfDate)
                     .build();

diff --git a/src/main/java/com/daon/onjung/account/application/service/ReadStoreDetailService.java b/src/main/java/com/daon/onjung/account/application/service/ReadStoreDetailService.java
@@ -53,7 +53,7 @@ public ReadStoreDetailResponseDto execute(Long id) {
         // event 정보
         Integer totalAmount = getTotalAmount(id);
 
-        ReadStoreDetailResponseDto.EventInfoDto eventInfoDto = ReadStoreDetailResponseDto.EventInfoDto.of(event.getId(), totalAmount, eventService.getRestOfDate(event));
+        ReadStoreDetailResponseDto.EventInfoDto eventInfoDto = ReadStoreDetailResponseDto.EventInfoDto.of(totalAmount, eventService.getRestOfDate(event));
 
         // onjung 정보 (null 값 대신 0으로
         Integer totalOnjungCount = Optional.ofNullable(storeRepository.countUsersByStoreId(id)).orElse(0);

diff --git a/src/main/java/com/daon/onjung/onjung/application/dto/request/CreateDonationRequestDto.java b/src/main/java/com/daon/onjung/onjung/application/dto/request/CreateDonationRequestDto.java
@@ -4,9 +4,6 @@
 
 public record CreateDonationRequestDto(
 
-        @JsonProperty("event_id")
-        Long eventId,
-
         @JsonProperty("donation_amount")
         Integer donationAmount
 ) {

diff --git a/src/main/java/com/daon/onjung/onjung/application/service/CreateDonationService.java b/src/main/java/com/daon/onjung/onjung/application/service/CreateDonationService.java
@@ -53,7 +53,7 @@ public CreateDonationResponseDto execute(UUID accountId, Long storeId, CreateDon
                 .orElseThrow(() -> new CommonException(ErrorCode.NOT_FOUND_RESOURCE));
 
         // 이벤트 조회
-        Event event = eventRepository.findById(requestDto.eventId())
+        Event event = eventRepository.findINPROGRESSEventByStoreId(storeId)
                 .orElseThrow(() -> new CommonException(ErrorCode.NOT_FOUND_RESOURCE));
 
         // 동참 생성