Skip to content

refactor: OAuth module 분리 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jjiggu merged 2 commits into from
Jun 30, 2025
Merged

refactor: OAuth module 분리 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fa1421
refactor: package 네이밍 일관되게 변경 및 OAuth 모듈 분리
Jjiggu Jun 30, 2025
3912c45
refactor: cors 설정 추가
Jjiggu Jun 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions api-admin/src/main/java/com/example/apiadmin/store/service/StoreService.java
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions api-user/src/main/java/com/example/apiuser/ApiUserApplication.java
View file
Open in desktop

This file was deleted.

0 api-admin/.gitattributes → application-admin/.gitattributes
View file
Open in desktop
File renamed without changes.
0 api-admin/.gitignore → application-admin/.gitignore
View file
Open in desktop
File renamed without changes.
0 api-admin/build.gradle → application-admin/build.gradle
View file
Open in desktop
File renamed without changes.
31 changes: 15 additions & 16 deletions ...example/apiadmin/ApiAdminApplication.java → ...applicationadmin/ApiAdminApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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) {
Expand Down
20 changes: 10 additions & 10 deletions ...min/exception/GlobalExceptionHandler.java → ...min/exception/GlobalExceptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.*;

Expand All @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions ...admin/menu/controller/MenuController.java → ...admin/menu/controller/MenuController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions .../menu/controller/MenuImageController.java → .../menu/controller/MenuImageController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions .../apiadmin/menu/dto/MenuCreateRequest.java → ...tionadmin/menu/dto/MenuCreateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...apiadmin/menu/dto/MenuCreateResponse.java → ...ionadmin/menu/dto/MenuCreateResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...min/menu/dto/MenuImageUploadResponse.java → ...min/menu/dto/MenuImageUploadResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...example/apiuser/menu/dto/MenuReadDto.java → ...pplicationadmin/menu/dto/MenuReadDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...le/apiuser/menu/dto/MenuReadResponse.java → ...ationadmin/menu/dto/MenuReadResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.apiuser.menu.dto;
package com.nowait.applicationadmin.menu.dto;

import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion .../apiadmin/menu/dto/MenuUpdateRequest.java → ...tionadmin/menu/dto/MenuUpdateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.apiadmin.menu.dto;
package com.nowait.applicationadmin.menu.dto;

import lombok.AllArgsConstructor;
import lombok.Builder;
Expand Down
14 changes: 7 additions & 7 deletions ...iadmin/menu/service/MenuImageService.java → ...nadmin/menu/service/MenuImageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
22 changes: 11 additions & 11 deletions ...le/apiadmin/menu/service/MenuService.java → ...cationadmin/menu/service/MenuService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...min/order/controller/OrderController.java → ...min/order/controller/OrderController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
12 changes: 6 additions & 6 deletions ...ion/controller/ReservationController.java → ...ion/controller/ReservationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...n/reservation/dto/CallGetResponseDto.java → ...n/reservation/dto/CallGetResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...vation/dto/ReservationGetResponseDto.java → ...vation/dto/ReservationGetResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...tion/dto/ReservationStatusSummaryDto.java → ...tion/dto/ReservationStatusSummaryDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.apiadmin.reservation.dto;
package com.nowait.applicationadmin.reservation.dto;

import java.util.List;

Expand Down
4 changes: 2 additions & 2 deletions ...to/ReservationStatusUpdateRequestDto.java → ...to/ReservationStatusUpdateRequestDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ception/ReservationNotFoundException.java → ...ception/ReservationNotFoundException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
19 changes: 9 additions & 10 deletions ...servation/service/ReservationService.java → ...servation/service/ReservationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
package com.example.apiadmin.reservation.service;
package com.nowait.applicationadmin.reservation.service;

import java.util.ArrayList;
import java.util.List;

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;

Expand Down
Loading