From b1fd7388de7b423c52e27cd3e0d3d3c24dd00716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=98=99=E2=97=A6=20The=20Tablet=20=E2=9D=80=20GamerGirla?=
 =?UTF-8?q?ndCo=20=E2=97=A6=E2=9D=A7?= <i.am.the.tablet@proton.me>
Date: Mon, 18 Aug 2025 17:27:36 -0400
Subject: [PATCH] use group_service to move groups and repos after dragging and
 dropping

---
 routers/web/group/edit.go | 35 ++++++++---------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)

diff --git a/routers/web/group/edit.go b/routers/web/group/edit.go
index 2e617b5aa2..a36a6ea939 100644
--- a/routers/web/group/edit.go
+++ b/routers/web/group/edit.go
@@ -4,8 +4,6 @@
 package group
 
 import (
-	group_model "code.gitea.io/gitea/models/group"
-	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/services/context"
 	"code.gitea.io/gitea/services/forms"
@@ -18,31 +16,14 @@ func MoveGroupItem(ctx *context.Context) {
 		ctx.ServerError("DecodeMovedGroupItemForm", err)
 		return
 	}
-	if form.IsGroup {
-		group, err := group_model.GetGroupByID(ctx, form.ItemID)
-		if err != nil {
-			ctx.ServerError("GetGroupByID", err)
-			return
-		}
-		if group.ParentGroupID != form.NewParent {
-			if err = group_model.MoveGroup(ctx, group, form.NewParent, form.NewPos); err != nil {
-				ctx.ServerError("MoveGroup", err)
-				return
-			}
-			if err = group_service.RecalculateGroupAccess(ctx, group, false); err != nil {
-				ctx.ServerError("RecalculateGroupAccess", err)
-			}
-		}
-	} else {
-		repo, err := repo_model.GetRepositoryByID(ctx, form.ItemID)
-		if err != nil {
-			ctx.ServerError("GetRepositoryByID", err)
-		}
-		if repo.GroupID != form.NewParent {
-			if err = group_service.MoveRepositoryToGroup(ctx, repo, form.NewParent, form.NewPos); err != nil {
-				ctx.ServerError("MoveRepositoryToGroup", err)
-			}
-		}
+	if err := group_service.MoveGroupItem(ctx, group_service.MoveGroupOptions{
+		IsGroup:   form.IsGroup,
+		ItemID:    form.ItemID,
+		NewPos:    form.NewPos,
+		NewParent: form.NewParent,
+	}, ctx.Doer); err != nil {
+		ctx.ServerError("MoveGroupItem", err)
+		return
 	}
 	ctx.JSONOK()
 }