Feature/52 : core-server module add

expedia-server/booking-server/build.gradle

@@ -8,4 +8,5 @@ bootJar {
 
 dependencies {
     implementation project(':product-server')
+    implementation project(':core-server')
 }

expedia-server/booking-server/src/main/java/org/clonecoder/bookingserver/BookingServerApplication.java

@@ -6,9 +6,8 @@
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.stereotype.Component;
 
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = {"org.clonecoder.bookingserver", "org.clonecoder.productserver", "org.clonecoder.coreserver"})
 @EnableJpaAuditing
-@ComponentScan(basePackages = {"org.clonecoder.bookingserver", "org.clonecoder.productserver"})
 public class BookingServerApplication {
 
     public static void main(String[] args) {

expedia-server/booking-server/src/main/java/org/clonecoder/bookingserver/domain/booking/BookingService.java

@@ -1,6 +1,7 @@
 package org.clonecoder.bookingserver.domain.booking;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.clonecoder.bookingserver.domain.Booking;
 import org.clonecoder.bookingserver.domain.BookingGuests;
 import org.clonecoder.bookingserver.domain.command.BookingCommand;
@@ -14,6 +15,7 @@
 
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class BookingService {
     private final BookingStore bookingStore;
     private final AccommodationStore accommodationStore;
@@ -42,6 +44,7 @@ public Booking saveBooking(BookingCommand bookingCommand, List<BookingGuestsComm
         bookingStore.saveBookingGuests(bookingGuestsList);
 
         /* 예약건에 대한 재고 감소 */
+        log.info("resultBooking.getAccommodationRoomId() : " + resultBooking.getAccommodationRoomId());
         accommodationStore.stockDecrease(resultBooking.getAccommodationRoomId());
 
         return resultBooking;

expedia-server/booking-server/src/main/java/org/clonecoder/bookingserver/interfaces/controller/BookingController.java

@@ -2,13 +2,13 @@
 
 import lombok.RequiredArgsConstructor;
 import org.clonecoder.bookingserver.application.booking.BookingFacade;
-import org.clonecoder.bookingserver.common.CommonResponse;
-import org.clonecoder.bookingserver.common.ResponseDto;
 import org.clonecoder.bookingserver.domain.command.BookingCommand;
 import org.clonecoder.bookingserver.domain.command.BookingGuestsCommand;
 import org.clonecoder.bookingserver.interfaces.dto.RequestBookingDto;
 import org.clonecoder.bookingserver.interfaces.mapper.BookingDtoMapper;
 import org.clonecoder.bookingserver.interfaces.mapper.BookingGuestsDtoMapper;
+import org.clonecoder.coreserver.common.CommonResponse;
+import org.clonecoder.coreserver.common.ResponseDto;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

expedia-server/booking-server/src/test/java/org/clonecoder/bookingserver/BookingTest.java

@@ -0,0 +1,14 @@
+package org.clonecoder.bookingserver;
+
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.jdbc.Sql;
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@Sql({"classpath:accommodation/schema/accommodation.sql"
+        , "classpath:accommodation/data/accommodation_1.sql"
+        , "classpath:accommodation/data/accommodation_2.sql"
+        , "classpath:accommodation/data/accommodation_3.sql"
+        , "classpath:accommodation/data/accommodation_code.sql"}
+)
+public class BookingTest {
+}

expedia-server/booking-server/src/test/java/org/clonecoder/bookingserver/acceptance/AcceptanceTest.java

@@ -1,12 +1,12 @@
 package org.clonecoder.bookingserver.acceptance;
 
 import io.restassured.RestAssured;
+import org.clonecoder.bookingserver.BookingTest;
 import org.junit.jupiter.api.BeforeEach;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.web.server.LocalServerPort;
 
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-public class AcceptanceTest {
+public class AcceptanceTest extends BookingTest {
     @LocalServerPort
     private int port;
 

expedia-server/booking-server/src/test/java/org/clonecoder/bookingserver/documentation/Documentation.java

@@ -3,6 +3,7 @@
 import io.restassured.RestAssured;
 import io.restassured.builder.RequestSpecBuilder;
 import io.restassured.specification.RequestSpecification;
+import org.clonecoder.bookingserver.BookingTest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
@@ -11,12 +12,13 @@
 import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.restdocs.RestDocumentationContextProvider;
 import org.springframework.restdocs.RestDocumentationExtension;
+import org.springframework.test.context.jdbc.Sql;
+import org.springframework.transaction.annotation.Transactional;
 
 import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.documentationConfiguration;
 
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ExtendWith(RestDocumentationExtension.class) // 스니펫 생성을 위한 선언
-public class Documentation {
+public class Documentation extends BookingTest {
     @LocalServerPort
     int port;
 

expedia-server/booking-server/src/test/java/org/clonecoder/bookingserver/param/ParamMap.java

@@ -24,7 +24,7 @@ public final class ParamMap {
     private static Map<String, Object> 예약_정보_셋팅() {
         Map<String, Object> params = new HashMap<>();
         params.put("bookingNo", "A25BD-20220928");
-        params.put("accommodationRoomId", 9);
+        params.put("accommodationRoomId", 1L);
         params.put("bookingUserId", "test1234");
         params.put("bookingLastName", "KIM");
         params.put("bookingFirstName", "SEOHAE");

expedia-server/booking-server/src/test/java/org/clonecoder/bookingserver/unit/domain/booking/BookingServiceTest.java

@@ -1,5 +1,6 @@
 package org.clonecoder.bookingserver.unit.domain.booking;
 
+import org.clonecoder.bookingserver.BookingTest;
 import org.clonecoder.bookingserver.domain.Booking;
 import org.clonecoder.bookingserver.domain.BookingGuests;
 import org.clonecoder.bookingserver.domain.booking.BookingService;
@@ -26,9 +27,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.clonecoder.bookingserver.param.ParamDto.예약_생성_정보_셋팅;
 
-@SpringBootTest
-@Sql({"classpath:accommodation/schema/accommodation.sql", "classpath:accommodation/data/accommodation_1.sql"})
-class BookingServiceTest {
+class BookingServiceTest extends BookingTest {
     @Autowired
     private BookingService bookingService;
 
@@ -70,10 +69,13 @@ void setUp() {
 
         // then
         Optional<Booking> findBooking = bookingRepository.findById(resultBooking.getId());
-        List<BookingGuests> findBookingGuests = bookingGuestsRepository.findAll();
+        List<BookingGuests> findBookingGuests =
+                bookingGuestsRepository.findAll().stream()
+                        .filter(bookingGuests -> bookingGuests.getBooking().getId().equals(resultBooking.getId()))
+                        .collect(Collectors.toList());
 
         // 1) 원하는 예약이 생성됨
-        assertThat(findBooking.get().getId()).isEqualTo(findBookingGuests.get(0).getBooking().getId());
+        assertThat(resultBooking.getId()).isEqualTo(findBookingGuests.get(0).getBooking().getId());
 
         // 2) 예약한 게스트 수가 일치해야함
         assertThat(findBookingGuests.size()).isEqualTo(requestBookingSaveDto.getBookingGuestsDtoList().size());

expedia-server/core-server/build.gradle

@@ -0,0 +1,10 @@
+jar {
+    enabled = true
+}
+
+bootJar {
+    enabled = true
+}
+
+dependencies {
+}

expedia-server/core-server/src/main/java/org/clonecoder/coreserver/CoreServerApplication.java

@@ -0,0 +1,13 @@
+package org.clonecoder.coreserver;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class CoreServerApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(CoreServerApplication.class, args);
+    }
+
+}

expedia-server/booking-server/src/main/java/org/clonecoder/bookingserver/common/CommonResponse.java → expedia-server/core-server/src/main/java/org/clonecoder/coreserver/common/CommonResponse.java

@@ -1,6 +1,6 @@
-package org.clonecoder.bookingserver.common;
+package org.clonecoder.coreserver.common;
 
-import org.clonecoder.bookingserver.common.enums.ExceptionMessage;
+import org.clonecoder.coreserver.common.enums.ExceptionMessage;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 

expedia-server/booking-server/src/main/java/org/clonecoder/bookingserver/common/ResponseDto.java → expedia-server/core-server/src/main/java/org/clonecoder/coreserver/common/ResponseDto.java

@@ -1,4 +1,4 @@
-package org.clonecoder.bookingserver.common;
+package org.clonecoder.coreserver.common;
 
 import lombok.Builder;
 import lombok.Getter;

expedia-server/product-server/src/main/java/org/clonecoder/productserver/common/enums/ExceptionMessage.java → expedia-server/core-server/src/main/java/org/clonecoder/coreserver/common/enums/ExceptionMessage.java

@@ -1,4 +1,4 @@
-package org.clonecoder.productserver.common.enums;
+package org.clonecoder.coreserver.common.enums;
 
 import lombok.Getter;
 

expedia-server/product-server/src/main/java/org/clonecoder/productserver/common/exception/BadRequestException.java → expedia-server/core-server/src/main/java/org/clonecoder/coreserver/common/exception/BadRequestException.java

@@ -1,7 +1,7 @@
-package org.clonecoder.productserver.common.exception;
+package org.clonecoder.coreserver.common.exception;
 
 import lombok.Getter;
-import org.clonecoder.productserver.common.enums.ExceptionMessage;
+import org.clonecoder.coreserver.common.enums.ExceptionMessage;
 
 public class BadRequestException extends RuntimeException {
     @Getter

expedia-server/booking-server/src/main/java/org/clonecoder/bookingserver/common/exception/CommonExceptionHandler.java → expedia-server/core-server/src/main/java/org/clonecoder/coreserver/common/exception/CommonExceptionHandler.java

@@ -1,9 +1,9 @@
-package org.clonecoder.bookingserver.common.exception;
+package org.clonecoder.coreserver.common.exception;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.clonecoder.bookingserver.common.CommonResponse;
-import org.clonecoder.bookingserver.common.enums.ExceptionMessage;
+import org.clonecoder.coreserver.common.CommonResponse;
+import org.clonecoder.coreserver.common.enums.ExceptionMessage;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ExceptionHandler;

expedia-server/core-server/src/main/resources/application.yml

@@ -0,0 +1 @@
+

expedia-server/core-server/src/test/java/org/clonecoder/coreserver/CoreServerApplicationTests.java

@@ -0,0 +1,13 @@
+package org.clonecoder.coreserver;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class CoreServerApplicationTests {
+
+    @Test
+    void contextLoads() {
+    }
+
+}

expedia-server/product-server/build.gradle

@@ -1,12 +1,14 @@
 jar {
-    enabled = false
+    enabled = true
 }
 
 bootJar {
     enabled = true
 }
 
 dependencies {
+    implementation project(':core-server')
+
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
     implementation 'org.redisson:redisson-spring-boot-starter:3.17.7'
 }

expedia-server/product-server/src/main/java/org/clonecoder/productserver/ProductServerApplication.java

@@ -2,8 +2,16 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
-@SpringBootApplication
+@SpringBootApplication(
+    scanBasePackages = {
+            "org.clonecoder.productserver",
+            "org.clonecoder.coreserver",
+    }
+)
 public class ProductServerApplication {
 
     public static void main(String[] args) {