Merge pull request #227 from swm-nodriversomabus/BUS-225-MVP2-API-test

hotfix(BE): 숙소 매칭 등록 안됨 BUS-225-MVP2-API-test
swm-nodriversomabus · Nov 22, 2023 · 0f2b242 · 0f2b242
2 parents fc7df82 + 41f392d
commit 0f2b242
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/main/java/com/example/api/matching/adapter/in/rest/MatchingController.java b/src/main/java/com/example/api/matching/adapter/in/rest/MatchingController.java
@@ -55,7 +55,7 @@ public class MatchingController {
      */
     @Operation(summary = "Create matching", description = "새로운 매칭을 생성한다.")
     @PostMapping("/matching")
-    public FindMatchingDto createMatching(@Valid @RequestBody SaveMatchingDto saveMatchingDto, @Valid @RequestBody(required = false) AccommodationDto accommodationDto) {
+    public FindMatchingDto createMatching(@Valid @RequestBody SaveMatchingDto saveMatchingDto) {
         SecurityUser securityUser = AuthenticationUtils.getCurrentUserAuthentication();
         if (securityUser == null) {
             log.error("MatchingController::createMatching: Login is needed");
@@ -86,10 +86,12 @@ public FindMatchingDto createMatching(@Valid @RequestBody SaveMatchingDto saveMa
         matchingApplicationUsecase.createMatchingApplicationData(securityUser.getUserId(), saveMatchingApplicationDto);
 
         if (saveMatchingDto.getType().equals(MatchingTypeEnum.Accommodation)) {
-            if (accommodationDto == null) {
-                log.error("MatchingController::createMatching: Accommodation data not found");
-                throw new CustomException(ErrorCodeEnum.ACCOMMODATION_NOT_FOUND);
-            }
+            AccommodationDto accommodationDto = AccommodationDto.builder()
+                    .matchingId(findMatchingDto.getMatchingId())
+                    .price(saveMatchingDto.getPrice())
+                    .pricePerOne(saveMatchingDto.getPricePerOne())
+                    .room(saveMatchingDto.getRoom())
+                    .build();
             accommodationUsecase.createAccommodation(findMatchingDto.getMatchingId(), accommodationDto);
         }
         return findMatchingDto;

diff --git a/src/main/java/com/example/api/matching/dto/SaveMatchingDto.java b/src/main/java/com/example/api/matching/dto/SaveMatchingDto.java
@@ -55,6 +55,14 @@ public class SaveMatchingDto {
     @Min(0)
     private Integer plusAge;
 
+//    @Min(0)
+    private Integer price;
+
+//    @Min(0)
+    private Integer pricePerOne;
+
+    private String room;
+
     @NotNull
     @Min(0)
     private Integer readCount;