Skip to content

Commit 0ce2fd7

Browse files
JjigguJjiggu
authored
Merge pull request #8 from GTable/feature#7/OAuth-module-extract
refactor: OAuth module 분리
2 parents 0e50f25 + 3912c45 commit 0ce2fd7

153 files changed

Lines changed: 571 additions & 647 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api-admin/src/main/java/com/example/apiadmin/store/service/StoreService.java‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎api-user/src/main/java/com/example/apiuser/ApiUserApplication.java‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

api-admin/.gitattributes renamed to application-admin/.gitattributes

File renamed without changes.

api-admin/.gitignore renamed to application-admin/.gitignore

File renamed without changes.

api-admin/build.gradle renamed to application-admin/build.gradle

File renamed without changes.

api-admin/src/main/java/com/example/apiadmin/ApiAdminApplication.java renamed to application-admin/src/main/java/com/nowait/applicationadmin/ApiAdminApplication.java

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.apiadmin;
1+
package com.nowait.applicationadmin;
22

33
import org.springframework.boot.autoconfigure.SpringBootApplication;
44
import org.springframework.boot.autoconfigure.domain.EntityScan;
@@ -7,27 +7,26 @@
77

88
@EnableJpaAuditing
99
@SpringBootApplication(scanBasePackages = {
10-
"com.example.apiadmin",
11-
"com.example.infrastorage",
10+
"com.nowait.applicationadmin",
11+
"com.nowait.infraaws",
1212
"com.nowait.adminsecurity"
1313
})
1414
@EntityScan(basePackages = {
15-
"com.example.menu.entity", // domain-menu
16-
"com.example.domainstore.entity", // domain-store
17-
"com.example.domaintoken.entity",
18-
"com.nowaiting.user.entity",
19-
"com.nowait.domainreservation.entity",
20-
"com.nowait.domainorder.entity",
21-
"com.nowait.domainorder.entity"
15+
"com.nowait.menu.entity",
16+
"com.nowait.store.entity",
17+
"com.nowait.token.entity",
18+
"com.nowait.user.entity",
19+
"com.nowait.reservation.entity",
20+
"com.nowait.order.entity"
2221

2322
})
2423
@EnableJpaRepositories(basePackages = {
25-
"com.example.menu.repository",
26-
"com.nowaiting.user.repository",
27-
"com.example.domainstore.repository",
28-
"com.example.domaintoken.repository",
29-
"com.nowait.domainorder.repository",
30-
"com.nowait.domainreservation.repository"
24+
"com.nowait.menu.repository",
25+
"com.nowait.user.repository",
26+
"com.nowait.store.repository",
27+
"com.nowait.token.repository",
28+
"com.nowait.order.repository",
29+
"com.nowait.reservation.repository"
3130
})
3231
public class ApiAdminApplication {
3332
public static void main(String[] args) {

api-admin/src/main/java/com/example/apiadmin/exception/GlobalExceptionHandler.java renamed to application-admin/src/main/java/com/nowait/applicationadmin/exception/GlobalExceptionHandler.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.example.apiadmin.exception;
1+
package com.nowait.applicationadmin.exception;
22

3-
import static com.nowaiting.common.exception.ErrorMessage.*;
3+
import static com.nowait.common.exception.ErrorMessage.*;
44
import static org.springframework.http.HttpStatus.UNAUTHORIZED;
55
import static org.springframework.http.HttpStatus.*;
66

@@ -17,16 +17,16 @@
1717
import org.springframework.web.bind.annotation.RestControllerAdvice;
1818
import org.springframework.web.multipart.MultipartException;
1919

20-
import com.example.apiadmin.reservation.exception.ReservationNotFoundException;
21-
import com.example.domaintoken.exception.BusinessException;
20+
import com.nowait.applicationadmin.reservation.exception.ReservationNotFoundException;
21+
import com.nowait.token.exception.BusinessException;
2222
import com.nowait.adminsecurity.exception.ResourceNotFoundException;
2323
import com.nowait.adminsecurity.exception.UnauthorizedException;
24-
import com.nowait.domainorder.exception.DuplicateOrderException;
25-
import com.nowait.domainorder.exception.OrderItemsEmptyException;
26-
import com.nowait.domainorder.exception.OrderParameterEmptyException;
27-
import com.nowaiting.common.exception.ErrorMessage;
28-
import com.nowaiting.common.exception.ErrorResponse;
29-
import com.nowaiting.user.exception.UserNotFoundException;
24+
import com.nowait.order.exception.DuplicateOrderException;
25+
import com.nowait.order.exception.OrderItemsEmptyException;
26+
import com.nowait.order.exception.OrderParameterEmptyException;
27+
import com.nowait.common.exception.ErrorMessage;
28+
import com.nowait.common.exception.ErrorResponse;
29+
import com.nowait.user.exception.UserNotFoundException;
3030

3131
import io.swagger.v3.oas.annotations.Hidden;
3232
import lombok.extern.slf4j.Slf4j;

api-admin/src/main/java/com/example/apiadmin/menu/controller/MenuController.java renamed to application-admin/src/main/java/com/nowait/applicationadmin/menu/controller/MenuController.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.apiadmin.menu.controller;
1+
package com.nowait.applicationadmin.menu.controller;
22

33
import org.springframework.http.HttpStatus;
44
import org.springframework.http.ResponseEntity;
@@ -11,11 +11,11 @@
1111
import org.springframework.web.bind.annotation.RequestMapping;
1212
import org.springframework.web.bind.annotation.RestController;
1313

14-
import com.example.apiadmin.menu.dto.MenuCreateRequest;
15-
import com.example.apiadmin.menu.dto.MenuCreateResponse;
16-
import com.example.apiadmin.menu.dto.MenuUpdateRequest;
17-
import com.example.apiadmin.menu.service.MenuService;
18-
import com.nowaiting.common.api.ApiUtils;
14+
import com.nowait.applicationadmin.menu.dto.MenuCreateRequest;
15+
import com.nowait.applicationadmin.menu.dto.MenuCreateResponse;
16+
import com.nowait.applicationadmin.menu.dto.MenuUpdateRequest;
17+
import com.nowait.applicationadmin.menu.service.MenuService;
18+
import com.nowait.common.api.ApiUtils;
1919

2020
import jakarta.validation.Valid;
2121
import lombok.RequiredArgsConstructor;

api-admin/src/main/java/com/example/apiadmin/menu/controller/MenuImageController.java renamed to application-admin/src/main/java/com/nowait/applicationadmin/menu/controller/MenuImageController.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.apiadmin.menu.controller;
1+
package com.nowait.applicationadmin.menu.controller;
22

33
import org.springframework.http.HttpStatus;
44
import org.springframework.http.ResponseEntity;
@@ -10,9 +10,9 @@
1010
import org.springframework.web.bind.annotation.RestController;
1111
import org.springframework.web.multipart.MultipartFile;
1212

13-
import com.example.apiadmin.menu.dto.MenuImageUploadResponse;
14-
import com.example.apiadmin.menu.service.MenuImageService;
15-
import com.nowaiting.common.api.ApiUtils;
13+
import com.nowait.applicationadmin.menu.dto.MenuImageUploadResponse;
14+
import com.nowait.applicationadmin.menu.service.MenuImageService;
15+
import com.nowait.common.api.ApiUtils;
1616

1717
import lombok.RequiredArgsConstructor;
1818

api-admin/src/main/java/com/example/apiadmin/menu/dto/MenuCreateRequest.java renamed to application-admin/src/main/java/com/nowait/applicationadmin/menu/dto/MenuCreateRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.example.apiadmin.menu.dto;
1+
package com.nowait.applicationadmin.menu.dto;
22

33

4-
import com.example.menu.entity.Menu;
4+
import com.nowait.menu.entity.Menu;
55

66
import jakarta.validation.constraints.NotNull;
77
import lombok.AllArgsConstructor;

0 commit comments

Comments
 (0)