fix(#7): 자동배포 파일 수정

.github/workflows/cd-prod.yml

@@ -35,6 +35,7 @@ jobs:
         with:
           context: .
           file: Docker/Dockerfile
+          platforms: linux/amd64
           push: true
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/realmatch-backend:prod
@@ -48,16 +49,15 @@ jobs:
           key: ${{ secrets.PROD_SERVER_SSH_KEY }}
           script: |
             cd /home/ubuntu/realmatch
-            git pull origin main
 
-            docker compose pull
-            docker compose up -d
-      
+            docker-compose pull
+            docker-compose up -d
+
             echo "Waiting for app to start..."
             sleep 10
-      
-            if ! docker compose ps | grep "Up"; then
+
+            if ! docker-compose ps | grep "Up"; then
               echo "❌ Container is not running"
-              docker compose logs
+              docker-compose logs
               exit 1
-            fi
+            fi

build.gradle

@@ -31,6 +31,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jdbc'
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-websocket'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	compileOnly 'org.projectlombok:lombok'
 	annotationProcessor 'org.projectlombok:lombok'

docker-compose.yaml

@@ -25,12 +25,11 @@ services:
       - "6379:6379"
 
   app:
-    build:
-      context: .
-      dockerfile: Docker/Dockerfile
+    image: ${DOCKERHUB_USERNAME}/realmatch-backend:prod
     container_name: spring_app
+    restart: always
     ports:
-      - "6000:6000"
+      - "8080:6000"
     depends_on:
       - db
       - redis

src/main/java/com/example/RealMatch/chat/presentation/config/ChatCursorConverterConfig.java

@@ -0,0 +1,25 @@
+package com.example.RealMatch.chat.presentation.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.converter.Converter;
+
+import com.example.RealMatch.chat.presentation.conversion.MessageCursor;
+import com.example.RealMatch.chat.presentation.conversion.RoomCursor;
+
+/**
+ * cursor 요청 파라미터를 RoomCursor/MessageCursor로 바인딩하는 설정
+ */
+@Configuration
+public class ChatCursorConverterConfig {
+
+    @Bean
+    public Converter<String, RoomCursor> roomCursorConverter() {
+        return RoomCursor::decode;
+    }
+
+    @Bean
+    public Converter<String, MessageCursor> messageCursorConverter() {
+        return MessageCursor::decode;
+    }
+}

src/main/java/com/example/RealMatch/chat/presentation/config/ChatWebSocketConfig.java

@@ -0,0 +1,41 @@
+package com.example.RealMatch.chat.presentation.config;
+
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.lang.NonNull;
+import org.springframework.messaging.simp.config.MessageBrokerRegistry;
+import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
+import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
+import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
+import org.springframework.web.socket.server.HandshakeHandler;
+
+@Configuration
+@EnableWebSocketMessageBroker
+public class ChatWebSocketConfig implements WebSocketMessageBrokerConfigurer {
+
+    @Value("${cors.allowed-origin}")
+    private String allowedOrigin;
+    private final ObjectProvider<HandshakeHandler> handshakeHandlerProvider;
+
+    public ChatWebSocketConfig(ObjectProvider<HandshakeHandler> handshakeHandlerProvider) {
+        this.handshakeHandlerProvider = handshakeHandlerProvider;
+    }
+
+    @Override
+    public void registerStompEndpoints(@NonNull StompEndpointRegistry registry) {
+        var registration = registry.addEndpoint("/ws/chat")
+                .setAllowedOrigins(allowedOrigin);
+        HandshakeHandler handshakeHandler = handshakeHandlerProvider.getIfAvailable();
+        if (handshakeHandler != null) {
+            registration.setHandshakeHandler(handshakeHandler);
+        }
+    }
+
+    @Override
+    public void configureMessageBroker(@NonNull MessageBrokerRegistry registry) {
+        registry.setApplicationDestinationPrefixes("/app");
+        registry.setUserDestinationPrefix("/user");
+        registry.enableSimpleBroker("/topic", "/queue");
+    }
+}

src/main/java/com/example/RealMatch/chat/presentation/controller/ChatController.java

@@ -0,0 +1,83 @@
+package com.example.RealMatch.chat.presentation.controller;
+
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+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.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.example.RealMatch.chat.presentation.controller.fixture.ChatFixtureFactory;
+import com.example.RealMatch.chat.presentation.conversion.MessageCursor;
+import com.example.RealMatch.chat.presentation.conversion.RoomCursor;
+import com.example.RealMatch.chat.presentation.dto.enums.ChatRoomFilterStatus;
+import com.example.RealMatch.chat.presentation.dto.enums.ChatRoomSort;
+import com.example.RealMatch.chat.presentation.dto.enums.ChatRoomTab;
+import com.example.RealMatch.chat.presentation.dto.request.ChatAttachmentUploadRequest;
+import com.example.RealMatch.chat.presentation.dto.request.ChatRoomCreateRequest;
+import com.example.RealMatch.chat.presentation.dto.response.ChatAttachmentUploadResponse;
+import com.example.RealMatch.chat.presentation.dto.response.ChatMessageListResponse;
+import com.example.RealMatch.chat.presentation.dto.response.ChatRoomCreateResponse;
+import com.example.RealMatch.chat.presentation.dto.response.ChatRoomDetailResponse;
+import com.example.RealMatch.chat.presentation.dto.response.ChatRoomListResponse;
+import com.example.RealMatch.chat.presentation.swagger.ChatSwagger;
+import com.example.RealMatch.global.config.jwt.CustomUserDetails;
+import com.example.RealMatch.global.presentation.CustomResponse;
+
+import jakarta.validation.Valid;
+
+@RestController
+@RequestMapping("/api/chat")
+public class ChatController implements ChatSwagger {
+
+    @PostMapping("/rooms")
+    public CustomResponse<ChatRoomCreateResponse> createOrGetRoom(
+            @AuthenticationPrincipal CustomUserDetails user,
+            @Valid @RequestBody ChatRoomCreateRequest request
+    ) {
+        return CustomResponse.ok(ChatFixtureFactory.sampleRoomCreateResponse());
+    }
+
+    @GetMapping("/rooms")
+    public CustomResponse<ChatRoomListResponse> getRoomList(
+            @AuthenticationPrincipal CustomUserDetails user,
+            @RequestParam(required = false) ChatRoomTab tab,
+            @RequestParam(name = "status", required = false) ChatRoomFilterStatus filterStatus,
+            @RequestParam(required = false) ChatRoomSort sort,
+            @RequestParam(name = "cursor", required = false) RoomCursor roomCursor,
+            @RequestParam(defaultValue = "20") int size
+    ) {
+        return CustomResponse.ok(ChatFixtureFactory.sampleRoomListResponse());
+    }
+
+    @GetMapping("/rooms/{roomId}")
+    public CustomResponse<ChatRoomDetailResponse> getRoomDetail(
+            @AuthenticationPrincipal CustomUserDetails user,
+            @PathVariable Long roomId
+    ) {
+        return CustomResponse.ok(ChatFixtureFactory.sampleRoomDetailResponse(roomId));
+    }
+
+    @GetMapping("/rooms/{roomId}/messages")
+    public CustomResponse<ChatMessageListResponse> getMessages(
+            @AuthenticationPrincipal CustomUserDetails user,
+            @PathVariable Long roomId,
+            @RequestParam(name = "cursor", required = false) MessageCursor messageCursor,
+            @RequestParam(defaultValue = "20") int size
+    ) {
+        return CustomResponse.ok(ChatFixtureFactory.sampleMessageListResponse(roomId));
+    }
+
+    @PostMapping("/attachments")
+    public CustomResponse<ChatAttachmentUploadResponse> uploadAttachment(
+            @AuthenticationPrincipal CustomUserDetails user,
+            @Valid @RequestPart("request") ChatAttachmentUploadRequest request,
+            @RequestPart("file") MultipartFile file
+    ) {
+        return CustomResponse.ok(ChatFixtureFactory.sampleAttachmentUploadResponse(request, file));
+    }
+}

src/main/java/com/example/RealMatch/chat/presentation/controller/ChatSocketController.java

@@ -0,0 +1,34 @@
+package com.example.RealMatch.chat.presentation.controller;
+
+import java.util.Objects;
+
+import org.springframework.messaging.handler.annotation.MessageMapping;
+import org.springframework.messaging.handler.annotation.Payload;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
+import org.springframework.messaging.simp.annotation.SendToUser;
+import org.springframework.stereotype.Controller;
+
+import com.example.RealMatch.chat.presentation.controller.fixture.ChatSocketFixtureFactory;
+import com.example.RealMatch.chat.presentation.dto.websocket.ChatMessageCreatedEvent;
+import com.example.RealMatch.chat.presentation.dto.websocket.ChatSendMessageAck;
+import com.example.RealMatch.chat.presentation.dto.websocket.ChatSendMessageCommand;
+
+import jakarta.validation.Valid;
+
+@Controller
+public class ChatSocketController {
+
+    private final SimpMessagingTemplate messagingTemplate;
+
+    public ChatSocketController(SimpMessagingTemplate messagingTemplate) {
+        this.messagingTemplate = messagingTemplate;
+    }
+
+    @MessageMapping("/chat.send")
+    @SendToUser("/queue/chat.ack")
+    public ChatSendMessageAck sendMessage(@Valid @Payload ChatSendMessageCommand command) {
+        ChatMessageCreatedEvent event = ChatSocketFixtureFactory.sampleMessageCreatedEvent(command);
+        messagingTemplate.convertAndSend("/topic/rooms/" + command.roomId(), Objects.requireNonNull(event));
+        return ChatSocketFixtureFactory.sampleAck(command, event.message().messageId());
+    }
+}