refactor : 호스트 검증 aop 적용

DuDoong-Api/src/main/java/band/gosrock/api/event/service/CreateEventUseCase.java

@@ -9,7 +9,6 @@
 import band.gosrock.domain.domains.event.domain.Event;
 import band.gosrock.domain.domains.event.service.EventService;
 import band.gosrock.domain.domains.host.service.HostService;
-import band.gosrock.domain.domains.user.domain.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -23,8 +22,7 @@ public class CreateEventUseCase {
 
     @Transactional
     public EventResponse execute(CreateEventRequest createEventRequest) {
-        final User user = userUtils.getCurrentUser();
-        final Long userId = user.getId();
+        final Long userId = userUtils.getCurrentUserId();
         // 슈퍼 호스트 이상만 공연 생성 가능
         hostService.validateManagerHostUser(createEventRequest.getHostId(), userId);
         final Event event = eventMapper.toEntity(createEventRequest);

DuDoong-Api/src/main/java/band/gosrock/api/event/service/ReadEventChecklistUseCase.java

@@ -1,32 +1,27 @@
 package band.gosrock.api.event.service;
 
+import static band.gosrock.api.common.aop.hostRole.FindHostFrom.EVENT_ID;
+import static band.gosrock.api.common.aop.hostRole.HostQualification.GUEST;
 
-import band.gosrock.api.common.UserUtils;
+import band.gosrock.api.common.aop.hostRole.HostRolesAllowed;
 import band.gosrock.api.event.model.dto.response.EventChecklistResponse;
 import band.gosrock.api.event.model.mapper.EventMapper;
 import band.gosrock.common.annotation.UseCase;
 import band.gosrock.domain.domains.event.adaptor.EventAdaptor;
 import band.gosrock.domain.domains.event.domain.Event;
-import band.gosrock.domain.domains.host.adaptor.HostAdaptor;
-import band.gosrock.domain.domains.host.domain.Host;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
 @UseCase
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
 public class ReadEventChecklistUseCase {
-    private final UserUtils userUtils;
     private final EventAdaptor eventAdaptor;
     private final EventMapper eventMapper;
-    private final HostAdaptor hostAdaptor;
 
+    @HostRolesAllowed(role = GUEST, findHostFrom = EVENT_ID)
     public EventChecklistResponse execute(Long eventId) {
         final Event event = eventAdaptor.findById(eventId);
-        final Host host = hostAdaptor.findById(event.getHostId());
-        final Long userId = userUtils.getCurrentUserId();
-        host.validateHostUser(userId);
-
         return eventMapper.toEventChecklistResponse(event);
     }
 }

DuDoong-Api/src/main/java/band/gosrock/api/event/service/ReadEventDetailUseCase.java

@@ -26,7 +26,6 @@ public EventDetailResponse execute(Long eventId) {
         final Event event = eventAdaptor.findById(eventId);
         final Host host = hostAdaptor.findById(event.getHostId());
         final Long userId = userUtils.getCurrentUserId();
-
         // 호스트 유저가 아닐 경우 준비 상태일 때 조회할 수 없음
         if (event.isPreparing() && !host.hasHostUserId(userId)) {
             throw EventNotOpenException.EXCEPTION;

DuDoong-Api/src/main/java/band/gosrock/api/event/service/ReadUserEventProfilesUseCase.java

@@ -6,11 +6,11 @@
 import band.gosrock.api.event.model.dto.response.EventProfileResponse;
 import band.gosrock.api.event.model.mapper.EventMapper;
 import band.gosrock.common.annotation.UseCase;
-import band.gosrock.domain.domains.user.domain.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.transaction.annotation.Transactional;
 
+/** 해당 호스트 유저가 관리중인 이벤트 리스트를 불러오는 유즈케이스 */
 @UseCase
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
@@ -19,8 +19,7 @@ public class ReadUserEventProfilesUseCase {
     private final EventMapper eventMapper;
 
     public SliceResponse<EventProfileResponse> execute(Pageable pageable) {
-        final User user = userUtils.getCurrentUser();
-        final Long userId = user.getId();
+        final Long userId = userUtils.getCurrentUserId();
         return SliceResponse.of(eventMapper.toEventProfileResponseSlice(userId, pageable));
     }
 }

DuDoong-Api/src/main/java/band/gosrock/api/event/service/UpdateEventBasicUseCase.java

@@ -1,7 +1,10 @@
 package band.gosrock.api.event.service;
 
+import static band.gosrock.api.common.aop.hostRole.FindHostFrom.EVENT_ID;
+import static band.gosrock.api.common.aop.hostRole.HostQualification.MANAGER;
 
 import band.gosrock.api.common.UserUtils;
+import band.gosrock.api.common.aop.hostRole.HostRolesAllowed;
 import band.gosrock.api.event.model.dto.request.UpdateEventBasicRequest;
 import band.gosrock.api.event.model.dto.response.EventResponse;
 import band.gosrock.api.event.model.mapper.EventMapper;
@@ -12,7 +15,6 @@
 import band.gosrock.domain.domains.event.domain.EventPlace;
 import band.gosrock.domain.domains.event.service.EventService;
 import band.gosrock.domain.domains.host.service.HostService;
-import band.gosrock.domain.domains.user.domain.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -26,12 +28,9 @@ public class UpdateEventBasicUseCase {
     private final EventMapper eventMapper;
 
     @Transactional
+    @HostRolesAllowed(role = MANAGER, findHostFrom = EVENT_ID)
     public EventResponse execute(Long eventId, UpdateEventBasicRequest updateEventBasicRequest) {
-        final User user = userUtils.getCurrentUser();
-        final Long userId = user.getId();
         final Event event = eventAdaptor.findById(eventId);
-        hostService.validateManagerHostUser(event.getHostId(), userId);
-
         EventBasic eventBasic = eventMapper.toEventBasic(updateEventBasicRequest);
         EventPlace eventPlace = eventMapper.toEventPlace(updateEventBasicRequest);
 

DuDoong-Api/src/main/java/band/gosrock/api/event/service/UpdateEventStatusUseCase.java

@@ -1,7 +1,10 @@
 package band.gosrock.api.event.service;
 
+import static band.gosrock.api.common.aop.hostRole.FindHostFrom.EVENT_ID;
+import static band.gosrock.api.common.aop.hostRole.HostQualification.MANAGER;
 
 import band.gosrock.api.common.UserUtils;
+import band.gosrock.api.common.aop.hostRole.HostRolesAllowed;
 import band.gosrock.api.event.model.dto.request.UpdateEventStatusRequest;
 import band.gosrock.api.event.model.dto.response.EventResponse;
 import band.gosrock.common.annotation.UseCase;
@@ -10,7 +13,6 @@
 import band.gosrock.domain.domains.event.domain.EventStatus;
 import band.gosrock.domain.domains.event.service.EventService;
 import band.gosrock.domain.domains.host.service.HostService;
-import band.gosrock.domain.domains.user.domain.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -23,11 +25,9 @@ public class UpdateEventStatusUseCase {
     private final EventAdaptor eventAdaptor;
 
     @Transactional
+    @HostRolesAllowed(role = MANAGER, findHostFrom = EVENT_ID)
     public EventResponse execute(Long eventId, UpdateEventStatusRequest updateEventStatusRequest) {
-        final User user = userUtils.getCurrentUser();
-        final Long userId = user.getId();
         final Event event = eventAdaptor.findById(eventId);
-        hostService.validateManagerHostUser(event.getHostId(), userId);
         final EventStatus status = updateEventStatusRequest.getStatus();
 
         return EventResponse.of(eventService.updateEventStatus(event, status));

DuDoong-Api/src/main/java/band/gosrock/api/host/model/mapper/HostMapper.java

@@ -24,6 +24,7 @@
 
 @Mapper
 @RequiredArgsConstructor
+@Transactional(readOnly = true)
 public class HostMapper {
     private final HostAdaptor hostAdaptor;
     private final UserAdaptor userAdaptor;
@@ -64,7 +65,6 @@ public HostUser toMasterHostUser(Long hostId, Long userId) {
         return HostUser.builder().userId(userId).host(host).role(HostRole.MASTER).build();
     }
 
-    @Transactional(readOnly = true)
     public UserProfileVo toHostInviteUserList(Long hostId, String email) {
         final Host host = hostAdaptor.findById(hostId);
 
@@ -75,13 +75,11 @@ public UserProfileVo toHostInviteUserList(Long hostId, String email) {
         return inviteUser.toUserProfileVo();
     }
 
-    @Transactional(readOnly = true)
     public HostDetailResponse toHostDetailResponse(Long hostId) {
         final Host host = hostAdaptor.findById(hostId);
         return toHostDetailResponseExecute(host);
     }
 
-    @Transactional(readOnly = true)
     public HostDetailResponse toHostDetailResponse(Host host) {
         return toHostDetailResponseExecute(host);
     }

DuDoong-Api/src/main/java/band/gosrock/api/host/service/InviteHostUseCase.java

@@ -1,7 +1,9 @@
 package band.gosrock.api.host.service;
 
+import static band.gosrock.api.common.aop.hostRole.FindHostFrom.HOST_ID;
+import static band.gosrock.api.common.aop.hostRole.HostQualification.MANAGER;
 
-import band.gosrock.api.common.UserUtils;
+import band.gosrock.api.common.aop.hostRole.HostRolesAllowed;
 import band.gosrock.api.host.model.dto.request.InviteHostRequest;
 import band.gosrock.api.host.model.dto.response.HostDetailResponse;
 import band.gosrock.api.host.model.mapper.HostMapper;
@@ -11,24 +13,21 @@
 import band.gosrock.domain.domains.host.domain.HostUser;
 import band.gosrock.domain.domains.host.service.HostService;
 import band.gosrock.domain.domains.user.adaptor.UserAdaptor;
-import band.gosrock.domain.domains.user.domain.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
 @UseCase
 @RequiredArgsConstructor
 public class InviteHostUseCase {
 
-    private final UserUtils userUtils;
     private final UserAdaptor userAdaptor;
     private final HostService hostService;
     private final HostAdaptor hostAdaptor;
     private final HostMapper hostMapper;
 
     @Transactional
+    @HostRolesAllowed(role = MANAGER, findHostFrom = HOST_ID)
     public HostDetailResponse execute(Long hostId, InviteHostRequest inviteHostRequest) {
-        // 존재하는 유저인지 검증
-        final User user = userUtils.getCurrentUser();
         // 초대할 유저
         final Long inviteUserId =
                 userAdaptor.queryUserByEmail(inviteHostRequest.getEmail()).getId();

DuDoong-Api/src/main/java/band/gosrock/api/host/service/JoinHostUseCase.java

@@ -1,14 +1,16 @@
 package band.gosrock.api.host.service;
 
+import static band.gosrock.api.common.aop.hostRole.FindHostFrom.HOST_ID;
+import static band.gosrock.api.common.aop.hostRole.HostQualification.GUEST;
 
 import band.gosrock.api.common.UserUtils;
+import band.gosrock.api.common.aop.hostRole.HostRolesAllowed;
 import band.gosrock.api.host.model.dto.response.HostDetailResponse;
 import band.gosrock.api.host.model.mapper.HostMapper;
 import band.gosrock.common.annotation.UseCase;
 import band.gosrock.domain.domains.host.adaptor.HostAdaptor;
 import band.gosrock.domain.domains.host.domain.Host;
 import band.gosrock.domain.domains.host.service.HostService;
-import band.gosrock.domain.domains.user.domain.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,14 +24,11 @@ public class JoinHostUseCase {
     private final HostMapper hostMapper;
 
     @Transactional
+    @HostRolesAllowed(role = GUEST, findHostFrom = HOST_ID)
     public HostDetailResponse execute(Long hostId) {
-        // 존재하는 유저인지 검증
-        final User user = userUtils.getCurrentUser();
-        final Long userId = user.getId();
+        final Long userId = userUtils.getCurrentUserId();
         final Host host = hostAdaptor.findById(hostId);
 
-        // 이 호스트에 초대받지 않음
-        host.validateHostUser(userId);
         return hostMapper.toHostDetailResponse(hostService.activateHostUser(host, userId));
     }
 }

DuDoong-Api/src/main/java/band/gosrock/api/host/service/ReadHostProfilesUseCase.java

@@ -13,11 +13,11 @@
 
 @UseCase
 @RequiredArgsConstructor
-@Transactional(readOnly = true)
 public class ReadHostProfilesUseCase {
     private final UserUtils userUtils;
     private final HostAdaptor hostAdaptor;
 
+    @Transactional(readOnly = true)
     public SliceResponse<HostProfileResponse> execute(Pageable pageable) {
         final User user = userUtils.getCurrentUser();
         final Long userId = user.getId();

DuDoong-Api/src/main/java/band/gosrock/api/host/service/ReadHostUseCase.java

@@ -11,11 +11,11 @@
 
 @UseCase
 @RequiredArgsConstructor
-@Transactional(readOnly = true)
 public class ReadHostUseCase {
     private final UserUtils userUtils;
     private final HostMapper hostMapper;
 
+    @Transactional(readOnly = true)
     public HostDetailResponse execute(Long hostId) {
         final User user = userUtils.getCurrentUser();
         final Long userId = user.getId();

DuDoong-Api/src/main/java/band/gosrock/api/host/service/ReadInviteUsersUseCase.java

@@ -1,24 +1,25 @@
 package band.gosrock.api.host.service;
 
+import static band.gosrock.api.common.aop.hostRole.FindHostFrom.HOST_ID;
+import static band.gosrock.api.common.aop.hostRole.HostQualification.GUEST;
 
 import band.gosrock.api.common.UserUtils;
+import band.gosrock.api.common.aop.hostRole.HostRolesAllowed;
 import band.gosrock.api.host.model.mapper.HostMapper;
 import band.gosrock.common.annotation.UseCase;
 import band.gosrock.domain.common.vo.UserProfileVo;
-import band.gosrock.domain.domains.user.domain.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
 @UseCase
 @RequiredArgsConstructor
-@Transactional(readOnly = true)
 public class ReadInviteUsersUseCase {
     private final UserUtils userUtils;
     private final HostMapper hostMapper;
 
+    @Transactional(readOnly = true)
+    @HostRolesAllowed(role = GUEST, findHostFrom = HOST_ID)
     public UserProfileVo execute(Long hostId, String email) {
-        final User user = userUtils.getCurrentUser();
-        final Long userId = user.getId();
         return hostMapper.toHostInviteUserList(hostId, email);
     }
 }

DuDoong-Api/src/main/java/band/gosrock/api/host/service/UpdateHostProfileUseCase.java

@@ -1,15 +1,17 @@
 package band.gosrock.api.host.service;
 
+import static band.gosrock.api.common.aop.hostRole.FindHostFrom.HOST_ID;
+import static band.gosrock.api.common.aop.hostRole.HostQualification.MANAGER;
 
 import band.gosrock.api.common.UserUtils;
+import band.gosrock.api.common.aop.hostRole.HostRolesAllowed;
 import band.gosrock.api.host.model.dto.request.UpdateHostRequest;
 import band.gosrock.api.host.model.dto.response.HostDetailResponse;
 import band.gosrock.api.host.model.mapper.HostMapper;
 import band.gosrock.common.annotation.UseCase;
 import band.gosrock.domain.domains.host.adaptor.HostAdaptor;
 import band.gosrock.domain.domains.host.domain.Host;
 import band.gosrock.domain.domains.host.service.HostService;
-import band.gosrock.domain.domains.user.domain.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,14 +24,9 @@ public class UpdateHostProfileUseCase {
     private final HostMapper hostMapper;
 
     @Transactional
+    @HostRolesAllowed(role = MANAGER, findHostFrom = HOST_ID)
     public HostDetailResponse execute(Long hostId, UpdateHostRequest updateHostRequest) {
-        // 존재하는 유저인지 검증
-        final User user = userUtils.getCurrentUser();
-        final Long userId = user.getId();
-
         final Host host = hostAdaptor.findById(hostId);
-        // 슈퍼 호스트 검증
-        host.validateManagerHostUser(userId);
 
         return hostMapper.toHostDetailResponse(
                 hostService.updateHostProfile(host, hostMapper.toHostProfile(updateHostRequest)));

DuDoong-Api/src/main/java/band/gosrock/api/host/service/UpdateHostUserRoleUseCase.java

@@ -1,7 +1,10 @@
 package band.gosrock.api.host.service;
 
+import static band.gosrock.api.common.aop.hostRole.FindHostFrom.HOST_ID;
+import static band.gosrock.api.common.aop.hostRole.HostQualification.MANAGER;
 
 import band.gosrock.api.common.UserUtils;
+import band.gosrock.api.common.aop.hostRole.HostRolesAllowed;
 import band.gosrock.api.host.model.dto.request.UpdateHostUserRoleRequest;
 import band.gosrock.api.host.model.dto.response.HostDetailResponse;
 import band.gosrock.api.host.model.mapper.HostMapper;
@@ -10,7 +13,6 @@
 import band.gosrock.domain.domains.host.domain.Host;
 import band.gosrock.domain.domains.host.domain.HostRole;
 import band.gosrock.domain.domains.host.service.HostService;
-import band.gosrock.domain.domains.user.domain.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -23,15 +25,10 @@ public class UpdateHostUserRoleUseCase {
     private final HostMapper hostMapper;
 
     @Transactional
+    @HostRolesAllowed(role = MANAGER, findHostFrom = HOST_ID)
     public HostDetailResponse execute(
             Long hostId, UpdateHostUserRoleRequest updateHostUserRoleRequest) {
-        // 존재하는 유저인지 검증
-        final User user = userUtils.getCurrentUser();
-        final Long userId = user.getId();
         final Host host = hostAdaptor.findById(hostId);
-        // 매니저 호스트 검증
-        host.validateManagerHostUser(userId);
-
         final Long updateUserId = updateHostUserRoleRequest.getUserId();
         final HostRole updateUserRole = updateHostUserRoleRequest.getRole();