From 9acb640abb9e85625967a6c1470560f8b4bac603 Mon Sep 17 00:00:00 2001 From: Doeun Jeong Date: Fri, 28 Feb 2025 23:28:47 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=84=B1=EC=A7=84=EB=8B=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=EC=82=AC=ED=95=AD=20(2/28)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/BungMapController.java | 12 +++++------ .../dto/bung_level/ReviewListResponse.java | 1 + .../service/BungMapService.java | 3 ++- src/main/resources/application.yml | 20 +++++++++---------- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/main/java/swyp_8th/bungmakase_backend/api/BungMapController.java b/src/main/java/swyp_8th/bungmakase_backend/api/BungMapController.java index afc971e..74759b9 100644 --- a/src/main/java/swyp_8th/bungmakase_backend/api/BungMapController.java +++ b/src/main/java/swyp_8th/bungmakase_backend/api/BungMapController.java @@ -13,10 +13,7 @@ import swyp_8th.bungmakase_backend.globals.response.ResponseTemplate; import swyp_8th.bungmakase_backend.service.BungMapService; -import java.util.List; -import java.util.NoSuchElementException; -import java.util.Optional; -import java.util.UUID; +import java.util.*; @RestController @CrossOrigin(origins = {"https://bungmakase.vercel.app", "http://localhost:3000", "https://localhost:3001"}) @@ -79,7 +76,7 @@ public ResponseEntity>> getMarkerByShop } @PostMapping(value = "/reviews", consumes = {"multipart/form-data"}) - public ResponseEntity> addShopReview( + public ResponseEntity>> addShopReview( @RequestHeader(value = "Authorization") String token, @RequestPart("reviewData") ShopReviewRequest reviewData, @RequestPart(value = "image", required = false) List images) { @@ -89,8 +86,11 @@ public ResponseEntity> addShopReview( mapService.addShopReview(userId, reviewData, images); + Map responseData = new HashMap<>(); + responseData.put("shopId", reviewData.getShopId()); + return ResponseEntity.status(HttpStatus.CREATED) - .body(new ResponseTemplate<>(SuccessCode.CREATED_201, null)); + .body(new ResponseTemplate<>(SuccessCode.CREATED_201, responseData)); } catch (Exception e) { return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body(new ResponseTemplate<>(FailureCode.BAD_REQUEST_400, null)); diff --git a/src/main/java/swyp_8th/bungmakase_backend/dto/bung_level/ReviewListResponse.java b/src/main/java/swyp_8th/bungmakase_backend/dto/bung_level/ReviewListResponse.java index 7238765..1faf798 100644 --- a/src/main/java/swyp_8th/bungmakase_backend/dto/bung_level/ReviewListResponse.java +++ b/src/main/java/swyp_8th/bungmakase_backend/dto/bung_level/ReviewListResponse.java @@ -22,4 +22,5 @@ public class ReviewListResponse { private List bungImages; private String reviewText; private LocalDateTime reviewTimestamp; + private Integer star; } diff --git a/src/main/java/swyp_8th/bungmakase_backend/service/BungMapService.java b/src/main/java/swyp_8th/bungmakase_backend/service/BungMapService.java index a894d92..e26599e 100644 --- a/src/main/java/swyp_8th/bungmakase_backend/service/BungMapService.java +++ b/src/main/java/swyp_8th/bungmakase_backend/service/BungMapService.java @@ -261,7 +261,8 @@ public List getShopReviews(UUID shopId) { .map(BungShopImage::getImageUrl) .collect(Collectors.toList()), review.getReviewText(), - review.getCreatedAt() + review.getCreatedAt(), + review.getStar() )) .collect(Collectors.toList()); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b0d2035..4780d1d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -60,13 +60,13 @@ ncp: server: - port: 443 - ssl: - key-store: classpath:keystore.p12 - key-store-password: bungmakase - key-store-type: PKCS12 - enabled: true - tomcat: - threads: - max: 200 # 최대 스레드 수 - min-spare: 20 # 최소 대기 스레드 수 \ No newline at end of file + port: 8080 +# ssl: +# key-store: classpath:keystore.p12 +# key-store-password: bungmakase +# key-store-type: PKCS12 +# enabled: true +# tomcat: +# threads: +# max: 200 # 최대 스레드 수 +# min-spare: 20 # 최소 대기 스레드 수 \ No newline at end of file