Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #117 자동 매칭방 탐색시 타입이 수동인 매칭방을 제외하고 탐색 #117

Merged
merged 2 commits into from
Feb 6, 2025
Merged

Fix #117 자동 매칭방 탐색시 타입이 수동인 매칭방을 제외하고 탐색 #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1739061
fix: 자동 매칭방 탐색시 타입이 수동인 매칭방을 제외하고 탐색
hyxklee Feb 6, 2025
1892b32
fix: 자동 매칭방 탐색시 타입이 수동인 매칭방을 제외하고 탐색
hyxklee Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions src/main/java/com/gachtaxi/domain/matching/common/entity/MatchingRoom.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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();
Expand Down
7 changes: 5 additions & 2 deletions src/main/java/com/gachtaxi/domain/matching/common/repository/MatchingRoomRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 " +
Expand All @@ -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' ")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

고생하셨습니다 !

변경된 내용 확인했습니당

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 "+
Expand Down