From bee2ca452ab165c2fc977312ded43e231dd31e90 Mon Sep 17 00:00:00 2001 From: kimueibin Date: Tue, 1 Oct 2024 18:16:50 +0900 Subject: [PATCH] fix : fix chat room lint issue --- cmd/server/handler/chat_handler.go | 4 ++-- internal/service/chat_service.go | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cmd/server/handler/chat_handler.go b/cmd/server/handler/chat_handler.go index 5752d44f..65fb3421 100644 --- a/cmd/server/handler/chat_handler.go +++ b/cmd/server/handler/chat_handler.go @@ -70,8 +70,8 @@ func (h ChatHandler) CreateRoom(c echo.Context) error { } var createRoomRequest domain.CreateRoomRequest - if err := pnd.ParseBody(c, &createRoomRequest); err != nil { - return c.JSON(err.StatusCode, err) + if bodyError := pnd.ParseBody(c, &createRoomRequest); bodyError != nil { + return c.JSON(bodyError.StatusCode, err) } res, err := h.chatService.CreateRoom( diff --git a/internal/service/chat_service.go b/internal/service/chat_service.go index bb352e47..b7f7c2f1 100644 --- a/internal/service/chat_service.go +++ b/internal/service/chat_service.go @@ -21,7 +21,9 @@ func NewChatService(conn *database.DB) *ChatService { } } -func (s *ChatService) CreateRoom(ctx context.Context, name, roomType string, userFirebaseUID string) ( +func (s *ChatService) CreateRoom( + ctx context.Context, name, roomType, userFirebaseUID string, +) ( *chat.RoomSimpleInfo, *pnd.AppError, ) { userData, err := databasegen.New(s.conn).FindUser(ctx, databasegen.FindUserParams{ @@ -35,7 +37,7 @@ func (s *ChatService) CreateRoom(ctx context.Context, name, roomType string, use tx, transactionError := s.conn.BeginTx(ctx) defer tx.Rollback() - if err != nil { + if transactionError != nil { return nil, transactionError }