Merge pull request #117 from Leets-Official/fix/#116/매칭방-검색

Fix #117 자동 매칭방 탐색시 타입이 수동인 매칭방을 제외하고 탐색
Leets-Official · Feb 6, 2025 · f6030a5 · f6030a5
2 parents a4a5be4 + 1892b32
commit f6030a5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 18 deletions.
diff --git a/src/main/java/com/gachtaxi/domain/matching/common/entity/MatchingRoom.java b/src/main/java/com/gachtaxi/domain/matching/common/entity/MatchingRoom.java
@@ -4,26 +4,14 @@
 import com.gachtaxi.domain.matching.algorithm.dto.FindRoomResult;
 import com.gachtaxi.domain.matching.common.entity.enums.MatchingRoomStatus;
 import com.gachtaxi.domain.matching.common.entity.enums.MatchingRoomType;
-import com.gachtaxi.domain.matching.event.dto.kafka_topic.MatchRoomCreatedEvent;
 import com.gachtaxi.domain.matching.common.entity.enums.Tags;
+import com.gachtaxi.domain.matching.event.dto.kafka_topic.MatchRoomCreatedEvent;
 import com.gachtaxi.domain.members.entity.Members;
 import com.gachtaxi.global.common.entity.BaseEntity;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
+import lombok.*;
+
 import java.util.List;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
 
 @Entity
 @Table(name = "matching_room")
@@ -120,6 +108,7 @@ public static MatchingRoom activeOf(MatchRoomCreatedEvent matchRoomCreatedEvent,
         .departure(matchRoomCreatedEvent.startName())
         .destination(matchRoomCreatedEvent.destinationName())
         .totalCharge(matchRoomCreatedEvent.expectedTotalCharge())
+        .matchingRoomType(MatchingRoomType.AUTO)
         .matchingRoomStatus(MatchingRoomStatus.ACTIVE)
         .chattingRoomId(chattingRoom.getId())
         .build();

diff --git a/src/main/java/com/gachtaxi/domain/matching/common/repository/MatchingRoomRepository.java b/src/main/java/com/gachtaxi/domain/matching/common/repository/MatchingRoomRepository.java
@@ -4,14 +4,15 @@
 import com.gachtaxi.domain.matching.common.entity.enums.MatchingRoomStatus;
 import com.gachtaxi.domain.matching.common.entity.enums.MatchingRoomType;
 import com.gachtaxi.domain.members.entity.Members;
-import java.util.List;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface MatchingRoomRepository extends JpaRepository<MatchingRoom, Long> {
 //    @Query("SELECT r FROM MatchingRoom r " +
@@ -31,8 +32,10 @@ public interface MatchingRoomRepository extends JpaRepository<MatchingRoom, Long
     @Query("SELECT r FROM MatchingRoom r " +
             "WHERE r.departure = :departure " +
             "AND r.destination = :destination " +
-            "AND r.matchingRoomStatus = 'ACTIVE' ")
+            "AND r.matchingRoomStatus = 'ACTIVE'" +
+            "AND r.matchingRoomType = 'AUTO' ")
     List<MatchingRoom> findRoomsByDepartureAndDestination(@Param("departure") String departure, @Param("destination") String destination);
+
     @Query("SELECT r " +
             "FROM MatchingRoom r JOIN r.memberMatchingRoomChargingInfo m " +
             "WHERE m.members = :user "+