Merge pull request #41 from igh9410/dev

Removed Mock tests. Will replace with integration test

Author: igh9410

backend/Dockerfile.multistage

@@ -12,11 +12,12 @@ RUN go mod download
 # Copy the entire application
 COPY . .
 
+# Run the tests
+RUN CGO_ENABLED=1 GOOS=linux go test -v ./...
+
+# Build the application
 RUN CGO_ENABLED=1 GOOS=linux go build -o blabber-hive ./cmd/main.go
 
-# Run the tests in the container
-FROM build-stage AS run-test-stage
-RUN go test -v ./...
 
 # Deploy the application binary into a lean image
 FROM gcr.io/distroless/cc-debian12 AS build-release-stage

backend/internal/chat/handler.go

@@ -86,7 +86,7 @@ func (h *Handler) GetChatRoomList(c *gin.Context) {
 
 	chatRoomList, err := h.Service.GetChatRoomList(c)
 	if err != nil {
-		slog.Error("Error occured with getting chat room list %v: %v", chatRoomList, err.Error())
+		log.Printf("Error occured with getting chat room list: %v", err.Error())
 	}
 	c.JSON(http.StatusOK, chatRoomList)
 }

backend/internal/chat/repository.go

@@ -60,6 +60,12 @@ func (r *repository) CreateChatRoom(ctx context.Context, chatRoom *ChatRoom) (*C
 		return nil, errors.New("failed to create chat room")
 	}
 
+	// Commit the transaction on success
+	if err = tx.Commit(); err != nil {
+		slog.Error("Transaction commit failed: ", err)
+		return nil, err
+	}
+
 	return chatRoom, nil
 }
 
@@ -119,19 +125,10 @@ func (r *repository) FindChatRoomInfoByID(ctx context.Context, chatRoomID uuid.U
 }
 
 func (r *repository) JoinChatRoomByID(ctx context.Context, chatRoomID uuid.UUID, userID uuid.UUID) (*ChatRoom, error) {
-	// Find the existing chat room first
-	chatRoom, err := r.FindChatRoomByID(ctx, chatRoomID)
-	if err != nil {
-		return nil, err
-	}
-
-	// INSERT into chat rooms, UNIQUE constraint will prevent duplicates
-	query := `INSERT INTO users_in_chat_rooms (user_id, chat_room_id) VALUES ($1, $2)`
-
 	tx, err := r.db.BeginTx(ctx, nil)
 	if err != nil {
 		slog.Error("Joining chat room transaction failed")
-		return nil, err // handle error appropriately
+		return nil, err
 	}
 
 	// Ensure rollback in case of error
@@ -143,7 +140,9 @@ func (r *repository) JoinChatRoomByID(ctx context.Context, chatRoomID uuid.UUID,
 		}
 	}()
 
-	_, err = r.db.ExecContext(ctx, query, userID, chatRoomID)
+	// INSERT into chat rooms, UNIQUE and FOREIGN KEY constraints will handle duplicates and non-existing chat room
+	query := `INSERT INTO users_in_chat_rooms (user_id, chat_room_id) VALUES ($1, $2)`
+	_, err = tx.ExecContext(ctx, query, userID, chatRoomID)
 	if err != nil {
 		slog.Error("Error joining chat room, db execcontext: ", err)
 		return nil, err
@@ -154,6 +153,9 @@ func (r *repository) JoinChatRoomByID(ctx context.Context, chatRoomID uuid.UUID,
 		slog.Error("Transaction commit failed: ", err)
 		return nil, err
 	}
+	chatRoom := &ChatRoom{
+		ID: chatRoomID,
+	}
 
 	return chatRoom, nil
 

backend/internal/chat/repository_test.go

@@ -3,7 +3,6 @@ package match
 import (
 	"backend/internal/common"
 	"log"
-	"log/slog"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
@@ -29,7 +28,9 @@ func (h *Handler) EnqueueUser(c *gin.Context) {
 	res, err := h.Service.EnqueueUser(c.Request.Context(), userID)
 
 	if err != nil {
-		slog.Error("Error occured with enqueuing user ID %v: %v", userID, err.Error())
+		log.Printf("Error occurred with user ID %v: %v", userID, err.Error())
+		c.JSON((http.StatusBadRequest), gin.H{"error": err.Error()})
+		return
 	}
 
 	c.JSON(http.StatusCreated, res)
@@ -47,7 +48,7 @@ func (h *Handler) DequeueUser(c *gin.Context) {
 
 	err := h.Service.DequeueUser(c.Request.Context(), userID)
 	if err != nil {
-		slog.Error("Error occurred with dequeuing user ID %v: %v", userID, err.Error())
+		log.Printf("Error occurred with dequeuing user ID %v: %v", userID, err.Error())
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "Error removing user from queue"})
 		return
 	}

backend/internal/match/handler.go

@@ -4,7 +4,9 @@ import (
 	"backend/infra/redis"
 	"backend/internal/chat"
 	"context"
+	"log"
 	"log/slog"
+	"strings"
 	"time"
 
 	"github.com/google/uuid"
@@ -83,7 +85,6 @@ func (s *service) StartMatchmakingSubscriber(ctx context.Context) {
 			if msg == nil {
 				continue // or handle the nil message scenario
 			}
-			slog.Info("Received matchmaking request for user:", msg.Payload)
 
 			// Trigger matchmaking logic
 			if err := s.performMatchmaking(msg.Payload); err != nil {
@@ -111,7 +112,7 @@ func (s *service) performMatchmaking(userID string) error {
 	}
 
 	if matchID == "" {
-		slog.Info("No suitable match found for user:", userID)
+		slog.Error("EnqueueUser error", "userID", userID, "error", err.Error())
 		return nil // or custom error indicating no match found
 	}
 
@@ -129,8 +130,8 @@ func (s *service) handleMatch(userID, matchID string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), s.timeout)
 	defer cancel()
 
-	removedIDs := []string{userID, matchID} // Remove two users from the queue to form a match
-	slog.Info("Match found for users:", removedIDs)
+	removedIDs := []string{userID, matchID}                                 // Remove two users from the queue to form a match
+	log.Printf("Match found for users: %s", strings.Join(removedIDs, ", ")) // Fix the format specifier from %d to %s
 	err := s.Repository.DequeueUsers(ctx, removedIDs...)
 	// Code goes here
 	if err != nil {
@@ -141,7 +142,8 @@ func (s *service) handleMatch(userID, matchID string) error {
 
 	_, err = s.ChatRepository.CreateChatRoom(ctx, chatRoom)
 	if err != nil {
-		slog.Error("Error creating chat room:", err)
+		log.Print("Error creating chat room:", err)
+		return err
 	}
 	return nil
 }

backend/internal/match/service.go

@@ -3,7 +3,7 @@ package user
 import (
 	"context"
 	"database/sql"
-	"log/slog"
+	"log"
 	"time"
 )
 
@@ -18,8 +18,6 @@ type DBTX interface {
 	QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
 	QueryRowContext(context.Context, string, ...interface{}) *sql.Row
 	BeginTx(ctx context.Context, opts *sql.TxOptions) (*sql.Tx, error)
-	Commit() error
-	Rollback() error
 }
 
 type repository struct {
@@ -34,15 +32,15 @@ func (r *repository) CreateUser(ctx context.Context, user *User) (*User, error)
 
 	tx, err := r.db.BeginTx(ctx, nil)
 	if err != nil {
-		slog.Error("Creating User transaction failed")
+		log.Println("Creating User transaction failed")
 		return nil, err // handle error appropriately
 	}
 
 	// Ensure rollback in case of error
 	defer func() {
 		if err != nil {
 			if rbErr := tx.Rollback(); rbErr != nil {
-				slog.Error("Transaction rollback failed: %v", rbErr)
+				log.Printf("Transaction rollback failed: %v", rbErr)
 			}
 		}
 	}()
@@ -55,13 +53,13 @@ func (r *repository) CreateUser(ctx context.Context, user *User) (*User, error)
 	err = r.db.QueryRowContext(ctx, query, user.ID, user.Username, user.Email, user.ProfileImageURL, user.CreatedAt).Scan(&user.ID)
 
 	if err != nil {
-		slog.Error("Error creating user, db execcontext: ", err)
+		log.Printf("Error creating user, db execcontext: %d", err)
 		return nil, err
 	}
 
 	// Commit transaction
 	if err = tx.Commit(); err != nil {
-		slog.Error("Transaction commit failed: ", err)
+		log.Printf("Transaction commit failed: %d", err)
 		return nil, err
 	}