fix build and lint errors

GamerGirlandCo · GamerGirlandCo · commit 6cfd2ade8dea · 2025-08-14T18:01:52.000-04:00
diff --git a/models/group/avatar.go b/models/group/avatar.go
@@ -1,3 +1,6 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package group
 
 import (
diff --git a/models/group/errors.go b/models/group/errors.go
@@ -1,3 +1,6 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package group
 
 import (
diff --git a/models/group/group.go b/models/group/group.go
@@ -1,3 +1,6 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package group
 
 import (
diff --git a/models/group/group_list.go b/models/group/group_list.go
@@ -1,3 +1,6 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package group
 
 import (
diff --git a/models/group/group_team.go b/models/group/group_team.go
@@ -1,3 +1,6 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package group
 
 import (
diff --git a/models/group/group_unit.go b/models/group/group_unit.go
@@ -1,3 +1,6 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package group
 
 import (
@@ -32,7 +35,7 @@ func GetGroupUnit(ctx context.Context, groupID, teamID int64, unitType unit.Type
 		And("team_id = ?", teamID).
 		And("type = ?", unitType).
 		Get(unit)
-	return
+	return unit, err
 }
 
 func GetMaxGroupUnit(ctx context.Context, groupID int64, unitType unit.Type) (unit *RepoGroupUnit, err error) {
@@ -42,12 +45,12 @@ func GetMaxGroupUnit(ctx context.Context, groupID int64, unitType unit.Type) (un
 		And("type = ?", unitType).
 		Find(&units)
 	if err != nil {
-		return
+		return nil, err
 	}
 	for _, u := range units {
 		if unit == nil || u.AccessMode > unit.AccessMode {
 			unit = u
 		}
 	}
-	return
+	return unit, err
 }
diff --git a/models/organization/team_group.go b/models/organization/team_group.go
@@ -1,3 +1,6 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package organization
 
 import (
diff --git a/models/shared/group/org_group.go b/models/shared/group/org_group.go
@@ -1,12 +1,15 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package group
 
 import (
-	repo_model "code.gitea.io/gitea/models/repo"
 	"context"
 
 	"code.gitea.io/gitea/models/db"
 	group_model "code.gitea.io/gitea/models/group"
 	organization_model "code.gitea.io/gitea/models/organization"
+	repo_model "code.gitea.io/gitea/models/repo"
 	user_model "code.gitea.io/gitea/models/user"
 
 	"xorm.io/builder"
diff --git a/modules/structs/repo_group.go b/modules/structs/repo_group.go
@@ -1,3 +1,6 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package structs
 
 // Group represents a group of repositories and subgroups in an organization
diff --git a/routers/api/v1/group/group.go b/routers/api/v1/group/group.go
@@ -1,13 +1,16 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package group
 
 import (
-	access_model "code.gitea.io/gitea/models/perm/access"
-	shared_group_model "code.gitea.io/gitea/models/shared/group"
-	"fmt"
+	"errors"
 	"net/http"
 	"strings"
 
 	group_model "code.gitea.io/gitea/models/group"
+	access_model "code.gitea.io/gitea/models/perm/access"
+	shared_group_model "code.gitea.io/gitea/models/shared/group"
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/web"
 	"code.gitea.io/gitea/services/context"
@@ -18,7 +21,7 @@ import (
 func createCommonGroup(ctx *context.APIContext, parentGroupID, ownerID int64) (*api.Group, error) {
 	if ownerID < 1 {
 		if parentGroupID < 1 {
-			return nil, fmt.Errorf("cannot determine new group's owner")
+			return nil, errors.New("cannot determine new group's owner")
 		}
 		npg, err := group_model.GetGroupByID(ctx, parentGroupID)
 		if err != nil {
@@ -153,7 +156,10 @@ func MoveGroup(ctx *context.APIContext) {
 		npos = *form.NewPos
 	}
 	err = group_service.MoveGroupItem(ctx, group_service.MoveGroupOptions{
-		form.NewParent, id, true, npos,
+		NewParent: form.NewParent,
+		ItemID:    id,
+		IsGroup:   true,
+		NewPos:    npos,
 	}, ctx.Doer)
 	if group_model.IsErrGroupNotExist(err) {
 		ctx.APIErrorNotFound()
diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go
@@ -1354,7 +1354,8 @@ func MoveRepoToGroup(ctx *context.APIContext) {
 		npos = *form.NewPos
 	}
 	err := group_service.MoveGroupItem(ctx, group_service.MoveGroupOptions{
-		IsGroup: false, NewPos: npos,
+		IsGroup:   false,
+		NewPos:    npos,
 		ItemID:    ctx.Repo.Repository.ID,
 		NewParent: form.NewParent,
 	}, ctx.Doer)
diff --git a/routers/api/v1/swagger/repo_group.go b/routers/api/v1/swagger/repo_group.go
@@ -1,3 +1,6 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package swagger
 
 import api "code.gitea.io/gitea/modules/structs"
diff --git a/services/convert/repo_group.go b/services/convert/repo_group.go
@@ -1,3 +1,6 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package convert
 
 import (
diff --git a/services/group/avatar.go b/services/group/avatar.go
@@ -1,3 +1,6 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package group
 
 import (
diff --git a/services/group/delete.go b/services/group/delete.go
@@ -1,3 +1,6 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package group
 
 import (
diff --git a/services/group/group.go b/services/group/group.go
@@ -1,7 +1,11 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package group
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"strings"
 
@@ -89,7 +93,7 @@ func MoveGroupItem(ctx context.Context, opts MoveGroupOptions, doer *user_model.
 		return err
 	}
 	if !canAccessNewParent {
-		return fmt.Errorf("cannot access new parent group")
+		return errors.New("cannot access new parent group")
 	}
 
 	err = parentGroup.LoadSubgroups(ctx, false)
diff --git a/services/group/group_test.go b/services/group/group_test.go
@@ -1,3 +1,6 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package group
 
 import (
@@ -42,7 +45,12 @@ func TestMoveGroup(t *testing.T) {
 		}
 		origCount := unittest.GetCount(t, new(group_model.Group), cond.ToConds())
 
-		assert.NoError(t, MoveGroupItem(t.Context(), MoveGroupOptions{123, gid, true, -1}, doer))
+		assert.NoError(t, MoveGroupItem(t.Context(), MoveGroupOptions{
+			NewParent: 123,
+			ItemID:    gid,
+			IsGroup:   true,
+			NewPos:    -1,
+		}, doer))
 		unittest.AssertCountByCond(t, "repo_group", cond.ToConds(), origCount+1)
 	}
 	testfn(124)
@@ -60,6 +68,11 @@ func TestMoveRepo(t *testing.T) {
 	})
 	origCount := unittest.GetCount(t, new(repo_model.Repository), cond)
 
-	assert.NoError(t, MoveGroupItem(db.DefaultContext, MoveGroupOptions{123, 32, false, -1}, doer))
+	assert.NoError(t, MoveGroupItem(db.DefaultContext, MoveGroupOptions{
+		NewParent: 123,
+		ItemID:    32,
+		IsGroup:   false,
+		NewPos:    -1,
+	}, doer))
 	unittest.AssertCountByCond(t, "repository", cond, origCount+1)
 }
diff --git a/services/group/search.go b/services/group/search.go
@@ -1,12 +1,15 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package group
 
 import (
-	"code.gitea.io/gitea/models/perm"
 	"context"
 	"slices"
 
 	"code.gitea.io/gitea/models/git"
 	group_model "code.gitea.io/gitea/models/group"
+	"code.gitea.io/gitea/models/perm"
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/models/unit"
 	user_model "code.gitea.io/gitea/models/user"
@@ -103,7 +106,7 @@ func (w *WebSearchGroup) doLoadChildren(opts *WebSearchOptions) error {
 			wsr.LatestCommitStatus = latestCommitStatuses[i]
 			wsr.LocaleLatestCommitStatus = latestCommitStatuses[i].LocaleString(opts.Locale)
 			if latestIdx > -1 {
-				if latestCommitStatuses[i].UpdatedUnix.AsLocalTime().Unix() > int64(latestCommitStatuses[latestIdx].UpdatedUnix.AsLocalTime().Unix()) {
+				if latestCommitStatuses[i].UpdatedUnix.AsLocalTime().Unix() > latestCommitStatuses[latestIdx].UpdatedUnix.AsLocalTime().Unix() {
 					latestIdx = i
 				}
 			} else {
diff --git a/services/group/team.go b/services/group/team.go
@@ -1,3 +1,6 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package group
 
 import (
@@ -68,7 +71,7 @@ func UpdateGroupTeam(ctx context.Context, gt *group_model.RepoGroupTeam) (err er
 			And("group_id=?", gt.GroupID).
 			And("type = ?", unit.Type).
 			Update(unit); err != nil {
-			return
+			return err
 		}
 	}
 	return committer.Commit()
@@ -92,7 +95,7 @@ func RecalculateGroupAccess(ctx context.Context, g *group_model.Group, isNew boo
 		teams, err = org_model.GetTeamsWithAccessToGroup(ctx, g.OwnerID, g.ParentGroupID, perm.AccessModeRead)
 	}
 	for _, t := range teams {
-		var gt *group_model.RepoGroupTeam = nil
+		var gt *group_model.RepoGroupTeam
 		if gt, err = group_model.FindGroupTeamByTeamID(ctx, g.ParentGroupID, t.ID); err != nil {
 			return err
 		}
@@ -110,7 +113,6 @@ func RecalculateGroupAccess(ctx context.Context, g *group_model.Group, isNew boo
 			return err
 		}
 		for _, u := range t.Units {
-
 			newAccessMode := u.AccessMode
 			if g.ParentGroup == nil {
 				gu, err := group_model.GetGroupUnit(ctx, g.ID, t.ID, u.Type)
diff --git a/services/group/update.go b/services/group/update.go
@@ -1,3 +1,6 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package group
 
 import (

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,6 @@`
	`1`	`+// Copyright 2025 The Gitea Authors. All rights reserved.`
	`2`	`+// SPDX-License-Identifier: MIT`
	`3`	`+`
`1`	`4`	`package group`
`2`	`5`
`3`	`6`	`import (`
`@@ -32,7 +35,7 @@ func GetGroupUnit(ctx context.Context, groupID, teamID int64, unitType unit.Type`
`32`	`35`	`And("team_id = ?", teamID).`
`33`	`36`	`And("type = ?", unitType).`
`34`	`37`	`Get(unit)`
`35`		`- return`
	`38`	`+ return unit, err`
`36`	`39`	`}`
`37`	`40`
`38`	`41`	`func GetMaxGroupUnit(ctx context.Context, groupID int64, unitType unit.Type) (unit *RepoGroupUnit, err error) {`
`@@ -42,12 +45,12 @@ func GetMaxGroupUnit(ctx context.Context, groupID int64, unitType unit.Type) (un`
`42`	`45`	`And("type = ?", unitType).`
`43`	`46`	`Find(&units)`
`44`	`47`	`if err != nil {`
`45`		`- return`
	`48`	`+ return nil, err`
`46`	`49`	`}`
`47`	`50`	`for _, u := range units {`
`48`	`51`	`if unit == nil \|\| u.AccessMode > unit.AccessMode {`
`49`	`52`	`unit = u`
`50`	`53`	`}`
`51`	`54`	`}`
`52`		`- return`
	`55`	`+ return unit, err`
`53`	`56`	`}`