Skip to content

Commit 573e429

Browse files
refactor: 중복 어노테이션 클래스 단으로 이동 & 중복 api 제거
1 parent 9002bb4 commit 573e429

5 files changed

Lines changed: 14 additions & 25 deletions

File tree

backend/src/main/java/com/back/api/event/controller/AdminEventController.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
@RestController
2626
@RequestMapping("/api/v1/admin/events")
2727
@RequiredArgsConstructor
28+
@PreAuthorize("hasRole('ADMIN')")
2829
public class AdminEventController implements AdminEventApi {
2930

3031
private final AdminEventService adminEventService;
3132

3233
@Override
3334
@PostMapping
34-
@PreAuthorize("hasRole('ADMIN')")
3535
public ApiResponse<EventResponse> createEvent(
3636
@Valid @RequestBody EventCreateRequest request) {
3737
EventResponse response = adminEventService.createEvent(request);
@@ -40,7 +40,6 @@ public ApiResponse<EventResponse> createEvent(
4040

4141
@Override
4242
@PutMapping("/{eventId}")
43-
@PreAuthorize("hasRole('ADMIN')")
4443
public ApiResponse<EventResponse> updateEvent(
4544
@PathVariable Long eventId,
4645
@Valid @RequestBody EventUpdateRequest request) {
@@ -50,7 +49,6 @@ public ApiResponse<EventResponse> updateEvent(
5049

5150
@Override
5251
@DeleteMapping("/{eventId}")
53-
@PreAuthorize("hasRole('ADMIN')")
5452
public ApiResponse<Void> deleteEvent(
5553
@PathVariable Long eventId) {
5654
adminEventService.deleteEvent(eventId);
@@ -59,7 +57,6 @@ public ApiResponse<Void> deleteEvent(
5957

6058
@Override
6159
@GetMapping("/dashboard")
62-
@PreAuthorize("hasRole('ADMIN')")
6360
public ApiResponse<List<AdminEventDashboardResponse>> getAllEventsDashboard() {
6461
List<AdminEventDashboardResponse> responses = adminEventService.getAllEventsDashboard();
6562
return ApiResponse.ok("이벤트 현황 조회 성공", responses);

backend/src/main/java/com/back/api/event/controller/EventController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
@RestController
2323
@RequestMapping("/api/v1/events")
2424
@RequiredArgsConstructor
25+
@PreAuthorize("hasRole('NORMAL')")
2526
public class EventController implements EventApi {
2627

2728
private final EventService eventService;
2829

2930
@Override
3031
@GetMapping("/{eventId}")
31-
@PreAuthorize("hasRole('NORMAL')")
3232
public ApiResponse<EventResponse> getEvent(
3333
@PathVariable Long eventId) {
3434
EventResponse response = eventService.getEvent(eventId);
@@ -37,7 +37,6 @@ public ApiResponse<EventResponse> getEvent(
3737

3838
@Override
3939
@GetMapping
40-
@PreAuthorize("hasRole('NORMAL')")
4140
public ApiResponse<Page<EventListResponse>> getEvents(
4241
@RequestParam(required = false) EventStatus status,
4342
@RequestParam(required = false) EventCategory category,

backend/src/main/java/com/back/api/seat/controller/AdminSeatController.java

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
import lombok.RequiredArgsConstructor;
2525

2626
@RestController
27-
@RequestMapping("/api/v1/admin")
27+
@RequestMapping("/api/v1/admin/events/{eventId}/seats")
2828
@RequiredArgsConstructor
29+
@PreAuthorize("hasRole('ADMIN')")
2930
public class AdminSeatController implements AdminSeatApi {
3031

3132
private final AdminSeatService adminSeatService;
3233

3334
@Override
34-
@PostMapping("/events/{eventId}/seats/bulk")
35-
@PreAuthorize("hasRole('ADMIN')")
35+
@PostMapping("/bulk")
3636
public ApiResponse<List<SeatResponse>> bulkCreateSeats(
3737
@PathVariable Long eventId,
3838
@Valid @RequestBody BulkCreateSeatsRequest request
@@ -49,8 +49,7 @@ public ApiResponse<List<SeatResponse>> bulkCreateSeats(
4949
}
5050

5151
@Override
52-
@PostMapping("/events/{eventId}/seats/auto")
53-
@PreAuthorize("hasRole('ADMIN')")
52+
@PostMapping("/auto")
5453
public ApiResponse<List<SeatResponse>> autoCreateSeats(
5554
@PathVariable Long eventId,
5655
@Valid @RequestBody AutoCreateSeatsRequest request
@@ -68,8 +67,7 @@ public ApiResponse<List<SeatResponse>> autoCreateSeats(
6867
}
6968

7069
@Override
71-
@PostMapping("/events/{eventId}/seats/single")
72-
@PreAuthorize("hasRole('ADMIN')")
70+
@PostMapping("/single")
7371
public ApiResponse<SeatResponse> createSingleSeat(
7472
@PathVariable Long eventId,
7573
@Valid @RequestBody SeatCreateRequest request
@@ -80,8 +78,7 @@ public ApiResponse<SeatResponse> createSingleSeat(
8078
}
8179

8280
@Override
83-
@PutMapping("/events/{eventId}/seats/{seatId}")
84-
@PreAuthorize("hasRole('ADMIN')")
81+
@PutMapping("/{seatId}")
8582
public ApiResponse<SeatResponse> updateSeat(
8683
@PathVariable Long eventId,
8784
@PathVariable Long seatId,
@@ -93,8 +90,7 @@ public ApiResponse<SeatResponse> updateSeat(
9390
}
9491

9592
@Override
96-
@DeleteMapping("/events/{eventId}/seats/{seatId}")
97-
@PreAuthorize("hasRole('ADMIN')")
93+
@DeleteMapping("/{seatId}")
9894
public ApiResponse<Void> deleteSeat(
9995
@PathVariable Long eventId,
10096
@PathVariable Long seatId
@@ -105,8 +101,7 @@ public ApiResponse<Void> deleteSeat(
105101
}
106102

107103
@Override
108-
@DeleteMapping("/events/{eventId}/seats")
109-
@PreAuthorize("hasRole('ADMIN')")
104+
@DeleteMapping
110105
public ApiResponse<Void> deleteAllEventSeats(
111106
@PathVariable Long eventId
112107
) {

backend/src/main/java/com/back/api/ticket/controller/TicketController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
import lombok.RequiredArgsConstructor;
1717

1818
@RestController
19-
@RequestMapping("/api/v1/tickets")
19+
@RequestMapping("/api/v1/tickets/my")
2020
@RequiredArgsConstructor
2121
public class TicketController implements TicketApi {
2222

2323
private final TicketService ticketService;
2424
private final HttpRequestContext httpRequestContext;
2525

2626
@Override
27-
@GetMapping("/my")
27+
@GetMapping
2828
public ApiResponse<List<TicketResponse>> getMyTickets() {
2929
Long userId = httpRequestContext.getUserId();
3030

@@ -34,7 +34,7 @@ public ApiResponse<List<TicketResponse>> getMyTickets() {
3434
}
3535

3636
@Override
37-
@GetMapping("/my/{ticketId}/details")
37+
@GetMapping("/{ticketId}/details")
3838
public ApiResponse<TicketResponse> getMyTicketDetails(
3939
@PathVariable Long ticketId
4040
) {

backend/src/main/java/com/back/api/user/controller/UserController.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
@RequestMapping("/api/v1/users")
2222
@RequiredArgsConstructor
2323
@Validated
24+
@PreAuthorize("hasRole('NORMAL')")
2425
public class UserController implements UserApi {
2526

2627
private final UserService userService;
2728
private final HttpRequestContext httpRequestContext;
2829

2930
@Override
3031
@GetMapping("/profile")
31-
@PreAuthorize("hasRole('NORMAL')")
3232
public ApiResponse<UserProfileResponse> getMe() {
3333
long userId = httpRequestContext.getUserId();
3434
UserProfileResponse response = userService.getUser(userId);
@@ -37,7 +37,6 @@ public ApiResponse<UserProfileResponse> getMe() {
3737

3838
@Override
3939
@PutMapping("/profile")
40-
@PreAuthorize("hasRole('NORMAL')")
4140
public ApiResponse<UserProfileResponse> updateProfile(
4241
@Validated @RequestBody UpdateProfileRequest request
4342
) {
@@ -48,7 +47,6 @@ public ApiResponse<UserProfileResponse> updateProfile(
4847

4948
@Override
5049
@DeleteMapping("/me")
51-
@PreAuthorize("hasRole('NORMAL')")
5250
public ApiResponse<Void> deleteUser() {
5351
long userUd = httpRequestContext.getUserId();
5452
userService.deleteUser(userUd);

0 commit comments

Comments
 (0)