[DEPLOY] 백엔드 버전 v2.0.0

build.gradle

@@ -51,6 +51,17 @@ dependencies {
     implementation 'org.apache.poi:poi-ooxml:5.2.3'
     implementation 'org.apache.poi:poi:5.2.3'
 
+    // Logging
+    implementation 'org.springframework.boot:spring-boot-starter-log4j2'
+    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
+
+    // Discord
+    implementation 'net.dv8tion:JDA:5.0.0-beta.24'
+
+    // Monitoring
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    implementation 'io.micrometer:micrometer-registry-prometheus'
+
     // DB schema manager
     implementation 'org.flywaydb:flyway-mysql'
 
@@ -64,10 +75,6 @@ dependencies {
     testImplementation 'org.springframework.restdocs:spring-restdocs-restassured'
     testImplementation 'com.epages:restdocs-api-spec-mockmvc:0.18.2'
     testImplementation 'com.epages:restdocs-api-spec-restassured:0.18.2'
-
-    // Logging
-    implementation 'org.springframework.boot:spring-boot-starter-log4j2'
-    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
 }
 
 bootJar {

scripts/dev/replace-new-version.sh

@@ -19,4 +19,4 @@ fi
 
 JAR_FILE=$(ls /home/ubuntu/app/*.jar | head -n 1)
 
-sudo nohup java -Dspring.profiles.active=dev -Duser.timezone=Asia/Seoul -Dserver.port=8080 -jar "$JAR_FILE" &
+sudo nohup java -Dspring.profiles.active=dev,monitor -Duser.timezone=Asia/Seoul -Dserver.port=8080 -jar "$JAR_FILE" &

scripts/prod/replace-new-version.sh

@@ -19,4 +19,4 @@ fi
 
 JAR_FILE=$(ls /home/ubuntu/app/*.jar | head -n 1)
 
-sudo nohup java -Dspring.profiles.active=prod -Duser.timezone=Asia/Seoul -Dserver.port=8080 -jar "$JAR_FILE" &
+sudo nohup java -Dspring.profiles.active=prod,monitor -Duser.timezone=Asia/Seoul -Dserver.port=8080 -jar "$JAR_FILE" &

src/main/java/com/debatetimer/client/notifier/ConsoleNotifier.java

@@ -0,0 +1,23 @@
+package com.debatetimer.client.notifier;
+
+import java.util.Arrays;
+import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class ConsoleNotifier implements ErrorNotifier {
+
+    private static final String ERROR_SEND_MESSAGE = "에러 정보가 채널로 발송되었습니다";
+
+    @Override
+    public void sendErrorMessage(Throwable throwable) {
+        log.error("{} : {}", ERROR_SEND_MESSAGE, throwable);
+        log.error(getStackTraceAsString(throwable));
+    }
+
+    private String getStackTraceAsString(Throwable throwable) {
+        return Arrays.stream(throwable.getStackTrace())
+                .map(StackTraceElement::toString)
+                .collect(Collectors.joining(System.lineSeparator()));
+    }
+}

src/main/java/com/debatetimer/client/notifier/DiscordNotifier.java

@@ -0,0 +1,56 @@
+package com.debatetimer.client.notifier;
+
+import com.debatetimer.exception.custom.DTInitializationException;
+import com.debatetimer.exception.errorcode.InitializationErrorCode;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
+import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.JDABuilder;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+
+@Slf4j
+public class DiscordNotifier implements ErrorNotifier {
+
+    private static final String NOTIFICATION_PREFIX = ":rotating_light:  [**Error 발생!**]\n";
+    private static final String STACK_TRACE_AFFIX =  "\n```\n";
+    private static final String DISCORD_LINE_SEPARATOR = "\n";
+    private static final int STACK_TRACE_LENGTH = 10;
+
+    private final DiscordProperties properties;
+    private final JDA jda;
+
+    public DiscordNotifier(DiscordProperties discordProperties) {
+        this.properties = discordProperties;
+        this.jda = initializeJda(properties.getToken());
+    }
+
+    private JDA initializeJda(String token) {
+        try {
+            return JDABuilder.createDefault(token).build().awaitReady();
+        } catch (InterruptedException e) {
+            throw new DTInitializationException(InitializationErrorCode.JDA_INITIALIZATION_FAIL);
+        }
+    }
+
+    public void sendErrorMessage(Throwable throwable) {
+        TextChannel channel = jda.getTextChannelById(properties.getChannelId());
+        String errorMessage = throwable.toString();
+        String stackTrace = getStackTraceAsString(throwable);
+
+        String errorNotification = NOTIFICATION_PREFIX
+                + errorMessage
+                + STACK_TRACE_AFFIX
+                + stackTrace
+                + STACK_TRACE_AFFIX;
+        channel.sendMessage(errorNotification).queue();
+    }
+
+    private String getStackTraceAsString(Throwable throwable) {
+        return Arrays.stream(throwable.getStackTrace())
+                .map(StackTraceElement::toString)
+                .limit(STACK_TRACE_LENGTH)
+                .collect(Collectors.joining(DISCORD_LINE_SEPARATOR));
+    }
+}
+

src/main/java/com/debatetimer/client/notifier/DiscordProperties.java

@@ -0,0 +1,27 @@
+package com.debatetimer.client.notifier;
+
+import com.debatetimer.exception.custom.DTInitializationException;
+import com.debatetimer.exception.errorcode.InitializationErrorCode;
+import lombok.Getter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@Getter
+@ConfigurationProperties(prefix = "discord")
+public class DiscordProperties {
+
+    private final String token;
+    private final String channelId;
+
+    public DiscordProperties(String token, String channelId) {
+        validate(token);
+        validate(channelId);
+        this.token = token;
+        this.channelId = channelId;
+    }
+
+    private void validate(String element) {
+        if (element == null || element.isBlank()) {
+            throw new DTInitializationException(InitializationErrorCode.DISCORD_PROPERTIES_EMPTY);
+        }
+    }
+}

src/main/java/com/debatetimer/client/notifier/ErrorNotifier.java

@@ -0,0 +1,6 @@
+package com.debatetimer.client.notifier;
+
+public interface ErrorNotifier {
+
+    void sendErrorMessage(Throwable throwable);
+}

src/main/java/com/debatetimer/client/OAuthClient.java → src/main/java/com/debatetimer/client/oauth/OAuthClient.java

@@ -1,4 +1,4 @@
-package com.debatetimer.client;
+package com.debatetimer.client.oauth;
 
 import com.debatetimer.aop.logging.LoggingClient;
 import com.debatetimer.dto.member.MemberCreateRequest;

src/main/java/com/debatetimer/client/OAuthProperties.java → src/main/java/com/debatetimer/client/oauth/OAuthProperties.java

@@ -1,4 +1,4 @@
-package com.debatetimer.client;
+package com.debatetimer.client.oauth;
 
 import com.debatetimer.dto.member.MemberCreateRequest;
 import com.debatetimer.exception.custom.DTInitializationException;

src/main/java/com/debatetimer/config/AuthenticationConfig.java

@@ -1,6 +1,6 @@
 package com.debatetimer.config;
 
-import com.debatetimer.client.OAuthProperties;
+import com.debatetimer.client.oauth.OAuthProperties;
 import com.debatetimer.controller.tool.jwt.JwtTokenProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/debatetimer/config/NotifierConfig.java

@@ -0,0 +1,39 @@
+package com.debatetimer.config;
+
+
+import com.debatetimer.client.notifier.ConsoleNotifier;
+import com.debatetimer.client.notifier.DiscordNotifier;
+import com.debatetimer.client.notifier.DiscordProperties;
+import com.debatetimer.client.notifier.ErrorNotifier;
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+public class NotifierConfig {
+
+    @Profile({"dev", "prod"})
+    @Configuration
+    @RequiredArgsConstructor
+    @EnableConfigurationProperties(DiscordProperties.class)
+    public static class DiscordNotifierConfig {
+
+        private final DiscordProperties discordProperties;
+
+        @Bean
+        public ErrorNotifier discordNotifier() {
+            return new DiscordNotifier(discordProperties);
+        }
+    }
+
+    @Profile({"test", "local"})
+    @Configuration
+    public static class ConsoleNotifierConfig {
+
+        @Bean
+        public ErrorNotifier consoleNotifier() {
+            return new ConsoleNotifier();
+        }
+    }
+}

src/main/java/com/debatetimer/controller/customize/CustomizeController.java

@@ -0,0 +1,72 @@
+package com.debatetimer.controller.customize;
+
+import com.debatetimer.controller.auth.AuthMember;
+import com.debatetimer.domain.member.Member;
+import com.debatetimer.dto.customize.request.CustomizeTableCreateRequest;
+import com.debatetimer.dto.customize.response.CustomizeTableResponse;
+import com.debatetimer.service.customize.CustomizeService;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+public class CustomizeController {
+
+    private final CustomizeService customizeService;
+
+    @PostMapping("/api/table/customize")
+    @ResponseStatus(HttpStatus.CREATED)
+    public CustomizeTableResponse save(
+            @Valid @RequestBody CustomizeTableCreateRequest tableCreateRequest,
+            @AuthMember Member member
+    ) {
+        return customizeService.save(tableCreateRequest, member);
+    }
+
+    @GetMapping("/api/table/customize/{tableId}")
+    @ResponseStatus(HttpStatus.OK)
+    public CustomizeTableResponse getTable(
+            @PathVariable Long tableId,
+            @AuthMember Member member
+    ) {
+        return customizeService.findTable(tableId, member);
+    }
+
+    @PutMapping("/api/table/customize/{tableId}")
+    @ResponseStatus(HttpStatus.OK)
+    public CustomizeTableResponse updateTable(
+            @Valid @RequestBody CustomizeTableCreateRequest tableCreateRequest,
+            @PathVariable Long tableId,
+            @AuthMember Member member
+    ) {
+        return customizeService.updateTable(tableCreateRequest, tableId, member);
+    }
+
+    @PatchMapping("/api/table/customize/{tableId}/debate")
+    @ResponseStatus(HttpStatus.OK)
+    public CustomizeTableResponse debate(
+            @PathVariable Long tableId,
+            @AuthMember Member member
+    ) {
+        return customizeService.updateUsedAt(tableId, member);
+    }
+
+    @DeleteMapping("/api/table/customize/{tableId}")
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    public void deleteTable(
+            @PathVariable Long tableId,
+            @AuthMember Member member
+    ) {
+        customizeService.deleteTable(tableId, member);
+    }
+}

src/main/java/com/debatetimer/domain/DebateTable.java

@@ -20,7 +20,7 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public abstract class DebateTable extends BaseTimeEntity {
 
-    private static final String NAME_REGEX = "^[a-zA-Z가-힣0-9 ]+$";
+    private static final String NAME_REGEX = "^[\\p{L}\\p{M}\\p{N}\\p{P}\\p{Z}\\s]+$";
     public static final int NAME_MAX_LENGTH = 20;
 
     @NotNull
@@ -68,7 +68,7 @@ protected final void updateTable(DebateTable renewTable) {
     }
 
     private void validate(String name) {
-        if (name.isBlank() || name.length() > NAME_MAX_LENGTH) {
+        if (name.length() > NAME_MAX_LENGTH) {
             throw new DTClientErrorException(ClientErrorCode.INVALID_TABLE_NAME_LENGTH);
         }
         if (!name.matches(NAME_REGEX)) {

src/main/java/com/debatetimer/domain/DebateTimeBox.java

@@ -15,24 +15,39 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public abstract class DebateTimeBox {
 
+    public static final int SPEAKER_MAX_LENGTH = 5;
+
     private int sequence;
 
     @NotNull
     @Enumerated(EnumType.STRING)
     private Stance stance;
 
     private int time;
-    private Integer speaker;
+    private String speaker;
 
-    protected DebateTimeBox(int sequence, Stance stance, int time, Integer speaker) {
+    protected DebateTimeBox(int sequence, Stance stance, int time, String speaker) {
+        validateSpeaker(speaker);
         validateSequence(sequence);
         validateTime(time);
-        validateSpeakerNumber(speaker);
 
         this.sequence = sequence;
         this.stance = stance;
         this.time = time;
-        this.speaker = speaker;
+        this.speaker = initializeSpeaker(speaker);
+    }
+
+    private String initializeSpeaker(String speaker) {
+        if (speaker == null || speaker.isBlank()) {
+            return null;
+        }
+        return speaker;
+    }
+
+    private void validateSpeaker(String speaker) {
+        if (speaker != null && speaker.length() > SPEAKER_MAX_LENGTH) {
+            throw new DTClientErrorException(ClientErrorCode.INVALID_TIME_BOX_SPEAKER_LENGTH);
+        }
     }
 
     private void validateSequence(int sequence) {
@@ -46,10 +61,4 @@ private void validateTime(int time) {
             throw new DTClientErrorException(ClientErrorCode.INVALID_TIME_BOX_TIME);
         }
     }
-
-    private void validateSpeakerNumber(Integer speaker) {
-        if (speaker != null && speaker <= 0) {
-            throw new DTClientErrorException(ClientErrorCode.INVALID_TIME_BOX_SPEAKER);
-        }
-    }
 }