Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions application-admin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ dependencies {
implementation project(':domain-reservation') // 예약 관련 도메인
implementation project(':security-admin') // 인증 관련 도메인
implementation project(':infra-aws') // aws 관련 도메인
implementation project(':application-config')

// Spring Boot Starter
implementation 'org.springframework.boot:spring-boot-starter-web'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
@SpringBootApplication(scanBasePackages = {
"com.nowait.applicationadmin",
"com.nowait.infraaws",
"com.nowait.adminsecurity"
"com.nowait.adminsecurity",
"com.nowait.config"
})
@EntityScan(basePackages = {
"com.nowait.menu.entity",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public CorsConfigurationSource corsConfigurationSource() {
CorsConfiguration config = new CorsConfiguration();

config.setAllowCredentials(true); // 쿠키나 인증헤더 자격증명 허용
config.setAllowedOrigins(List.of("http://localhost:5173")); // 허용할 출처 설정
config.setAllowedOrigins(List.of("http://localhost:5173","http://localhost:63342")); // 허용할 출처 설정
config.setAllowedMethods(List.of("GET", "POST", "PATCH", "PUT", "DELETE", "OPTIONS")); // 메서드 허용
config.setAllowedHeaders(List.of("*")); //클라이언트가 보낼 수 있는 헤더
config.setExposedHeaders(List.of("Authorization")); //클라이언트(브라우저)가 접근할 수 있는 헤더 지정
Expand Down
1 change: 1 addition & 0 deletions application-user/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ dependencies {
implementation project(':infra-aws') // 사용자 관련 도메인
implementation project(':security-front') // 사용자 관련 도메인
implementation project(':external-oauth') // 외부 OAuth 관련 도메인
implementation project(':application-config')

// Spring Boot Starter
implementation 'org.springframework.boot:spring-boot-starter-web'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
@SpringBootApplication(scanBasePackages = {
"com.nowait.applicationuser",
"com.nowait.frontsecurity",
"com.nowait.externaloauth"
"com.nowait.externaloauth",
"com.nowait.config"
})
@EntityScan(basePackages = {
"com.nowait.menu.entity",
Expand All @@ -19,7 +20,6 @@
"com.nowait.user.entity",
"com.nowait.bookmark.entity",
"com.nowait.reservation.entity",
"com.nowait.order.entity",
"com.nowait.order.entity"
})
@EnableJpaRepositories(basePackages = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@ public class OrderCreateResponseDto {
private Long orderId; // 주문 ID // 주문 상태 (예: "주문완료", "배송중" 등)
private Long storeId; // 상점 ID
private String storeName; // 상점 이름
private String sessionId;
private List<OrderItemResponseDTO> orderItems; // 주문 항목 목록

public static OrderCreateResponseDto fromEntity(UserOrder order) {
return OrderCreateResponseDto.builder()
.orderId(order.getId())
.storeId(order.getStore().getStoreId())
.storeName(order.getStore().getName())
.sessionId(order.getSessionId())
.orderItems(List.of())
.build();
}
Expand Down