🚀 :: Api-v0.1.4-2

🚀 :: Api-v0.1.4-2

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

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

DuDoong-Api/src/main/java/band/gosrock/api/host/model/dto/request/UpdateHostSlackRequest.java

@@ -2,6 +2,7 @@
 
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import javax.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -13,6 +14,7 @@
 @AllArgsConstructor
 public class UpdateHostSlackRequest {
     @Schema(defaultValue = "https://slack.dd.com", description = "슬랙 웹훅 URL")
+    @NotBlank(message = "올바른 슬랙 URL 을 입력해주세요")
     @URL(message = "올바른 슬랙 URL 을 입력해주세요")
     private String slackUrl;
 }

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

@@ -10,7 +10,10 @@
 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.exception.InvalidSlackUrlException;
 import band.gosrock.domain.domains.host.service.HostService;
+import band.gosrock.infrastructure.config.slack.SlackMessageProvider;
+import java.net.UnknownHostException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -21,11 +24,20 @@ public class UpdateHostSlackUrlUseCase {
     private final HostAdaptor hostAdaptor;
     private final HostMapper hostMapper;
 
+    private final SlackMessageProvider slackMessageProvider;
+
     @Transactional
     @HostRolesAllowed(role = MANAGER, findHostFrom = HOST_ID)
     public HostDetailResponse execute(Long hostId, UpdateHostSlackRequest updateHostSlackRequest) {
         final Host host = hostAdaptor.findById(hostId);
         final String slackUrl = updateHostSlackRequest.getSlackUrl();
-        return hostMapper.toHostDetailResponse(hostService.updateHostSlackUrl(host, slackUrl));
+        hostService.validateDuplicatedSlackUrl(host, slackUrl);
+
+        try {
+            slackMessageProvider.register(slackUrl);
+            return hostMapper.toHostDetailResponse(hostService.updateHostSlackUrl(host, slackUrl));
+        } catch (UnknownHostException e) {
+            throw InvalidSlackUrlException.EXCEPTION;
+        }
     }
 }

DuDoong-Api/src/main/java/band/gosrock/api/event/handler/EventContentChangeEventHandler.java → DuDoong-Api/src/main/java/band/gosrock/api/slack/handler/event/EventContentChangeEventHandler.java

@@ -1,4 +1,4 @@
-package band.gosrock.api.event.handler;
+package band.gosrock.api.slack.handler.event;
 
 
 import band.gosrock.domain.common.alarm.EventSlackAlarm;

DuDoong-Api/src/main/java/band/gosrock/api/event/handler/EventCreationEventHandler.java → DuDoong-Api/src/main/java/band/gosrock/api/slack/handler/event/EventCreationEventHandler.java

@@ -1,4 +1,4 @@
-package band.gosrock.api.event.handler;
+package band.gosrock.api.slack.handler.event;
 
 
 import band.gosrock.domain.common.alarm.EventSlackAlarm;

DuDoong-Api/src/main/java/band/gosrock/api/event/handler/EventDeletionEventHandler.java → DuDoong-Api/src/main/java/band/gosrock/api/slack/handler/event/EventDeletionEventHandler.java

@@ -1,4 +1,4 @@
-package band.gosrock.api.event.handler;
+package band.gosrock.api.slack.handler.event;
 
 
 import band.gosrock.domain.common.alarm.EventSlackAlarm;

DuDoong-Api/src/main/java/band/gosrock/api/event/handler/EventStatusChangeEventHandler.java → DuDoong-Api/src/main/java/band/gosrock/api/slack/handler/event/EventStatusChangeEventHandler.java

@@ -1,4 +1,4 @@
-package band.gosrock.api.event.handler;
+package band.gosrock.api.slack.handler.event;
 
 
 import band.gosrock.domain.common.alarm.EventSlackAlarm;

DuDoong-Api/src/main/java/band/gosrock/api/host/handler/HostRegisterSlackEventHandler.java → DuDoong-Api/src/main/java/band/gosrock/api/slack/handler/host/HostRegisterSlackEventHandler.java

@@ -1,4 +1,4 @@
-package band.gosrock.api.host.handler;
+package band.gosrock.api.slack.handler.host;
 
 
 import band.gosrock.domain.common.alarm.HostSlackAlarm;

DuDoong-Api/src/main/java/band/gosrock/api/host/handler/HostUserDisabledEventHandler.java → DuDoong-Api/src/main/java/band/gosrock/api/slack/handler/host/HostUserDisabledEventHandler.java

@@ -1,4 +1,4 @@
-package band.gosrock.api.host.handler;
+package band.gosrock.api.slack.handler.host;
 
 
 import band.gosrock.api.email.service.HostUserDisabledEmailService;

DuDoong-Api/src/main/java/band/gosrock/api/host/handler/HostUserInvitationEventHandler.java → DuDoong-Api/src/main/java/band/gosrock/api/slack/handler/host/HostUserInvitationEventHandler.java

@@ -1,4 +1,4 @@
-package band.gosrock.api.host.handler;
+package band.gosrock.api.slack.handler.host;
 
 
 import band.gosrock.api.email.service.HostUserInvitationEmailService;

DuDoong-Api/src/main/java/band/gosrock/api/host/handler/HostUserJoinEventHandler.java → DuDoong-Api/src/main/java/band/gosrock/api/slack/handler/host/HostUserJoinEventHandler.java

@@ -1,4 +1,4 @@
-package band.gosrock.api.host.handler;
+package band.gosrock.api.slack.handler.host;
 
 
 import band.gosrock.domain.common.alarm.HostSlackAlarm;

DuDoong-Api/src/main/java/band/gosrock/api/host/handler/HostUserRoleChangeEventHandler.java → DuDoong-Api/src/main/java/band/gosrock/api/slack/handler/host/HostUserRoleChangeEventHandler.java

@@ -1,4 +1,4 @@
-package band.gosrock.api.host.handler;
+package band.gosrock.api.slack.handler.host;
 
 
 import band.gosrock.api.email.service.HostMasterChangeEmailService;

DuDoong-Api/src/main/java/band/gosrock/api/ticketItem/controller/TicketItemController.java

@@ -56,6 +56,12 @@ public GetEventTicketItemsResponse getEventTicketItems(@PathVariable Long eventI
         return getEventTicketItemsUseCase.execute(eventId);
     }
 
+    @Operation(summary = "해당 이벤트의 티켓상품을 모두 조회합니다. (어드민용)", description = "재고 정보가 무조건 공개됩니다.")
+    @GetMapping("/admin")
+    public GetEventTicketItemsResponse getEventTicketItemsForAdmin(@PathVariable Long eventId) {
+        return getEventTicketItemsUseCase.executeForAdmin(eventId);
+    }
+
     @Operation(summary = "해당 티켓상품의 옵션을 모두 조회합니다.")
     @GetMapping("/{ticketItemId}/options")
     public GetTicketItemOptionsResponse getTicketItemOptions(

DuDoong-Api/src/main/java/band/gosrock/api/ticketItem/dto/response/TicketItemResponse.java

@@ -42,7 +42,7 @@ public class TicketItemResponse {
     @Schema(description = "재고공개 여부")
     private final Boolean isQuantityPublic;
 
-    public static TicketItemResponse from(TicketItem ticketItem) {
+    public static TicketItemResponse from(TicketItem ticketItem, Boolean isAdmin) {
 
         return TicketItemResponse.builder()
                 .ticketItemId(ticketItem.getId())
@@ -53,7 +53,10 @@ public static TicketItemResponse from(TicketItem ticketItem) {
                 .approveType(ticketItem.getType())
                 .purchaseLimit(ticketItem.getPurchaseLimit())
                 .supplyCount(ticketItem.getSupplyCount())
-                .quantity(ticketItem.getQuantity())
+                .quantity(
+                        isAdmin || ticketItem.getIsQuantityPublic()
+                                ? ticketItem.getQuantity()
+                                : null)
                 .isQuantityPublic(ticketItem.getIsQuantityPublic())
                 .build();
     }

DuDoong-Api/src/main/java/band/gosrock/api/ticketItem/mapper/TicketItemMapper.java

@@ -41,12 +41,15 @@ public TicketItem toTicketItem(CreateTicketItemRequest createTicketItemRequest,
     }
 
     @Transactional(readOnly = true)
-    public GetEventTicketItemsResponse toGetEventTicketItemsResponse(Long eventId) {
+    public GetEventTicketItemsResponse toGetEventTicketItemsResponse(
+            Long eventId, Boolean isAdmin) {
 
         Event event = eventAdaptor.findById(eventId);
         List<TicketItem> ticketItems = ticketItemAdaptor.findAllByEventId(event.getId());
         return GetEventTicketItemsResponse.from(
-                ticketItems.stream().map(TicketItemResponse::from).toList());
+                ticketItems.stream()
+                        .map(ticketItem -> TicketItemResponse.from(ticketItem, isAdmin))
+                        .toList());
     }
 
     @Transactional(readOnly = true)

DuDoong-Api/src/main/java/band/gosrock/api/ticketItem/service/CreateTicketItemUseCase.java

@@ -42,6 +42,6 @@ public TicketItemResponse execute(
                 ticketItemService.createTicketItem(
                         ticketItemMapper.toTicketItem(createTicketItemRequest, event), isPartner);
 
-        return TicketItemResponse.from(ticketItem);
+        return TicketItemResponse.from(ticketItem, true);
     }
 }

DuDoong-Api/src/main/java/band/gosrock/api/ticketItem/service/DeleteTicketItemUseCase.java

@@ -34,6 +34,6 @@ public GetEventTicketItemsResponse execute(Long eventId, Long ticketItemId) {
 
         ticketItemService.softDeleteTicketItem(eventId, ticketItemId);
 
-        return ticketItemMapper.toGetEventTicketItemsResponse(eventId);
+        return ticketItemMapper.toGetEventTicketItemsResponse(eventId, true);
     }
 }

DuDoong-Api/src/main/java/band/gosrock/api/ticketItem/service/GetEventTicketItemsUseCase.java

@@ -1,6 +1,9 @@
 package band.gosrock.api.ticketItem.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.aop.hostRole.HostRolesAllowed;
 import band.gosrock.api.ticketItem.dto.response.GetEventTicketItemsResponse;
 import band.gosrock.api.ticketItem.mapper.TicketItemMapper;
 import band.gosrock.common.annotation.UseCase;
@@ -14,6 +17,12 @@ public class GetEventTicketItemsUseCase {
 
     public GetEventTicketItemsResponse execute(Long eventId) {
 
-        return ticketItemMapper.toGetEventTicketItemsResponse(eventId);
+        return ticketItemMapper.toGetEventTicketItemsResponse(eventId, false);
+    }
+
+    @HostRolesAllowed(role = GUEST, findHostFrom = EVENT_ID)
+    public GetEventTicketItemsResponse executeForAdmin(Long eventId) {
+
+        return ticketItemMapper.toGetEventTicketItemsResponse(eventId, true);
     }
 }

DuDoong-Domain/src/main/java/band/gosrock/domain/common/vo/HostInfoVo.java

@@ -30,6 +30,7 @@ public static HostInfoVo from(Host host) {
                 .profileImage(host.getProfile().getProfileImage())
                 .contactEmail(host.getProfile().getContactEmail())
                 .contactNumber(host.getProfile().getContactNumber())
+                .partner(host.getPartner())
                 .build();
     }
 }

DuDoong-Domain/src/main/java/band/gosrock/domain/domains/host/domain/Host.java

@@ -15,6 +15,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.apache.commons.codec.binary.StringUtils;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -77,7 +78,7 @@ public void updateProfile(HostProfile hostProfile) {
     }
 
     public void setSlackUrl(String slackUrl) {
-        if (this.slackUrl.equals(slackUrl)) {
+        if (StringUtils.equals(this.slackUrl, slackUrl)) {
             throw DuplicateSlackUrlException.EXCEPTION;
         }
         Events.raise(HostRegisterSlackEvent.of(this));

DuDoong-Domain/src/main/java/band/gosrock/domain/domains/host/exception/HostErrorCode.java

@@ -22,6 +22,7 @@ public enum HostErrorCode implements BaseErrorCode {
     NOT_ACCEPTED_HOST(BAD_REQUEST, "HOST_400_6", "아직 초대를 수락하지 않은 유저입니다."),
     NOT_PARTNER_HOST(BAD_REQUEST, "HOST_400_7", "파트너 호스트만 사용할 수 있는 기능입니다. 제휴 신청을 해주세요."),
     DUPLICATED_SLACK_URL(BAD_REQUEST, "HOST_400_8", "기존과 동일한 슬랙 url 입니다."),
+    INVALID_SLACK_URL(BAD_REQUEST, "HOST_400_9", "유효하지 않은 않은 슬랙 url 입니다."),
     HOST_NOT_FOUND(NOT_FOUND, "Host_404_1", "해당 호스트를 찾을 수 없습니다."),
     HOST_USER_NOT_FOUND(NOT_FOUND, "HOST_404_2", "가입된 호스트 유저가 아닙니다.");
 

DuDoong-Domain/src/main/java/band/gosrock/domain/domains/host/exception/InvalidSlackUrlException.java

@@ -0,0 +1,12 @@
+package band.gosrock.domain.domains.host.exception;
+
+
+import band.gosrock.common.exception.DuDoongCodeException;
+
+public class InvalidSlackUrlException extends DuDoongCodeException {
+    public static final DuDoongCodeException EXCEPTION = new InvalidSlackUrlException();
+
+    private InvalidSlackUrlException() {
+        super(HostErrorCode.INVALID_SLACK_URL);
+    }
+}

DuDoong-Domain/src/main/java/band/gosrock/domain/domains/host/service/HostService.java

@@ -7,9 +7,11 @@
 import band.gosrock.domain.domains.host.domain.HostProfile;
 import band.gosrock.domain.domains.host.domain.HostRole;
 import band.gosrock.domain.domains.host.domain.HostUser;
+import band.gosrock.domain.domains.host.exception.InvalidSlackUrlException;
 import band.gosrock.domain.domains.host.repository.HostRepository;
 import java.util.Set;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.codec.binary.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 
 @DomainService
@@ -53,6 +55,12 @@ public Host activateHostUser(Host host, Long userId) {
         return hostRepository.save(host);
     }
 
+    public void validateDuplicatedSlackUrl(Host host, String url) {
+        if (StringUtils.equals(host.getSlackUrl(), url)) {
+            throw InvalidSlackUrlException.EXCEPTION;
+        }
+    }
+
     /** 해당 유저가 호스트에 속하는지 확인하는 검증 로직입니다 */
     public void validateHostUser(Host host, Long userId) {
         host.validateHostUser(userId);

DuDoong-Domain/src/main/java/band/gosrock/domain/domains/issuedTicket/domain/IssuedTicket.java

@@ -163,7 +163,7 @@ public EmailIssuedTicketInfo toEmailIssuedTicketInfo() {
     티켓이 입장 미완료 상태가 아니면 취소 할 수 없음
      */
     public void cancel() {
-        if (this.issuedTicketStatus != IssuedTicketStatus.ENTRANCE_INCOMPLETE) {
+        if (!this.issuedTicketStatus.isBeforeEntrance()) {
             throw CanNotCancelException.EXCEPTION;
         }
         this.issuedTicketStatus = IssuedTicketStatus.CANCELED;
@@ -175,10 +175,10 @@ public void cancel() {
     (입장 처리 도메인 이벤트 발행)
      */
     public void entrance() {
-        if (this.issuedTicketStatus == IssuedTicketStatus.CANCELED) {
+        if (this.issuedTicketStatus.isCanceled()) {
             throw CanNotEntranceException.EXCEPTION;
         }
-        if (this.issuedTicketStatus == IssuedTicketStatus.ENTRANCE_COMPLETED) {
+        if (this.issuedTicketStatus.isAfterEntrance()) {
             throw IssuedTicketAlreadyEntranceException.EXCEPTION;
         }
         this.issuedTicketStatus = IssuedTicketStatus.ENTRANCE_COMPLETED;
@@ -190,7 +190,7 @@ public void entrance() {
     티켓이 입장 완료 상태가 아니면 입장 취소 할 수 없음
      */
     public void entranceCancel() {
-        if (this.issuedTicketStatus != IssuedTicketStatus.ENTRANCE_COMPLETED) {
+        if (!this.issuedTicketStatus.isAfterEntrance()) {
             throw CanNotCancelEntranceException.EXCEPTION;
         }
         this.issuedTicketStatus = IssuedTicketStatus.ENTRANCE_INCOMPLETE;

DuDoong-Domain/src/main/java/band/gosrock/domain/domains/issuedTicket/domain/IssuedTicketStatus.java

@@ -30,4 +30,8 @@ public Boolean isBeforeEntrance() {
     public Boolean isAfterEntrance() {
         return this == IssuedTicketStatus.ENTRANCE_COMPLETED;
     }
+
+    public Boolean is(IssuedTicket issuedTicket) {
+        return issuedTicket.getIssuedTicketStatus() == IssuedTicketStatus.ENTRANCE_INCOMPLETE;
+    }
 }

DuDoong-Domain/src/main/java/band/gosrock/domain/domains/issuedTicket/validator/IssuedTicketValidator.java

@@ -3,9 +3,7 @@
 
 import band.gosrock.common.annotation.Validator;
 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 band.gosrock.domain.domains.issuedTicket.domain.IssuedTicket;
 import band.gosrock.domain.domains.issuedTicket.exception.IssuedTicketNotMatchedEventException;
 import java.util.Objects;
@@ -17,12 +15,13 @@ public class IssuedTicketValidator {
 
     private final EventAdaptor eventAdaptor;
     private final HostAdaptor hostAdaptor;
-
-    public void validCanModifyIssuedTicketUser(IssuedTicket issuedTicket, Long currentUserId) {
-        Event event = eventAdaptor.findById(issuedTicket.getEventId());
-        Host host = hostAdaptor.findById(event.getHostId());
-        host.validateHostUser(currentUserId);
-    }
+    //
+    //    public void validCanModifyIssuedTicketUser(IssuedTicket issuedTicket, Long currentUserId)
+    // {
+    //        Event event = eventAdaptor.findById(issuedTicket.getEventId());
+    //        Host host = hostAdaptor.findById(event.getHostId());
+    //        host.validateHostUser(currentUserId);
+    //    }
 
     public void validIssuedTicketEventIdEqualEvent(IssuedTicket issuedTicket, Long eventId) {
         if (!Objects.equals(issuedTicket.getEventId(), eventId)) {

DuDoong-Domain/src/test/java/band/gosrock/domain/domains/issuedTicket/domain/validator/IssuedTicketValidatorTest.java

@@ -0,0 +1,51 @@
+package band.gosrock.domain.domains.issuedTicket.domain.validator;
+
+import static org.mockito.BDDMockito.given;
+
+import band.gosrock.domain.domains.event.adaptor.EventAdaptor;
+import band.gosrock.domain.domains.host.adaptor.HostAdaptor;
+import band.gosrock.domain.domains.issuedTicket.domain.IssuedTicket;
+import band.gosrock.domain.domains.issuedTicket.exception.IssuedTicketNotMatchedEventException;
+import band.gosrock.domain.domains.issuedTicket.validator.IssuedTicketValidator;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class IssuedTicketValidatorTest {
+
+    @Mock IssuedTicket issuedTicket;
+
+    @Mock EventAdaptor eventAdaptor;
+
+    @Mock HostAdaptor hostAdaptor;
+
+    IssuedTicketValidator issuedTicketValidator;
+
+    @BeforeEach
+    public void setUp() {
+        issuedTicketValidator = new IssuedTicketValidator(eventAdaptor, hostAdaptor);
+    }
+
+    @Test
+    public void 발급티켓_이벤트_검증_성공() {
+        // given
+        given(issuedTicket.getEventId()).willReturn(1L);
+        // when
+        issuedTicketValidator.validIssuedTicketEventIdEqualEvent(issuedTicket, 1L);
+    }
+
+    @Test
+    public void 발급티켓_이벤트_검증_실패() {
+        // given
+        given(issuedTicket.getEventId()).willReturn(2L);
+        // when
+        // then
+        Assertions.assertThrows(
+                IssuedTicketNotMatchedEventException.class,
+                () -> issuedTicketValidator.validIssuedTicketEventIdEqualEvent(issuedTicket, 1L));
+    }
+}