added add member to group route

database/groups.go

@@ -20,34 +20,60 @@ func CreateGroup(db *sql.DB, groupName string, userID uuid.UUID) (uuid.UUID, err
   	  RETURNING granted_at;
   	`
 
-	addMemberToGroupQuery := `
-  	  INSERT INTO Memberships (conversation_id, user_id)
-  	  VALUES ($1, $2)
-  	  ON CONFLICT DO NOTHING
-  	  RETURNING user_id;
-  	`
-
+	// Create conversation
 	var groupID uuid.UUID
 	err := db.QueryRow(createConversationQuery, groupName).Scan(&groupID)
 	if err != nil {
 		return uuid.Nil, helpers.NewError(helpers.ErrInternal, "Failed to create group", fmt.Errorf("failed to create group: %w", err))
 	}
 
+	// Insert group admin (make user that created the group an admin)
 	var grantedAt string
 	err = db.QueryRow(insertGroupAdminQuery, groupID, userID, userID).Scan(&grantedAt)
 	if err != nil {
 		return uuid.Nil, helpers.NewError(helpers.ErrInternal, "Failed to create group", fmt.Errorf("failed to insert group admin: %w", err))
 	}
 
-	var memberID uuid.UUID
-	err = db.QueryRow(addMemberToGroupQuery, groupID, userID).Scan(&memberID)
+	// Add self as group member
+	_, err = AddMemberToGroup(db, userID, groupID)
 	if err != nil {
-		return uuid.Nil, helpers.NewError(helpers.ErrInternal, "Failed to create group", fmt.Errorf("failed to add member to group: %w", err))
+		return uuid.Nil, err
 	}
 
+	// Insert group contact
 	_, err = InsertContactByID(db, userID, groupID)
 	if err != nil {
 		return groupID, helpers.NewError(helpers.ErrInternal, "Failed to create group contact", fmt.Errorf("failed to insert group contact: %w", err))
 	}
+
 	return groupID, nil
 }
+
+func AddMemberToGroup(db *sql.DB, userID uuid.UUID, groupID uuid.UUID) (uuid.UUID, error) {
+	query := `
+  	  INSERT INTO Memberships (conversation_id, user_id)
+  	  VALUES ($1, $2)
+  	  ON CONFLICT DO NOTHING
+  	  RETURNING user_id;
+  	`
+	var memberID uuid.UUID
+	err := db.QueryRow(query, groupID, userID).Scan(&memberID)
+	if err != nil {
+		return uuid.Nil, helpers.NewError(helpers.ErrInternal, "Failed to add member to group", fmt.Errorf("failed to add member to group: %w", err))
+	}
+	return memberID, nil
+}
+
+func IsAdmin(db *sql.DB, userID uuid.UUID, conversationID uuid.UUID) (bool, error) {
+	query := `
+  	  SELECT COUNT(1) FROM GroupAdmins
+  	  WHERE user_id = $1
+  	  AND conversation_id = $2;
+  	`
+	var count int
+	err := db.QueryRow(query, userID, conversationID).Scan(&count)
+	if err != nil {
+		return false, helpers.NewError(helpers.ErrInternal, "Failed to check admin status", fmt.Errorf("failed to check admin status: %w", err))
+	}
+	return count > 0, nil
+}

handlers/groups.go

@@ -3,6 +3,7 @@ package handlers
 import (
 	"github.com/gofiber/fiber/v2"
 	"github.com/google/uuid"
+	"log"
 	"relay-server/database"
 	"relay-server/helpers"
 )
@@ -31,3 +32,37 @@ func CreateGroup(c *fiber.Ctx) error {
 	return c.Status(fiber.StatusOK).JSON(fiber.Map{"groupID": groupID})
 
 }
+
+func AddMemberToGroup(c *fiber.Ctx) error {
+	type addMemberToGroupRequest struct {
+		GroupID uuid.UUID `json:"group_id"`
+		UserID  uuid.UUID `json:"user_id"`
+	}
+	var req addMemberToGroupRequest
+	if err := c.BodyParser(&req); err != nil {
+		return helpers.NewError(helpers.ErrInvalidInput, "Invalid request body", err)
+	}
+	if req.GroupID == uuid.Nil {
+		return helpers.NewError(helpers.ErrInvalidInput, "Group ID is empty", nil)
+	}
+	if req.UserID == uuid.Nil {
+		return helpers.NewError(helpers.ErrInvalidInput, "User ID is empty", nil)
+	}
+
+	isAdmin, err := database.IsAdmin(database.DB, req.UserID, req.GroupID)
+	if err != nil {
+		return err
+	}
+	if !isAdmin {
+		return helpers.NewError(helpers.ErrUnauthorized, "You are not a group administrator", nil)
+	}
+
+	_, err = database.AddMemberToGroup(database.DB, req.GroupID, req.UserID)
+	if err != nil {
+		return err
+	}
+	//TODO zrobic io.to(req.GroupID).emit("added to group", {groupID: req.GroupID, userID: req.UserID}), i wyslij do tego latest message bo na razie mi sie nie chce
+
+	log.Println("Successfully added member to group")
+	return c.Status(fiber.StatusOK).JSON(fiber.Map{"message": "Successfully added member to group"})
+}

router/router.go

@@ -34,4 +34,5 @@ func SetupRoutes(app *fiber.App) {
 	// Groups group
 	groups := chat.Group("/groups", middleware.Protected(), logger.New())
 	groups.Post("/create", handlers.CreateGroup)
+	groups.Post("/addMember", handlers.AddMemberToGroup)
 }