From 1739061895837c9e4220e8fe7f1881c74dc1ed01 Mon Sep 17 00:00:00 2001 From: hyxklee Date: Thu, 6 Feb 2025 10:21:47 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=EC=9E=90=EB=8F=99=20=EB=A7=A4?= =?UTF-8?q?=EC=B9=AD=EB=B0=A9=20=ED=83=90=EC=83=89=EC=8B=9C=20=ED=83=80?= =?UTF-8?q?=EC=9E=85=EC=9D=B4=20=EC=88=98=EB=8F=99=EC=9D=B8=20=EB=A7=A4?= =?UTF-8?q?=EC=B9=AD=EB=B0=A9=EC=9D=84=20=EC=A0=9C=EC=99=B8=ED=95=98?= =?UTF-8?q?=EA=B3=A0=20=ED=83=90=EC=83=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../matching/common/repository/MatchingRoomRepository.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 index 27193b2d..1dbfb022 100644 --- 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,7 +4,6 @@ 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; @@ -12,6 +11,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository public interface MatchingRoomRepository extends JpaRepository { // @Query("SELECT r FROM MatchingRoom r " + @@ -31,8 +32,10 @@ public interface MatchingRoomRepository extends JpaRepository findRoomsByDepartureAndDestination(@Param("departure") String departure, @Param("destination") String destination); + @Query("SELECT r " + "FROM MatchingRoom r JOIN r.memberMatchingRoomChargingInfo m " + "WHERE m.members = :user "+ From 1892b325925160aa4b81508d2b147bb64b5203a2 Mon Sep 17 00:00:00 2001 From: hyxklee Date: Thu, 6 Feb 2025 10:29:13 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EC=9E=90=EB=8F=99=20=EB=A7=A4?= =?UTF-8?q?=EC=B9=AD=EB=B0=A9=20=ED=83=90=EC=83=89=EC=8B=9C=20=ED=83=80?= =?UTF-8?q?=EC=9E=85=EC=9D=B4=20=EC=88=98=EB=8F=99=EC=9D=B8=20=EB=A7=A4?= =?UTF-8?q?=EC=B9=AD=EB=B0=A9=EC=9D=84=20=EC=A0=9C=EC=99=B8=ED=95=98?= =?UTF-8?q?=EA=B3=A0=20=ED=83=90=EC=83=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../matching/common/entity/MatchingRoom.java | 21 +++++-------------- .../repository/MatchingRoomRepository.java | 2 +- 2 files changed, 6 insertions(+), 17 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 index d18bdde3..417002ad 100644 --- 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 index 1dbfb022..c34f85ac 100644 --- a/src/main/java/com/gachtaxi/domain/matching/common/repository/MatchingRoomRepository.java +++ b/src/main/java/com/gachtaxi/domain/matching/common/repository/MatchingRoomRepository.java @@ -33,7 +33,7 @@ public interface MatchingRoomRepository extends JpaRepository findRoomsByDepartureAndDestination(@Param("departure") String departure, @Param("destination") String destination); @Query("SELECT r " +