From 5a746a348feace9a85cfd9ac1704cd6df2bd2353 Mon Sep 17 00:00:00 2001 From: Seung Ik Lee Date: Thu, 16 Jan 2025 22:32:45 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20#142=20=EB=A7=A4=EC=B9=AD=20=ED=98=84?= =?UTF-8?q?=ED=99=A9=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?API=20=EA=B4=80=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 --- .../walkmong_back/api/apply/dto/res/MatchingResponseDto.java | 4 ++-- .../api/apply/repository/impl/ApplyRepositoryImpl.java | 4 ++-- .../api/board/repository/impl/BoardRepositoryImpl.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/jullaene/walkmong_back/api/apply/dto/res/MatchingResponseDto.java b/src/main/java/org/jullaene/walkmong_back/api/apply/dto/res/MatchingResponseDto.java index fc12434..f8042c7 100644 --- a/src/main/java/org/jullaene/walkmong_back/api/apply/dto/res/MatchingResponseDto.java +++ b/src/main/java/org/jullaene/walkmong_back/api/apply/dto/res/MatchingResponseDto.java @@ -9,7 +9,6 @@ @Getter @AllArgsConstructor public class MatchingResponseDto { - private final Long boardId; private final String tabStatus; private final String dogName; private final Gender dogGender; @@ -21,10 +20,10 @@ public class MatchingResponseDto { private final String walkerName; private final String walkerProfile; private final String walkMatchingStatus; + private final Long boardId; public MatchingResponseDto() { - this.boardId = null; this.tabStatus = null; this.dogName = null; this.dogGender = null; @@ -36,5 +35,6 @@ public MatchingResponseDto() { this.walkerName = null; this.walkerProfile = null; this.walkMatchingStatus = null; + this.boardId = null; } } diff --git a/src/main/java/org/jullaene/walkmong_back/api/apply/repository/impl/ApplyRepositoryImpl.java b/src/main/java/org/jullaene/walkmong_back/api/apply/repository/impl/ApplyRepositoryImpl.java index f582a41..60c64f6 100644 --- a/src/main/java/org/jullaene/walkmong_back/api/apply/repository/impl/ApplyRepositoryImpl.java +++ b/src/main/java/org/jullaene/walkmong_back/api/apply/repository/impl/ApplyRepositoryImpl.java @@ -136,7 +136,6 @@ else if (status.equals(WalkMatchingStatus.REJECT)) { return queryFactory.selectDistinct( Projections.constructor(MatchingResponseDto.class, Expressions.constant(TabStatus.APPLY.name()), - apply.boardId.as("boardId"), dog.name.as("dogName"), dog.gender.as("dogGender"), dog.profile.as("dogProfile"), @@ -146,7 +145,8 @@ else if (status.equals(WalkMatchingStatus.REJECT)) { distanceExpression.as("distance"), Expressions.nullExpression(String.class), Expressions.nullExpression(String.class), - Expressions.asString(status.name()).as("walkMatchingStatus") + Expressions.asString(status.name()).as("walkMatchingStatus"), + apply.boardId.as("boardId") )) .from(apply) .leftJoin(board) diff --git a/src/main/java/org/jullaene/walkmong_back/api/board/repository/impl/BoardRepositoryImpl.java b/src/main/java/org/jullaene/walkmong_back/api/board/repository/impl/BoardRepositoryImpl.java index 64780f3..8ce9967 100644 --- a/src/main/java/org/jullaene/walkmong_back/api/board/repository/impl/BoardRepositoryImpl.java +++ b/src/main/java/org/jullaene/walkmong_back/api/board/repository/impl/BoardRepositoryImpl.java @@ -389,7 +389,6 @@ else if (status.equals(WalkMatchingStatus.REJECT)) { return queryFactory.selectDistinct( Projections.constructor(MatchingResponseDto.class, Expressions.constant(TabStatus.BOARD.name()), - board.boardId.as("boardId"), dog.name.as("dogName"), dog.gender.as("dogGender"), dog.profile.as("dogProfile"), @@ -399,7 +398,8 @@ else if (status.equals(WalkMatchingStatus.REJECT)) { Expressions.nullExpression(Double.class), member.name.as("walkerName"), // member와의 조인을 통해 walkerName 설정 member.profile.as("walkerProfile"), // member와의 조인을 통해 walkerProfile 설정 - Expressions.asString(status.name()).as("walkMatchingStatus") + Expressions.asString(status.name()).as("walkMatchingStatus"), + board.boardId.as("boardId") )) .from(board) .join(dog)