fix: Fixed CreateChatRoom bug

Added Query

Author: igh9410

backend/internal/app/infrastructure/database/migrations/20240811153347_change_int4_to_int32.sql

@@ -0,0 +1,38 @@
+-- +goose Up
+-- +goose StatementBegin
+-- For the `public.friends` table
+ALTER TABLE public.friends
+    ALTER COLUMN id SET DATA TYPE integer USING id::integer;
+
+-- For the `public.friend_requests` table
+ALTER TABLE public.friend_requests
+    ALTER COLUMN id SET DATA TYPE integer USING id::integer;
+
+-- For the `public.messages` table
+ALTER TABLE public.messages
+    ALTER COLUMN id SET DATA TYPE integer USING id::integer;
+
+-- For the `public.users_in_chat_rooms` table
+ALTER TABLE public.users_in_chat_rooms
+    ALTER COLUMN id SET DATA TYPE integer USING id::integer;
+
+-- +goose StatementEnd
+
+-- +goose Down
+-- +goose StatementBegin
+-- For the `public.friends` table
+ALTER TABLE public.friends
+    ALTER COLUMN id SET DATA TYPE integer USING id::integer;
+
+-- For the `public.friend_requests` table
+ALTER TABLE public.friend_requests
+    ALTER COLUMN id SET DATA TYPE integer USING id::integer;
+
+-- For the `public.messages` table
+ALTER TABLE public.messages
+    ALTER COLUMN id SET DATA TYPE integer USING id::integer;
+
+-- For the `public.users_in_chat_rooms` table
+ALTER TABLE public.users_in_chat_rooms
+    ALTER COLUMN id SET DATA TYPE integer USING id::integer;
+-- +goose StatementEnd

backend/internal/chat/model.go

@@ -13,7 +13,7 @@ type ChatRoom struct {
 }
 
 type Message struct {
-	ID              int        `json:"id"`
+	ID              int32      `json:"id"`
 	ChatRoomID      uuid.UUID  `json:"chat_room_id"`
 	SenderID        uuid.UUID  `json:"sender_id"`
 	Content         string     `json:"content"`
@@ -24,7 +24,7 @@ type Message struct {
 }
 
 type UserInChatRoom struct {
-	ID         int       `json:"id"`
+	ID         int32     `json:"id"`
 	UserID     uuid.UUID `json:"user_id"`
 	ChatRoomID uuid.UUID `json:"chat_room_id"`
 }

backend/internal/chat/repository.go

@@ -3,14 +3,13 @@ package chat
 import (
 	"context"
 	"database/sql"
-	"errors"
 	"fmt"
-	"log"
 	"log/slog"
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/igh9410/blabber-hive/backend/internal/app/infrastructure/database"
+	db "github.com/igh9410/blabber-hive/backend/internal/app/infrastructure/database"
+	"github.com/igh9410/blabber-hive/backend/internal/pkg/sqlc"
 )
 
 type Repository interface {
@@ -33,76 +32,80 @@ func NewRepository(db *db.Database) Repository {
 }
 
 func (r *repository) CreateChatRoom(ctx context.Context, chatRoom *ChatRoom) (*ChatRoom, error) {
-	tx, err := r.db.Pool.Begin(ctx)
-	if err != nil {
-		slog.Error("Creating Chatroom transaction failed: ", err.Error(), " in CreateChatRoom")
-		return nil, err // handle error appropriately
-	}
-	// Generate a UUID for user ID
-	chatRoom.ID = uuid.New()
 
-	// Set the current timestamp for CreatedAt
-	chatRoom.CreatedAt = time.Now()
+	err := r.db.Querier.CreateChatRoom(ctx, sqlc.CreateChatRoomParams{
+		Name:      sqlc.StringToPgtype(chatRoom.Name),
+		CreatedAt: sqlc.TimeToPgtype(time.Now()),
+	})
 
-	if rbErr := tx.Rollback(ctx); rbErr != nil {
-		slog.Error("Transaction rollback failed: %v", rbErr.Error(), " in CreateChatRoom")
-		return nil, rbErr
+	if err != nil {
+		slog.Error("Error creating chat room: ", err.Error(), " in CreateChatRoom")
+		return nil, err
 	}
 
 	return chatRoom, nil
 }
 
 func (r *repository) FindChatRoomByID(ctx context.Context, id uuid.UUID) (*ChatRoom, error) {
-	chatRoom := &ChatRoom{}
-	query := "SELECT id,created_at FROM chat_rooms WHERE id = $1"
-	err := r.db.Pool.QueryRow(ctx, query, id).Scan(&chatRoom.ID, &chatRoom.CreatedAt)
 
+	chatRoom, err := r.db.Querier.FindChatRoomByID(ctx, id)
 	if err != nil {
-		if err == sql.ErrNoRows {
-			return nil, errors.New("chat room not found") // or a custom error indicating not found
-		}
+		slog.Error("Error finding chat room by ID: ", err.Error(), " in FindChatRoomByID")
 		return nil, err
 	}
-	return chatRoom, nil
+
+	return &ChatRoom{
+		ID:        chatRoom.ID,
+		Name:      sqlc.PgtypeToString(chatRoom.Name),
+		CreatedAt: sqlc.PgtypeToTime(chatRoom.CreatedAt),
+	}, nil
+
 }
 
 // FindChatRoomInfoByID implements Repository.
 func (r *repository) FindChatRoomInfoByID(ctx context.Context, chatRoomID uuid.UUID) (*ChatRoomInfo, error) {
-	chatRoomInfo := &ChatRoomInfo{}
-	query := `
-        SELECT
-            uicr.id,
-            uicr.user_id,
-            uicr.chat_room_id,
-            cr.created_at
-        FROM users_in_chat_rooms AS uicr
-        INNER JOIN chat_rooms AS cr ON uicr.chat_room_id = cr.id
-        WHERE cr.id = $1
-        GROUP BY uicr.id, uicr.user_id, uicr.chat_room_id, cr.created_at
-    `
-	rows, err := r.db.Pool.Query(ctx, query, chatRoomID)
+	/*chatRoomInfo := &ChatRoomInfo{}
+		query := `
+	        SELECT
+	            uicr.id,
+	            uicr.user_id,
+	            uicr.chat_room_id,
+	            cr.created_at
+	        FROM users_in_chat_rooms AS uicr
+	        INNER JOIN chat_rooms AS cr ON uicr.chat_room_id = cr.id
+	        WHERE cr.id = $1
+	        GROUP BY uicr.id, uicr.user_id, uicr.chat_room_id, cr.created_at
+	    `
+		rows, err := r.db.Pool.Query(ctx, query, chatRoomID)
+		if err != nil {
+			log.Printf("Failed to fetch chat room info, err: %v", err)
+			return nil, err
+		}
+		defer rows.Close() */
+	sqlcRows, err := r.db.Querier.FindChatRoomInfoByID(ctx, chatRoomID)
 	if err != nil {
-		log.Printf("Failed to fetch chat room info, err: %v", err)
-		return nil, err
+		slog.Error("Error finding chat room info by ID", "error", err, "chatRoomID", chatRoomID)
+		return nil, fmt.Errorf("failed to find chat room info: %w", err)
 	}
-	defer rows.Close()
 
-	usersInChatRoom := make([]UserInChatRoom, 0)
-	var createdAt time.Time
-	for rows.Next() {
-		var userInChatRoom UserInChatRoom
-		err := rows.Scan(&userInChatRoom.ID, &userInChatRoom.UserID, &userInChatRoom.ChatRoomID, &createdAt)
-		if err != nil {
-			log.Printf("Failed to scan chat room info, err: %v", err.Error())
-			return nil, err
+	if len(sqlcRows) == 0 {
+		return nil, sql.ErrNoRows
+	}
+
+	usersInChatRoom := make([]UserInChatRoom, len(sqlcRows))
+	for i, row := range sqlcRows {
+		usersInChatRoom[i] = UserInChatRoom{
+			ID:         row.ID,
+			UserID:     sqlc.PgtypeToUUID(row.UserID),
+			ChatRoomID: sqlc.PgtypeToUUID(row.ChatRoomID),
 		}
-		usersInChatRoom = append(usersInChatRoom, userInChatRoom)
 	}
 
-	chatRoomInfo.ID = chatRoomID
-	chatRoomInfo.UserList = usersInChatRoom
-	chatRoomInfo.CreatedAt = createdAt
-	return chatRoomInfo, nil
+	return &ChatRoomInfo{
+		ID:        chatRoomID,
+		UserList:  usersInChatRoom,
+		CreatedAt: sqlc.PgtypeToTime(sqlcRows[0].CreatedAt),
+	}, nil
 
 }
 

backend/internal/pkg/sqlc/models.go

@@ -2,7 +2,7 @@ version: "2"
 sql:
   - engine: "postgresql"
     queries: "query.sql" # This is relative to `internal/pkg/sqlc`
-    # schema: "../../app/infrastructure/database/migrations" # Relative path to migrations
+    #schema: "../../app/infrastructure/database/migrations" # Relative path to migrations
     schema: "schema.sql"
     gen:
       go:
@@ -14,3 +14,10 @@ sql:
         emit_exact_table_names: false
         emit_interface: true
         emit_empty_slices: true
+        overrides:
+          - db_type: "uuid"
+            go_type: "github.com/google/uuid.UUID"
+          - db_type: "text"
+            go_type: "string"
+          - db_type: "timestamp"
+            go_type: "time.Time"