From 77b3f2cba6d62061c62044c0cbeb0d7e82f45fed Mon Sep 17 00:00:00 2001 From: yejin Date: Thu, 4 Dec 2025 00:25:10 +0900 Subject: [PATCH] =?UTF-8?q?Fix:=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/place/entity/CafeteriaMenu.java | 1 + .../place/service/CafeteriaMenuService.java | 9 +++++++-- .../search/dto/response/SearchPlaceRes.java | 16 ++++++++-------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/main/java/devkor/com/teamcback/domain/place/entity/CafeteriaMenu.java b/src/main/java/devkor/com/teamcback/domain/place/entity/CafeteriaMenu.java index 1ad5fe4c..8f9f627f 100644 --- a/src/main/java/devkor/com/teamcback/domain/place/entity/CafeteriaMenu.java +++ b/src/main/java/devkor/com/teamcback/domain/place/entity/CafeteriaMenu.java @@ -25,6 +25,7 @@ public class CafeteriaMenu extends BaseEntity { private String kind; @Getter + @Setter @Column(nullable = false, length = 500) // 식단 내용 private String menu; diff --git a/src/main/java/devkor/com/teamcback/domain/place/service/CafeteriaMenuService.java b/src/main/java/devkor/com/teamcback/domain/place/service/CafeteriaMenuService.java index cee50ada..5f918a3b 100644 --- a/src/main/java/devkor/com/teamcback/domain/place/service/CafeteriaMenuService.java +++ b/src/main/java/devkor/com/teamcback/domain/place/service/CafeteriaMenuService.java @@ -190,12 +190,17 @@ else if(placeId == 2490) { // 메뉴가 존재하는 경우 if(!content.equals(NO_MENU_INFO)) { - // 메뉴가 변경된 경우 - if (savedMenu == null || !savedMenu.getMenu().equals(content)) { + // 메뉴가 추가된 경우 + if (savedMenu == null) { // 학식 메뉴 저장 cafeteriaMenuRepository.save(new CafeteriaMenu(date, kind, content, placeId)); } + // 메뉴가 변경된 경우 + else if(!savedMenu.getMenu().equals(content)) { + savedMenu.setMenu(content); + } + // 당일에 해당하는 경우 식당 설명 수정 if(date.equals(LocalDate.now())) { if(!updated) { diff --git a/src/main/java/devkor/com/teamcback/domain/search/dto/response/SearchPlaceRes.java b/src/main/java/devkor/com/teamcback/domain/search/dto/response/SearchPlaceRes.java index b9546750..54e7228f 100644 --- a/src/main/java/devkor/com/teamcback/domain/search/dto/response/SearchPlaceRes.java +++ b/src/main/java/devkor/com/teamcback/domain/search/dto/response/SearchPlaceRes.java @@ -58,8 +58,8 @@ public class SearchPlaceRes { public SearchPlaceRes(Place place, String imageUrl) { this.id = place.getId(); - this.buildingId = place.getBuilding().getId(); - this.buildingName = place.getBuilding().getName(); + this.buildingId = place.getBuilding() != null ? place.getBuilding().getId() : null; + this.buildingName = place.getBuilding() != null ? place.getBuilding().getName() : ""; this.name = place.getName(); this.imageUrl = imageUrl != null ? imageUrl : place.getImageUrl(); this.detail = place.getDetail(); @@ -67,14 +67,14 @@ public SearchPlaceRes(Place place, String imageUrl) { this.saturdayOperatingTime = place.getSaturdayOperatingTime(); this.sundayOperatingTime = place.getSundayOperatingTime(); this.isOperating = place.isOperating(); - this.needStudentCard = place.getBuilding().isNeedStudentCard(); + this.needStudentCard = place.getBuilding() != null ? place.getBuilding().isNeedStudentCard() : false; this.floor = place.getFloor(); - this.address = place.getBuilding().getAddress(); + this.address = place.getBuilding() != null ? place.getBuilding().getAddress() : ""; this.plugAvailability = place.isPlugAvailability(); - this.longitude = place.getNode().getLongitude(); - this.latitude = place.getNode().getLatitude(); - this.xCoord = place.getNode().getXCoord(); - this.yCoord = place.getNode().getYCoord(); + this.longitude = place.getNode() != null ? place.getNode().getLongitude() : null; + this.latitude = place.getNode() != null ? place.getNode().getLatitude() : null; + this.xCoord = place.getNode() != null ? place.getNode().getXCoord() : null; + this.yCoord = place.getNode() != null ? place.getNode().getYCoord() : null; this.locationType = LocationType.PLACE; this.placeType = place.getType(); this.description = place.getDescription();