From 728bbd038a4796e0fb02fa2dbea49d40cba52ab5 Mon Sep 17 00:00:00 2001
From: Ada Werefox <ada.werefox@tutanota.com>
Date: Tue, 13 May 2025 23:40:28 -0500
Subject: [PATCH] Minor changes to fix group methods after refactor.

---
 src/gin-cpularp.go              |  6 ++----
 src/lib/database/group/group.go | 26 ++++++--------------------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/src/gin-cpularp.go b/src/gin-cpularp.go
index 56649fa..26cef91 100755
--- a/src/gin-cpularp.go
+++ b/src/gin-cpularp.go
@@ -26,16 +26,14 @@ func main() {
 	router.GET("/auth/callback", api.AuthCallback)
 	router.GET("/auth/login", api.AuthLoginRedirect)
 	router.GET("/auth/logout", api.AuthLogoutRedirect)
+	// User methods
 	router.GET("/user/token/generate", api.CreateAPIToken)
 	router.GET("/user/info", api.GetDiscordUser)
 	router.GET("/user/authorized", api.GetUserLoggedIn)
-	// Create
+	// Object Requests
 	router.POST("/:object", api.ObjectRequest)
-	// Update
 	router.PUT("/:object", api.ObjectRequest)
-	// Read
 	router.GET("/:object", api.ObjectRequest)
-	// Delete
 	router.DELETE("/:object", api.ObjectRequest)
 	router.Run(":31337")
 }
diff --git a/src/lib/database/group/group.go b/src/lib/database/group/group.go
index 3019406..dd6994e 100644
--- a/src/lib/database/group/group.go
+++ b/src/lib/database/group/group.go
@@ -56,7 +56,7 @@ func (group Group) update(db *gorm.DB) error {
 }
 
 func (group Group) delete(db *gorm.DB) error {
-	result := db.Delete(&group)
+	result := db.Unscoped().Delete(&group)
 	if result.Error != nil {
 		return result.Error
 	}
@@ -71,18 +71,9 @@ func (group Group) create(db *gorm.DB) error {
 	return nil
 }
 
-func Create(db *gorm.DB, context *gin.Context) error {
-	body, err := io.ReadAll(context.Request.Body)
-	if err != nil {
-		return err
-	}
-	var newGroup Group
-	err = json.Unmarshal(body, &newGroup)
-	if err != nil {
-		return err
-	}
+func Create(db *gorm.DB, params groupParams) error {
 	return Group{
-		Name: newGroup.Name,
+		Name: params.Name,
 	}.create(db)
 }
 
@@ -99,12 +90,7 @@ func Get(db *gorm.DB, inputGroups []uint) *[]Group {
 	return &outputGroups
 }
 
-func Update(db *gorm.DB, context *gin.Context) error {
-	var params groupParams
-	err := params.validate(context)
-	if err != nil {
-		return err
-	}
+func Update(db *gorm.DB, params groupParams) error {
 	uintID, err := strconv.Atoi(params.ID)
 	if err != nil {
 		return err
@@ -159,9 +145,9 @@ func HandleRequest(db *gorm.DB, context *gin.Context) error {
 			"result": result,
 		})
 	case "POST":
-		err = Create(db, context)
+		err = Create(db, params)
 	case "PUT":
-		err = Update(db, context)
+		err = Update(db, params)
 	case "DELETE":
 		err = Delete(db, idUintArray)
 	}