fix : fix chat room lint issue

pet-sitter · Oct 1, 2024 · bee2ca4 · bee2ca4
1 parent a1c2148
commit bee2ca4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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
 	}