채팅방 내 Plain Text 메시지 발송 시, 저장 로직을 추가합니다.

.golangci.yml

@@ -44,7 +44,7 @@ linters-settings:
     # Checks the number of lines in a function.
     # If lower than 0, disable the check.
     # Default: 60
-    lines: 150
+    lines: 180
     # Checks the number of statements in a function.
     # If lower than 0, disable the check.
     # Default: 40

cmd/server/router.go

@@ -171,7 +171,7 @@ func NewRouter(app *firebaseinfra.FirebaseApp) (*echo.Echo, error) {
 	}
 
 	upgrader := wschat.NewDefaultUpgrader()
-	wsServerV2 := wschat.NewWSServer(upgrader, authService, *mediaService)
+	wsServerV2 := wschat.NewWSServer(upgrader, authService, *mediaService, *chatService)
 
 	go wsServerV2.LoopOverClientMessages()
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/pet-sitter/pets-next-door-api
 
-go 1.23
+go 1.23.0
 
 require (
 	firebase.google.com/go v3.13.0+incompatible

internal/domain/chat/view.go

@@ -179,3 +179,16 @@ func ToUserChatRoomMessageView(
 ) *MessageCursorView {
 	return createMessageCursorView(row, hasNext, hasPrev, nextMessageID, prevMessageID)
 }
+
+func ToChatRoomMessage(
+	row databasegen.SaveChatMessageRow,
+) *Message {
+	return &Message{
+		ID:          row.ID,
+		UserID:      row.UserID,
+		RoomID:      row.RoomID,
+		MessageType: row.MessageType,
+		Content:     row.Content,
+		CreatedAt:   row.CreatedAt,
+	}
+}

internal/service/chat_service.go

@@ -384,3 +384,39 @@ func (s *ChatService) HasNextMessages(
 
 	return hasNext, nil
 }
+
+// 채팅 메시지를 저장합니다.
+func (s *ChatService) SaveChatMessage(
+	ctx context.Context, userID, roomID uuid.UUID, messageType, content string,
+) (*chat.Message, error) {
+	chatMessageID, uuidError := uuid.NewV7()
+	if uuidError != nil {
+		return nil, pnd.ErrUnknown(fmt.Errorf("failed to generate UUID: %w", uuidError))
+	}
+
+	tx, transactionError := s.conn.BeginTx(ctx)
+	defer tx.Rollback()
+
+	if transactionError != nil {
+		return nil, transactionError
+	}
+
+	q := databasegen.New(tx)
+	row, databaseGenError := q.SaveChatMessage(ctx, databasegen.SaveChatMessageParams{
+		ID:          chatMessageID,
+		UserID:      userID,
+		RoomID:      roomID,
+		MessageType: messageType,
+		Content:     content,
+	})
+
+	if databaseGenError != nil {
+		return nil, databaseGenError
+	}
+
+	if err := tx.Commit(); err != nil {
+		return nil, err
+	}
+
+	return chat.ToChatRoomMessage(row), nil
+}

internal/wschat/server.go

@@ -22,19 +22,22 @@ type WSServer struct {
 
 	authService  service.AuthService
 	mediaService service.MediaService
+	chatService  service.ChatService
 }
 
 func NewWSServer(
 	upgrader websocket.Upgrader,
 	authService service.AuthService,
 	mediaService service.MediaService,
+	chatService service.ChatService,
 ) *WSServer {
 	return &WSServer{
 		clients:      make(map[uuid.UUID]WSClient),
 		broadcast:    make(chan MessageRequest),
 		upgrader:     upgrader,
 		authService:  authService,
 		mediaService: mediaService,
+		chatService:  chatService,
 	}
 }
 
@@ -101,6 +104,7 @@ func (s *WSServer) HandleConnections(
 }
 
 // Broadcast messages to all clients
+// TODO : 각 메시지 별 타입에 따라, 메시지 처리하고 있음 (plain, media) 저장로직 추가해야 함
 func (s *WSServer) LoopOverClientMessages() {
 	log.Info().Msg("Looping over client messages")
 	ctx := context.Background()
@@ -121,6 +125,27 @@ func (s *WSServer) LoopOverClientMessages() {
 			var msg MessageResponse
 			switch msgReq.MessageType {
 			case "plain":
+				saveChatMessage, err := s.chatService.SaveChatMessage(
+					ctx,
+					msgReq.Sender.ID,
+					msgReq.Room.ID,
+					msgReq.MessageType,
+					msgReq.Message,
+				)
+				if err != nil {
+					log.Error().Err(err).Msg("Failed to save chat message")
+					msg = NewErrorMessageResponse(
+						msgReq.MessageID,
+						msgReq.Sender,
+						msgReq.Room,
+						"Failed to save chat message",
+						time.Now(),
+					)
+
+					break
+				}
+
+				log.Info().Msg("Save chat message: " + saveChatMessage.ID.String())
 				msg = NewPlainMessageResponse(
 					msgReq.MessageID,
 					msgReq.Sender,

queries/chats.sql

@@ -184,3 +184,14 @@ WHERE chat_messages.deleted_at IS NULL
   AND room_id = $2
 ORDER BY chat_messages.created_at DESC
 LIMIT $1;
+
+-- name: SaveChatMessage :one
+INSERT INTO chat_messages
+(id,
+ user_id,
+ room_id,
+ message_type,
+ content,
+ created_at)
+VALUES ($1, $2, $3, $4, $5, NOW())
+RETURNING id, user_id, room_id, message_type, content, created_at;