Skip to content

fix: 성진님 수정사항 (2/28) #84

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

Merged
jdoeun merged 1 commit into from
Feb 28, 2025
Merged

fix: 성진님 수정사항 (2/28) #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions src/main/java/swyp_8th/bungmakase_backend/api/BungMapController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"})
Expand Down Expand Up @@ -79,7 +76,7 @@ public ResponseEntity<ResponseTemplate<List<MarkerResponseDto>>> getMarkerByShop
}

@PostMapping(value = "/reviews", consumes = {"multipart/form-data"})
public ResponseEntity<ResponseTemplate<Void>> addShopReview(
public ResponseEntity<ResponseTemplate<Map<String, String>>> addShopReview(
@RequestHeader(value = "Authorization") String token,
@RequestPart("reviewData") ShopReviewRequest reviewData,
@RequestPart(value = "image", required = false) List<MultipartFile> images) {
Expand All @@ -89,8 +86,11 @@ public ResponseEntity<ResponseTemplate<Void>> addShopReview(

mapService.addShopReview(userId, reviewData, images);

Map<String, String> 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));
Expand Down
1 change: 1 addition & 0 deletions src/main/java/swyp_8th/bungmakase_backend/dto/bung_level/ReviewListResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ public class ReviewListResponse {
private List<String> bungImages;
private String reviewText;
private LocalDateTime reviewTimestamp;
private Integer star;
}
3 changes: 2 additions & 1 deletion src/main/java/swyp_8th/bungmakase_backend/service/BungMapService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,8 @@ public List<ReviewListResponse> getShopReviews(UUID shopId) {
.map(BungShopImage::getImageUrl)
.collect(Collectors.toList()),
review.getReviewText(),
review.getCreatedAt()
review.getCreatedAt(),
review.getStar()
))
.collect(Collectors.toList());
}
Expand Down
20 changes: 10 additions & 10 deletions src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 # 최소 대기 스레드 수
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 # 최소 대기 스레드 수