Merge pull request #109 from Leets-Official/refactor/#108/자동매칭,수동매칭-요…

…청형식통일 refactor: 수동 매칭, 자동 매칭 요청 형식, 타입 통일
Leets-Official · Feb 5, 2025 · 18679c3 · 18679c3
2 parents 9a789e6 + 87f68b0
commit 18679c3
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/src/main/java/com/gachtaxi/domain/matching/common/dto/request/AutoMatchingPostRequest.java b/src/main/java/com/gachtaxi/domain/matching/common/dto/request/AutoMatchingPostRequest.java
@@ -1,18 +1,25 @@
 package com.gachtaxi.domain.matching.common.dto.request;
 
 import com.gachtaxi.domain.matching.common.entity.enums.Tags;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
 public record AutoMatchingPostRequest(
     String startPoint,
 //    String startName,
     String destinationPoint,
 //    String destinationName,
+
+    // 현재 사용하는 필드
     String startName,
     String destinationName,
     List<String> criteria,
-    List<Integer> members,
-    Integer expectedTotalCharge
+    @NotNull
+    List<Long> members,
+
+    @Min(value = 4000)
+    int expectedTotalCharge
 ) {
 
   public List<Tags> getCriteria() {

diff --git a/src/main/java/com/gachtaxi/domain/matching/common/dto/request/ManualMatchingRequest.java b/src/main/java/com/gachtaxi/domain/matching/common/dto/request/ManualMatchingRequest.java
@@ -22,22 +22,22 @@ public record ManualMatchingRequest(
         String departureTime,
 
         @Schema(description = "예상 요금")
-        @Min(value = 0)
+        @Min(value = 4000)
         int expectedTotalCharge,
 
         @Schema(description = "매칭 태그")
         List<String> criteria,
 
-        @Schema(description = "초대할 친구 닉네임 리스트")
-        List<String> members
+        @Schema(description = "초대할 친구 아이디 리스트")
+        List<Long> members
 ) {
     public List<Tags> getCriteria() {
         return this.criteria.stream()
                 .map(Tags::valueOf)
                 .toList();
     }
 
-    public List<String> getFriendNicknames() {
+    public List<Long> getFriendsId() {
         return members;
     }
 

diff --git a/src/main/java/com/gachtaxi/domain/matching/common/service/ManualMatchingService.java b/src/main/java/com/gachtaxi/domain/matching/common/service/ManualMatchingService.java
@@ -80,7 +80,7 @@ public Long createManualMatchingRoom(Long userId, ManualMatchingRequest request)
 
         MatchingRoom savedMatchingRoom = matchingRoomRepository.save(matchingRoom);
 
-        matchingInvitationService.sendMatchingInvitation(roomMaster, request.getFriendNicknames(), savedMatchingRoom.getId());
+        matchingInvitationService.sendMatchingInvitation(roomMaster, request.getFriendsId(), savedMatchingRoom.getId());
 
         matchingRoomService.saveMatchingRoomTagInfoForManual(savedMatchingRoom, request.getCriteria());
         matchingRoomService.saveRoomMasterChargingInfoForManual(savedMatchingRoom, roomMaster);

diff --git a/src/main/java/com/gachtaxi/domain/matching/common/service/MatchingInvitationService.java b/src/main/java/com/gachtaxi/domain/matching/common/service/MatchingInvitationService.java
@@ -41,12 +41,12 @@ public class MatchingInvitationService {
     public static final String MATCHING_INVITE_TITLE = "수동 매칭 초대";
     public static final String MATCHING_INVITE_CONTENT = "%s 님이 수동 매칭 초대를 보냈습니다.";
 
-    public void sendMatchingInvitation(Members sender, List<String> friendNicknames, Long matchingRoomId) {
-        if (friendNicknames == null || friendNicknames.isEmpty()) {
+    public void sendMatchingInvitation(Members sender, List<Long> friendIds, Long matchingRoomId) {
+        if (friendIds == null || friendIds.isEmpty()) {
             return;
         }
 
-        List<Members> friends = memberRepository.findByNicknameIn(friendNicknames);
+        List<Members> friends = memberRepository.findByIdIn(friendIds);
 
         for (Members friend : friends) {
             notificationService.sendWithPush(

diff --git a/src/main/java/com/gachtaxi/domain/members/repository/MemberRepository.java b/src/main/java/com/gachtaxi/domain/members/repository/MemberRepository.java
@@ -27,5 +27,5 @@ public interface MemberRepository extends JpaRepository<Members, Long> {
 
     Optional<Members> findByEmailAndStatus(String email, UserStatus status);
 
-    List<Members> findByNicknameIn(List<String> nicknames);
+    List<Members> findByIdIn(List<Long> ids);
 }