Merge pull request #105 from Hanaro-trip-together-bank/feature/dues-req

refactor: 회비 규칙 생성/수정 api 구현
Hanaro-trip-together-bank · Jun 3, 2024 · 567d33e · 567d33e
2 parents 608e457 + 6af1aec
commit 567d33e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/main/java/com/hanaro/triptogether/dues/domain/entity/Dues.java b/src/main/java/com/hanaro/triptogether/dues/domain/entity/Dues.java
@@ -1,5 +1,6 @@
 package com.hanaro.triptogether.dues.domain.entity;
 
+import com.hanaro.triptogether.dues.dto.request.DuesRuleRequestDto;
 import jakarta.persistence.*;
 import lombok.*;
 
@@ -19,10 +20,14 @@ public class Dues extends BaseEntity {
 
     private Long teamIdx;
 
-    private LocalDate duesDate;
+    private int duesDate;
 
     private BigDecimal duesAmount;
 
 
+    public void modifyDuesRule(DuesRuleRequestDto dto){
+        this.duesDate=dto.getDuesDate();
+        this.duesAmount=dto.getDuesAmount();
+    }
 
 }
diff --git a/src/main/java/com/hanaro/triptogether/dues/dto/request/DuesRuleRequestDto.java b/src/main/java/com/hanaro/triptogether/dues/dto/request/DuesRuleRequestDto.java
@@ -14,7 +14,7 @@
 public class DuesRuleRequestDto {
 
     private Long teamIdx;
-    private LocalDate duesDate;
+    private int duesDate;
     private BigDecimal duesAmount;
 
     public Dues toEntity() {

diff --git a/src/main/java/com/hanaro/triptogether/dues/service/DuesService.java b/src/main/java/com/hanaro/triptogether/dues/service/DuesService.java
@@ -13,6 +13,7 @@
 
 import java.math.BigDecimal;
 import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -34,15 +35,21 @@ public List<DuesDetailYearTotalAmountResponseDto> getDuesDetailByMonthAmount(Lon
     }
 
     public void setDuesRule(DuesRuleRequestDto duesRuleRequestDto){
-        duesRepository.save(duesRuleRequestDto.toEntity());
+        Dues curDues = duesRepository.findDuesByTeamIdx(duesRuleRequestDto.getTeamIdx());
+        if (curDues !=null) {
+            curDues.modifyDuesRule(duesRuleRequestDto);
+            duesRepository.save(curDues);
+        } else {
+            duesRepository.save(duesRuleRequestDto.toEntity());
+        }
     }
 
     public DuesRuleResponseDto getDuesRule(Long teamIdx){
         Dues dues = duesRepository.findDuesByTeamIdx(teamIdx);
         if (dues == null) {
             return null;
         }
-        return DuesRuleResponseDto.builder().duesDate(String.valueOf(dues.getDuesDate().getDayOfMonth())).duesAmount(dues.getDuesAmount()).build();
+        return DuesRuleResponseDto.builder().duesDate(String.valueOf(dues.getDuesDate())).duesAmount(dues.getDuesAmount()).build();
     }