From 7c28f579407aaff206f14ba7a73ab71c43181df5 Mon Sep 17 00:00:00 2001 From: yeobi Date: Sun, 29 Dec 2024 20:01:38 +0900 Subject: [PATCH 1/5] =?UTF-8?q?[Refac]=20Dutch=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=B5=9C=EC=8B=A0=EC=88=9C=EC=9C=BC=EB=A1=9C=20=EC=A0=95?= =?UTF-8?q?=EB=A0=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dodutch_Server/domain/dutch/controller/DutchController.java | 2 +- .../Dodutch_Server/domain/dutch/repository/DutchRepository.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/Dodutch_Server/domain/dutch/controller/DutchController.java b/src/main/java/com/Dodutch_Server/domain/dutch/controller/DutchController.java index f9c3dd2..2e58817 100644 --- a/src/main/java/com/Dodutch_Server/domain/dutch/controller/DutchController.java +++ b/src/main/java/com/Dodutch_Server/domain/dutch/controller/DutchController.java @@ -37,7 +37,7 @@ private boolean isValidTrip(Long tripId) { public ResponseEntity getAllDutchList() { Long memberId = SecurityUtil.getCurrentUserId(); - List dutchList = dutchRepository.findByPayerIdOrPayeeId(memberId, memberId); + List dutchList = dutchRepository.findByPayerIdOrPayeeIdOrderByCreatedAtDesc(memberId, memberId); List responseDTOs = dutchList.stream() .map(DutchResponseDTO::fromEntity) diff --git a/src/main/java/com/Dodutch_Server/domain/dutch/repository/DutchRepository.java b/src/main/java/com/Dodutch_Server/domain/dutch/repository/DutchRepository.java index 72d63b2..664e1f2 100644 --- a/src/main/java/com/Dodutch_Server/domain/dutch/repository/DutchRepository.java +++ b/src/main/java/com/Dodutch_Server/domain/dutch/repository/DutchRepository.java @@ -12,4 +12,5 @@ public interface DutchRepository extends JpaRepository { Optional findByTripIdAndId(Long tripId, Long id); boolean existsByTripIdAndPayerIdAndPayeeIdAndPerCost(Long tripId, Long payerId, Long payeeId, Integer perCost); List findByPayerIdOrPayeeId(Long payerId, Long payeeId); + List findByPayerIdOrPayeeIdOrderByCreatedAtDesc(Long payerId, Long payeeId); } From 704ba447870366b8606d5b1956ebbd82e682dfbf Mon Sep 17 00:00:00 2001 From: yeobi Date: Sun, 29 Dec 2024 20:35:31 +0900 Subject: [PATCH 2/5] =?UTF-8?q?[Refac]=20payer,=20payee=20nickname=20Respo?= =?UTF-8?q?nseDTO=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dutch/controller/DutchController.java | 33 ++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/Dodutch_Server/domain/dutch/controller/DutchController.java b/src/main/java/com/Dodutch_Server/domain/dutch/controller/DutchController.java index 2e58817..e2f9d00 100644 --- a/src/main/java/com/Dodutch_Server/domain/dutch/controller/DutchController.java +++ b/src/main/java/com/Dodutch_Server/domain/dutch/controller/DutchController.java @@ -8,10 +8,10 @@ import com.Dodutch_Server.domain.trip.entity.TripMember; import com.Dodutch_Server.domain.trip.repository.TripMemberRepository; import com.Dodutch_Server.domain.trip.repository.TripRepository; +import lombok.Data; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; -import org.springframework.data.domain.Sort; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -160,18 +160,41 @@ public ApiResponse(boolean isSuccess, String code, String message, T data) { @Setter public static class DutchResponseDTO { private Long id; - private Long payerId; - private Long payeeId; + private PayerInfo payer; + private PayeeInfo payee; private Integer perCost; private Boolean isCompleted; + @Data + public static class PayerInfo { + private Long payerId; + private String payerNickName; + } + + @Data + public static class PayeeInfo { + private Long payeeId; + private String payeeNickName; + } + public static DutchResponseDTO fromEntity(Dutch dutch) { DutchResponseDTO dto = new DutchResponseDTO(); dto.setId(dutch.getId()); - dto.setPayerId(dutch.getPayer() != null ? dutch.getPayer().getId() : null); - dto.setPayeeId(dutch.getPayee() != null ? dutch.getPayee().getId() : null); dto.setPerCost(dutch.getPerCost()); dto.setIsCompleted(dutch.getIsCompleted()); + + // Payer 정보 + PayerInfo payerInfo = new PayerInfo(); + payerInfo.setPayerId(dutch.getPayer().getId()); + payerInfo.setPayerNickName(dutch.getPayer().getNickName()); + dto.setPayer(payerInfo); + + // Payee 정보 + PayeeInfo payeeInfo = new PayeeInfo(); + payeeInfo.setPayeeId(dutch.getPayee().getId()); + payeeInfo.setPayeeNickName(dutch.getPayee().getNickName()); + dto.setPayee(payeeInfo); + return dto; } } From 29f99d3b82ce65f251dc4385920acdbfb24ff002 Mon Sep 17 00:00:00 2001 From: fewolee Date: Sun, 29 Dec 2024 20:36:51 +0900 Subject: [PATCH 3/5] =?UTF-8?q?[Refac]=20=EC=8B=9C=ED=81=90=EB=A6=AC?= =?UTF-8?q?=ED=8B=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/Dodutch_Server/global/config/security/CorsConfig.java | 1 + .../Dodutch_Server/global/config/security/SecurityConfig.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/com/Dodutch_Server/global/config/security/CorsConfig.java b/src/main/java/com/Dodutch_Server/global/config/security/CorsConfig.java index 7865e3c..98b568d 100644 --- a/src/main/java/com/Dodutch_Server/global/config/security/CorsConfig.java +++ b/src/main/java/com/Dodutch_Server/global/config/security/CorsConfig.java @@ -16,6 +16,7 @@ public class CorsConfig implements WebMvcConfigurer { public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/**") .allowedOrigins("http://localhost:3000") + .allowedOrigins("https://dodutch.vercel.app") .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS","PATCH") .allowedHeaders("*") .allowCredentials(true); diff --git a/src/main/java/com/Dodutch_Server/global/config/security/SecurityConfig.java b/src/main/java/com/Dodutch_Server/global/config/security/SecurityConfig.java index b570104..d8ec061 100644 --- a/src/main/java/com/Dodutch_Server/global/config/security/SecurityConfig.java +++ b/src/main/java/com/Dodutch_Server/global/config/security/SecurityConfig.java @@ -61,6 +61,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { http.cors(corsCustomizer -> corsCustomizer.configurationSource(request -> { CorsConfiguration config = new CorsConfiguration(); config.setAllowedOrigins(Collections.singletonList("http://localhost:3000")); // 허용할 도메인 + config.setAllowedOrigins(Collections.singletonList("https://dodutch.vercel.app")); // 허용할 도메인 config.setAllowedMethods(Collections.singletonList("*")); // 모든 메서드 허용 config.setAllowCredentials(true); // 인증 정보 허용 config.setAllowedHeaders(Collections.singletonList("*")); // 모든 헤더 허용 From d1351372818c29853aa68d33f49780a546454d30 Mon Sep 17 00:00:00 2001 From: yeobi Date: Sun, 29 Dec 2024 20:38:35 +0900 Subject: [PATCH 4/5] =?UTF-8?q?[Refac]=20Dutch=20Response=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dodutch_Server/domain/dutch/controller/DutchController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/Dodutch_Server/domain/dutch/controller/DutchController.java b/src/main/java/com/Dodutch_Server/domain/dutch/controller/DutchController.java index e2f9d00..a4a3dc5 100644 --- a/src/main/java/com/Dodutch_Server/domain/dutch/controller/DutchController.java +++ b/src/main/java/com/Dodutch_Server/domain/dutch/controller/DutchController.java @@ -199,6 +199,7 @@ public static DutchResponseDTO fromEntity(Dutch dutch) { } } + @Getter @Setter public static class DutchUpdateRequest{ From 0c0dc40809f53ef9c9f05cda2f8f3a876d166225 Mon Sep 17 00:00:00 2001 From: fewolee Date: Sun, 29 Dec 2024 20:48:15 +0900 Subject: [PATCH 5/5] =?UTF-8?q?[Refac]=20=EC=8B=9C=ED=81=90=EB=A6=AC?= =?UTF-8?q?=ED=8B=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/Dodutch_Server/global/config/security/CorsConfig.java | 1 + .../Dodutch_Server/global/config/security/SecurityConfig.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/com/Dodutch_Server/global/config/security/CorsConfig.java b/src/main/java/com/Dodutch_Server/global/config/security/CorsConfig.java index 98b568d..892469a 100644 --- a/src/main/java/com/Dodutch_Server/global/config/security/CorsConfig.java +++ b/src/main/java/com/Dodutch_Server/global/config/security/CorsConfig.java @@ -17,6 +17,7 @@ public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/**") .allowedOrigins("http://localhost:3000") .allowedOrigins("https://dodutch.vercel.app") + .allowedOrigins("http://dodutch.vercel.app") .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS","PATCH") .allowedHeaders("*") .allowCredentials(true); diff --git a/src/main/java/com/Dodutch_Server/global/config/security/SecurityConfig.java b/src/main/java/com/Dodutch_Server/global/config/security/SecurityConfig.java index d8ec061..13a5b57 100644 --- a/src/main/java/com/Dodutch_Server/global/config/security/SecurityConfig.java +++ b/src/main/java/com/Dodutch_Server/global/config/security/SecurityConfig.java @@ -62,6 +62,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { CorsConfiguration config = new CorsConfiguration(); config.setAllowedOrigins(Collections.singletonList("http://localhost:3000")); // 허용할 도메인 config.setAllowedOrigins(Collections.singletonList("https://dodutch.vercel.app")); // 허용할 도메인 + config.setAllowedOrigins(Collections.singletonList("http://dodutch.vercel.app")); // 허용할 도메인 config.setAllowedMethods(Collections.singletonList("*")); // 모든 메서드 허용 config.setAllowCredentials(true); // 인증 정보 허용 config.setAllowedHeaders(Collections.singletonList("*")); // 모든 헤더 허용