🚀 :: Api-v0.1.3

🚀 :: Api-v0.1.3

DuDoong-Api/src/main/java/band/gosrock/api/auth/service/RefreshUseCase.java

@@ -9,6 +9,7 @@
 import band.gosrock.domain.domains.user.adaptor.UserAdaptor;
 import band.gosrock.domain.domains.user.domain.RefreshTokenEntity;
 import band.gosrock.domain.domains.user.domain.User;
+import band.gosrock.domain.domains.user.service.UserDomainService;
 import lombok.RequiredArgsConstructor;
 
 @UseCase
@@ -17,6 +18,7 @@ public class RefreshUseCase {
     private final UserAdaptor userAdaptor;
     private final JwtTokenProvider jwtTokenProvider;
 
+    private final UserDomainService userDomainService;
     private final RefreshTokenAdaptor refreshTokenAdaptor;
 
     private final TokenGenerateHelper tokenGenerateHelper;
@@ -29,7 +31,8 @@ public TokenAndUserResponse execute(String refreshToken) {
                 jwtTokenProvider.parseRefreshToken(savedRefreshTokenEntity.getRefreshToken());
 
         User user = userAdaptor.queryUser(refreshUserId);
-
+        // 리프레쉬 시에도 last로그인 정보 업데이트
+        userDomainService.loginUser(user.getOauthInfo());
         return tokenGenerateHelper.execute(user);
     }
 }

DuDoong-Api/src/main/java/band/gosrock/api/auth/service/helper/TokenGenerateHelper.java

@@ -9,6 +9,7 @@
 import band.gosrock.domain.domains.user.domain.RefreshTokenEntity;
 import band.gosrock.domain.domains.user.domain.User;
 import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
 
 @Helper
 @RequiredArgsConstructor
@@ -18,6 +19,7 @@ public class TokenGenerateHelper {
 
     private final RefreshTokenAdaptor refreshTokenAdaptor;
 
+    @Transactional
     public TokenAndUserResponse execute(User user) {
         String newAccessToken =
                 jwtTokenProvider.generateAccessToken(

DuDoong-Api/src/main/java/band/gosrock/api/comment/controller/CommentController.java

@@ -12,26 +12,31 @@
 import band.gosrock.api.comment.service.RetrieveCommentUseCase;
 import band.gosrock.api.comment.service.RetrieveRandomCommentUseCase;
 import band.gosrock.api.common.slice.SliceResponse;
+import band.gosrock.common.annotation.DisableSwaggerSecurity;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import javax.validation.Valid;
+import javax.validation.constraints.Min;
 import lombok.RequiredArgsConstructor;
 import org.springdoc.api.annotations.ParameterObject;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @SecurityRequirement(name = "access-token")
 @Tag(name = "응원톡 컨트롤러")
 @RestController
 @RequestMapping("/v1/events/{eventId}/comments")
+@Validated
 @RequiredArgsConstructor
 public class CommentController {
 
@@ -53,6 +58,7 @@ public CreateCommentResponse postComment(
         return createCommentUseCase.execute(eventId, createCommentRequest);
     }
 
+    @DisableSwaggerSecurity
     @Operation(summary = "응원글을 조회합니다.")
     @GetMapping
     public SliceResponse<RetrieveCommentDTO> getComments(
@@ -67,15 +73,19 @@ public void deleteComment(@PathVariable Long eventId, @PathVariable Long comment
         deleteCommentUseCase.execute(eventId, commentId);
     }
 
+    @DisableSwaggerSecurity
     @Operation(summary = "응원글 개수를 카운팅합니다.")
     @GetMapping(value = "/counts")
     public RetrieveCommentCountResponse getCommentCounts(@PathVariable Long eventId) {
         return retrieveCommentCountUseCase.execute(eventId);
     }
 
+    @DisableSwaggerSecurity
     @Operation(summary = "응원글을 랜덤으로 뽑아옵니다.")
     @GetMapping(value = "/random")
-    public RetrieveRandomCommentResponse getRandomComment(@PathVariable Long eventId) {
-        return retrieveRandomCommentUseCase.execute(eventId);
+    public RetrieveRandomCommentResponse getRandomComment(
+            @PathVariable Long eventId,
+            @RequestParam @Min(value = 1L, message = "limit 값은 0보다 커야 합니다.") Long limit) {
+        return retrieveRandomCommentUseCase.execute(eventId, limit);
     }
 }

DuDoong-Api/src/main/java/band/gosrock/api/comment/mapper/CommentMapper.java

@@ -13,6 +13,7 @@
 import band.gosrock.domain.domains.comment.dto.condition.CommentCondition;
 import band.gosrock.domain.domains.event.domain.Event;
 import band.gosrock.domain.domains.user.domain.User;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Slice;
 import org.springframework.transaction.annotation.Transactional;
@@ -49,8 +50,8 @@ public RetrieveCommentCountResponse toRetrieveCommentCountResponse(Long commentC
         return RetrieveCommentCountResponse.of(commentCount);
     }
 
-    public RetrieveRandomCommentResponse toRetrieveRandomCommentResponse(Comment comment) {
-        return RetrieveRandomCommentResponse.of(comment);
+    public RetrieveRandomCommentResponse toRetrieveRandomCommentResponse(List<Comment> comments) {
+        return RetrieveRandomCommentResponse.of(comments);
     }
 
     private RetrieveCommentDTO toRetrieveCommentDTO(Comment comment, Long currentUserId) {

DuDoong-Api/src/main/java/band/gosrock/api/comment/model/response/RetrieveRandomCommentResponse.java

@@ -3,18 +3,19 @@
 
 import band.gosrock.domain.common.vo.CommentInfoVo;
 import band.gosrock.domain.domains.comment.domain.Comment;
+import java.util.List;
 import lombok.Builder;
 import lombok.Getter;
 
 @Getter
 @Builder
 public class RetrieveRandomCommentResponse {
 
-    private final CommentInfoVo commentInfo;
+    private final List<CommentInfoVo> commentInfos;
 
-    public static RetrieveRandomCommentResponse of(Comment comment) {
+    public static RetrieveRandomCommentResponse of(List<Comment> comments) {
         return RetrieveRandomCommentResponse.builder()
-                .commentInfo(comment.toCommentInfoVo())
+                .commentInfos(comments.stream().map(Comment::toCommentInfoVo).toList())
                 .build();
     }
 }

DuDoong-Api/src/main/java/band/gosrock/api/comment/service/RetrieveRandomCommentUseCase.java

@@ -8,6 +8,7 @@
 import band.gosrock.domain.domains.comment.domain.Comment;
 import band.gosrock.domain.domains.event.adaptor.EventAdaptor;
 import band.gosrock.domain.domains.event.domain.Event;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,9 +23,9 @@ public class RetrieveRandomCommentUseCase {
     private final EventAdaptor eventAdaptor;
 
     @Transactional(readOnly = true)
-    public RetrieveRandomCommentResponse execute(Long eventId) {
+    public RetrieveRandomCommentResponse execute(Long eventId, Long limit) {
         Event event = eventAdaptor.findById(eventId);
-        Comment comment = commentAdaptor.queryRandomComment(event.getId());
-        return commentMapper.toRetrieveRandomCommentResponse(comment);
+        List<Comment> comments = commentAdaptor.queryRandomComment(event.getId(), limit);
+        return commentMapper.toRetrieveRandomCommentResponse(comments);
     }
 }

DuDoong-Api/src/main/java/band/gosrock/api/config/response/GlobalExceptionHandler.java

@@ -2,7 +2,7 @@
 
 
 import band.gosrock.api.config.security.SecurityUtils;
-import band.gosrock.api.config.slack.SlackApiProvider;
+import band.gosrock.api.slack.sender.SlackInternalErrorSender;
 import band.gosrock.common.dto.ErrorReason;
 import band.gosrock.common.dto.ErrorResponse;
 import band.gosrock.common.exception.BaseErrorCode;
@@ -39,7 +39,7 @@
 @RequiredArgsConstructor
 public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
 
-    private final SlackApiProvider slackApiProvider;
+    private final SlackInternalErrorSender slackInternalErrorSender;
     //    /** Json 날짜 형식 파싱에 대한 에러 핸들러 */
     //    @ExceptionHandler({ InvalidFormatException.class, DateTimeParseException.class})
     //    public ResponseEntity<ErrorResponse> JsonParseExceptionHandler(
@@ -181,7 +181,7 @@ protected ResponseEntity<ErrorResponse> handleException(Exception e, HttpServlet
                         internalServerError.getReason(),
                         url);
 
-        slackApiProvider.sendError(cachingRequest, e, userId);
+        slackInternalErrorSender.execute(cachingRequest, e, userId);
         return ResponseEntity.status(HttpStatus.valueOf(internalServerError.getStatus()))
                 .body(errorResponse);
     }

DuDoong-Api/src/main/java/band/gosrock/api/config/security/SecurityConfig.java

@@ -37,6 +37,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 .permitAll()
                 .mvcMatchers(HttpMethod.GET, "/v1/events/{eventId:[\\d+]}/ticketItems")
                 .permitAll()
+                .mvcMatchers(HttpMethod.GET, "/v1/events/{eventId:[\\d+]}/comments/**")
+                .permitAll()
                 .mvcMatchers(HttpMethod.POST, "/v1/coupons/campaigns")
                 .hasRole("SUPER_ADMIN")
                 .anyRequest()

DuDoong-Api/src/main/java/band/gosrock/api/event/controller/EventController.java

@@ -36,6 +36,7 @@ public class EventController {
     private final UpdateEventBasicUseCase updateEventBasicUseCase;
     private final UpdateEventDetailUseCase updateEventDetailUseCase;
     private final UpdateEventStatusUseCase updateEventStatusUseCase;
+    private final OpenEventUseCase openEventStatusUseCase;
 
     @Operation(summary = "자신이 관리 중인 이벤트 리스트를 가져옵니다.")
     @GetMapping
@@ -79,7 +80,13 @@ public EventResponse updateEventDetail(
         return updateEventDetailUseCase.execute(eventId, updateEventDetailRequest);
     }
 
-    @Operation(summary = "공연 상태를 변경합니다.")
+    @Operation(summary = "공연을 오픈 상태로 변경합니다. 모든 체크리스트를 달성해야 합니다.")
+    @PatchMapping("/{eventId}/open")
+    public EventResponse updateEventStatus(@PathVariable Long eventId) {
+        return openEventStatusUseCase.execute(eventId);
+    }
+
+    @Operation(summary = "공연 상태를 변경합니다. (OPEN 제외)")
     @PatchMapping("/{eventId}/status")
     public EventResponse updateEventStatus(
             @PathVariable Long eventId,

DuDoong-Api/src/main/java/band/gosrock/api/event/model/dto/request/CreateEventRequest.java

@@ -9,6 +9,7 @@
 import javax.validation.constraints.Positive;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import org.hibernate.validator.constraints.Length;
 
 @Getter
 @RequiredArgsConstructor
@@ -19,6 +20,7 @@ public class CreateEventRequest {
 
     @Schema(defaultValue = "고스락 제 22회 정기공연", description = "공연 이름")
     @NotBlank(message = "공연 이름을 입력하세요")
+    @Length(max = 25)
     private String name;
 
     @Schema(

DuDoong-Api/src/main/java/band/gosrock/api/event/model/dto/request/UpdateEventBasicRequest.java

@@ -9,12 +9,14 @@
 import javax.validation.constraints.Positive;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import org.hibernate.validator.constraints.Length;
 
 @Getter
 @RequiredArgsConstructor
 public class UpdateEventBasicRequest {
     @Schema(defaultValue = "고스락 제 22회 정기공연", description = "공연 이름")
     @NotBlank(message = "공연 이름을 입력하세요")
+    @Length(max = 25)
     private String name;
 
     @Schema(

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

@@ -0,0 +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.MANAGER;
+
+import band.gosrock.api.common.aop.hostRole.HostRolesAllowed;
+import band.gosrock.api.event.model.dto.response.EventResponse;
+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.event.service.EventService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+
+@UseCase
+@RequiredArgsConstructor
+public class OpenEventUseCase {
+    private final EventService eventService;
+    private final EventAdaptor eventAdaptor;
+
+    @Transactional
+    @HostRolesAllowed(role = MANAGER, findHostFrom = EVENT_ID)
+    public EventResponse execute(Long eventId) {
+        final Event event = eventAdaptor.findById(eventId);
+        return EventResponse.of(eventService.openEvent(event));
+    }
+}

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

@@ -4,16 +4,18 @@
 import band.gosrock.common.annotation.Phone;
 import io.swagger.v3.oas.annotations.media.Schema;
 import javax.validation.constraints.Email;
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import org.hibernate.validator.constraints.Length;
 
 /** 호스트 간편 생성 요청 DTO */
 @Getter
 @RequiredArgsConstructor
 public class CreateHostRequest {
     @Schema(defaultValue = "고스락", description = "호스트 이름")
-    @NotEmpty(message = "호스트 이름을 입력해주세요")
+    @NotBlank(message = "호스트 이름을 입력해주세요")
+    @Length(max = 15)
     private String name;
 
     @Schema(defaultValue = "[email protected]", description = "마스터 이메일")

DuDoong-Api/src/main/java/band/gosrock/api/config/slack/SlackApiProvider.java → DuDoong-Api/src/main/java/band/gosrock/api/slack/sender/SlackInternalErrorSender.java

@@ -1,68 +1,40 @@
-package band.gosrock.api.config.slack;
+package band.gosrock.api.slack.sender;
 
 import static com.slack.api.model.block.Blocks.divider;
 import static com.slack.api.model.block.Blocks.section;
 import static com.slack.api.model.block.composition.BlockCompositions.plainText;
 
+import band.gosrock.infrastructure.config.slack.SlackProvider;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.slack.api.methods.MethodsClient;
-import com.slack.api.methods.SlackApiException;
-import com.slack.api.methods.request.chat.ChatPostMessageRequest;
 import com.slack.api.model.block.Blocks;
 import com.slack.api.model.block.LayoutBlock;
 import com.slack.api.model.block.composition.MarkdownTextObject;
 import com.slack.api.model.block.composition.TextObject;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.env.Environment;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.util.ContentCachingRequestWrapper;
 
 @Component
 @RequiredArgsConstructor
 @Slf4j
-public class SlackApiProvider {
-    private final MethodsClient methodsClient;
+public class SlackInternalErrorSender {
     private final ObjectMapper objectMapper;
 
-    private final Environment env;
+    private final SlackProvider slackProvider;
 
-    private final List<String> sendAlarmProfiles = List.of("staging", "prod");
-
-    @Value("${slack.webhook.id}")
-    private String CHANNEL_ID;
-
-    private final int MAX_LEN = 500;
-
-    @Async
-    public void sendError(ContentCachingRequestWrapper cachingRequest, Exception e, Long userId)
-            throws IOException {
-        String[] activeProfiles = env.getActiveProfiles();
-        List<String> currentProfile = Arrays.stream(activeProfiles).toList();
-        if (CollectionUtils.containsAny(sendAlarmProfiles, currentProfile)) {
-            executeSendError(cachingRequest, e, userId);
-        }
-    }
-
-    private void executeSendError(
-            ContentCachingRequestWrapper cachingRequest, Exception e, Long userId)
+    public void execute(ContentCachingRequestWrapper cachingRequest, Exception e, Long userId)
             throws IOException {
         final String url = cachingRequest.getRequestURL().toString();
         final String method = cachingRequest.getMethod();
         final String body =
                 objectMapper.readTree(cachingRequest.getContentAsByteArray()).toString();
-        final String exceptionAsString = Arrays.toString(e.getStackTrace());
-        final int cutLength = Math.min(exceptionAsString.length(), MAX_LEN);
 
         final String errorMessage = e.getMessage();
-        final String errorStack = exceptionAsString.substring(0, cutLength);
+        String errorStack = slackProvider.getErrorStack(e);
         final String errorUserIP = cachingRequest.getRemoteAddr();
 
         List<LayoutBlock> layoutBlocks = new ArrayList<>();
@@ -99,16 +71,6 @@ private void executeSendError(
         layoutBlocks.add(
                 section(section -> section.fields(List.of(errorNameMarkdown, errorStackMarkdown))));
 
-        ChatPostMessageRequest chatPostMessageRequest =
-                ChatPostMessageRequest.builder()
-                        .channel(CHANNEL_ID)
-                        .text("")
-                        .blocks(layoutBlocks)
-                        .build();
-        try {
-            methodsClient.chatPostMessage(chatPostMessageRequest);
-        } catch (SlackApiException slackApiException) {
-            log.error(slackApiException.toString());
-        }
+        slackProvider.sendNotification(layoutBlocks);
     }
 }