diff --git a/api-admin/src/main/java/com/example/apiadmin/store/service/StoreService.java b/api-admin/src/main/java/com/example/apiadmin/store/service/StoreService.java deleted file mode 100644 index 6b230d4b..00000000 --- a/api-admin/src/main/java/com/example/apiadmin/store/service/StoreService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.example.apiadmin.store.service; - -import com.example.apiadmin.store.dto.StoreCreateRequest; -import com.example.apiadmin.store.dto.StoreCreateResponse; -import com.example.apiadmin.store.dto.StoreReadDto; -import com.example.apiadmin.store.dto.StoreUpdateRequest; - -public interface StoreService { - - StoreCreateResponse createStore(StoreCreateRequest request); - - StoreReadDto getStoreByStoreId(Long storeId); - - StoreReadDto updateStore(Long storeId, StoreUpdateRequest request); - - String deleteStore(Long storeId); - - Boolean toggleActive(Long storeId); -} diff --git a/api-user/src/main/java/com/example/apiuser/ApiUserApplication.java b/api-user/src/main/java/com/example/apiuser/ApiUserApplication.java deleted file mode 100644 index fcaf441e..00000000 --- a/api-user/src/main/java/com/example/apiuser/ApiUserApplication.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.example.apiuser; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.data.jpa.repository.config.EnableJpaAuditing; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; - -@EnableJpaAuditing -@SpringBootApplication(scanBasePackages = { - "com.example.apiuser", - "com.nowait.auth" -}) -@EntityScan(basePackages = { - "com.example.menu.entity", // domain-menu - "com.example.domainstore.entity", // domain-store - "com.example.domaintoken.entity", - "com.nowaiting.user.entity", - "com.nowait.domainbookmark.entity", - "com.nowait.domainreservation.entity", - "com.nowait.domainorder.entity", - "com.nowait.domainorder.entity" -}) -@EnableJpaRepositories(basePackages = { - "com.example.menu.repository", - "com.nowaiting.user.repository", - "com.example.domainstore.repository", - "com.example.domaintoken.repository", - "com.nowait.domainbookmark.repository", - "com.nowait.domainorder.repository", - "com.nowait.domainreservation.repository" -}) -public class ApiUserApplication { - - public static void main(String[] args) { - SpringApplication.run(ApiUserApplication.class, args); - } - -} diff --git a/api-admin/.gitattributes b/application-admin/.gitattributes similarity index 100% rename from api-admin/.gitattributes rename to application-admin/.gitattributes diff --git a/api-admin/.gitignore b/application-admin/.gitignore similarity index 100% rename from api-admin/.gitignore rename to application-admin/.gitignore diff --git a/api-admin/build.gradle b/application-admin/build.gradle similarity index 100% rename from api-admin/build.gradle rename to application-admin/build.gradle diff --git a/api-admin/src/main/java/com/example/apiadmin/ApiAdminApplication.java b/application-admin/src/main/java/com/nowait/applicationadmin/ApiAdminApplication.java similarity index 51% rename from api-admin/src/main/java/com/example/apiadmin/ApiAdminApplication.java rename to application-admin/src/main/java/com/nowait/applicationadmin/ApiAdminApplication.java index 29363011..5f43869a 100644 --- a/api-admin/src/main/java/com/example/apiadmin/ApiAdminApplication.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/ApiAdminApplication.java @@ -1,4 +1,4 @@ -package com.example.apiadmin; +package com.nowait.applicationadmin; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.domain.EntityScan; @@ -7,27 +7,26 @@ @EnableJpaAuditing @SpringBootApplication(scanBasePackages = { - "com.example.apiadmin", - "com.example.infrastorage", + "com.nowait.applicationadmin", + "com.nowait.infraaws", "com.nowait.adminsecurity" }) @EntityScan(basePackages = { - "com.example.menu.entity", // domain-menu - "com.example.domainstore.entity", // domain-store - "com.example.domaintoken.entity", - "com.nowaiting.user.entity", - "com.nowait.domainreservation.entity", - "com.nowait.domainorder.entity", - "com.nowait.domainorder.entity" + "com.nowait.menu.entity", + "com.nowait.store.entity", + "com.nowait.token.entity", + "com.nowait.user.entity", + "com.nowait.reservation.entity", + "com.nowait.order.entity" }) @EnableJpaRepositories(basePackages = { - "com.example.menu.repository", - "com.nowaiting.user.repository", - "com.example.domainstore.repository", - "com.example.domaintoken.repository", - "com.nowait.domainorder.repository", - "com.nowait.domainreservation.repository" + "com.nowait.menu.repository", + "com.nowait.user.repository", + "com.nowait.store.repository", + "com.nowait.token.repository", + "com.nowait.order.repository", + "com.nowait.reservation.repository" }) public class ApiAdminApplication { public static void main(String[] args) { diff --git a/api-admin/src/main/java/com/example/apiadmin/exception/GlobalExceptionHandler.java b/application-admin/src/main/java/com/nowait/applicationadmin/exception/GlobalExceptionHandler.java similarity index 89% rename from api-admin/src/main/java/com/example/apiadmin/exception/GlobalExceptionHandler.java rename to application-admin/src/main/java/com/nowait/applicationadmin/exception/GlobalExceptionHandler.java index 5c5c5c1d..2ccd5726 100644 --- a/api-admin/src/main/java/com/example/apiadmin/exception/GlobalExceptionHandler.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/exception/GlobalExceptionHandler.java @@ -1,6 +1,6 @@ -package com.example.apiadmin.exception; +package com.nowait.applicationadmin.exception; -import static com.nowaiting.common.exception.ErrorMessage.*; +import static com.nowait.common.exception.ErrorMessage.*; import static org.springframework.http.HttpStatus.UNAUTHORIZED; import static org.springframework.http.HttpStatus.*; @@ -17,16 +17,16 @@ import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.multipart.MultipartException; -import com.example.apiadmin.reservation.exception.ReservationNotFoundException; -import com.example.domaintoken.exception.BusinessException; +import com.nowait.applicationadmin.reservation.exception.ReservationNotFoundException; +import com.nowait.token.exception.BusinessException; import com.nowait.adminsecurity.exception.ResourceNotFoundException; import com.nowait.adminsecurity.exception.UnauthorizedException; -import com.nowait.domainorder.exception.DuplicateOrderException; -import com.nowait.domainorder.exception.OrderItemsEmptyException; -import com.nowait.domainorder.exception.OrderParameterEmptyException; -import com.nowaiting.common.exception.ErrorMessage; -import com.nowaiting.common.exception.ErrorResponse; -import com.nowaiting.user.exception.UserNotFoundException; +import com.nowait.order.exception.DuplicateOrderException; +import com.nowait.order.exception.OrderItemsEmptyException; +import com.nowait.order.exception.OrderParameterEmptyException; +import com.nowait.common.exception.ErrorMessage; +import com.nowait.common.exception.ErrorResponse; +import com.nowait.user.exception.UserNotFoundException; import io.swagger.v3.oas.annotations.Hidden; import lombok.extern.slf4j.Slf4j; diff --git a/api-admin/src/main/java/com/example/apiadmin/menu/controller/MenuController.java b/application-admin/src/main/java/com/nowait/applicationadmin/menu/controller/MenuController.java similarity index 87% rename from api-admin/src/main/java/com/example/apiadmin/menu/controller/MenuController.java rename to application-admin/src/main/java/com/nowait/applicationadmin/menu/controller/MenuController.java index bc709367..f93eb255 100644 --- a/api-admin/src/main/java/com/example/apiadmin/menu/controller/MenuController.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/menu/controller/MenuController.java @@ -1,4 +1,4 @@ -package com.example.apiadmin.menu.controller; +package com.nowait.applicationadmin.menu.controller; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -11,11 +11,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.example.apiadmin.menu.dto.MenuCreateRequest; -import com.example.apiadmin.menu.dto.MenuCreateResponse; -import com.example.apiadmin.menu.dto.MenuUpdateRequest; -import com.example.apiadmin.menu.service.MenuService; -import com.nowaiting.common.api.ApiUtils; +import com.nowait.applicationadmin.menu.dto.MenuCreateRequest; +import com.nowait.applicationadmin.menu.dto.MenuCreateResponse; +import com.nowait.applicationadmin.menu.dto.MenuUpdateRequest; +import com.nowait.applicationadmin.menu.service.MenuService; +import com.nowait.common.api.ApiUtils; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/api-admin/src/main/java/com/example/apiadmin/menu/controller/MenuImageController.java b/application-admin/src/main/java/com/nowait/applicationadmin/menu/controller/MenuImageController.java similarity index 87% rename from api-admin/src/main/java/com/example/apiadmin/menu/controller/MenuImageController.java rename to application-admin/src/main/java/com/nowait/applicationadmin/menu/controller/MenuImageController.java index a64d8bca..286b3915 100644 --- a/api-admin/src/main/java/com/example/apiadmin/menu/controller/MenuImageController.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/menu/controller/MenuImageController.java @@ -1,4 +1,4 @@ -package com.example.apiadmin.menu.controller; +package com.nowait.applicationadmin.menu.controller; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -10,9 +10,9 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.example.apiadmin.menu.dto.MenuImageUploadResponse; -import com.example.apiadmin.menu.service.MenuImageService; -import com.nowaiting.common.api.ApiUtils; +import com.nowait.applicationadmin.menu.dto.MenuImageUploadResponse; +import com.nowait.applicationadmin.menu.service.MenuImageService; +import com.nowait.common.api.ApiUtils; import lombok.RequiredArgsConstructor; diff --git a/api-admin/src/main/java/com/example/apiadmin/menu/dto/MenuCreateRequest.java b/application-admin/src/main/java/com/nowait/applicationadmin/menu/dto/MenuCreateRequest.java similarity index 87% rename from api-admin/src/main/java/com/example/apiadmin/menu/dto/MenuCreateRequest.java rename to application-admin/src/main/java/com/nowait/applicationadmin/menu/dto/MenuCreateRequest.java index 3dc462d2..7ac4bfe8 100644 --- a/api-admin/src/main/java/com/example/apiadmin/menu/dto/MenuCreateRequest.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/menu/dto/MenuCreateRequest.java @@ -1,7 +1,7 @@ -package com.example.apiadmin.menu.dto; +package com.nowait.applicationadmin.menu.dto; -import com.example.menu.entity.Menu; +import com.nowait.menu.entity.Menu; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; diff --git a/api-admin/src/main/java/com/example/apiadmin/menu/dto/MenuCreateResponse.java b/application-admin/src/main/java/com/nowait/applicationadmin/menu/dto/MenuCreateResponse.java similarity index 90% rename from api-admin/src/main/java/com/example/apiadmin/menu/dto/MenuCreateResponse.java rename to application-admin/src/main/java/com/nowait/applicationadmin/menu/dto/MenuCreateResponse.java index c2d59e7f..35700684 100644 --- a/api-admin/src/main/java/com/example/apiadmin/menu/dto/MenuCreateResponse.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/menu/dto/MenuCreateResponse.java @@ -1,8 +1,8 @@ -package com.example.apiadmin.menu.dto; +package com.nowait.applicationadmin.menu.dto; import java.time.LocalDateTime; -import com.example.menu.entity.Menu; +import com.nowait.menu.entity.Menu; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/api-admin/src/main/java/com/example/apiadmin/menu/dto/MenuImageUploadResponse.java b/application-admin/src/main/java/com/nowait/applicationadmin/menu/dto/MenuImageUploadResponse.java similarity index 80% rename from api-admin/src/main/java/com/example/apiadmin/menu/dto/MenuImageUploadResponse.java rename to application-admin/src/main/java/com/nowait/applicationadmin/menu/dto/MenuImageUploadResponse.java index 44db28d4..b73755ed 100644 --- a/api-admin/src/main/java/com/example/apiadmin/menu/dto/MenuImageUploadResponse.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/menu/dto/MenuImageUploadResponse.java @@ -1,6 +1,6 @@ -package com.example.apiadmin.menu.dto; +package com.nowait.applicationadmin.menu.dto; -import com.example.menu.entity.MenuImage; +import com.nowait.menu.entity.MenuImage; import lombok.Builder; import lombok.Getter; diff --git a/api-user/src/main/java/com/example/apiuser/menu/dto/MenuReadDto.java b/application-admin/src/main/java/com/nowait/applicationadmin/menu/dto/MenuReadDto.java similarity index 90% rename from api-user/src/main/java/com/example/apiuser/menu/dto/MenuReadDto.java rename to application-admin/src/main/java/com/nowait/applicationadmin/menu/dto/MenuReadDto.java index 1206b870..c4e89b08 100644 --- a/api-user/src/main/java/com/example/apiuser/menu/dto/MenuReadDto.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/menu/dto/MenuReadDto.java @@ -1,8 +1,8 @@ -package com.example.apiuser.menu.dto; +package com.nowait.applicationadmin.menu.dto; import java.util.List; -import com.example.menu.entity.Menu; +import com.nowait.menu.entity.Menu; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/api-user/src/main/java/com/example/apiuser/menu/dto/MenuReadResponse.java b/application-admin/src/main/java/com/nowait/applicationadmin/menu/dto/MenuReadResponse.java similarity index 88% rename from api-user/src/main/java/com/example/apiuser/menu/dto/MenuReadResponse.java rename to application-admin/src/main/java/com/nowait/applicationadmin/menu/dto/MenuReadResponse.java index 755b243f..61c206e1 100644 --- a/api-user/src/main/java/com/example/apiuser/menu/dto/MenuReadResponse.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/menu/dto/MenuReadResponse.java @@ -1,4 +1,4 @@ -package com.example.apiuser.menu.dto; +package com.nowait.applicationadmin.menu.dto; import java.util.List; diff --git a/api-admin/src/main/java/com/example/apiadmin/menu/dto/MenuUpdateRequest.java b/application-admin/src/main/java/com/nowait/applicationadmin/menu/dto/MenuUpdateRequest.java similarity index 85% rename from api-admin/src/main/java/com/example/apiadmin/menu/dto/MenuUpdateRequest.java rename to application-admin/src/main/java/com/nowait/applicationadmin/menu/dto/MenuUpdateRequest.java index bdee0e15..3f2878aa 100644 --- a/api-admin/src/main/java/com/example/apiadmin/menu/dto/MenuUpdateRequest.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/menu/dto/MenuUpdateRequest.java @@ -1,4 +1,4 @@ -package com.example.apiadmin.menu.dto; +package com.nowait.applicationadmin.menu.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/api-admin/src/main/java/com/example/apiadmin/menu/service/MenuImageService.java b/application-admin/src/main/java/com/nowait/applicationadmin/menu/service/MenuImageService.java similarity index 79% rename from api-admin/src/main/java/com/example/apiadmin/menu/service/MenuImageService.java rename to application-admin/src/main/java/com/nowait/applicationadmin/menu/service/MenuImageService.java index 5aec2e7a..bc884793 100644 --- a/api-admin/src/main/java/com/example/apiadmin/menu/service/MenuImageService.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/menu/service/MenuImageService.java @@ -1,15 +1,15 @@ -package com.example.apiadmin.menu.service; +package com.nowait.applicationadmin.menu.service; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import com.example.apiadmin.menu.dto.MenuImageUploadResponse; -import com.example.infrastorage.s3.S3Service; -import com.example.menu.entity.Menu; -import com.example.menu.entity.MenuImage; -import com.example.menu.repository.MenuImageRepository; -import com.example.menu.repository.MenuRepository; +import com.nowait.applicationadmin.menu.dto.MenuImageUploadResponse; +import com.nowait.infraaws.s3.S3Service; +import com.nowait.menu.entity.Menu; +import com.nowait.menu.entity.MenuImage; +import com.nowait.menu.repository.MenuImageRepository; +import com.nowait.menu.repository.MenuRepository; import lombok.RequiredArgsConstructor; diff --git a/api-admin/src/main/java/com/example/apiadmin/menu/service/MenuService.java b/application-admin/src/main/java/com/nowait/applicationadmin/menu/service/MenuService.java similarity index 82% rename from api-admin/src/main/java/com/example/apiadmin/menu/service/MenuService.java rename to application-admin/src/main/java/com/nowait/applicationadmin/menu/service/MenuService.java index cf8fde2d..d5afc825 100644 --- a/api-admin/src/main/java/com/example/apiadmin/menu/service/MenuService.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/menu/service/MenuService.java @@ -1,20 +1,20 @@ -package com.example.apiadmin.menu.service; +package com.nowait.applicationadmin.menu.service; import java.util.List; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.example.apiadmin.menu.dto.MenuCreateRequest; -import com.example.apiadmin.menu.dto.MenuCreateResponse; -import com.example.apiadmin.menu.dto.MenuImageUploadResponse; -import com.example.apiadmin.menu.dto.MenuReadDto; -import com.example.apiadmin.menu.dto.MenuReadResponse; -import com.example.apiadmin.menu.dto.MenuUpdateRequest; -import com.example.menu.entity.Menu; -import com.example.menu.entity.MenuImage; -import com.example.menu.repository.MenuImageRepository; -import com.example.menu.repository.MenuRepository; +import com.nowait.applicationadmin.menu.dto.MenuCreateRequest; +import com.nowait.applicationadmin.menu.dto.MenuCreateResponse; +import com.nowait.applicationadmin.menu.dto.MenuImageUploadResponse; +import com.nowait.applicationadmin.menu.dto.MenuReadDto; +import com.nowait.applicationadmin.menu.dto.MenuReadResponse; +import com.nowait.applicationadmin.menu.dto.MenuUpdateRequest; +import com.nowait.menu.entity.Menu; +import com.nowait.menu.entity.MenuImage; +import com.nowait.menu.repository.MenuImageRepository; +import com.nowait.menu.repository.MenuRepository; import lombok.RequiredArgsConstructor; diff --git a/api-admin/src/main/java/com/example/apiadmin/order/controller/OrderController.java b/application-admin/src/main/java/com/nowait/applicationadmin/order/controller/OrderController.java similarity index 87% rename from api-admin/src/main/java/com/example/apiadmin/order/controller/OrderController.java rename to application-admin/src/main/java/com/nowait/applicationadmin/order/controller/OrderController.java index 69c7e3f8..2adb243b 100644 --- a/api-admin/src/main/java/com/example/apiadmin/order/controller/OrderController.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/order/controller/OrderController.java @@ -1,4 +1,4 @@ -package com.example.apiadmin.order.controller; +package com.nowait.applicationadmin.order.controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/api-admin/src/main/java/com/example/apiadmin/reservation/controller/ReservationController.java b/application-admin/src/main/java/com/nowait/applicationadmin/reservation/controller/ReservationController.java similarity index 83% rename from api-admin/src/main/java/com/example/apiadmin/reservation/controller/ReservationController.java rename to application-admin/src/main/java/com/nowait/applicationadmin/reservation/controller/ReservationController.java index db32a09f..b29d3b56 100644 --- a/api-admin/src/main/java/com/example/apiadmin/reservation/controller/ReservationController.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/reservation/controller/ReservationController.java @@ -1,4 +1,4 @@ -package com.example.apiadmin.reservation.controller; +package com.nowait.applicationadmin.reservation.controller; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -9,11 +9,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.example.apiadmin.reservation.dto.CallGetResponseDto; -import com.example.apiadmin.reservation.dto.ReservationStatusSummaryDto; -import com.example.apiadmin.reservation.dto.ReservationStatusUpdateRequestDto; -import com.example.apiadmin.reservation.service.ReservationService; -import com.nowaiting.common.api.ApiUtils; +import com.nowait.applicationadmin.reservation.dto.CallGetResponseDto; +import com.nowait.applicationadmin.reservation.dto.ReservationStatusSummaryDto; +import com.nowait.applicationadmin.reservation.dto.ReservationStatusUpdateRequestDto; +import com.nowait.applicationadmin.reservation.service.ReservationService; +import com.nowait.common.api.ApiUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/api-admin/src/main/java/com/example/apiadmin/reservation/dto/CallGetResponseDto.java b/application-admin/src/main/java/com/nowait/applicationadmin/reservation/dto/CallGetResponseDto.java similarity index 86% rename from api-admin/src/main/java/com/example/apiadmin/reservation/dto/CallGetResponseDto.java rename to application-admin/src/main/java/com/nowait/applicationadmin/reservation/dto/CallGetResponseDto.java index 927638ee..6d366830 100644 --- a/api-admin/src/main/java/com/example/apiadmin/reservation/dto/CallGetResponseDto.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/reservation/dto/CallGetResponseDto.java @@ -1,8 +1,8 @@ -package com.example.apiadmin.reservation.dto; +package com.nowait.applicationadmin.reservation.dto; import java.time.LocalDateTime; -import com.nowait.domainreservation.entity.Reservation; +import com.nowait.reservation.entity.Reservation; import lombok.Builder; import lombok.Getter; diff --git a/api-admin/src/main/java/com/example/apiadmin/reservation/dto/ReservationGetResponseDto.java b/application-admin/src/main/java/com/nowait/applicationadmin/reservation/dto/ReservationGetResponseDto.java similarity index 87% rename from api-admin/src/main/java/com/example/apiadmin/reservation/dto/ReservationGetResponseDto.java rename to application-admin/src/main/java/com/nowait/applicationadmin/reservation/dto/ReservationGetResponseDto.java index 3f7aca3d..00022384 100644 --- a/api-admin/src/main/java/com/example/apiadmin/reservation/dto/ReservationGetResponseDto.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/reservation/dto/ReservationGetResponseDto.java @@ -1,8 +1,8 @@ -package com.example.apiadmin.reservation.dto; +package com.nowait.applicationadmin.reservation.dto; import java.time.LocalDateTime; -import com.nowait.domainreservation.entity.Reservation; +import com.nowait.reservation.entity.Reservation; import lombok.Builder; import lombok.Getter; diff --git a/api-admin/src/main/java/com/example/apiadmin/reservation/dto/ReservationStatusSummaryDto.java b/application-admin/src/main/java/com/nowait/applicationadmin/reservation/dto/ReservationStatusSummaryDto.java similarity index 87% rename from api-admin/src/main/java/com/example/apiadmin/reservation/dto/ReservationStatusSummaryDto.java rename to application-admin/src/main/java/com/nowait/applicationadmin/reservation/dto/ReservationStatusSummaryDto.java index 3cd9d406..7c49552b 100644 --- a/api-admin/src/main/java/com/example/apiadmin/reservation/dto/ReservationStatusSummaryDto.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/reservation/dto/ReservationStatusSummaryDto.java @@ -1,4 +1,4 @@ -package com.example.apiadmin.reservation.dto; +package com.nowait.applicationadmin.reservation.dto; import java.util.List; diff --git a/api-admin/src/main/java/com/example/apiadmin/reservation/dto/ReservationStatusUpdateRequestDto.java b/application-admin/src/main/java/com/nowait/applicationadmin/reservation/dto/ReservationStatusUpdateRequestDto.java similarity index 59% rename from api-admin/src/main/java/com/example/apiadmin/reservation/dto/ReservationStatusUpdateRequestDto.java rename to application-admin/src/main/java/com/nowait/applicationadmin/reservation/dto/ReservationStatusUpdateRequestDto.java index 688e4c7f..161eed90 100644 --- a/api-admin/src/main/java/com/example/apiadmin/reservation/dto/ReservationStatusUpdateRequestDto.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/reservation/dto/ReservationStatusUpdateRequestDto.java @@ -1,6 +1,6 @@ -package com.example.apiadmin.reservation.dto; +package com.nowait.applicationadmin.reservation.dto; -import com.nowaiting.common.enums.ReservationStatus; +import com.nowait.common.enums.ReservationStatus; import lombok.Builder; import lombok.Getter; diff --git a/api-admin/src/main/java/com/example/apiadmin/reservation/exception/ReservationNotFoundException.java b/application-admin/src/main/java/com/nowait/applicationadmin/reservation/exception/ReservationNotFoundException.java similarity index 61% rename from api-admin/src/main/java/com/example/apiadmin/reservation/exception/ReservationNotFoundException.java rename to application-admin/src/main/java/com/nowait/applicationadmin/reservation/exception/ReservationNotFoundException.java index 0f9c37ad..491cc3f6 100644 --- a/api-admin/src/main/java/com/example/apiadmin/reservation/exception/ReservationNotFoundException.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/reservation/exception/ReservationNotFoundException.java @@ -1,6 +1,6 @@ -package com.example.apiadmin.reservation.exception; +package com.nowait.applicationadmin.reservation.exception; -import com.nowaiting.common.exception.ErrorMessage; +import com.nowait.common.exception.ErrorMessage; public class ReservationNotFoundException extends RuntimeException { public ReservationNotFoundException() { diff --git a/api-admin/src/main/java/com/example/apiadmin/reservation/service/ReservationService.java b/application-admin/src/main/java/com/nowait/applicationadmin/reservation/service/ReservationService.java similarity index 73% rename from api-admin/src/main/java/com/example/apiadmin/reservation/service/ReservationService.java rename to application-admin/src/main/java/com/nowait/applicationadmin/reservation/service/ReservationService.java index e0bfbfd5..ee9831e9 100644 --- a/api-admin/src/main/java/com/example/apiadmin/reservation/service/ReservationService.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/reservation/service/ReservationService.java @@ -1,4 +1,4 @@ -package com.example.apiadmin.reservation.service; +package com.nowait.applicationadmin.reservation.service; import java.util.ArrayList; import java.util.List; @@ -6,15 +6,14 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.example.apiadmin.reservation.dto.CallGetResponseDto; -import com.example.apiadmin.reservation.dto.ReservationGetResponseDto; -import com.example.apiadmin.reservation.dto.ReservationStatusSummaryDto; -import com.example.apiadmin.reservation.dto.ReservationStatusUpdateRequestDto; -import com.example.apiadmin.reservation.exception.ReservationNotFoundException; -import com.example.domainstore.repository.StoreRepository; -import com.nowait.domainreservation.entity.Reservation; -import com.nowait.domainreservation.repository.ReservationRepository; -import com.nowaiting.common.enums.ReservationStatus; +import com.nowait.applicationadmin.reservation.dto.CallGetResponseDto; +import com.nowait.applicationadmin.reservation.dto.ReservationGetResponseDto; +import com.nowait.applicationadmin.reservation.dto.ReservationStatusSummaryDto; +import com.nowait.applicationadmin.reservation.dto.ReservationStatusUpdateRequestDto; +import com.nowait.applicationadmin.reservation.exception.ReservationNotFoundException; +import com.nowait.reservation.entity.Reservation; +import com.nowait.reservation.repository.ReservationRepository; +import com.nowait.common.enums.ReservationStatus; import lombok.RequiredArgsConstructor; diff --git a/api-admin/src/main/java/com/example/apiadmin/store/controller/StoreController.java b/application-admin/src/main/java/com/nowait/applicationadmin/store/controller/StoreController.java similarity index 85% rename from api-admin/src/main/java/com/example/apiadmin/store/controller/StoreController.java rename to application-admin/src/main/java/com/nowait/applicationadmin/store/controller/StoreController.java index fac4a429..f9ee3a27 100644 --- a/api-admin/src/main/java/com/example/apiadmin/store/controller/StoreController.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/store/controller/StoreController.java @@ -1,4 +1,4 @@ -package com.example.apiadmin.store.controller; +package com.nowait.applicationadmin.store.controller; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -11,11 +11,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.example.apiadmin.store.dto.StoreCreateRequest; -import com.example.apiadmin.store.dto.StoreCreateResponse; -import com.example.apiadmin.store.dto.StoreUpdateRequest; -import com.example.apiadmin.store.service.StoreService; -import com.nowaiting.common.api.ApiUtils; +import com.nowait.applicationadmin.store.dto.StoreCreateRequest; +import com.nowait.applicationadmin.store.dto.StoreCreateResponse; +import com.nowait.applicationadmin.store.dto.StoreUpdateRequest; +import com.nowait.applicationadmin.store.service.StoreService; +import com.nowait.common.api.ApiUtils; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/api-admin/src/main/java/com/example/apiadmin/store/controller/StoreImageController.java b/application-admin/src/main/java/com/nowait/applicationadmin/store/controller/StoreImageController.java similarity index 89% rename from api-admin/src/main/java/com/example/apiadmin/store/controller/StoreImageController.java rename to application-admin/src/main/java/com/nowait/applicationadmin/store/controller/StoreImageController.java index 61bfbb34..b3547d03 100644 --- a/api-admin/src/main/java/com/example/apiadmin/store/controller/StoreImageController.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/store/controller/StoreImageController.java @@ -1,4 +1,4 @@ -package com.example.apiadmin.store.controller; +package com.nowait.applicationadmin.store.controller; import java.util.List; @@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.example.apiadmin.store.dto.StoreImageUploadResponse; -import com.example.apiadmin.store.service.StoreImageService; -import com.nowaiting.common.api.ApiUtils; +import com.nowait.applicationadmin.store.dto.StoreImageUploadResponse; +import com.nowait.applicationadmin.store.service.StoreImageService; +import com.nowait.common.api.ApiUtils; import lombok.RequiredArgsConstructor; diff --git a/api-admin/src/main/java/com/example/apiadmin/store/dto/StoreCreateRequest.java b/application-admin/src/main/java/com/nowait/applicationadmin/store/dto/StoreCreateRequest.java similarity index 87% rename from api-admin/src/main/java/com/example/apiadmin/store/dto/StoreCreateRequest.java rename to application-admin/src/main/java/com/nowait/applicationadmin/store/dto/StoreCreateRequest.java index 5fa790f0..fb4f58a4 100644 --- a/api-admin/src/main/java/com/example/apiadmin/store/dto/StoreCreateRequest.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/store/dto/StoreCreateRequest.java @@ -1,6 +1,6 @@ -package com.example.apiadmin.store.dto; +package com.nowait.applicationadmin.store.dto; -import com.example.domainstore.entity.Store; +import com.nowait.store.entity.Store; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/api-admin/src/main/java/com/example/apiadmin/store/dto/StoreCreateResponse.java b/application-admin/src/main/java/com/nowait/applicationadmin/store/dto/StoreCreateResponse.java similarity index 90% rename from api-admin/src/main/java/com/example/apiadmin/store/dto/StoreCreateResponse.java rename to application-admin/src/main/java/com/nowait/applicationadmin/store/dto/StoreCreateResponse.java index f1c359ec..2356d469 100644 --- a/api-admin/src/main/java/com/example/apiadmin/store/dto/StoreCreateResponse.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/store/dto/StoreCreateResponse.java @@ -1,8 +1,8 @@ -package com.example.apiadmin.store.dto; +package com.nowait.applicationadmin.store.dto; import java.time.LocalDateTime; -import com.example.domainstore.entity.Store; +import com.nowait.store.entity.Store; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/api-admin/src/main/java/com/example/apiadmin/store/dto/StoreImageUploadResponse.java b/application-admin/src/main/java/com/nowait/applicationadmin/store/dto/StoreImageUploadResponse.java similarity index 80% rename from api-admin/src/main/java/com/example/apiadmin/store/dto/StoreImageUploadResponse.java rename to application-admin/src/main/java/com/nowait/applicationadmin/store/dto/StoreImageUploadResponse.java index bbc1d9da..9e2abe7d 100644 --- a/api-admin/src/main/java/com/example/apiadmin/store/dto/StoreImageUploadResponse.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/store/dto/StoreImageUploadResponse.java @@ -1,6 +1,6 @@ -package com.example.apiadmin.store.dto; +package com.nowait.applicationadmin.store.dto; -import com.example.domainstore.entity.StoreImage; +import com.nowait.store.entity.StoreImage; import lombok.Builder; import lombok.Getter; diff --git a/api-admin/src/main/java/com/example/apiadmin/store/dto/StoreReadDto.java b/application-admin/src/main/java/com/nowait/applicationadmin/store/dto/StoreReadDto.java similarity index 91% rename from api-admin/src/main/java/com/example/apiadmin/store/dto/StoreReadDto.java rename to application-admin/src/main/java/com/nowait/applicationadmin/store/dto/StoreReadDto.java index 0a0148c8..00e1a234 100644 --- a/api-admin/src/main/java/com/example/apiadmin/store/dto/StoreReadDto.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/store/dto/StoreReadDto.java @@ -1,9 +1,9 @@ -package com.example.apiadmin.store.dto; +package com.nowait.applicationadmin.store.dto; import java.time.LocalDateTime; import java.util.List; -import com.example.domainstore.entity.Store; +import com.nowait.store.entity.Store; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/api-admin/src/main/java/com/example/apiadmin/store/dto/StoreUpdateRequest.java b/application-admin/src/main/java/com/nowait/applicationadmin/store/dto/StoreUpdateRequest.java similarity index 85% rename from api-admin/src/main/java/com/example/apiadmin/store/dto/StoreUpdateRequest.java rename to application-admin/src/main/java/com/nowait/applicationadmin/store/dto/StoreUpdateRequest.java index bbe0dfdc..c6b2ccbb 100644 --- a/api-admin/src/main/java/com/example/apiadmin/store/dto/StoreUpdateRequest.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/store/dto/StoreUpdateRequest.java @@ -1,4 +1,4 @@ -package com.example.apiadmin.store.dto; +package com.nowait.applicationadmin.store.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/api-admin/src/main/java/com/example/apiadmin/store/service/StoreImageService.java b/application-admin/src/main/java/com/nowait/applicationadmin/store/service/StoreImageService.java similarity index 85% rename from api-admin/src/main/java/com/example/apiadmin/store/service/StoreImageService.java rename to application-admin/src/main/java/com/nowait/applicationadmin/store/service/StoreImageService.java index 1c7bafb4..f0b5e833 100644 --- a/api-admin/src/main/java/com/example/apiadmin/store/service/StoreImageService.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/store/service/StoreImageService.java @@ -1,4 +1,4 @@ -package com.example.apiadmin.store.service; +package com.nowait.applicationadmin.store.service; import java.util.ArrayList; import java.util.List; @@ -8,13 +8,13 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import com.example.apiadmin.store.dto.StoreImageUploadResponse; -import com.example.domainstore.entity.Store; +import com.nowait.applicationadmin.store.dto.StoreImageUploadResponse; +import com.nowait.store.entity.Store; -import com.example.domainstore.entity.StoreImage; -import com.example.domainstore.repository.StoreImageRepository; -import com.example.domainstore.repository.StoreRepository; -import com.example.infrastorage.s3.S3Service; +import com.nowait.store.entity.StoreImage; +import com.nowait.store.repository.StoreImageRepository; +import com.nowait.store.repository.StoreRepository; +import com.nowait.infraaws.s3.S3Service; import jakarta.persistence.EntityNotFoundException; import lombok.RequiredArgsConstructor; diff --git a/application-admin/src/main/java/com/nowait/applicationadmin/store/service/StoreService.java b/application-admin/src/main/java/com/nowait/applicationadmin/store/service/StoreService.java new file mode 100644 index 00000000..02c39915 --- /dev/null +++ b/application-admin/src/main/java/com/nowait/applicationadmin/store/service/StoreService.java @@ -0,0 +1,19 @@ +package com.nowait.applicationadmin.store.service; + +import com.nowait.applicationadmin.store.dto.StoreCreateRequest; +import com.nowait.applicationadmin.store.dto.StoreCreateResponse; +import com.nowait.applicationadmin.store.dto.StoreReadDto; +import com.nowait.applicationadmin.store.dto.StoreUpdateRequest; + +public interface StoreService { + + StoreCreateResponse createStore(StoreCreateRequest request); + + StoreReadDto getStoreByStoreId(Long storeId); + + StoreReadDto updateStore(Long storeId, StoreUpdateRequest request); + + String deleteStore(Long storeId); + + Boolean toggleActive(Long storeId); +} diff --git a/api-admin/src/main/java/com/example/apiadmin/store/service/StoreServiceImpl.java b/application-admin/src/main/java/com/nowait/applicationadmin/store/service/StoreServiceImpl.java similarity index 81% rename from api-admin/src/main/java/com/example/apiadmin/store/service/StoreServiceImpl.java rename to application-admin/src/main/java/com/nowait/applicationadmin/store/service/StoreServiceImpl.java index ee7be676..56b6406b 100644 --- a/api-admin/src/main/java/com/example/apiadmin/store/service/StoreServiceImpl.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/store/service/StoreServiceImpl.java @@ -1,19 +1,19 @@ -package com.example.apiadmin.store.service; +package com.nowait.applicationadmin.store.service; import java.util.List; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.example.apiadmin.store.dto.StoreCreateRequest; -import com.example.apiadmin.store.dto.StoreCreateResponse; -import com.example.apiadmin.store.dto.StoreImageUploadResponse; -import com.example.apiadmin.store.dto.StoreReadDto; -import com.example.apiadmin.store.dto.StoreUpdateRequest; -import com.example.domainstore.entity.Store; -import com.example.domainstore.entity.StoreImage; -import com.example.domainstore.repository.StoreImageRepository; -import com.example.domainstore.repository.StoreRepository; +import com.nowait.applicationadmin.store.dto.StoreCreateRequest; +import com.nowait.applicationadmin.store.dto.StoreCreateResponse; +import com.nowait.applicationadmin.store.dto.StoreImageUploadResponse; +import com.nowait.applicationadmin.store.dto.StoreReadDto; +import com.nowait.applicationadmin.store.dto.StoreUpdateRequest; +import com.nowait.store.entity.Store; +import com.nowait.store.entity.StoreImage; +import com.nowait.store.repository.StoreImageRepository; +import com.nowait.store.repository.StoreRepository; import jakarta.persistence.EntityNotFoundException; import lombok.RequiredArgsConstructor; diff --git a/api-admin/src/main/java/com/example/apiadmin/token/controller/TokenController.java b/application-admin/src/main/java/com/nowait/applicationadmin/token/controller/TokenController.java similarity index 89% rename from api-admin/src/main/java/com/example/apiadmin/token/controller/TokenController.java rename to application-admin/src/main/java/com/nowait/applicationadmin/token/controller/TokenController.java index 0ad4e64f..ebadba02 100644 --- a/api-admin/src/main/java/com/example/apiadmin/token/controller/TokenController.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/token/controller/TokenController.java @@ -1,4 +1,4 @@ -package com.example.apiadmin.token.controller; +package com.nowait.applicationadmin.token.controller; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; @@ -8,9 +8,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.example.apiadmin.token.dto.AuthenticationResponse; -import com.example.apiadmin.token.dto.RefreshTokenRequest; -import com.example.apiadmin.token.service.TokenService; +import com.nowait.applicationadmin.token.dto.AuthenticationResponse; +import com.nowait.applicationadmin.token.dto.RefreshTokenRequest; +import com.nowait.applicationadmin.token.service.TokenService; import com.nowait.adminsecurity.auth.jwt.JwtUtil; import lombok.RequiredArgsConstructor; diff --git a/api-user/src/main/java/com/example/apiuser/token/dto/AuthenticationResponse.java b/application-admin/src/main/java/com/nowait/applicationadmin/token/dto/AuthenticationResponse.java similarity index 90% rename from api-user/src/main/java/com/example/apiuser/token/dto/AuthenticationResponse.java rename to application-admin/src/main/java/com/nowait/applicationadmin/token/dto/AuthenticationResponse.java index 71db8914..cb67851d 100644 --- a/api-user/src/main/java/com/example/apiuser/token/dto/AuthenticationResponse.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/token/dto/AuthenticationResponse.java @@ -1,4 +1,4 @@ -package com.example.apiuser.token.dto; +package com.nowait.applicationadmin.token.dto; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/api-user/src/main/java/com/example/apiuser/token/dto/RefreshTokenRequest.java b/application-admin/src/main/java/com/nowait/applicationadmin/token/dto/RefreshTokenRequest.java similarity index 84% rename from api-user/src/main/java/com/example/apiuser/token/dto/RefreshTokenRequest.java rename to application-admin/src/main/java/com/nowait/applicationadmin/token/dto/RefreshTokenRequest.java index 4ab8ae75..df7ed26f 100644 --- a/api-user/src/main/java/com/example/apiuser/token/dto/RefreshTokenRequest.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/token/dto/RefreshTokenRequest.java @@ -1,4 +1,4 @@ -package com.example.apiuser.token.dto; +package com.nowait.applicationadmin.token.dto; import jakarta.validation.constraints.NotBlank; import lombok.Getter; diff --git a/api-admin/src/main/java/com/example/apiadmin/token/service/TokenService.java b/application-admin/src/main/java/com/nowait/applicationadmin/token/service/TokenService.java similarity index 93% rename from api-admin/src/main/java/com/example/apiadmin/token/service/TokenService.java rename to application-admin/src/main/java/com/nowait/applicationadmin/token/service/TokenService.java index 458ec8e2..3ba54b63 100644 --- a/api-admin/src/main/java/com/example/apiadmin/token/service/TokenService.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/token/service/TokenService.java @@ -1,4 +1,4 @@ -package com.example.apiadmin.token.service; +package com.nowait.applicationadmin.token.service; import java.time.LocalDateTime; import java.util.Optional; @@ -6,8 +6,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.example.domaintoken.entity.Token; -import com.example.domaintoken.repository.TokenRepository; +import com.nowait.token.entity.Token; +import com.nowait.token.repository.TokenRepository; import com.nowait.adminsecurity.auth.jwt.JwtUtil; import com.nowait.adminsecurity.exception.RefreshTokenNotFoundException; import com.nowait.adminsecurity.exception.TokenBadRequestException; diff --git a/api-admin/src/main/java/com/example/apiadmin/user/controller/UserController.java b/application-admin/src/main/java/com/nowait/applicationadmin/user/controller/UserController.java similarity index 86% rename from api-admin/src/main/java/com/example/apiadmin/user/controller/UserController.java rename to application-admin/src/main/java/com/nowait/applicationadmin/user/controller/UserController.java index 412e5a99..be794e84 100644 --- a/api-admin/src/main/java/com/example/apiadmin/user/controller/UserController.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/user/controller/UserController.java @@ -1,4 +1,4 @@ -package com.example.apiadmin.user.controller; +package com.nowait.applicationadmin.user.controller; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -7,10 +7,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.example.apiadmin.user.dto.ManagerLoginRequestDto; -import com.example.apiadmin.user.dto.ManagerSignupRequestDto; -import com.example.apiadmin.user.serivce.UserService; -import com.nowaiting.common.api.ApiUtils; +import com.nowait.applicationadmin.user.dto.ManagerLoginRequestDto; +import com.nowait.applicationadmin.user.dto.ManagerSignupRequestDto; +import com.nowait.applicationadmin.user.serivce.UserService; +import com.nowait.common.api.ApiUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/api-admin/src/main/java/com/example/apiadmin/user/dto/ManagerLoginRequestDto.java b/application-admin/src/main/java/com/nowait/applicationadmin/user/dto/ManagerLoginRequestDto.java similarity index 94% rename from api-admin/src/main/java/com/example/apiadmin/user/dto/ManagerLoginRequestDto.java rename to application-admin/src/main/java/com/nowait/applicationadmin/user/dto/ManagerLoginRequestDto.java index d1f40771..e545bf6d 100644 --- a/api-admin/src/main/java/com/example/apiadmin/user/dto/ManagerLoginRequestDto.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/user/dto/ManagerLoginRequestDto.java @@ -1,4 +1,4 @@ -package com.example.apiadmin.user.dto; +package com.nowait.applicationadmin.user.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Email; diff --git a/api-admin/src/main/java/com/example/apiadmin/user/dto/ManagerLoginResponseDto.java b/application-admin/src/main/java/com/nowait/applicationadmin/user/dto/ManagerLoginResponseDto.java similarity index 92% rename from api-admin/src/main/java/com/example/apiadmin/user/dto/ManagerLoginResponseDto.java rename to application-admin/src/main/java/com/nowait/applicationadmin/user/dto/ManagerLoginResponseDto.java index 4a36fb27..48acf335 100644 --- a/api-admin/src/main/java/com/example/apiadmin/user/dto/ManagerLoginResponseDto.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/user/dto/ManagerLoginResponseDto.java @@ -1,6 +1,6 @@ -package com.example.apiadmin.user.dto; +package com.nowait.applicationadmin.user.dto; -import com.nowaiting.user.entity.User; +import com.nowait.user.entity.User; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/api-admin/src/main/java/com/example/apiadmin/user/dto/ManagerSignupRequestDto.java b/application-admin/src/main/java/com/nowait/applicationadmin/user/dto/ManagerSignupRequestDto.java similarity index 87% rename from api-admin/src/main/java/com/example/apiadmin/user/dto/ManagerSignupRequestDto.java rename to application-admin/src/main/java/com/nowait/applicationadmin/user/dto/ManagerSignupRequestDto.java index 3d61b7ad..3d89c41a 100644 --- a/api-admin/src/main/java/com/example/apiadmin/user/dto/ManagerSignupRequestDto.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/user/dto/ManagerSignupRequestDto.java @@ -1,8 +1,8 @@ -package com.example.apiadmin.user.dto; +package com.nowait.applicationadmin.user.dto; -import com.nowaiting.common.enums.Role; -import com.nowaiting.common.enums.SocialType; -import com.nowaiting.user.entity.User; +import com.nowait.common.enums.Role; +import com.nowait.common.enums.SocialType; +import com.nowait.user.entity.User; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Email; diff --git a/api-admin/src/main/java/com/example/apiadmin/user/dto/ManagerSignupResponseDto.java b/application-admin/src/main/java/com/nowait/applicationadmin/user/dto/ManagerSignupResponseDto.java similarity index 87% rename from api-admin/src/main/java/com/example/apiadmin/user/dto/ManagerSignupResponseDto.java rename to application-admin/src/main/java/com/nowait/applicationadmin/user/dto/ManagerSignupResponseDto.java index 9d311942..46e8a1e4 100644 --- a/api-admin/src/main/java/com/example/apiadmin/user/dto/ManagerSignupResponseDto.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/user/dto/ManagerSignupResponseDto.java @@ -1,7 +1,7 @@ -package com.example.apiadmin.user.dto; +package com.nowait.applicationadmin.user.dto; -import com.nowaiting.common.enums.Role; -import com.nowaiting.user.entity.User; +import com.nowait.common.enums.Role; +import com.nowait.user.entity.User; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/api-admin/src/main/java/com/example/apiadmin/user/dto/UserResponseDto.java b/application-admin/src/main/java/com/nowait/applicationadmin/user/dto/UserResponseDto.java similarity index 87% rename from api-admin/src/main/java/com/example/apiadmin/user/dto/UserResponseDto.java rename to application-admin/src/main/java/com/nowait/applicationadmin/user/dto/UserResponseDto.java index bbcdb8ea..d00601f2 100644 --- a/api-admin/src/main/java/com/example/apiadmin/user/dto/UserResponseDto.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/user/dto/UserResponseDto.java @@ -1,4 +1,4 @@ -package com.example.apiadmin.user.dto; +package com.nowait.applicationadmin.user.dto; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/api-admin/src/main/java/com/example/apiadmin/user/serivce/UserService.java b/application-admin/src/main/java/com/nowait/applicationadmin/user/serivce/UserService.java similarity index 83% rename from api-admin/src/main/java/com/example/apiadmin/user/serivce/UserService.java rename to application-admin/src/main/java/com/nowait/applicationadmin/user/serivce/UserService.java index 1e026c56..9a11c497 100644 --- a/api-admin/src/main/java/com/example/apiadmin/user/serivce/UserService.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/user/serivce/UserService.java @@ -1,4 +1,4 @@ -package com.example.apiadmin.user.serivce; +package com.nowait.applicationadmin.user.serivce; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.authentication.AuthenticationProvider; @@ -8,14 +8,14 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.example.apiadmin.user.dto.ManagerLoginRequestDto; -import com.example.apiadmin.user.dto.ManagerLoginResponseDto; -import com.example.apiadmin.user.dto.ManagerSignupRequestDto; -import com.example.apiadmin.user.dto.ManagerSignupResponseDto; +import com.nowait.applicationadmin.user.dto.ManagerLoginRequestDto; +import com.nowait.applicationadmin.user.dto.ManagerLoginResponseDto; +import com.nowait.applicationadmin.user.dto.ManagerSignupRequestDto; +import com.nowait.applicationadmin.user.dto.ManagerSignupResponseDto; import com.nowait.adminsecurity.auth.jwt.JwtUtil; -import com.nowaiting.user.entity.MemberDetails; -import com.nowaiting.user.entity.User; -import com.nowaiting.user.repository.UserRepository; +import com.nowait.user.entity.MemberDetails; +import com.nowait.user.entity.User; +import com.nowait.user.repository.UserRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/application-config/src/main/java/com/example/applicationconfig/config/AsyncConfig.java b/application-config/src/main/java/com/nowait/config/config/AsyncConfig.java similarity index 92% rename from application-config/src/main/java/com/example/applicationconfig/config/AsyncConfig.java rename to application-config/src/main/java/com/nowait/config/config/AsyncConfig.java index 9c839fbb..0d63871f 100644 --- a/application-config/src/main/java/com/example/applicationconfig/config/AsyncConfig.java +++ b/application-config/src/main/java/com/nowait/config/config/AsyncConfig.java @@ -1,4 +1,4 @@ -package com.example.applicationconfig.config; +package com.nowait.config.config; import java.util.concurrent.Executor; diff --git a/application-config/src/main/java/com/example/applicationconfig/config/CorsConfig.java b/application-config/src/main/java/com/nowait/config/config/CorsConfig.java similarity index 96% rename from application-config/src/main/java/com/example/applicationconfig/config/CorsConfig.java rename to application-config/src/main/java/com/nowait/config/config/CorsConfig.java index 6d0a6770..06823454 100644 --- a/application-config/src/main/java/com/example/applicationconfig/config/CorsConfig.java +++ b/application-config/src/main/java/com/nowait/config/config/CorsConfig.java @@ -1,4 +1,4 @@ -package com.example.applicationconfig.config; +package com.nowait.config.config; import java.util.List; diff --git a/api-user/.gitattributes b/application-user/.gitattributes similarity index 100% rename from api-user/.gitattributes rename to application-user/.gitattributes diff --git a/api-user/.gitignore b/application-user/.gitignore similarity index 100% rename from api-user/.gitignore rename to application-user/.gitignore diff --git a/api-user/build.gradle b/application-user/build.gradle similarity index 95% rename from api-user/build.gradle rename to application-user/build.gradle index 74bdca87..6b68d7be 100644 --- a/api-user/build.gradle +++ b/application-user/build.gradle @@ -28,6 +28,7 @@ dependencies { implementation project(':domain-reservation') // 예약 관련 도메인 implementation project(':infra-aws') // 사용자 관련 도메인 implementation project(':security-front') // 사용자 관련 도메인 + implementation project(':external-oauth') // 외부 OAuth 관련 도메인 // Spring Boot Starter implementation 'org.springframework.boot:spring-boot-starter-web' diff --git a/api-user/gradle/wrapper/gradle-wrapper.jar b/application-user/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from api-user/gradle/wrapper/gradle-wrapper.jar rename to application-user/gradle/wrapper/gradle-wrapper.jar diff --git a/api-user/gradle/wrapper/gradle-wrapper.properties b/application-user/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from api-user/gradle/wrapper/gradle-wrapper.properties rename to application-user/gradle/wrapper/gradle-wrapper.properties diff --git a/application-user/src/main/java/com/nowait/applicationuser/ApiUserApplication.java b/application-user/src/main/java/com/nowait/applicationuser/ApiUserApplication.java new file mode 100644 index 00000000..7e59d07d --- /dev/null +++ b/application-user/src/main/java/com/nowait/applicationuser/ApiUserApplication.java @@ -0,0 +1,40 @@ +package com.nowait.applicationuser; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; + +@EnableJpaAuditing +@SpringBootApplication(scanBasePackages = { + "com.nowait.applicationuser", + "com.nowait.frontsecurity", + "com.nowait.externaloauth" +}) +@EntityScan(basePackages = { + "com.nowait.menu.entity", + "com.nowait.store.entity", + "com.nowait.token.entity", + "com.nowait.user.entity", + "com.nowait.bookmark.entity", + "com.nowait.reservation.entity", + "com.nowait.order.entity", + "com.nowait.order.entity" +}) +@EnableJpaRepositories(basePackages = { + "com.nowait.menu.repository", + "com.nowait.user.repository", + "com.nowait.store.repository", + "com.nowait.token.repository", + "com.nowait.bookmark.repository", + "com.nowait.order.repository", + "com.nowait.reservation.repository" +}) +public class ApiUserApplication { + + public static void main(String[] args) { + SpringApplication.run(ApiUserApplication.class, args); + } + +} diff --git a/api-user/src/main/java/com/example/apiuser/bookmark/controller/BookmarkController.java b/application-user/src/main/java/com/nowait/applicationuser/bookmark/controller/BookmarkController.java similarity index 89% rename from api-user/src/main/java/com/example/apiuser/bookmark/controller/BookmarkController.java rename to application-user/src/main/java/com/nowait/applicationuser/bookmark/controller/BookmarkController.java index 32c4132a..14d47d7e 100644 --- a/api-user/src/main/java/com/example/apiuser/bookmark/controller/BookmarkController.java +++ b/application-user/src/main/java/com/nowait/applicationuser/bookmark/controller/BookmarkController.java @@ -1,4 +1,4 @@ -package com.example.apiuser.bookmark.controller; +package com.nowait.applicationuser.bookmark.controller; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -10,10 +10,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.example.apiuser.bookmark.dto.BookmarkCreateResponse; -import com.example.apiuser.bookmark.service.BookmarkService; -import com.nowait.auth.dto.CustomOAuth2User; -import com.nowaiting.common.api.ApiUtils; +import com.nowait.applicationuser.bookmark.dto.BookmarkCreateResponse; +import com.nowait.applicationuser.bookmark.service.BookmarkService; +import com.nowait.common.api.ApiUtils; +import com.nowait.externaloauth.dto.CustomOAuth2User; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/api-user/src/main/java/com/example/apiuser/bookmark/dto/BookmarkCreateResponse.java b/application-user/src/main/java/com/nowait/applicationuser/bookmark/dto/BookmarkCreateResponse.java similarity index 83% rename from api-user/src/main/java/com/example/apiuser/bookmark/dto/BookmarkCreateResponse.java rename to application-user/src/main/java/com/nowait/applicationuser/bookmark/dto/BookmarkCreateResponse.java index 5e4a8f65..3f0d03e2 100644 --- a/api-user/src/main/java/com/example/apiuser/bookmark/dto/BookmarkCreateResponse.java +++ b/application-user/src/main/java/com/nowait/applicationuser/bookmark/dto/BookmarkCreateResponse.java @@ -1,6 +1,6 @@ -package com.example.apiuser.bookmark.dto; +package com.nowait.applicationuser.bookmark.dto; -import com.nowait.domainbookmark.entity.Bookmark; +import com.nowait.bookmark.entity.Bookmark; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/api-user/src/main/java/com/example/apiuser/bookmark/dto/BookmarkGetResponse.java b/application-user/src/main/java/com/nowait/applicationuser/bookmark/dto/BookmarkGetResponse.java similarity index 83% rename from api-user/src/main/java/com/example/apiuser/bookmark/dto/BookmarkGetResponse.java rename to application-user/src/main/java/com/nowait/applicationuser/bookmark/dto/BookmarkGetResponse.java index 6f05db8e..8caf5c55 100644 --- a/api-user/src/main/java/com/example/apiuser/bookmark/dto/BookmarkGetResponse.java +++ b/application-user/src/main/java/com/nowait/applicationuser/bookmark/dto/BookmarkGetResponse.java @@ -1,6 +1,6 @@ -package com.example.apiuser.bookmark.dto; +package com.nowait.applicationuser.bookmark.dto; -import com.nowait.domainbookmark.entity.Bookmark; +import com.nowait.bookmark.entity.Bookmark; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/api-user/src/main/java/com/example/apiuser/bookmark/service/BookmarkService.java b/application-user/src/main/java/com/nowait/applicationuser/bookmark/service/BookmarkService.java similarity index 82% rename from api-user/src/main/java/com/example/apiuser/bookmark/service/BookmarkService.java rename to application-user/src/main/java/com/nowait/applicationuser/bookmark/service/BookmarkService.java index 91ce0ff8..5aae6553 100644 --- a/api-user/src/main/java/com/example/apiuser/bookmark/service/BookmarkService.java +++ b/application-user/src/main/java/com/nowait/applicationuser/bookmark/service/BookmarkService.java @@ -1,19 +1,19 @@ -package com.example.apiuser.bookmark.service; +package com.nowait.applicationuser.bookmark.service; import java.util.List; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.example.apiuser.bookmark.dto.BookmarkCreateResponse; -import com.example.apiuser.bookmark.dto.BookmarkGetResponse; -import com.example.domainstore.entity.Store; -import com.example.domainstore.repository.StoreRepository; -import com.nowait.auth.dto.CustomOAuth2User; -import com.nowait.domainbookmark.entity.Bookmark; -import com.nowait.domainbookmark.repository.BookmarkRepository; -import com.nowaiting.user.entity.User; -import com.nowaiting.user.repository.UserRepository; +import com.nowait.applicationuser.bookmark.dto.BookmarkCreateResponse; +import com.nowait.applicationuser.bookmark.dto.BookmarkGetResponse; +import com.nowait.externaloauth.dto.CustomOAuth2User; +import com.nowait.store.entity.Store; +import com.nowait.store.repository.StoreRepository; +import com.nowait.bookmark.entity.Bookmark; +import com.nowait.bookmark.repository.BookmarkRepository; +import com.nowait.user.entity.User; +import com.nowait.user.repository.UserRepository; import jakarta.persistence.EntityNotFoundException; import lombok.RequiredArgsConstructor; diff --git a/api-user/src/main/java/com/example/apiuser/exception/GlobalExceptionHandler.java b/application-user/src/main/java/com/nowait/applicationuser/exception/GlobalExceptionHandler.java similarity index 88% rename from api-user/src/main/java/com/example/apiuser/exception/GlobalExceptionHandler.java rename to application-user/src/main/java/com/nowait/applicationuser/exception/GlobalExceptionHandler.java index fedb029f..bcf4eda3 100644 --- a/api-user/src/main/java/com/example/apiuser/exception/GlobalExceptionHandler.java +++ b/application-user/src/main/java/com/nowait/applicationuser/exception/GlobalExceptionHandler.java @@ -1,6 +1,6 @@ -package com.example.apiuser.exception; +package com.nowait.applicationuser.exception; -import static com.nowaiting.common.exception.ErrorMessage.*; +import static com.nowait.common.exception.ErrorMessage.*; import static org.springframework.http.HttpStatus.*; import static org.springframework.http.HttpStatus.UNAUTHORIZED; @@ -18,18 +18,18 @@ import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.multipart.MultipartException; -import com.example.apiuser.reservation.exception.ReservationNotFoundException; -import com.nowait.domainbookmark.exception.BookmarkOwnerMismatchException; -import com.nowait.domainbookmark.exception.DuplicateBookmarkException; -import com.nowait.domainorder.exception.DuplicateOrderException; -import com.nowait.domainorder.exception.OrderItemsEmptyException; -import com.nowait.domainorder.exception.OrderParameterEmptyException; -import com.nowait.exception.BusinessException; -import com.nowait.exception.ResourceNotFoundException; -import com.nowait.exception.UnauthorizedException; -import com.nowaiting.common.exception.ErrorMessage; -import com.nowaiting.common.exception.ErrorResponse; -import com.nowaiting.user.exception.UserNotFoundException; +import com.nowait.applicationuser.reservation.exception.ReservationNotFoundException; +import com.nowait.bookmark.exception.BookmarkOwnerMismatchException; +import com.nowait.bookmark.exception.DuplicateBookmarkException; +import com.nowait.common.exception.ErrorMessage; +import com.nowait.common.exception.ErrorResponse; +import com.nowait.frontsecurity.exception.ResourceNotFoundException; +import com.nowait.frontsecurity.exception.UnauthorizedException; +import com.nowait.order.exception.DuplicateOrderException; +import com.nowait.order.exception.OrderItemsEmptyException; +import com.nowait.order.exception.OrderParameterEmptyException; +import com.nowait.token.exception.BusinessException; +import com.nowait.user.exception.UserNotFoundException; import io.swagger.v3.oas.annotations.Hidden; import lombok.extern.slf4j.Slf4j; diff --git a/api-user/src/main/java/com/example/apiuser/menu/controller/MenuController.java b/application-user/src/main/java/com/nowait/applicationuser/menu/controller/MenuController.java similarity index 87% rename from api-user/src/main/java/com/example/apiuser/menu/controller/MenuController.java rename to application-user/src/main/java/com/nowait/applicationuser/menu/controller/MenuController.java index d1270ccb..f7627f2e 100644 --- a/api-user/src/main/java/com/example/apiuser/menu/controller/MenuController.java +++ b/application-user/src/main/java/com/nowait/applicationuser/menu/controller/MenuController.java @@ -1,4 +1,4 @@ -package com.example.apiuser.menu.controller; +package com.nowait.applicationuser.menu.controller; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.example.apiuser.menu.service.MenuService; -import com.nowaiting.common.api.ApiUtils; +import com.nowait.applicationuser.menu.service.MenuService; +import com.nowait.common.api.ApiUtils; import lombok.RequiredArgsConstructor; diff --git a/api-user/src/main/java/com/example/apiuser/menu/dto/MenuImageUploadResponse.java b/application-user/src/main/java/com/nowait/applicationuser/menu/dto/MenuImageUploadResponse.java similarity index 80% rename from api-user/src/main/java/com/example/apiuser/menu/dto/MenuImageUploadResponse.java rename to application-user/src/main/java/com/nowait/applicationuser/menu/dto/MenuImageUploadResponse.java index c32be356..b7e24a85 100644 --- a/api-user/src/main/java/com/example/apiuser/menu/dto/MenuImageUploadResponse.java +++ b/application-user/src/main/java/com/nowait/applicationuser/menu/dto/MenuImageUploadResponse.java @@ -1,6 +1,6 @@ -package com.example.apiuser.menu.dto; +package com.nowait.applicationuser.menu.dto; -import com.example.menu.entity.MenuImage; +import com.nowait.menu.entity.MenuImage; import lombok.Builder; import lombok.Getter; diff --git a/api-admin/src/main/java/com/example/apiadmin/menu/dto/MenuReadDto.java b/application-user/src/main/java/com/nowait/applicationuser/menu/dto/MenuReadDto.java similarity index 90% rename from api-admin/src/main/java/com/example/apiadmin/menu/dto/MenuReadDto.java rename to application-user/src/main/java/com/nowait/applicationuser/menu/dto/MenuReadDto.java index c369f0fc..e0fcad93 100644 --- a/api-admin/src/main/java/com/example/apiadmin/menu/dto/MenuReadDto.java +++ b/application-user/src/main/java/com/nowait/applicationuser/menu/dto/MenuReadDto.java @@ -1,8 +1,8 @@ -package com.example.apiadmin.menu.dto; +package com.nowait.applicationuser.menu.dto; import java.util.List; -import com.example.menu.entity.Menu; +import com.nowait.menu.entity.Menu; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/api-admin/src/main/java/com/example/apiadmin/menu/dto/MenuReadResponse.java b/application-user/src/main/java/com/nowait/applicationuser/menu/dto/MenuReadResponse.java similarity index 89% rename from api-admin/src/main/java/com/example/apiadmin/menu/dto/MenuReadResponse.java rename to application-user/src/main/java/com/nowait/applicationuser/menu/dto/MenuReadResponse.java index 5df79e2f..5e9c6c21 100644 --- a/api-admin/src/main/java/com/example/apiadmin/menu/dto/MenuReadResponse.java +++ b/application-user/src/main/java/com/nowait/applicationuser/menu/dto/MenuReadResponse.java @@ -1,4 +1,4 @@ -package com.example.apiadmin.menu.dto; +package com.nowait.applicationuser.menu.dto; import java.util.List; diff --git a/api-user/src/main/java/com/example/apiuser/menu/service/MenuService.java b/application-user/src/main/java/com/nowait/applicationuser/menu/service/MenuService.java similarity index 77% rename from api-user/src/main/java/com/example/apiuser/menu/service/MenuService.java rename to application-user/src/main/java/com/nowait/applicationuser/menu/service/MenuService.java index 8763f270..bd28fada 100644 --- a/api-user/src/main/java/com/example/apiuser/menu/service/MenuService.java +++ b/application-user/src/main/java/com/nowait/applicationuser/menu/service/MenuService.java @@ -1,17 +1,17 @@ -package com.example.apiuser.menu.service; +package com.nowait.applicationuser.menu.service; import java.util.List; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.example.apiuser.menu.dto.MenuImageUploadResponse; -import com.example.apiuser.menu.dto.MenuReadDto; -import com.example.apiuser.menu.dto.MenuReadResponse; -import com.example.menu.entity.Menu; -import com.example.menu.entity.MenuImage; -import com.example.menu.repository.MenuImageRepository; -import com.example.menu.repository.MenuRepository; +import com.nowait.applicationuser.menu.dto.MenuImageUploadResponse; +import com.nowait.applicationuser.menu.dto.MenuReadDto; +import com.nowait.applicationuser.menu.dto.MenuReadResponse; +import com.nowait.menu.entity.Menu; +import com.nowait.menu.entity.MenuImage; +import com.nowait.menu.repository.MenuImageRepository; +import com.nowait.menu.repository.MenuRepository; import lombok.RequiredArgsConstructor; diff --git a/api-user/src/main/java/com/example/apiuser/order/controller/OrderController.java b/application-user/src/main/java/com/nowait/applicationuser/order/controller/OrderController.java similarity index 86% rename from api-user/src/main/java/com/example/apiuser/order/controller/OrderController.java rename to application-user/src/main/java/com/nowait/applicationuser/order/controller/OrderController.java index 65238120..87cb3fe0 100644 --- a/api-user/src/main/java/com/example/apiuser/order/controller/OrderController.java +++ b/application-user/src/main/java/com/nowait/applicationuser/order/controller/OrderController.java @@ -1,4 +1,4 @@ -package com.example.apiuser.order.controller; +package com.nowait.applicationuser.order.controller; import java.util.List; @@ -11,11 +11,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.example.apiuser.order.dto.OrderCreateRequestDto; -import com.example.apiuser.order.dto.OrderCreateResponseDto; -import com.example.apiuser.order.dto.OrderItemListGetResponseDto; -import com.example.apiuser.order.service.OrderService; -import com.nowaiting.common.api.ApiUtils; +import com.nowait.applicationuser.order.dto.OrderCreateRequestDto; +import com.nowait.applicationuser.order.dto.OrderCreateResponseDto; +import com.nowait.applicationuser.order.dto.OrderItemListGetResponseDto; +import com.nowait.applicationuser.order.service.OrderService; +import com.nowait.common.api.ApiUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/api-user/src/main/java/com/example/apiuser/order/dto/CartItemDto.java b/application-user/src/main/java/com/nowait/applicationuser/order/dto/CartItemDto.java similarity index 79% rename from api-user/src/main/java/com/example/apiuser/order/dto/CartItemDto.java rename to application-user/src/main/java/com/nowait/applicationuser/order/dto/CartItemDto.java index 1b8fc52b..72b7b58e 100644 --- a/api-user/src/main/java/com/example/apiuser/order/dto/CartItemDto.java +++ b/application-user/src/main/java/com/nowait/applicationuser/order/dto/CartItemDto.java @@ -1,4 +1,4 @@ -package com.example.apiuser.order.dto; +package com.nowait.applicationuser.order.dto; import lombok.Builder; import lombok.Getter; diff --git a/api-user/src/main/java/com/example/apiuser/order/dto/OrderCreateRequestDto.java b/application-user/src/main/java/com/nowait/applicationuser/order/dto/OrderCreateRequestDto.java similarity index 84% rename from api-user/src/main/java/com/example/apiuser/order/dto/OrderCreateRequestDto.java rename to application-user/src/main/java/com/nowait/applicationuser/order/dto/OrderCreateRequestDto.java index 056d44a6..1372a980 100644 --- a/api-user/src/main/java/com/example/apiuser/order/dto/OrderCreateRequestDto.java +++ b/application-user/src/main/java/com/nowait/applicationuser/order/dto/OrderCreateRequestDto.java @@ -1,4 +1,4 @@ -package com.example.apiuser.order.dto; +package com.nowait.applicationuser.order.dto; import java.util.List; diff --git a/api-user/src/main/java/com/example/apiuser/order/dto/OrderCreateResponseDto.java b/application-user/src/main/java/com/nowait/applicationuser/order/dto/OrderCreateResponseDto.java similarity index 89% rename from api-user/src/main/java/com/example/apiuser/order/dto/OrderCreateResponseDto.java rename to application-user/src/main/java/com/nowait/applicationuser/order/dto/OrderCreateResponseDto.java index 1293ac0f..cd8f6568 100644 --- a/api-user/src/main/java/com/example/apiuser/order/dto/OrderCreateResponseDto.java +++ b/application-user/src/main/java/com/nowait/applicationuser/order/dto/OrderCreateResponseDto.java @@ -1,8 +1,8 @@ -package com.example.apiuser.order.dto; +package com.nowait.applicationuser.order.dto; import java.util.List; -import com.nowait.domainorder.entity.UserOrder; +import com.nowait.order.entity.UserOrder; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/api-user/src/main/java/com/example/apiuser/order/dto/OrderItemListGetResponseDto.java b/application-user/src/main/java/com/nowait/applicationuser/order/dto/OrderItemListGetResponseDto.java similarity index 87% rename from api-user/src/main/java/com/example/apiuser/order/dto/OrderItemListGetResponseDto.java rename to application-user/src/main/java/com/nowait/applicationuser/order/dto/OrderItemListGetResponseDto.java index 02e24e3f..ef6bb13e 100644 --- a/api-user/src/main/java/com/example/apiuser/order/dto/OrderItemListGetResponseDto.java +++ b/application-user/src/main/java/com/nowait/applicationuser/order/dto/OrderItemListGetResponseDto.java @@ -1,6 +1,6 @@ -package com.example.apiuser.order.dto; +package com.nowait.applicationuser.order.dto; -import com.nowait.domainorder.entity.OrderItem; +import com.nowait.order.entity.OrderItem; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/api-user/src/main/java/com/example/apiuser/order/dto/OrderItemResponseDTO.java b/application-user/src/main/java/com/nowait/applicationuser/order/dto/OrderItemResponseDTO.java similarity index 88% rename from api-user/src/main/java/com/example/apiuser/order/dto/OrderItemResponseDTO.java rename to application-user/src/main/java/com/nowait/applicationuser/order/dto/OrderItemResponseDTO.java index 12f04514..1c29a4f2 100644 --- a/api-user/src/main/java/com/example/apiuser/order/dto/OrderItemResponseDTO.java +++ b/application-user/src/main/java/com/nowait/applicationuser/order/dto/OrderItemResponseDTO.java @@ -1,4 +1,4 @@ -package com.example.apiuser.order.dto; +package com.nowait.applicationuser.order.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/api-user/src/main/java/com/example/apiuser/order/service/OrderService.java b/application-user/src/main/java/com/nowait/applicationuser/order/service/OrderService.java similarity index 82% rename from api-user/src/main/java/com/example/apiuser/order/service/OrderService.java rename to application-user/src/main/java/com/nowait/applicationuser/order/service/OrderService.java index 1644ba16..07cc19c3 100644 --- a/api-user/src/main/java/com/example/apiuser/order/service/OrderService.java +++ b/application-user/src/main/java/com/nowait/applicationuser/order/service/OrderService.java @@ -1,4 +1,4 @@ -package com.example.apiuser.order.service; +package com.nowait.applicationuser.order.service; import java.time.LocalDateTime; import java.util.List; @@ -11,21 +11,21 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.DigestUtils; -import com.example.apiuser.order.dto.CartItemDto; -import com.example.apiuser.order.dto.OrderCreateRequestDto; -import com.example.apiuser.order.dto.OrderCreateResponseDto; -import com.example.apiuser.order.dto.OrderItemListGetResponseDto; -import com.example.domainstore.entity.Store; -import com.example.domainstore.repository.StoreRepository; -import com.example.menu.entity.Menu; -import com.example.menu.repository.MenuRepository; -import com.nowait.domainorder.entity.OrderItem; -import com.nowait.domainorder.entity.UserOrder; -import com.nowait.domainorder.exception.DuplicateOrderException; -import com.nowait.domainorder.exception.OrderItemsEmptyException; -import com.nowait.domainorder.exception.OrderParameterEmptyException; -import com.nowait.domainorder.repository.OrderItemRepository; -import com.nowait.domainorder.repository.OrderRepository; +import com.nowait.applicationuser.order.dto.CartItemDto; +import com.nowait.applicationuser.order.dto.OrderCreateRequestDto; +import com.nowait.applicationuser.order.dto.OrderCreateResponseDto; +import com.nowait.applicationuser.order.dto.OrderItemListGetResponseDto; +import com.nowait.store.entity.Store; +import com.nowait.store.repository.StoreRepository; +import com.nowait.menu.entity.Menu; +import com.nowait.menu.repository.MenuRepository; +import com.nowait.order.entity.OrderItem; +import com.nowait.order.entity.UserOrder; +import com.nowait.order.exception.DuplicateOrderException; +import com.nowait.order.exception.OrderItemsEmptyException; +import com.nowait.order.exception.OrderParameterEmptyException; +import com.nowait.order.repository.OrderItemRepository; +import com.nowait.order.repository.OrderRepository; import lombok.RequiredArgsConstructor; diff --git a/api-user/src/main/java/com/example/apiuser/reservation/controller/ReservationController.java b/application-user/src/main/java/com/nowait/applicationuser/reservation/controller/ReservationController.java similarity index 79% rename from api-user/src/main/java/com/example/apiuser/reservation/controller/ReservationController.java rename to application-user/src/main/java/com/nowait/applicationuser/reservation/controller/ReservationController.java index 75416513..dd3176e8 100644 --- a/api-user/src/main/java/com/example/apiuser/reservation/controller/ReservationController.java +++ b/application-user/src/main/java/com/nowait/applicationuser/reservation/controller/ReservationController.java @@ -1,4 +1,4 @@ -package com.example.apiuser.reservation.controller; +package com.nowait.applicationuser.reservation.controller; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -9,11 +9,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.example.apiuser.reservation.dto.ReservationCreateRequestDto; -import com.example.apiuser.reservation.dto.ReservationCreateResponseDto; -import com.example.apiuser.reservation.service.ReservationService; -import com.nowait.auth.dto.CustomOAuth2User; -import com.nowaiting.common.api.ApiUtils; +import com.nowait.applicationuser.reservation.dto.ReservationCreateRequestDto; +import com.nowait.applicationuser.reservation.dto.ReservationCreateResponseDto; +import com.nowait.applicationuser.reservation.service.ReservationService; +import com.nowait.common.api.ApiUtils; +import com.nowait.externaloauth.dto.CustomOAuth2User; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/api-user/src/main/java/com/example/apiuser/reservation/dto/ReservationCreateRequestDto.java b/application-user/src/main/java/com/nowait/applicationuser/reservation/dto/ReservationCreateRequestDto.java similarity index 72% rename from api-user/src/main/java/com/example/apiuser/reservation/dto/ReservationCreateRequestDto.java rename to application-user/src/main/java/com/nowait/applicationuser/reservation/dto/ReservationCreateRequestDto.java index 03fbfb4f..c6871832 100644 --- a/api-user/src/main/java/com/example/apiuser/reservation/dto/ReservationCreateRequestDto.java +++ b/application-user/src/main/java/com/nowait/applicationuser/reservation/dto/ReservationCreateRequestDto.java @@ -1,4 +1,4 @@ -package com.example.apiuser.reservation.dto; +package com.nowait.applicationuser.reservation.dto; import lombok.Builder; import lombok.Getter; diff --git a/api-user/src/main/java/com/example/apiuser/reservation/dto/ReservationCreateResponseDto.java b/application-user/src/main/java/com/nowait/applicationuser/reservation/dto/ReservationCreateResponseDto.java similarity index 84% rename from api-user/src/main/java/com/example/apiuser/reservation/dto/ReservationCreateResponseDto.java rename to application-user/src/main/java/com/nowait/applicationuser/reservation/dto/ReservationCreateResponseDto.java index fa581589..0a07e466 100644 --- a/api-user/src/main/java/com/example/apiuser/reservation/dto/ReservationCreateResponseDto.java +++ b/application-user/src/main/java/com/nowait/applicationuser/reservation/dto/ReservationCreateResponseDto.java @@ -1,4 +1,4 @@ -package com.example.apiuser.reservation.dto; +package com.nowait.applicationuser.reservation.dto; import java.time.LocalDateTime; diff --git a/api-user/src/main/java/com/example/apiuser/reservation/exception/ReservationNotFoundException.java b/application-user/src/main/java/com/nowait/applicationuser/reservation/exception/ReservationNotFoundException.java similarity index 61% rename from api-user/src/main/java/com/example/apiuser/reservation/exception/ReservationNotFoundException.java rename to application-user/src/main/java/com/nowait/applicationuser/reservation/exception/ReservationNotFoundException.java index 37dc86eb..bb6db2f8 100644 --- a/api-user/src/main/java/com/example/apiuser/reservation/exception/ReservationNotFoundException.java +++ b/application-user/src/main/java/com/nowait/applicationuser/reservation/exception/ReservationNotFoundException.java @@ -1,6 +1,6 @@ -package com.example.apiuser.reservation.exception; +package com.nowait.applicationuser.reservation.exception; -import com.nowaiting.common.exception.ErrorMessage; +import com.nowait.common.exception.ErrorMessage; public class ReservationNotFoundException extends RuntimeException { public ReservationNotFoundException() { diff --git a/api-user/src/main/java/com/example/apiuser/reservation/service/ReservationService.java b/application-user/src/main/java/com/nowait/applicationuser/reservation/service/ReservationService.java similarity index 67% rename from api-user/src/main/java/com/example/apiuser/reservation/service/ReservationService.java rename to application-user/src/main/java/com/nowait/applicationuser/reservation/service/ReservationService.java index a5394ec8..e4c3ed4d 100644 --- a/api-user/src/main/java/com/example/apiuser/reservation/service/ReservationService.java +++ b/application-user/src/main/java/com/nowait/applicationuser/reservation/service/ReservationService.java @@ -1,21 +1,21 @@ -package com.example.apiuser.reservation.service; +package com.nowait.applicationuser.reservation.service; import java.time.LocalDateTime; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.example.apiuser.reservation.dto.ReservationCreateRequestDto; -import com.example.apiuser.reservation.dto.ReservationCreateResponseDto; -import com.example.domainstore.entity.Store; -import com.example.domainstore.repository.StoreRepository; -import com.nowait.auth.dto.CustomOAuth2User; -import com.nowait.domainreservation.entity.Reservation; -import com.nowait.domainreservation.repository.ReservationRepository; -import com.nowaiting.common.enums.ReservationStatus; -import com.nowaiting.user.entity.User; -import com.nowaiting.user.exception.UserNotFoundException; -import com.nowaiting.user.repository.UserRepository; +import com.nowait.applicationuser.reservation.dto.ReservationCreateRequestDto; +import com.nowait.applicationuser.reservation.dto.ReservationCreateResponseDto; +import com.nowait.externaloauth.dto.CustomOAuth2User; +import com.nowait.store.entity.Store; +import com.nowait.store.repository.StoreRepository; +import com.nowait.reservation.entity.Reservation; +import com.nowait.reservation.repository.ReservationRepository; +import com.nowait.common.enums.ReservationStatus; +import com.nowait.user.entity.User; +import com.nowait.user.exception.UserNotFoundException; +import com.nowait.user.repository.UserRepository; import lombok.RequiredArgsConstructor; diff --git a/api-user/src/main/java/com/example/apiuser/store/controller/StoreController.java b/application-user/src/main/java/com/nowait/applicationuser/store/controller/StoreController.java similarity index 90% rename from api-user/src/main/java/com/example/apiuser/store/controller/StoreController.java rename to application-user/src/main/java/com/nowait/applicationuser/store/controller/StoreController.java index 6a3cba2e..f3f7f2c1 100644 --- a/api-user/src/main/java/com/example/apiuser/store/controller/StoreController.java +++ b/application-user/src/main/java/com/nowait/applicationuser/store/controller/StoreController.java @@ -1,4 +1,4 @@ -package com.example.apiuser.store.controller; +package com.nowait.applicationuser.store.controller; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -9,8 +9,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.example.apiuser.store.service.StoreService; -import com.nowaiting.common.api.ApiUtils; +import com.nowait.applicationuser.store.service.StoreService; +import com.nowait.common.api.ApiUtils; import lombok.RequiredArgsConstructor; diff --git a/api-user/src/main/java/com/example/apiuser/store/dto/StoreImageUploadResponse.java b/application-user/src/main/java/com/nowait/applicationuser/store/dto/StoreImageUploadResponse.java similarity index 80% rename from api-user/src/main/java/com/example/apiuser/store/dto/StoreImageUploadResponse.java rename to application-user/src/main/java/com/nowait/applicationuser/store/dto/StoreImageUploadResponse.java index 23a1b224..8f5612d0 100644 --- a/api-user/src/main/java/com/example/apiuser/store/dto/StoreImageUploadResponse.java +++ b/application-user/src/main/java/com/nowait/applicationuser/store/dto/StoreImageUploadResponse.java @@ -1,6 +1,6 @@ -package com.example.apiuser.store.dto; +package com.nowait.applicationuser.store.dto; -import com.example.domainstore.entity.StoreImage; +import com.nowait.store.entity.StoreImage; import lombok.Builder; import lombok.Getter; diff --git a/api-user/src/main/java/com/example/apiuser/store/dto/StoreReadDto.java b/application-user/src/main/java/com/nowait/applicationuser/store/dto/StoreReadDto.java similarity index 91% rename from api-user/src/main/java/com/example/apiuser/store/dto/StoreReadDto.java rename to application-user/src/main/java/com/nowait/applicationuser/store/dto/StoreReadDto.java index d6cfab6e..b13cb220 100644 --- a/api-user/src/main/java/com/example/apiuser/store/dto/StoreReadDto.java +++ b/application-user/src/main/java/com/nowait/applicationuser/store/dto/StoreReadDto.java @@ -1,9 +1,9 @@ -package com.example.apiuser.store.dto; +package com.nowait.applicationuser.store.dto; import java.time.LocalDateTime; import java.util.List; -import com.example.domainstore.entity.Store; +import com.nowait.store.entity.Store; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/api-user/src/main/java/com/example/apiuser/store/dto/StoreReadResponse.java b/application-user/src/main/java/com/nowait/applicationuser/store/dto/StoreReadResponse.java similarity index 90% rename from api-user/src/main/java/com/example/apiuser/store/dto/StoreReadResponse.java rename to application-user/src/main/java/com/nowait/applicationuser/store/dto/StoreReadResponse.java index a580e562..37faef23 100644 --- a/api-user/src/main/java/com/example/apiuser/store/dto/StoreReadResponse.java +++ b/application-user/src/main/java/com/nowait/applicationuser/store/dto/StoreReadResponse.java @@ -1,4 +1,4 @@ -package com.example.apiuser.store.dto; +package com.nowait.applicationuser.store.dto; import java.util.List; diff --git a/api-user/src/main/java/com/example/apiuser/store/service/StoreService.java b/application-user/src/main/java/com/nowait/applicationuser/store/service/StoreService.java similarity index 64% rename from api-user/src/main/java/com/example/apiuser/store/service/StoreService.java rename to application-user/src/main/java/com/nowait/applicationuser/store/service/StoreService.java index 83ea3467..e2f37f61 100644 --- a/api-user/src/main/java/com/example/apiuser/store/service/StoreService.java +++ b/application-user/src/main/java/com/nowait/applicationuser/store/service/StoreService.java @@ -1,11 +1,11 @@ -package com.example.apiuser.store.service; +package com.nowait.applicationuser.store.service; import java.util.List; import org.springframework.data.domain.Pageable; -import com.example.apiuser.store.dto.StoreReadDto; -import com.example.apiuser.store.dto.StoreReadResponse; +import com.nowait.applicationuser.store.dto.StoreReadDto; +import com.nowait.applicationuser.store.dto.StoreReadResponse; public interface StoreService { diff --git a/api-user/src/main/java/com/example/apiuser/store/service/StoreServiceImpl.java b/application-user/src/main/java/com/nowait/applicationuser/store/service/StoreServiceImpl.java similarity index 86% rename from api-user/src/main/java/com/example/apiuser/store/service/StoreServiceImpl.java rename to application-user/src/main/java/com/nowait/applicationuser/store/service/StoreServiceImpl.java index c68657f9..2660af67 100644 --- a/api-user/src/main/java/com/example/apiuser/store/service/StoreServiceImpl.java +++ b/application-user/src/main/java/com/nowait/applicationuser/store/service/StoreServiceImpl.java @@ -1,4 +1,4 @@ -package com.example.apiuser.store.service; +package com.nowait.applicationuser.store.service; import java.util.List; @@ -6,13 +6,13 @@ import org.springframework.data.domain.Slice; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.example.apiuser.store.dto.StoreImageUploadResponse; -import com.example.apiuser.store.dto.StoreReadDto; -import com.example.apiuser.store.dto.StoreReadResponse; -import com.example.domainstore.entity.Store; -import com.example.domainstore.entity.StoreImage; -import com.example.domainstore.repository.StoreImageRepository; -import com.example.domainstore.repository.StoreRepository; +import com.nowait.applicationuser.store.dto.StoreImageUploadResponse; +import com.nowait.applicationuser.store.dto.StoreReadDto; +import com.nowait.applicationuser.store.dto.StoreReadResponse; +import com.nowait.store.entity.Store; +import com.nowait.store.entity.StoreImage; +import com.nowait.store.repository.StoreImageRepository; +import com.nowait.store.repository.StoreRepository; import jakarta.persistence.EntityNotFoundException; import lombok.RequiredArgsConstructor; diff --git a/api-user/src/main/java/com/example/apiuser/token/controller/TokenController.java b/application-user/src/main/java/com/nowait/applicationuser/token/controller/TokenController.java similarity index 87% rename from api-user/src/main/java/com/example/apiuser/token/controller/TokenController.java rename to application-user/src/main/java/com/nowait/applicationuser/token/controller/TokenController.java index 11120f30..bb72e0ec 100644 --- a/api-user/src/main/java/com/example/apiuser/token/controller/TokenController.java +++ b/application-user/src/main/java/com/nowait/applicationuser/token/controller/TokenController.java @@ -1,4 +1,4 @@ -package com.example.apiuser.token.controller; +package com.nowait.applicationuser.token.controller; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; @@ -8,10 +8,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.example.apiuser.token.dto.AuthenticationResponse; -import com.example.apiuser.token.dto.RefreshTokenRequest; -import com.example.apiuser.token.service.TokenService; -import com.nowait.auth.jwt.JwtUtil; +import com.nowait.applicationuser.token.dto.AuthenticationResponse; +import com.nowait.applicationuser.token.dto.RefreshTokenRequest; +import com.nowait.applicationuser.token.service.TokenService; +import com.nowait.externaloauth.jwt.JwtUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/api-admin/src/main/java/com/example/apiadmin/token/dto/AuthenticationResponse.java b/application-user/src/main/java/com/nowait/applicationuser/token/dto/AuthenticationResponse.java similarity index 90% rename from api-admin/src/main/java/com/example/apiadmin/token/dto/AuthenticationResponse.java rename to application-user/src/main/java/com/nowait/applicationuser/token/dto/AuthenticationResponse.java index 170a3166..5a1a3c39 100644 --- a/api-admin/src/main/java/com/example/apiadmin/token/dto/AuthenticationResponse.java +++ b/application-user/src/main/java/com/nowait/applicationuser/token/dto/AuthenticationResponse.java @@ -1,4 +1,4 @@ -package com.example.apiadmin.token.dto; +package com.nowait.applicationuser.token.dto; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/api-admin/src/main/java/com/example/apiadmin/token/dto/RefreshTokenRequest.java b/application-user/src/main/java/com/nowait/applicationuser/token/dto/RefreshTokenRequest.java similarity index 85% rename from api-admin/src/main/java/com/example/apiadmin/token/dto/RefreshTokenRequest.java rename to application-user/src/main/java/com/nowait/applicationuser/token/dto/RefreshTokenRequest.java index aa97db17..c0bf4e68 100644 --- a/api-admin/src/main/java/com/example/apiadmin/token/dto/RefreshTokenRequest.java +++ b/application-user/src/main/java/com/nowait/applicationuser/token/dto/RefreshTokenRequest.java @@ -1,4 +1,4 @@ -package com.example.apiadmin.token.dto; +package com.nowait.applicationuser.token.dto; import jakarta.validation.constraints.NotBlank; import lombok.Getter; diff --git a/api-user/src/main/java/com/example/apiuser/token/service/TokenService.java b/application-user/src/main/java/com/nowait/applicationuser/token/service/TokenService.java similarity index 86% rename from api-user/src/main/java/com/example/apiuser/token/service/TokenService.java rename to application-user/src/main/java/com/nowait/applicationuser/token/service/TokenService.java index 56845238..a3acfee8 100644 --- a/api-user/src/main/java/com/example/apiuser/token/service/TokenService.java +++ b/application-user/src/main/java/com/nowait/applicationuser/token/service/TokenService.java @@ -1,4 +1,4 @@ -package com.example.apiuser.token.service; +package com.nowait.applicationuser.token.service; import java.time.LocalDateTime; import java.util.Optional; @@ -6,11 +6,11 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.example.domaintoken.entity.Token; -import com.example.domaintoken.repository.TokenRepository; -import com.nowait.auth.jwt.JwtUtil; -import com.nowait.exception.RefreshTokenNotFoundException; -import com.nowait.exception.TokenBadRequestException; +import com.nowait.externaloauth.jwt.JwtUtil; +import com.nowait.token.entity.Token; +import com.nowait.token.repository.TokenRepository; +import com.nowait.frontsecurity.exception.RefreshTokenNotFoundException; +import com.nowait.frontsecurity.exception.TokenBadRequestException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/common/src/main/java/com/nowaiting/common/api/ApiError.java b/common/src/main/java/com/nowait/common/api/ApiError.java similarity index 89% rename from common/src/main/java/com/nowaiting/common/api/ApiError.java rename to common/src/main/java/com/nowait/common/api/ApiError.java index b5cbca81..08f3e598 100644 --- a/common/src/main/java/com/nowaiting/common/api/ApiError.java +++ b/common/src/main/java/com/nowait/common/api/ApiError.java @@ -1,6 +1,6 @@ -package com.nowaiting.common.api; +package com.nowait.common.api; -import com.nowaiting.common.enums.HttpStatusCode; +import com.nowait.common.enums.HttpStatusCode; /** * API 에러 정보 diff --git a/common/src/main/java/com/nowaiting/common/api/ApiResult.java b/common/src/main/java/com/nowait/common/api/ApiResult.java similarity index 92% rename from common/src/main/java/com/nowaiting/common/api/ApiResult.java rename to common/src/main/java/com/nowait/common/api/ApiResult.java index 82e9a161..73509f56 100644 --- a/common/src/main/java/com/nowaiting/common/api/ApiResult.java +++ b/common/src/main/java/com/nowait/common/api/ApiResult.java @@ -1,4 +1,4 @@ -package com.nowaiting.common.api; +package com.nowait.common.api; public class ApiResult { private final boolean success; diff --git a/common/src/main/java/com/nowaiting/common/api/ApiUtils.java b/common/src/main/java/com/nowait/common/api/ApiUtils.java similarity index 85% rename from common/src/main/java/com/nowaiting/common/api/ApiUtils.java rename to common/src/main/java/com/nowait/common/api/ApiUtils.java index 6cd010d3..1517f253 100644 --- a/common/src/main/java/com/nowaiting/common/api/ApiUtils.java +++ b/common/src/main/java/com/nowait/common/api/ApiUtils.java @@ -1,7 +1,7 @@ // common/api/ApiUtils.java -package com.nowaiting.common.api; +package com.nowait.common.api; -import com.nowaiting.common.enums.HttpStatusCode; +import com.nowait.common.enums.HttpStatusCode; public class ApiUtils { public static ApiResult success(T response) { diff --git a/common/src/main/java/com/nowaiting/common/enums/HttpStatusCode.java b/common/src/main/java/com/nowait/common/enums/HttpStatusCode.java similarity index 88% rename from common/src/main/java/com/nowaiting/common/enums/HttpStatusCode.java rename to common/src/main/java/com/nowait/common/enums/HttpStatusCode.java index a22fe922..5d96e2eb 100644 --- a/common/src/main/java/com/nowaiting/common/enums/HttpStatusCode.java +++ b/common/src/main/java/com/nowait/common/enums/HttpStatusCode.java @@ -1,4 +1,4 @@ -package com.nowaiting.common.enums; +package com.nowait.common.enums; public enum HttpStatusCode { OK(200), diff --git a/common/src/main/java/com/nowaiting/common/enums/ReservationStatus.java b/common/src/main/java/com/nowait/common/enums/ReservationStatus.java similarity index 67% rename from common/src/main/java/com/nowaiting/common/enums/ReservationStatus.java rename to common/src/main/java/com/nowait/common/enums/ReservationStatus.java index 597c460c..4d4f58a2 100644 --- a/common/src/main/java/com/nowaiting/common/enums/ReservationStatus.java +++ b/common/src/main/java/com/nowait/common/enums/ReservationStatus.java @@ -1,4 +1,4 @@ -package com.nowaiting.common.enums; +package com.nowait.common.enums; public enum ReservationStatus { WAITING,CALLING, CONFIRMED, CANCELLED diff --git a/common/src/main/java/com/nowaiting/common/enums/Role.java b/common/src/main/java/com/nowait/common/enums/Role.java similarity index 94% rename from common/src/main/java/com/nowaiting/common/enums/Role.java rename to common/src/main/java/com/nowait/common/enums/Role.java index c0a87c2e..5aed5a91 100644 --- a/common/src/main/java/com/nowaiting/common/enums/Role.java +++ b/common/src/main/java/com/nowait/common/enums/Role.java @@ -1,4 +1,4 @@ -package com.nowaiting.common.enums; +package com.nowait.common.enums; public enum Role { USER("USER"), diff --git a/common/src/main/java/com/nowaiting/common/enums/SocialType.java b/common/src/main/java/com/nowait/common/enums/SocialType.java similarity index 62% rename from common/src/main/java/com/nowaiting/common/enums/SocialType.java rename to common/src/main/java/com/nowait/common/enums/SocialType.java index a853e826..1e46a7c6 100644 --- a/common/src/main/java/com/nowaiting/common/enums/SocialType.java +++ b/common/src/main/java/com/nowait/common/enums/SocialType.java @@ -1,4 +1,4 @@ -package com.nowaiting.common.enums; +package com.nowait.common.enums; public enum SocialType { KAKAO, NAVER, GOOGLE, LOCAL diff --git a/common/src/main/java/com/nowaiting/common/exception/ErrorMessage.java b/common/src/main/java/com/nowait/common/exception/ErrorMessage.java similarity index 96% rename from common/src/main/java/com/nowaiting/common/exception/ErrorMessage.java rename to common/src/main/java/com/nowait/common/exception/ErrorMessage.java index dc7e34da..d695104f 100644 --- a/common/src/main/java/com/nowaiting/common/exception/ErrorMessage.java +++ b/common/src/main/java/com/nowait/common/exception/ErrorMessage.java @@ -1,4 +1,4 @@ -package com.nowaiting.common.exception; +package com.nowait.common.exception; public enum ErrorMessage { // global diff --git a/common/src/main/java/com/nowaiting/common/exception/ErrorResponse.java b/common/src/main/java/com/nowait/common/exception/ErrorResponse.java similarity index 94% rename from common/src/main/java/com/nowaiting/common/exception/ErrorResponse.java rename to common/src/main/java/com/nowait/common/exception/ErrorResponse.java index 935069e7..1e0f70a7 100644 --- a/common/src/main/java/com/nowaiting/common/exception/ErrorResponse.java +++ b/common/src/main/java/com/nowait/common/exception/ErrorResponse.java @@ -1,4 +1,4 @@ -package com.nowaiting.common.exception; +package com.nowait.common.exception; import java.util.HashMap; import java.util.Map; diff --git a/domain-bookmark/src/main/java/com/nowait/domainbookmark/entity/Bookmark.java b/domain-bookmark/src/main/java/com/nowait/bookmark/entity/Bookmark.java similarity index 90% rename from domain-bookmark/src/main/java/com/nowait/domainbookmark/entity/Bookmark.java rename to domain-bookmark/src/main/java/com/nowait/bookmark/entity/Bookmark.java index 18f69e0c..d1808277 100644 --- a/domain-bookmark/src/main/java/com/nowait/domainbookmark/entity/Bookmark.java +++ b/domain-bookmark/src/main/java/com/nowait/bookmark/entity/Bookmark.java @@ -1,8 +1,8 @@ -package com.nowait.domainbookmark.entity; +package com.nowait.bookmark.entity; -import com.example.domainstore.entity.Store; +import com.nowait.store.entity.Store; import com.nowait.base.BaseTimeEntity; -import com.nowaiting.user.entity.User; +import com.nowait.user.entity.User; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/domain-bookmark/src/main/java/com/nowait/domainbookmark/exception/BookmarkOwnerMismatchException.java b/domain-bookmark/src/main/java/com/nowait/bookmark/exception/BookmarkOwnerMismatchException.java similarity index 64% rename from domain-bookmark/src/main/java/com/nowait/domainbookmark/exception/BookmarkOwnerMismatchException.java rename to domain-bookmark/src/main/java/com/nowait/bookmark/exception/BookmarkOwnerMismatchException.java index 733d40d9..dcb2549a 100644 --- a/domain-bookmark/src/main/java/com/nowait/domainbookmark/exception/BookmarkOwnerMismatchException.java +++ b/domain-bookmark/src/main/java/com/nowait/bookmark/exception/BookmarkOwnerMismatchException.java @@ -1,6 +1,6 @@ -package com.nowait.domainbookmark.exception; +package com.nowait.bookmark.exception; -import com.nowaiting.common.exception.ErrorMessage; +import com.nowait.common.exception.ErrorMessage; public class BookmarkOwnerMismatchException extends RuntimeException { public BookmarkOwnerMismatchException() { diff --git a/domain-bookmark/src/main/java/com/nowait/domainbookmark/exception/DuplicateBookmarkException.java b/domain-bookmark/src/main/java/com/nowait/bookmark/exception/DuplicateBookmarkException.java similarity index 63% rename from domain-bookmark/src/main/java/com/nowait/domainbookmark/exception/DuplicateBookmarkException.java rename to domain-bookmark/src/main/java/com/nowait/bookmark/exception/DuplicateBookmarkException.java index 29e70466..d18b4371 100644 --- a/domain-bookmark/src/main/java/com/nowait/domainbookmark/exception/DuplicateBookmarkException.java +++ b/domain-bookmark/src/main/java/com/nowait/bookmark/exception/DuplicateBookmarkException.java @@ -1,6 +1,6 @@ -package com.nowait.domainbookmark.exception; +package com.nowait.bookmark.exception; -import com.nowaiting.common.exception.ErrorMessage; +import com.nowait.common.exception.ErrorMessage; public class DuplicateBookmarkException extends RuntimeException { public DuplicateBookmarkException() { diff --git a/domain-bookmark/src/main/java/com/nowait/domainbookmark/repository/BookmarkRepository.java b/domain-bookmark/src/main/java/com/nowait/bookmark/repository/BookmarkRepository.java similarity index 65% rename from domain-bookmark/src/main/java/com/nowait/domainbookmark/repository/BookmarkRepository.java rename to domain-bookmark/src/main/java/com/nowait/bookmark/repository/BookmarkRepository.java index 1865bfea..e5a2a10d 100644 --- a/domain-bookmark/src/main/java/com/nowait/domainbookmark/repository/BookmarkRepository.java +++ b/domain-bookmark/src/main/java/com/nowait/bookmark/repository/BookmarkRepository.java @@ -1,13 +1,13 @@ -package com.nowait.domainbookmark.repository; +package com.nowait.bookmark.repository; import java.util.Collection; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import com.example.domainstore.entity.Store; -import com.nowait.domainbookmark.entity.Bookmark; -import com.nowaiting.user.entity.User; +import com.nowait.store.entity.Store; +import com.nowait.bookmark.entity.Bookmark; +import com.nowait.user.entity.User; @Repository public interface BookmarkRepository extends JpaRepository { diff --git a/domain-menu/src/main/java/com/example/menu/entity/Menu.java b/domain-menu/src/main/java/com/nowait/menu/entity/Menu.java similarity index 97% rename from domain-menu/src/main/java/com/example/menu/entity/Menu.java rename to domain-menu/src/main/java/com/nowait/menu/entity/Menu.java index 711bc779..31b280ae 100644 --- a/domain-menu/src/main/java/com/example/menu/entity/Menu.java +++ b/domain-menu/src/main/java/com/nowait/menu/entity/Menu.java @@ -1,4 +1,4 @@ -package com.example.menu.entity; +package com.nowait.menu.entity; import java.time.LocalDateTime; import com.nowait.base.BaseTimeEntity; diff --git a/domain-menu/src/main/java/com/example/menu/entity/MenuImage.java b/domain-menu/src/main/java/com/nowait/menu/entity/MenuImage.java similarity index 96% rename from domain-menu/src/main/java/com/example/menu/entity/MenuImage.java rename to domain-menu/src/main/java/com/nowait/menu/entity/MenuImage.java index 6269ad43..c7dc602f 100644 --- a/domain-menu/src/main/java/com/example/menu/entity/MenuImage.java +++ b/domain-menu/src/main/java/com/nowait/menu/entity/MenuImage.java @@ -1,4 +1,4 @@ -package com.example.menu.entity; +package com.nowait.menu.entity; import com.nowait.base.BaseTimeEntity; diff --git a/domain-menu/src/main/java/com/example/menu/repository/MenuImageRepository.java b/domain-menu/src/main/java/com/nowait/menu/repository/MenuImageRepository.java similarity index 70% rename from domain-menu/src/main/java/com/example/menu/repository/MenuImageRepository.java rename to domain-menu/src/main/java/com/nowait/menu/repository/MenuImageRepository.java index 05e125b8..11615149 100644 --- a/domain-menu/src/main/java/com/example/menu/repository/MenuImageRepository.java +++ b/domain-menu/src/main/java/com/nowait/menu/repository/MenuImageRepository.java @@ -1,12 +1,12 @@ -package com.example.menu.repository; +package com.nowait.menu.repository; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import com.example.menu.entity.Menu; -import com.example.menu.entity.MenuImage; +import com.nowait.menu.entity.Menu; +import com.nowait.menu.entity.MenuImage; @Repository public interface MenuImageRepository extends JpaRepository { diff --git a/domain-menu/src/main/java/com/example/menu/repository/MenuRepository.java b/domain-menu/src/main/java/com/nowait/menu/repository/MenuRepository.java similarity index 85% rename from domain-menu/src/main/java/com/example/menu/repository/MenuRepository.java rename to domain-menu/src/main/java/com/nowait/menu/repository/MenuRepository.java index ca15d517..fbe2282b 100644 --- a/domain-menu/src/main/java/com/example/menu/repository/MenuRepository.java +++ b/domain-menu/src/main/java/com/nowait/menu/repository/MenuRepository.java @@ -1,4 +1,4 @@ -package com.example.menu.repository; +package com.nowait.menu.repository; import java.util.List; import java.util.Optional; @@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import com.example.menu.entity.Menu; +import com.nowait.menu.entity.Menu; @Repository public interface MenuRepository extends JpaRepository { diff --git a/domain-order/src/main/java/com/nowait/domainorder/entity/OrderItem.java b/domain-order/src/main/java/com/nowait/order/entity/OrderItem.java similarity index 92% rename from domain-order/src/main/java/com/nowait/domainorder/entity/OrderItem.java rename to domain-order/src/main/java/com/nowait/order/entity/OrderItem.java index 064fc166..a979933a 100644 --- a/domain-order/src/main/java/com/nowait/domainorder/entity/OrderItem.java +++ b/domain-order/src/main/java/com/nowait/order/entity/OrderItem.java @@ -1,6 +1,6 @@ -package com.nowait.domainorder.entity; +package com.nowait.order.entity; -import com.example.menu.entity.Menu; +import com.nowait.menu.entity.Menu; import com.nowait.base.BaseTimeEntity; import jakarta.persistence.Entity; diff --git a/domain-order/src/main/java/com/nowait/domainorder/entity/UserOrder.java b/domain-order/src/main/java/com/nowait/order/entity/UserOrder.java similarity index 93% rename from domain-order/src/main/java/com/nowait/domainorder/entity/UserOrder.java rename to domain-order/src/main/java/com/nowait/order/entity/UserOrder.java index 8831f74a..7d94e44e 100644 --- a/domain-order/src/main/java/com/nowait/domainorder/entity/UserOrder.java +++ b/domain-order/src/main/java/com/nowait/order/entity/UserOrder.java @@ -1,9 +1,9 @@ -package com.nowait.domainorder.entity; +package com.nowait.order.entity; import java.util.ArrayList; import java.util.List; -import com.example.domainstore.entity.Store; +import com.nowait.store.entity.Store; import com.nowait.base.BaseTimeEntity; import jakarta.persistence.CascadeType; diff --git a/domain-order/src/main/java/com/nowait/domainorder/exception/DuplicateOrderException.java b/domain-order/src/main/java/com/nowait/order/exception/DuplicateOrderException.java similarity index 62% rename from domain-order/src/main/java/com/nowait/domainorder/exception/DuplicateOrderException.java rename to domain-order/src/main/java/com/nowait/order/exception/DuplicateOrderException.java index a3e816cd..aee663cd 100644 --- a/domain-order/src/main/java/com/nowait/domainorder/exception/DuplicateOrderException.java +++ b/domain-order/src/main/java/com/nowait/order/exception/DuplicateOrderException.java @@ -1,6 +1,6 @@ -package com.nowait.domainorder.exception; +package com.nowait.order.exception; -import com.nowaiting.common.exception.ErrorMessage; +import com.nowait.common.exception.ErrorMessage; public class DuplicateOrderException extends RuntimeException { public DuplicateOrderException() { diff --git a/domain-order/src/main/java/com/nowait/domainorder/exception/OrderItemsEmptyException.java b/domain-order/src/main/java/com/nowait/order/exception/OrderItemsEmptyException.java similarity index 63% rename from domain-order/src/main/java/com/nowait/domainorder/exception/OrderItemsEmptyException.java rename to domain-order/src/main/java/com/nowait/order/exception/OrderItemsEmptyException.java index 70614798..416e101f 100644 --- a/domain-order/src/main/java/com/nowait/domainorder/exception/OrderItemsEmptyException.java +++ b/domain-order/src/main/java/com/nowait/order/exception/OrderItemsEmptyException.java @@ -1,6 +1,6 @@ -package com.nowait.domainorder.exception; +package com.nowait.order.exception; -import com.nowaiting.common.exception.ErrorMessage; +import com.nowait.common.exception.ErrorMessage; public class OrderItemsEmptyException extends RuntimeException { public OrderItemsEmptyException() { diff --git a/domain-order/src/main/java/com/nowait/domainorder/exception/OrderParameterEmptyException.java b/domain-order/src/main/java/com/nowait/order/exception/OrderParameterEmptyException.java similarity index 65% rename from domain-order/src/main/java/com/nowait/domainorder/exception/OrderParameterEmptyException.java rename to domain-order/src/main/java/com/nowait/order/exception/OrderParameterEmptyException.java index d3b6736c..197814c4 100644 --- a/domain-order/src/main/java/com/nowait/domainorder/exception/OrderParameterEmptyException.java +++ b/domain-order/src/main/java/com/nowait/order/exception/OrderParameterEmptyException.java @@ -1,6 +1,6 @@ -package com.nowait.domainorder.exception; +package com.nowait.order.exception; -import com.nowaiting.common.exception.ErrorMessage; +import com.nowait.common.exception.ErrorMessage; public class OrderParameterEmptyException extends RuntimeException { public OrderParameterEmptyException() { diff --git a/domain-order/src/main/java/com/nowait/domainorder/repository/OrderItemRepository.java b/domain-order/src/main/java/com/nowait/order/repository/OrderItemRepository.java similarity index 69% rename from domain-order/src/main/java/com/nowait/domainorder/repository/OrderItemRepository.java rename to domain-order/src/main/java/com/nowait/order/repository/OrderItemRepository.java index 949b4e78..7544e3d0 100644 --- a/domain-order/src/main/java/com/nowait/domainorder/repository/OrderItemRepository.java +++ b/domain-order/src/main/java/com/nowait/order/repository/OrderItemRepository.java @@ -1,9 +1,9 @@ -package com.nowait.domainorder.repository; +package com.nowait.order.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import com.nowait.domainorder.entity.OrderItem; +import com.nowait.order.entity.OrderItem; @Repository public interface OrderItemRepository extends JpaRepository { diff --git a/domain-order/src/main/java/com/nowait/domainorder/repository/OrderRepository.java b/domain-order/src/main/java/com/nowait/order/repository/OrderRepository.java similarity index 83% rename from domain-order/src/main/java/com/nowait/domainorder/repository/OrderRepository.java rename to domain-order/src/main/java/com/nowait/order/repository/OrderRepository.java index 94e7a09e..e41b80de 100644 --- a/domain-order/src/main/java/com/nowait/domainorder/repository/OrderRepository.java +++ b/domain-order/src/main/java/com/nowait/order/repository/OrderRepository.java @@ -1,4 +1,4 @@ -package com.nowait.domainorder.repository; +package com.nowait.order.repository; import java.time.LocalDateTime; import java.util.List; @@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import com.nowait.domainorder.entity.UserOrder; +import com.nowait.order.entity.UserOrder; @Repository public interface OrderRepository extends JpaRepository { diff --git a/domain-reservation/src/main/java/com/nowait/domainreservation/entity/Reservation.java b/domain-reservation/src/main/java/com/nowait/reservation/entity/Reservation.java similarity index 88% rename from domain-reservation/src/main/java/com/nowait/domainreservation/entity/Reservation.java rename to domain-reservation/src/main/java/com/nowait/reservation/entity/Reservation.java index 90b9eeb3..67463687 100644 --- a/domain-reservation/src/main/java/com/nowait/domainreservation/entity/Reservation.java +++ b/domain-reservation/src/main/java/com/nowait/reservation/entity/Reservation.java @@ -1,10 +1,10 @@ -package com.nowait.domainreservation.entity; +package com.nowait.reservation.entity; import java.time.LocalDateTime; -import com.example.domainstore.entity.Store; -import com.nowaiting.common.enums.ReservationStatus; -import com.nowaiting.user.entity.User; +import com.nowait.store.entity.Store; +import com.nowait.common.enums.ReservationStatus; +import com.nowait.user.entity.User; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/domain-reservation/src/main/java/com/nowait/domainreservation/repository/ReservationRepository.java b/domain-reservation/src/main/java/com/nowait/reservation/repository/ReservationRepository.java similarity index 70% rename from domain-reservation/src/main/java/com/nowait/domainreservation/repository/ReservationRepository.java rename to domain-reservation/src/main/java/com/nowait/reservation/repository/ReservationRepository.java index 3483e91b..e564ff78 100644 --- a/domain-reservation/src/main/java/com/nowait/domainreservation/repository/ReservationRepository.java +++ b/domain-reservation/src/main/java/com/nowait/reservation/repository/ReservationRepository.java @@ -1,10 +1,10 @@ -package com.nowait.domainreservation.repository; +package com.nowait.reservation.repository; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; -import com.nowait.domainreservation.entity.Reservation; +import com.nowait.reservation.entity.Reservation; public interface ReservationRepository extends JpaRepository { List findAllByStore_StoreIdOrderByRequestedAtAsc(Long storeId); diff --git a/domain-store/src/main/java/com/example/domainstore/entity/Store.java b/domain-store/src/main/java/com/nowait/store/entity/Store.java similarity index 97% rename from domain-store/src/main/java/com/example/domainstore/entity/Store.java rename to domain-store/src/main/java/com/nowait/store/entity/Store.java index 17464734..abd03960 100644 --- a/domain-store/src/main/java/com/example/domainstore/entity/Store.java +++ b/domain-store/src/main/java/com/nowait/store/entity/Store.java @@ -1,4 +1,4 @@ -package com.example.domainstore.entity; +package com.nowait.store.entity; import java.time.LocalDateTime; diff --git a/domain-store/src/main/java/com/example/domainstore/entity/StoreImage.java b/domain-store/src/main/java/com/nowait/store/entity/StoreImage.java similarity index 96% rename from domain-store/src/main/java/com/example/domainstore/entity/StoreImage.java rename to domain-store/src/main/java/com/nowait/store/entity/StoreImage.java index 41f0896f..cddb9ad1 100644 --- a/domain-store/src/main/java/com/example/domainstore/entity/StoreImage.java +++ b/domain-store/src/main/java/com/nowait/store/entity/StoreImage.java @@ -1,4 +1,4 @@ -package com.example.domainstore.entity; +package com.nowait.store.entity; import com.nowait.base.BaseTimeEntity; diff --git a/domain-store/src/main/java/com/example/domainstore/repository/StoreImageRepository.java b/domain-store/src/main/java/com/nowait/store/repository/StoreImageRepository.java similarity index 66% rename from domain-store/src/main/java/com/example/domainstore/repository/StoreImageRepository.java rename to domain-store/src/main/java/com/nowait/store/repository/StoreImageRepository.java index dcbe07ba..0617122e 100644 --- a/domain-store/src/main/java/com/example/domainstore/repository/StoreImageRepository.java +++ b/domain-store/src/main/java/com/nowait/store/repository/StoreImageRepository.java @@ -1,12 +1,12 @@ -package com.example.domainstore.repository; +package com.nowait.store.repository; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import com.example.domainstore.entity.Store; -import com.example.domainstore.entity.StoreImage; +import com.nowait.store.entity.Store; +import com.nowait.store.entity.StoreImage; @Repository public interface StoreImageRepository extends JpaRepository { diff --git a/domain-store/src/main/java/com/example/domainstore/repository/StoreRepository.java b/domain-store/src/main/java/com/nowait/store/repository/StoreRepository.java similarity index 86% rename from domain-store/src/main/java/com/example/domainstore/repository/StoreRepository.java rename to domain-store/src/main/java/com/nowait/store/repository/StoreRepository.java index 1d817652..0c3c7013 100644 --- a/domain-store/src/main/java/com/example/domainstore/repository/StoreRepository.java +++ b/domain-store/src/main/java/com/nowait/store/repository/StoreRepository.java @@ -1,4 +1,4 @@ -package com.example.domainstore.repository; +package com.nowait.store.repository; import java.util.List; import java.util.Optional; @@ -8,7 +8,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import com.example.domainstore.entity.Store; +import com.nowait.store.entity.Store; @Repository public interface StoreRepository extends JpaRepository { diff --git a/domain-token/src/main/java/com/example/domaintoken/exception/BusinessException.java b/domain-token/src/main/java/com/example/domaintoken/exception/BusinessException.java deleted file mode 100644 index 05dc5c67..00000000 --- a/domain-token/src/main/java/com/example/domaintoken/exception/BusinessException.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.example.domaintoken.exception; - -import com.nowaiting.common.exception.ErrorMessage; - -public abstract class BusinessException extends RuntimeException { - private final ErrorMessage errorMessage; - - protected BusinessException(ErrorMessage errorMessage) { - super(errorMessage.getMessage()); - this.errorMessage = errorMessage; - } - - public String getCode() { - return errorMessage.getCode(); - } -} diff --git a/domain-token/src/main/java/com/example/domaintoken/entity/Token.java b/domain-token/src/main/java/com/nowait/token/entity/Token.java similarity index 94% rename from domain-token/src/main/java/com/example/domaintoken/entity/Token.java rename to domain-token/src/main/java/com/nowait/token/entity/Token.java index d337bdd5..16311bfa 100644 --- a/domain-token/src/main/java/com/example/domaintoken/entity/Token.java +++ b/domain-token/src/main/java/com/nowait/token/entity/Token.java @@ -1,8 +1,8 @@ -package com.example.domaintoken.entity; +package com.nowait.token.entity; import java.time.LocalDateTime; -import com.nowaiting.user.entity.User; +import com.nowait.user.entity.User; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/security-front/src/main/java/com/nowait/exception/BusinessException.java b/domain-token/src/main/java/com/nowait/token/exception/BusinessException.java similarity index 78% rename from security-front/src/main/java/com/nowait/exception/BusinessException.java rename to domain-token/src/main/java/com/nowait/token/exception/BusinessException.java index 60eec165..b9df2243 100644 --- a/security-front/src/main/java/com/nowait/exception/BusinessException.java +++ b/domain-token/src/main/java/com/nowait/token/exception/BusinessException.java @@ -1,4 +1,6 @@ -package com.nowait.exception; +package com.nowait.token.exception; + +import com.nowait.common.exception.ErrorMessage; public abstract class BusinessException extends RuntimeException { private final ErrorMessage errorMessage; diff --git a/domain-token/src/main/java/com/example/domaintoken/repository/TokenRepository.java b/domain-token/src/main/java/com/nowait/token/repository/TokenRepository.java similarity index 70% rename from domain-token/src/main/java/com/example/domaintoken/repository/TokenRepository.java rename to domain-token/src/main/java/com/nowait/token/repository/TokenRepository.java index d813fd09..53d49d76 100644 --- a/domain-token/src/main/java/com/example/domaintoken/repository/TokenRepository.java +++ b/domain-token/src/main/java/com/nowait/token/repository/TokenRepository.java @@ -1,10 +1,10 @@ -package com.example.domaintoken.repository; +package com.nowait.token.repository; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; -import com.example.domaintoken.entity.Token; +import com.nowait.token.entity.Token; public interface TokenRepository extends JpaRepository { Optional findByUserId(Long userId); diff --git a/domain-token/src/test/java/com/example/domaintoken/DomainTokenApplicationTests.java b/domain-token/src/test/java/com/nowait/token/DomainTokenApplicationTests.java similarity index 85% rename from domain-token/src/test/java/com/example/domaintoken/DomainTokenApplicationTests.java rename to domain-token/src/test/java/com/nowait/token/DomainTokenApplicationTests.java index 6a53ad8c..99f6cd30 100644 --- a/domain-token/src/test/java/com/example/domaintoken/DomainTokenApplicationTests.java +++ b/domain-token/src/test/java/com/nowait/token/DomainTokenApplicationTests.java @@ -1,4 +1,4 @@ -package com.example.domaintoken; +package com.nowait.token; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/domain-user/src/main/java/com/nowaiting/user/entity/MemberDetails.java b/domain-user/src/main/java/com/nowait/user/entity/MemberDetails.java similarity index 97% rename from domain-user/src/main/java/com/nowaiting/user/entity/MemberDetails.java rename to domain-user/src/main/java/com/nowait/user/entity/MemberDetails.java index c2c512f1..247b5ae8 100644 --- a/domain-user/src/main/java/com/nowaiting/user/entity/MemberDetails.java +++ b/domain-user/src/main/java/com/nowait/user/entity/MemberDetails.java @@ -1,4 +1,4 @@ -package com.nowaiting.user.entity; +package com.nowait.user.entity; import java.util.Collection; import java.util.List; diff --git a/domain-user/src/main/java/com/nowaiting/user/entity/User.java b/domain-user/src/main/java/com/nowait/user/entity/User.java similarity index 94% rename from domain-user/src/main/java/com/nowaiting/user/entity/User.java rename to domain-user/src/main/java/com/nowait/user/entity/User.java index 164d86a4..71e68ecb 100644 --- a/domain-user/src/main/java/com/nowaiting/user/entity/User.java +++ b/domain-user/src/main/java/com/nowait/user/entity/User.java @@ -1,9 +1,9 @@ -package com.nowaiting.user.entity; +package com.nowait.user.entity; import org.springframework.security.crypto.password.PasswordEncoder; -import com.nowaiting.common.enums.Role; -import com.nowaiting.common.enums.SocialType; +import com.nowait.common.enums.Role; +import com.nowait.common.enums.SocialType; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/domain-user/src/main/java/com/nowaiting/user/exception/UserNotFoundException.java b/domain-user/src/main/java/com/nowait/user/exception/UserNotFoundException.java similarity index 62% rename from domain-user/src/main/java/com/nowaiting/user/exception/UserNotFoundException.java rename to domain-user/src/main/java/com/nowait/user/exception/UserNotFoundException.java index bd2dfdc9..74788aa9 100644 --- a/domain-user/src/main/java/com/nowaiting/user/exception/UserNotFoundException.java +++ b/domain-user/src/main/java/com/nowait/user/exception/UserNotFoundException.java @@ -1,6 +1,6 @@ -package com.nowaiting.user.exception; +package com.nowait.user.exception; -import com.nowaiting.common.exception.ErrorMessage; +import com.nowait.common.exception.ErrorMessage; public class UserNotFoundException extends RuntimeException { public UserNotFoundException() { diff --git a/domain-user/src/main/java/com/nowaiting/user/repository/UserRepository.java b/domain-user/src/main/java/com/nowait/user/repository/UserRepository.java similarity index 76% rename from domain-user/src/main/java/com/nowaiting/user/repository/UserRepository.java rename to domain-user/src/main/java/com/nowait/user/repository/UserRepository.java index eea680f1..331264a3 100644 --- a/domain-user/src/main/java/com/nowaiting/user/repository/UserRepository.java +++ b/domain-user/src/main/java/com/nowait/user/repository/UserRepository.java @@ -1,10 +1,10 @@ -package com.nowaiting.user.repository; +package com.nowait.user.repository; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; -import com.nowaiting.user.entity.User; +import com.nowait.user.entity.User; public interface UserRepository extends JpaRepository { Optional findByEmail(String email); diff --git a/external-oauth/.gitignore b/external-oauth/.gitignore new file mode 100644 index 00000000..c2065bc2 --- /dev/null +++ b/external-oauth/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/external-oauth/build.gradle b/external-oauth/build.gradle new file mode 100644 index 00000000..8d44e560 --- /dev/null +++ b/external-oauth/build.gradle @@ -0,0 +1,40 @@ +plugins { + id 'java-library' +} + +group = 'com.nowaiting' +version = rootProject.version + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation project(':common') + implementation project(':domain-user') + implementation project(':domain-base') + implementation project(':domain-token') + + // SPRING SECURITY + api 'org.springframework.boot:spring-boot-starter-security' + api 'org.springframework.boot:spring-boot-starter-test' + // Lombok (optional) + compileOnly 'org.projectlombok:lombok:1.18.26' + annotationProcessor 'org.projectlombok:lombok:1.18.26' + // jwt + implementation 'io.jsonwebtoken:jjwt-api:0.12.3' + implementation 'io.jsonwebtoken:jjwt-impl:0.12.3' + implementation 'io.jsonwebtoken:jjwt-jackson:0.12.3' + // OAUTH2 + implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' + implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' + implementation 'jakarta.servlet:jakarta.servlet-api:6.0.0' + // SWAGGER + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0' +} diff --git a/security-front/src/main/java/com/nowait/auth/dto/CustomOAuth2User.java b/external-oauth/src/main/java/com/nowait/externaloauth/dto/CustomOAuth2User.java similarity index 93% rename from security-front/src/main/java/com/nowait/auth/dto/CustomOAuth2User.java rename to external-oauth/src/main/java/com/nowait/externaloauth/dto/CustomOAuth2User.java index 91eaaea9..41a5b1b1 100644 --- a/security-front/src/main/java/com/nowait/auth/dto/CustomOAuth2User.java +++ b/external-oauth/src/main/java/com/nowait/externaloauth/dto/CustomOAuth2User.java @@ -1,4 +1,4 @@ -package com.nowait.auth.dto; +package com.nowait.externaloauth.dto; import java.util.ArrayList; import java.util.Collection; @@ -7,7 +7,7 @@ import org.springframework.security.core.GrantedAuthority; import org.springframework.security.oauth2.core.user.OAuth2User; -import com.nowaiting.user.entity.User; +import com.nowait.user.entity.User; import lombok.RequiredArgsConstructor; diff --git a/security-front/src/main/java/com/nowait/auth/dto/KaKaoResponse.java b/external-oauth/src/main/java/com/nowait/externaloauth/dto/KaKaoResponse.java similarity index 96% rename from security-front/src/main/java/com/nowait/auth/dto/KaKaoResponse.java rename to external-oauth/src/main/java/com/nowait/externaloauth/dto/KaKaoResponse.java index e745bd26..8808617b 100644 --- a/security-front/src/main/java/com/nowait/auth/dto/KaKaoResponse.java +++ b/external-oauth/src/main/java/com/nowait/externaloauth/dto/KaKaoResponse.java @@ -1,4 +1,4 @@ -package com.nowait.auth.dto; +package com.nowait.externaloauth.dto; import java.util.Map; diff --git a/security-front/src/main/java/com/nowait/auth/dto/OAuth2Response.java b/external-oauth/src/main/java/com/nowait/externaloauth/dto/OAuth2Response.java similarity index 91% rename from security-front/src/main/java/com/nowait/auth/dto/OAuth2Response.java rename to external-oauth/src/main/java/com/nowait/externaloauth/dto/OAuth2Response.java index de987480..99cb1932 100644 --- a/security-front/src/main/java/com/nowait/auth/dto/OAuth2Response.java +++ b/external-oauth/src/main/java/com/nowait/externaloauth/dto/OAuth2Response.java @@ -1,4 +1,4 @@ -package com.nowait.auth.dto; +package com.nowait.externaloauth.dto; public interface OAuth2Response { // 제공자 (ex. naver, kakao) diff --git a/security-front/src/main/java/com/nowait/auth/jwt/JwtAuthorizationFilter.java b/external-oauth/src/main/java/com/nowait/externaloauth/jwt/JwtAuthorizationFilter.java similarity index 93% rename from security-front/src/main/java/com/nowait/auth/jwt/JwtAuthorizationFilter.java rename to external-oauth/src/main/java/com/nowait/externaloauth/jwt/JwtAuthorizationFilter.java index d55f9a5f..8494a235 100644 --- a/security-front/src/main/java/com/nowait/auth/jwt/JwtAuthorizationFilter.java +++ b/external-oauth/src/main/java/com/nowait/externaloauth/jwt/JwtAuthorizationFilter.java @@ -1,4 +1,4 @@ -package com.nowait.auth.jwt; +package com.nowait.externaloauth.jwt; import java.io.IOException; @@ -6,10 +6,10 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.web.filter.OncePerRequestFilter; -import com.nowait.auth.dto.CustomOAuth2User; -import com.nowaiting.common.enums.Role; -import com.nowaiting.common.enums.SocialType; -import com.nowaiting.user.entity.User; +import com.nowait.externaloauth.dto.CustomOAuth2User; +import com.nowait.common.enums.Role; +import com.nowait.common.enums.SocialType; +import com.nowait.user.entity.User; import io.jsonwebtoken.ExpiredJwtException; import jakarta.servlet.FilterChain; diff --git a/security-front/src/main/java/com/nowait/auth/jwt/JwtUtil.java b/external-oauth/src/main/java/com/nowait/externaloauth/jwt/JwtUtil.java similarity index 98% rename from security-front/src/main/java/com/nowait/auth/jwt/JwtUtil.java rename to external-oauth/src/main/java/com/nowait/externaloauth/jwt/JwtUtil.java index fd0620e9..72a17583 100644 --- a/security-front/src/main/java/com/nowait/auth/jwt/JwtUtil.java +++ b/external-oauth/src/main/java/com/nowait/externaloauth/jwt/JwtUtil.java @@ -1,4 +1,4 @@ -package com.nowait.auth.jwt; +package com.nowait.externaloauth.jwt; import java.nio.charset.StandardCharsets; import java.util.Date; diff --git a/security-front/src/main/java/com/nowait/auth/oauth2/CustomOAuth2UserService.java b/external-oauth/src/main/java/com/nowait/externaloauth/oauth2/CustomOAuth2UserService.java similarity index 85% rename from security-front/src/main/java/com/nowait/auth/oauth2/CustomOAuth2UserService.java rename to external-oauth/src/main/java/com/nowait/externaloauth/oauth2/CustomOAuth2UserService.java index fbb16cfb..475ff257 100644 --- a/security-front/src/main/java/com/nowait/auth/oauth2/CustomOAuth2UserService.java +++ b/external-oauth/src/main/java/com/nowait/externaloauth/oauth2/CustomOAuth2UserService.java @@ -1,4 +1,4 @@ -package com.nowait.auth.oauth2; +package com.nowait.externaloauth.oauth2; import java.util.Optional; @@ -8,13 +8,13 @@ import org.springframework.security.oauth2.core.user.OAuth2User; import org.springframework.stereotype.Service; -import com.nowait.auth.dto.CustomOAuth2User; -import com.nowait.auth.dto.KaKaoResponse; -import com.nowait.auth.dto.OAuth2Response; -import com.nowaiting.common.enums.Role; -import com.nowaiting.common.enums.SocialType; -import com.nowaiting.user.entity.User; -import com.nowaiting.user.repository.UserRepository; +import com.nowait.externaloauth.dto.CustomOAuth2User; +import com.nowait.externaloauth.dto.KaKaoResponse; +import com.nowait.externaloauth.dto.OAuth2Response; +import com.nowait.common.enums.Role; +import com.nowait.common.enums.SocialType; +import com.nowait.user.entity.User; +import com.nowait.user.repository.UserRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/security-front/src/main/java/com/nowait/auth/oauth2/OAuth2LoginSuccessHandler.java b/external-oauth/src/main/java/com/nowait/externaloauth/oauth2/OAuth2LoginSuccessHandler.java similarity index 91% rename from security-front/src/main/java/com/nowait/auth/oauth2/OAuth2LoginSuccessHandler.java rename to external-oauth/src/main/java/com/nowait/externaloauth/oauth2/OAuth2LoginSuccessHandler.java index b483f6d9..ea397a72 100644 --- a/security-front/src/main/java/com/nowait/auth/oauth2/OAuth2LoginSuccessHandler.java +++ b/external-oauth/src/main/java/com/nowait/externaloauth/oauth2/OAuth2LoginSuccessHandler.java @@ -1,4 +1,4 @@ -package com.nowait.auth.oauth2; +package com.nowait.externaloauth.oauth2; import java.io.IOException; import java.time.LocalDateTime; @@ -11,12 +11,13 @@ import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler; import org.springframework.stereotype.Component; -import com.example.domaintoken.entity.Token; -import com.example.domaintoken.repository.TokenRepository; +import com.nowait.token.entity.Token; +import com.nowait.token.repository.TokenRepository; import com.fasterxml.jackson.databind.ObjectMapper; -import com.nowait.auth.dto.CustomOAuth2User; -import com.nowait.auth.jwt.JwtUtil; -import com.nowaiting.user.entity.User; + +import com.nowait.externaloauth.dto.CustomOAuth2User; +import com.nowait.externaloauth.jwt.JwtUtil; +import com.nowait.user.entity.User; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/security-front/src/main/java/com/nowait/auth/service/CustomUserDetailService.java b/external-oauth/src/main/java/com/nowait/externaloauth/service/CustomUserDetailService.java similarity index 83% rename from security-front/src/main/java/com/nowait/auth/service/CustomUserDetailService.java rename to external-oauth/src/main/java/com/nowait/externaloauth/service/CustomUserDetailService.java index 53550a56..87b639e3 100644 --- a/security-front/src/main/java/com/nowait/auth/service/CustomUserDetailService.java +++ b/external-oauth/src/main/java/com/nowait/externaloauth/service/CustomUserDetailService.java @@ -1,13 +1,13 @@ -package com.nowait.auth.service; +package com.nowait.externaloauth.service; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Component; -import com.nowaiting.user.entity.MemberDetails; -import com.nowaiting.user.entity.User; -import com.nowaiting.user.repository.UserRepository; +import com.nowait.user.entity.MemberDetails; +import com.nowait.user.entity.User; +import com.nowait.user.repository.UserRepository; import lombok.RequiredArgsConstructor; diff --git a/infra-aws/src/main/java/com/example/infrastorage/config/AwsS3Config.java b/infra-aws/src/main/java/com/nowait/infraaws/config/AwsS3Config.java similarity index 95% rename from infra-aws/src/main/java/com/example/infrastorage/config/AwsS3Config.java rename to infra-aws/src/main/java/com/nowait/infraaws/config/AwsS3Config.java index 4eda87c2..e0470e0e 100644 --- a/infra-aws/src/main/java/com/example/infrastorage/config/AwsS3Config.java +++ b/infra-aws/src/main/java/com/nowait/infraaws/config/AwsS3Config.java @@ -1,4 +1,4 @@ -package com.example.infrastorage.config; +package com.nowait.infraaws.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/infra-aws/src/main/java/com/example/infrastorage/s3/S3Service.java b/infra-aws/src/main/java/com/nowait/infraaws/s3/S3Service.java similarity index 98% rename from infra-aws/src/main/java/com/example/infrastorage/s3/S3Service.java rename to infra-aws/src/main/java/com/nowait/infraaws/s3/S3Service.java index 20d9abf0..a2c586fc 100644 --- a/infra-aws/src/main/java/com/example/infrastorage/s3/S3Service.java +++ b/infra-aws/src/main/java/com/nowait/infraaws/s3/S3Service.java @@ -1,4 +1,4 @@ -package com.example.infrastorage.s3; +package com.nowait.infraaws.s3; import java.io.InputStream; import java.util.UUID; diff --git a/security-admin/src/main/java/com/nowait/adminsecurity/auth/config/SecurityConfig.java b/security-admin/src/main/java/com/nowait/adminsecurity/auth/config/SecurityConfig.java index f45e5ec1..81214e1c 100644 --- a/security-admin/src/main/java/com/nowait/adminsecurity/auth/config/SecurityConfig.java +++ b/security-admin/src/main/java/com/nowait/adminsecurity/auth/config/SecurityConfig.java @@ -13,6 +13,7 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import org.springframework.web.cors.CorsConfigurationSource; import com.nowait.adminsecurity.auth.jwt.JwtAuthorizationFilter; import com.nowait.adminsecurity.auth.jwt.JwtUtil; @@ -26,10 +27,12 @@ public class SecurityConfig { private final JwtUtil jwtUtil; private final CustomUserDetailService customUserDetailService; + private final CorsConfigurationSource corsConfigurationSource; @Bean public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { http + .cors(cors -> cors.configurationSource(corsConfigurationSource)) // CSRF 방어 기능 비활성화 (jwt 토큰을 사용할 것이기에 필요없음) .csrf(AbstractHttpConfigurer::disable) // 시큐리티 폼 로그인 비활성화 diff --git a/security-admin/src/main/java/com/nowait/adminsecurity/auth/service/CustomUserDetailService.java b/security-admin/src/main/java/com/nowait/adminsecurity/auth/service/CustomUserDetailService.java index 130f7669..6f1bd303 100644 --- a/security-admin/src/main/java/com/nowait/adminsecurity/auth/service/CustomUserDetailService.java +++ b/security-admin/src/main/java/com/nowait/adminsecurity/auth/service/CustomUserDetailService.java @@ -5,9 +5,9 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Component; -import com.nowaiting.user.entity.MemberDetails; -import com.nowaiting.user.entity.User; -import com.nowaiting.user.repository.UserRepository; +import com.nowait.user.entity.MemberDetails; +import com.nowait.user.entity.User; +import com.nowait.user.repository.UserRepository; import lombok.RequiredArgsConstructor; diff --git a/security-admin/src/main/java/com/nowait/adminsecurity/exception/RefreshTokenNotFoundException.java b/security-admin/src/main/java/com/nowait/adminsecurity/exception/RefreshTokenNotFoundException.java index e02f5114..eda367d5 100644 --- a/security-admin/src/main/java/com/nowait/adminsecurity/exception/RefreshTokenNotFoundException.java +++ b/security-admin/src/main/java/com/nowait/adminsecurity/exception/RefreshTokenNotFoundException.java @@ -1,6 +1,6 @@ package com.nowait.adminsecurity.exception; -import com.nowaiting.common.exception.ErrorMessage; +import com.nowait.common.exception.ErrorMessage; public class RefreshTokenNotFoundException extends ResourceNotFoundException { diff --git a/security-admin/src/main/java/com/nowait/adminsecurity/exception/ResourceNotFoundException.java b/security-admin/src/main/java/com/nowait/adminsecurity/exception/ResourceNotFoundException.java index 90b43f35..9b26d0ca 100644 --- a/security-admin/src/main/java/com/nowait/adminsecurity/exception/ResourceNotFoundException.java +++ b/security-admin/src/main/java/com/nowait/adminsecurity/exception/ResourceNotFoundException.java @@ -1,6 +1,6 @@ package com.nowait.adminsecurity.exception; -import com.nowaiting.common.exception.ErrorMessage; +import com.nowait.common.exception.ErrorMessage; public abstract class ResourceNotFoundException extends RuntimeException { private final ErrorMessage errorMessage; diff --git a/security-admin/src/main/java/com/nowait/adminsecurity/exception/TokenBadRequestException.java b/security-admin/src/main/java/com/nowait/adminsecurity/exception/TokenBadRequestException.java index 146a36b1..483b2193 100644 --- a/security-admin/src/main/java/com/nowait/adminsecurity/exception/TokenBadRequestException.java +++ b/security-admin/src/main/java/com/nowait/adminsecurity/exception/TokenBadRequestException.java @@ -1,7 +1,7 @@ package com.nowait.adminsecurity.exception; -import com.example.domaintoken.exception.BusinessException; -import com.nowaiting.common.exception.ErrorMessage; +import com.nowait.token.exception.BusinessException; +import com.nowait.common.exception.ErrorMessage; public class TokenBadRequestException extends BusinessException { public TokenBadRequestException() { diff --git a/security-admin/src/main/java/com/nowait/adminsecurity/exception/UnauthorizedException.java b/security-admin/src/main/java/com/nowait/adminsecurity/exception/UnauthorizedException.java index 558e1e2a..c65b3bc6 100644 --- a/security-admin/src/main/java/com/nowait/adminsecurity/exception/UnauthorizedException.java +++ b/security-admin/src/main/java/com/nowait/adminsecurity/exception/UnauthorizedException.java @@ -1,6 +1,6 @@ package com.nowait.adminsecurity.exception; -import com.nowaiting.common.exception.ErrorMessage; +import com.nowait.common.exception.ErrorMessage; public class UnauthorizedException extends RuntimeException { private final ErrorMessage errorMessage; diff --git a/security-front/build.gradle b/security-front/build.gradle index f5d61d33..5bb9ee1b 100644 --- a/security-front/build.gradle +++ b/security-front/build.gradle @@ -20,6 +20,7 @@ dependencies { implementation project(':domain-user') implementation project(':domain-base') implementation project(':domain-token') + implementation project(':external-oauth') // SPRING SECURITY api 'org.springframework.boot:spring-boot-starter-security' api 'org.springframework.boot:spring-boot-starter-test' diff --git a/security-front/src/main/java/com/nowait/exception/ErrorMessage.java b/security-front/src/main/java/com/nowait/exception/ErrorMessage.java deleted file mode 100644 index c365a92e..00000000 --- a/security-front/src/main/java/com/nowait/exception/ErrorMessage.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.nowait.exception; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -@Getter -@RequiredArgsConstructor -public enum ErrorMessage { - // global - INVALID_INPUT_VALUE("입력값이 올바르지 않습니다.", "global001"), - - // auth - UNAUTHORIZED("권한이 없습니다", "auth001"), - - // token - REFRESH_TOKEN_NOT_FOUND("기존 리프레시 토큰을 찾을 수 없습니다.", "token001"), - DOES_NOT_MATCH_REFRESH_TOKEN("기존 리프레시 토큰이 일치하지 않습니다.", "token002"); - - private final String message; - private final String code; - -} diff --git a/security-front/src/main/java/com/nowait/exception/ErrorResponse.java b/security-front/src/main/java/com/nowait/exception/ErrorResponse.java deleted file mode 100644 index a15935e8..00000000 --- a/security-front/src/main/java/com/nowait/exception/ErrorResponse.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.nowait.exception; - -import java.util.HashMap; -import java.util.Map; - -import lombok.Getter; - -@Getter -public class ErrorResponse { - private final String message; - private final String code; - private final Map errors; - - public ErrorResponse(String message, String code) { - this.message = message; - this.code = code; - errors = new HashMap<>(); - } - - public ErrorResponse(String message, String code, Map errors) { - this.message = message; - this.code = code; - this.errors = errors; - } - -} diff --git a/security-front/src/main/java/com/nowait/exception/GlobalExceptionHandler.java b/security-front/src/main/java/com/nowait/exception/GlobalExceptionHandler.java deleted file mode 100644 index b9f7c1e2..00000000 --- a/security-front/src/main/java/com/nowait/exception/GlobalExceptionHandler.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.nowait.exception; - -import static com.nowait.exception.ErrorMessage.*; -import static org.springframework.http.HttpStatus.*; -import static org.springframework.http.HttpStatus.UNAUTHORIZED; - -import java.util.Map; -import java.util.stream.Collectors; - -import org.springframework.http.converter.HttpMessageNotReadableException; -import org.springframework.security.oauth2.core.OAuth2AuthenticationException; -import org.springframework.validation.FieldError; -import org.springframework.validation.ObjectError; -import org.springframework.web.bind.MethodArgumentNotValidException; -import org.springframework.web.bind.MissingRequestValueException; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.web.bind.annotation.RestControllerAdvice; -import org.springframework.web.multipart.MultipartException; - -import io.swagger.v3.oas.annotations.Hidden; -import lombok.extern.slf4j.Slf4j; - -@Slf4j -@Hidden -@RestControllerAdvice -public class GlobalExceptionHandler { - - // OAUTH 인증 실패 에러처리 메서드 - @ResponseStatus(value = BAD_REQUEST) - @ExceptionHandler(OAuth2AuthenticationException.class) - public ErrorResponse handlerOAuth2AuthenticationException(OAuth2AuthenticationException e) { - log.error("handleOAuth2AuthenticationException", e); - - return new ErrorResponse("OAuth 인증 실패 : " + e.getMessage(), INVALID_INPUT_VALUE.getCode()); - } - - @ResponseStatus(value = BAD_REQUEST) - @ExceptionHandler(BusinessException.class) - public ErrorResponse handleBusinessException(BusinessException e) { - log.error("handleBusinessException", e); - return new ErrorResponse(e.getMessage(), e.getCode()); - } - - @ResponseStatus(value = BAD_REQUEST) - @ExceptionHandler(MethodArgumentNotValidException.class) - public ErrorResponse handleMethodArgumentNotValidException(MethodArgumentNotValidException e) { - log.error("handleMethodArgumentNotValidException", e); - Map errors = getErrors(e); - return new ErrorResponse(INVALID_INPUT_VALUE.getMessage(), INVALID_INPUT_VALUE.getCode(), errors); - } - - @ResponseStatus(value = BAD_REQUEST) - @ExceptionHandler(HttpMessageNotReadableException.class) - public ErrorResponse handleHttpMessageNotReadableException(HttpMessageNotReadableException e) { - log.error("handleHttpMessageNotReadableException", e); - return new ErrorResponse(INVALID_INPUT_VALUE.getMessage(), INVALID_INPUT_VALUE.getCode()); - } - - @ResponseStatus(value = BAD_REQUEST) - @ExceptionHandler(IllegalArgumentException.class) - public ErrorResponse handleIllegalArgumentException(IllegalArgumentException e) { - log.error("handleIllegalArgumentException", e); - return new ErrorResponse(e.getMessage(), INVALID_INPUT_VALUE.getCode()); - } - - @ResponseStatus(value = BAD_REQUEST) - @ExceptionHandler(MissingRequestValueException.class) - public ErrorResponse handleMissingRequestValueException(MissingRequestValueException e) { - log.error("handleMissingRequestValueExceptionException", e); - return new ErrorResponse(INVALID_INPUT_VALUE.getMessage(), INVALID_INPUT_VALUE.getCode()); - } - - @ResponseStatus(value = UNAUTHORIZED) - @ExceptionHandler(UnauthorizedException.class) - public ErrorResponse handleUnauthorizedException(UnauthorizedException e) { - log.error("handleUnauthorizedExceptionException", e); - return new ErrorResponse(e.getMessage(), e.getCode()); - } - - @ResponseStatus(value = NOT_FOUND) - @ExceptionHandler(ResourceNotFoundException.class) - public ErrorResponse handleResourceNotFoundException(ResourceNotFoundException e) { - log.error("handleResourceNotFoundExceptionException", e); - return new ErrorResponse(e.getMessage(), e.getCode()); - } - - @ResponseStatus(value = BAD_REQUEST) - @ExceptionHandler(MultipartException.class) - public ErrorResponse handleMultipartException(MultipartException e) { - log.error("handleMultipartException", e); - return new ErrorResponse(e.getMessage(), INVALID_INPUT_VALUE.getCode()); - } - - - private static Map getErrors(MethodArgumentNotValidException e) { - return e.getBindingResult() - .getAllErrors() - .stream() - .filter(ObjectError.class::isInstance) - .collect(Collectors.toMap( - error -> error instanceof FieldError ? ((FieldError)error).getField() : error.getObjectName(), - ObjectError::getDefaultMessage, - (msg1, msg2) -> msg1 + ";" + msg2 - )); - } - -} diff --git a/security-front/src/main/java/com/nowait/auth/config/SecurityConfig.java b/security-front/src/main/java/com/nowait/frontsecurity/auth/config/SecurityConfig.java similarity index 85% rename from security-front/src/main/java/com/nowait/auth/config/SecurityConfig.java rename to security-front/src/main/java/com/nowait/frontsecurity/auth/config/SecurityConfig.java index aa535f8c..8afe5fc2 100644 --- a/security-front/src/main/java/com/nowait/auth/config/SecurityConfig.java +++ b/security-front/src/main/java/com/nowait/frontsecurity/auth/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package com.nowait.auth.config; +package com.nowait.frontsecurity.auth.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -14,11 +14,11 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.web.cors.CorsConfigurationSource; -import com.nowait.auth.jwt.JwtAuthorizationFilter; -import com.nowait.auth.jwt.JwtUtil; -import com.nowait.auth.oauth2.CustomOAuth2UserService; -import com.nowait.auth.oauth2.OAuth2LoginSuccessHandler; -import com.nowait.auth.service.CustomUserDetailService; +import com.nowait.externaloauth.jwt.JwtAuthorizationFilter; +import com.nowait.externaloauth.jwt.JwtUtil; +import com.nowait.externaloauth.oauth2.CustomOAuth2UserService; +import com.nowait.externaloauth.oauth2.OAuth2LoginSuccessHandler; +import com.nowait.externaloauth.service.CustomUserDetailService; import lombok.RequiredArgsConstructor; @@ -27,13 +27,15 @@ @RequiredArgsConstructor public class SecurityConfig { private final CustomOAuth2UserService customOAuth2UserService; - private final OAuth2LoginSuccessHandler OAuth2LoginSuccessHandler; + private final OAuth2LoginSuccessHandler oAuth2LoginSuccessHandler; private final JwtUtil jwtUtil; private final CustomUserDetailService userDetailsService; + private final CorsConfigurationSource corsConfigurationSource; @Bean public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { http + .cors(cors -> cors.configurationSource(corsConfigurationSource)) // CSRF 방어 기능 비활성화 (jwt 토큰을 사용할 것이기에 필요없음) .csrf(AbstractHttpConfigurer::disable) // 시큐리티 폼 로그인 비활성화 @@ -46,7 +48,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .oauth2Login(oauth2 -> oauth2.userInfoEndpoint(userInfoEndpoint -> userInfoEndpoint.userService(customOAuth2UserService) - ).successHandler(OAuth2LoginSuccessHandler) + ).successHandler(oAuth2LoginSuccessHandler) ) // 세션 사용하지 않음 .sessionManagement(session -> diff --git a/security-front/src/main/java/com/nowait/exception/RefreshTokenNotFoundException.java b/security-front/src/main/java/com/nowait/frontsecurity/exception/RefreshTokenNotFoundException.java similarity index 65% rename from security-front/src/main/java/com/nowait/exception/RefreshTokenNotFoundException.java rename to security-front/src/main/java/com/nowait/frontsecurity/exception/RefreshTokenNotFoundException.java index 5365ef52..409fe133 100644 --- a/security-front/src/main/java/com/nowait/exception/RefreshTokenNotFoundException.java +++ b/security-front/src/main/java/com/nowait/frontsecurity/exception/RefreshTokenNotFoundException.java @@ -1,4 +1,6 @@ -package com.nowait.exception; +package com.nowait.frontsecurity.exception; + +import com.nowait.common.exception.ErrorMessage; public class RefreshTokenNotFoundException extends ResourceNotFoundException { diff --git a/security-front/src/main/java/com/nowait/exception/ResourceNotFoundException.java b/security-front/src/main/java/com/nowait/frontsecurity/exception/ResourceNotFoundException.java similarity index 77% rename from security-front/src/main/java/com/nowait/exception/ResourceNotFoundException.java rename to security-front/src/main/java/com/nowait/frontsecurity/exception/ResourceNotFoundException.java index ae4e4b7b..75c05b16 100644 --- a/security-front/src/main/java/com/nowait/exception/ResourceNotFoundException.java +++ b/security-front/src/main/java/com/nowait/frontsecurity/exception/ResourceNotFoundException.java @@ -1,4 +1,6 @@ -package com.nowait.exception; +package com.nowait.frontsecurity.exception; + +import com.nowait.common.exception.ErrorMessage; public abstract class ResourceNotFoundException extends RuntimeException { private final ErrorMessage errorMessage; diff --git a/security-front/src/main/java/com/nowait/exception/TokenBadRequestException.java b/security-front/src/main/java/com/nowait/frontsecurity/exception/TokenBadRequestException.java similarity index 52% rename from security-front/src/main/java/com/nowait/exception/TokenBadRequestException.java rename to security-front/src/main/java/com/nowait/frontsecurity/exception/TokenBadRequestException.java index 504852ee..95a00a18 100644 --- a/security-front/src/main/java/com/nowait/exception/TokenBadRequestException.java +++ b/security-front/src/main/java/com/nowait/frontsecurity/exception/TokenBadRequestException.java @@ -1,4 +1,7 @@ -package com.nowait.exception; +package com.nowait.frontsecurity.exception; + +import com.nowait.common.exception.ErrorMessage; +import com.nowait.token.exception.BusinessException; public class TokenBadRequestException extends BusinessException { public TokenBadRequestException() { diff --git a/security-front/src/main/java/com/nowait/exception/UnauthorizedException.java b/security-front/src/main/java/com/nowait/frontsecurity/exception/UnauthorizedException.java similarity index 82% rename from security-front/src/main/java/com/nowait/exception/UnauthorizedException.java rename to security-front/src/main/java/com/nowait/frontsecurity/exception/UnauthorizedException.java index 65a8fd0a..8ccedea3 100644 --- a/security-front/src/main/java/com/nowait/exception/UnauthorizedException.java +++ b/security-front/src/main/java/com/nowait/frontsecurity/exception/UnauthorizedException.java @@ -1,4 +1,6 @@ -package com.nowait.exception; +package com.nowait.frontsecurity.exception; + +import com.nowait.common.exception.ErrorMessage; public class UnauthorizedException extends RuntimeException { private final ErrorMessage errorMessage; diff --git a/settings.gradle b/settings.gradle index 501d4ca7..4984deb9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -rootProject.name = 'nowaiting' +rootProject.name = 'nowait' include 'common' include 'domain-base' @@ -9,10 +9,11 @@ include 'domain-token' include 'domain-bookmark' include 'domain-order' include 'domain-reservation' -include 'api-user' -include 'api-admin' -include 'infra-aws' include 'security-admin' include 'security-front' +include 'external-oauth' +include 'infra-aws' include 'application-config' +include 'application-user' +include 'application-admin'