Reorganize circles_repo and user_repo

Author: Leo7Deng

backend/circles/handler.go

@@ -270,6 +270,7 @@ func SearchTextHandler(w http.ResponseWriter, r *http.Request) {
 		json.NewEncoder(w).Encode("HTTP 400 bad request")
 		return
 	}
+	fmt.Println("Circle ID: " + searchData.CircleID + " Content: " + searchData.Content)
 	results, err := postgres.SearchCircle(searchData.CircleID, searchData.Content)
 	if err != nil {
 		fmt.Printf("Failed to search circles\n")

backend/postgres/circles_repo.go

@@ -223,6 +223,49 @@ func GetInviteUsersInCircle(userID string, circleID string) ([]models.User, erro
 	return users, nil
 }
 
+func AddUsersToCircle(circleID string, userIDs []string) error {
+	ctx := context.Background()
+	conn, err := pool.Acquire(ctx)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Unable to acquire a connection from the pool: %v\n", err)
+		return err
+	}
+	defer conn.Release()
+
+	tx, err := conn.Begin(ctx)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Unable to begin transaction: %v\n", err)
+	}
+	defer func() {
+		if err != nil {
+			_ = tx.Rollback(ctx)
+		}
+	}()
+
+	for _, id := range userIDs {
+		_, err = tx.Exec(
+			ctx,
+			`
+			INSERT INTO users_circles (user_id, circle_id, joined_at, role)
+			VALUES ($1, $2, NOW(), 'member');
+			`,
+			id,
+			circleID)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "Error inserting into users_circles: %v\n", err)
+			return err
+		}
+	}
+
+	err = tx.Commit(ctx)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Unable to commit transaction: %v\n", err)
+		return err
+	}
+
+	return nil
+}
+
 func EditRoleInCircle(circleID string, targetUserID string, role string) error {
 	ctx := context.Background()
 	conn, err := pool.Acquire(ctx)

backend/postgres/migrations/000005_init.up.sql

@@ -22,10 +22,10 @@ RETURNS TABLE (
 BEGIN
     IF NOT EXISTS (
         SELECT *
-        FROM users_circles
-        WHERE user_id = request_user_id
-          AND circle_id = circle_id_input
-          AND role = 'admin'
+        FROM users_circles uc
+        WHERE uc.user_id = request_user_id
+          AND uc.circle_id = circle_id_input
+          AND uc.role = 'admin'
     ) THEN
         RAISE EXCEPTION 'permission denied';
     END IF;
@@ -34,7 +34,7 @@ BEGIN
     SELECT u.id, u.username, uc.role
     FROM users u
     INNER JOIN users_circles uc ON u.id = uc.user_id
-    WHERE u.id != p_requester_id AND uc.circle_id = p_circle_id
+    WHERE u.id != request_user_id AND uc.circle_id = circle_id_input
     ORDER BY u.username ASC;
 END;
 $$ LANGUAGE plpgsql;

backend/postgres/user_repo.go

@@ -83,49 +83,6 @@ func InsertRefreshToken(userID string, token uuid.UUID) {
 	}
 }
 
-func AddUsersToCircle(circleID string, userIDs []string) error {
-	ctx := context.Background()
-	conn, err := pool.Acquire(ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Unable to acquire a connection from the pool: %v\n", err)
-		return err
-	}
-	defer conn.Release()
-
-	tx, err := conn.Begin(ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Unable to begin transaction: %v\n", err)
-	}
-	defer func() {
-		if err != nil {
-			_ = tx.Rollback(ctx)
-		}
-	}()
-
-	for _, id := range userIDs {
-		_, err = tx.Exec(
-			ctx,
-			`
-			INSERT INTO users_circles (user_id, circle_id, joined_at, role)
-			VALUES ($1, $2, NOW(), 'member');
-			`,
-			id,
-			circleID)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "Error inserting into users_circles: %v\n", err)
-			return err
-		}
-	}
-
-	err = tx.Commit(ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Unable to commit transaction: %v\n", err)
-		return err
-	}
-
-	return nil
-}
-
 func GetUsername(userID string) (string, error) {
 	ctx := context.Background()
 	conn, err := pool.Acquire(ctx)