From ec8824322fb781e3ff997bf7f6a948458d7ef5d0 Mon Sep 17 00:00:00 2001 From: PicturePark1101 Date: Sat, 19 Jul 2025 18:25:15 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EB=82=B4=20=EC=9E=84=EC=9E=A5=20?= =?UTF-8?q?=EB=85=B8=ED=8A=B8=20=EC=A1=B0=ED=9A=8C=20response=20=EC=9A=94?= =?UTF-8?q?=EC=86=8C=20=EC=B6=94=EA=B0=80=20-=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=ED=99=94=EB=A9=B4=EC=97=90=EC=84=9C=20=ED=95=84=EC=9A=94=20#44?= =?UTF-8?q?5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../limjang/service/NoteQueryServiceV2.java | 2 +- .../service/response/UserNoteGetResponse.java | 22 ++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/main/java/umc/th/juinjang/api/limjang/service/NoteQueryServiceV2.java b/src/main/java/umc/th/juinjang/api/limjang/service/NoteQueryServiceV2.java index 8ad460a8..0ba4f69a 100644 --- a/src/main/java/umc/th/juinjang/api/limjang/service/NoteQueryServiceV2.java +++ b/src/main/java/umc/th/juinjang/api/limjang/service/NoteQueryServiceV2.java @@ -89,7 +89,7 @@ private Map mapToNoteIdAndImageId(List imageList) { public UserNoteGetResponse findNote(Long noteId) { Limjang note = noteFinder.getNoteByIdWithAddressAndNotePriceWhereDeletedIsFalse(noteId); boolean isShared = sharedNoteFinder.existsByDeletedAtIsNullAndLimjang(note); - return UserNoteGetResponse.of(isShared, note); + return UserNoteGetResponse.of(isShared, note, note.getAddressEntity()); } public ChecklistConditionResponse checkLimjangChecklistSatisfaction(Long limjangId) { diff --git a/src/main/java/umc/th/juinjang/api/limjang/service/response/UserNoteGetResponse.java b/src/main/java/umc/th/juinjang/api/limjang/service/response/UserNoteGetResponse.java index 4eb50ad3..2496cb60 100644 --- a/src/main/java/umc/th/juinjang/api/limjang/service/response/UserNoteGetResponse.java +++ b/src/main/java/umc/th/juinjang/api/limjang/service/response/UserNoteGetResponse.java @@ -4,6 +4,7 @@ import java.util.List; import umc.th.juinjang.domain.image.model.Image; +import umc.th.juinjang.domain.limjang.model.Address; import umc.th.juinjang.domain.limjang.model.Limjang; import umc.th.juinjang.domain.limjang.model.LimjangPriceType; import umc.th.juinjang.domain.limjang.model.LimjangPropertyType; @@ -22,9 +23,14 @@ public record UserNoteGetResponse( String monthlyRent, String updatedAt, String floor, - Integer pyong + Integer pyong, + String bcode, + String sido, + String sigungu, + String bname1, + String bname2 ) { - public static UserNoteGetResponse of(boolean isShared, Limjang note) { + public static UserNoteGetResponse of(boolean isShared, Limjang note, Address address) { return new UserNoteGetResponse( isShared, note.getPurpose(), @@ -32,12 +38,18 @@ public static UserNoteGetResponse of(boolean isShared, Limjang note) { note.getPriceType(), note.getNickname(), note.getImageList().stream().map(Image::getImageUrl).limit(3).toList(), - note.getAddressEntity().getRoadAddress(), - note.getAddressEntity().getAddressDetail(), + address.getRoadAddress(), + address.getAddressDetail(), note.getLimjangPrice().getPrice(note.getPriceType(), note.getPurpose()), note.getPriceType() == LimjangPriceType.MONTHLY_RENT ? note.getLimjangPrice().getMonthlyRent() : null, note.getUpdatedAt().format(DateTimeFormatter.ofPattern("yy.MM.dd")), note.getFloor(), - note.getPyong()); + note.getPyong(), + address.getBcode(), + address.getSido(), + address.getSigungo(), + address.getBname1(), + address.getBname2() + ); } }