Merge branch 'dev' into fe/dev/feat_friendApi/#202

Author: 42inshin

src/backend/auth-server/package.json

@@ -39,8 +39,7 @@
     "mysql2": "^3.12.0",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.1",
-    "typeorm": "^0.3.20",
-    "prom-client": "^15.1.3"
+    "typeorm": "^0.3.20"
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3.2.0",

src/backend/chat-server/build.gradle

@@ -18,8 +18,7 @@ repositories {
 }
 
 dependencies {
-	implementation 'org.springframework.boot:spring-boot-starter-actuator'
-	implementation 'io.micrometer:micrometer-registry-prometheus'
+	implementation 'io.github.dnovitski:logback-awslogs-appender:1.7.2'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-websocket'
 	implementation 'org.springframework.kafka:spring-kafka'

src/backend/chat-server/src/main/java/kickzo/stomp_chat/config/WebSocketConfig.java

@@ -23,6 +23,9 @@ public void registerStompEndpoints(StompEndpointRegistry registry) {
         registry.addEndpoint("/ws")
                 .setAllowedOriginPatterns("*")
                 .withSockJS();
+
+        registry.addEndpoint("/ws/mobile")
+                .setAllowedOriginPatterns("*");
     }
 }
 

src/backend/chat-server/src/main/java/kickzo/stomp_chat/controller/WebSocketController.java

@@ -1,5 +1,8 @@
 package kickzo.stomp_chat.controller;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import kickzo.stomp_chat.enums.EventType;
@@ -75,5 +78,12 @@ public void playTime(String payload) throws Exception {
     public record UserConnectRequest(long userId) {}
     public record SendMessageRequest(long roomId, long userId, String nickname, int role, String profileImageUrl, String content, String message) {}
 
-    public record PlayTimeRequest(long roomId, long playTime, String playerState) {}
+    public record PlayTimeRequest(long roomId, BigDecimal playTime, String playerState) {
+        public PlayTimeRequest(long roomId, BigDecimal playTime, String playerState) {
+            this.roomId = roomId;
+            this.playTime = playTime.setScale(2, RoundingMode.HALF_UP); // 소수점 2자리로 변환
+            this.playerState = playerState;
+        }
+    }
+
 }

src/backend/chat-server/src/main/java/kickzo/stomp_chat/dto/playlist/PlayTime.java

@@ -1,5 +1,8 @@
 package kickzo.stomp_chat.dto.playlist;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -9,6 +12,6 @@
 @NoArgsConstructor
 public class PlayTime {
 	private long roomId;
-	private long playTime;
+	private BigDecimal playTime;
 	private String playerState;
 }

src/backend/chat-server/src/main/java/kickzo/stomp_chat/dto/room/ChatMessage.java

@@ -1,3 +1,3 @@
 package kickzo.stomp_chat.dto.room;
 
-public record ChatMessage(long roomId, long userId, String nickname, int role, String profileImageUrl, String content, String message) {}
+public record ChatMessage(long roomId, long userId, String nickname, int role, String profileImageUrl, String content, String message, long timestamp) {}

src/backend/chat-server/src/main/java/kickzo/stomp_chat/service/WebSocketRoomService.java

@@ -1,5 +1,7 @@
 package kickzo.stomp_chat.service;
 
+import java.math.BigDecimal;
+
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -34,7 +36,8 @@ public void leavePage(long userId) {
 	 * 방에 메시지 전송
 	 */
 	public void handleMessageSend(long roomId, long userId, String nickname, int role, String profileImageUrl, String content, String message) {
-		ChatMessage chatMessage = new ChatMessage(roomId, userId, nickname, role, profileImageUrl, content, message);
+		long timestamp = System.currentTimeMillis();  // 현재 서버 시간
+		ChatMessage chatMessage = new ChatMessage(roomId, userId, nickname, role, profileImageUrl, content, message, timestamp);
 		kafkaRepository.sendChatMessage(chatMessage);
 	}
 
@@ -49,7 +52,7 @@ public void sendConnection(long userId, EventType eventType) {
 	/**
 	 * Kafka에 playlistTime 전송
 	 */
-	public void sendPlayTime (long roomId, long playTime, String playerState){
+	public void sendPlayTime (long roomId, BigDecimal playTime, String playerState){
 		PlayTime playTimeObject = new PlayTime(roomId, playTime, playerState);
 
 		RoomEvent roomEvent = new RoomEvent("play-time", playTimeObject);

src/backend/chat-server/src/main/resources/application.properties

@@ -10,15 +10,4 @@ spring.profiles.active=dev
 spring.kafka.consumer.group-id=my-group-${server.port}
 spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
 spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer
-spring.kafka.consumer.auto-offset-reset=earliest
-
-# Actuator ????? ?? ??
-management.endpoints.web.exposure.include=health,metrics,prometheus
-
-# Prometheus ??? ?? ???
-management.prometheus.metrics.export.enabled=true
-management.metrics.web.server.request.auto-timeouts=true
-
-# ????? ??? ?? ??? ??? ??
-# Actuator ???? ?? (???? 8080)
-management.server.port=8080
+spring.kafka.consumer.auto-offset-reset=earliest

src/backend/chat-server/src/main/resources/logback.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration packagingData="true">
+    <timestamp key="timestamp" datePattern="yyyy-MM-dd-HH-mm-ssSSS"/>
+
+    <appender name="aws_cloud_watch_log" class="ca.pjer.logback.AwsLogsAppender">
+        <layout>
+            <pattern>[%thread] [%date] [%level] [%file:%line] - %msg%n</pattern>
+        </layout>
+        <logGroupName>kickzo-logs</logGroupName>
+        <logStreamUuidPrefix>kickzo-log</logStreamUuidPrefix>
+        <logRegion>ap-northeast-1</logRegion>
+        <maxBatchLogEvents>50</maxBatchLogEvents>
+        <maxFlushTimeMillis>30000</maxFlushTimeMillis>
+        <maxBlockTimeMillis>5000</maxBlockTimeMillis>
+        <retentionTimeDays>0</retentionTimeDays>
+        <accessKeyId>${AWS_ACCESS_KEY}</accessKeyId>
+        <secretAccessKey>${AWS_SECRET_KEY}</secretAccessKey>
+    </appender>
+
+    <property name="CONSOLE_LOG_PATTERN" value="%highlight(%-5level) %date [%thread] %cyan([%C{0} :: %M :: %L]) - %msg%n"/>
+    <appender name="console_log" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <springProfile name="dev">
+        <root level="INFO">
+            <appender-ref ref="console_log"/>
+        </root>
+    </springProfile>
+
+    <springProfile name="docker">
+        <root level="WARN">
+            <appender-ref ref="aws_cloud_watch_log"/>
+        </root>
+    </springProfile>
+</configuration>

src/backend/chat-server/src/main/resources/static/index.html

@@ -59,7 +59,7 @@ <h2>Room Chat</h2>
     <div id="messages"></div>
     <input type="text" id="messageInput" placeholder="Enter your message" />
     <button onclick="sendMessage()">Send</button>
-    <button onclick="sendPlaylistTime(12)">Send Playlist Time (12 sec)</button>
+    <button onclick="sendplayTime(12.12354)">Send Play Time (12.12354 sec)</button>
 </div>
 
 <div id="status">Status: Disconnected</div>
@@ -161,14 +161,14 @@ <h2>Room Chat</h2>
         console.log('Sent message:', payload);
     }
 
-    function sendPlaylistTime(playlistTime) {
+    function sendplayTime(playTime) {
         if (stompClient && stompClient.connected) {
             const payload = JSON.stringify({
                 roomId: roomId,
-                playlistTime: playlistTime
+                playTime: playTime
             });
             stompClient.send('/app/play-time', {}, payload);
-            console.log('Sent playlistTime:', payload);
+            console.log('Sent playTime:', payload);
         } else {
             console.error('WebSocket not connected.');
         }