Code review change implemented: The Organization object could be the first parameter of the function.

Author: user

models/organization/org_times.go

@@ -33,7 +33,7 @@ type ResultTimesByMembers struct {
 }
 
 // GetTimesByRepos fetches data from DB to serve TimesByRepos.
-func (org *Organization) GetTimesByRepos(unixfrom, unixto int64) (results []ResultTimesByRepos, err error) {
+func GetTimesByRepos(org *Organization, unixfrom, unixto int64) (results []ResultTimesByRepos, err error) {
 	// Get the data from the DB
 	err = db.GetEngine(db.DefaultContext).
 		Select("repository.name, SUM(tracked_time.time) AS sum_time").
@@ -51,7 +51,7 @@ func (org *Organization) GetTimesByRepos(unixfrom, unixto int64) (results []Resu
 }
 
 // GetTimesByMilestones gets the actual data from the DB to serve TimesByMilestones.
-func (org *Organization) GetTimesByMilestones(unixfrom, unixto int64) (results []ResultTimesByMilestones, err error) {
+func GetTimesByMilestones(org *Organization, unixfrom, unixto int64) (results []ResultTimesByMilestones, err error) {
 	err = db.GetEngine(db.DefaultContext).
 		Select("repository.name AS repo_name, milestone.name, milestone.id, SUM(tracked_time.time) AS sum_time").
 		Table("tracked_time").
@@ -70,7 +70,7 @@ func (org *Organization) GetTimesByMilestones(unixfrom, unixto int64) (results [
 }
 
 // getTimesByMembers gets the actual data from the DB to serve TimesByMembers.
-func (org *Organization) GetTimesByMembers(unixfrom, unixto int64) (results []ResultTimesByMembers, err error) {
+func GetTimesByMembers(org *Organization, unixfrom, unixto int64) (results []ResultTimesByMembers, err error) {
 	err = db.GetEngine(db.DefaultContext).
 		Select("user.name, SUM(tracked_time.time) AS sum_time").
 		Table("tracked_time").

models/organization/org_time/org_times_test.go renamed to models/organization/org_times_test.go

@@ -3,10 +3,9 @@
 // license that can be found in the LICENSE file.
 // SPDX-License-Identifier: MIT
 
-package orgtime_test
+package organization_test
 
 import (
-	"path/filepath"
 	"testing"
 
 	"code.gitea.io/gitea/models/db"
@@ -18,21 +17,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-// TestMain sets up the testing environment specifically for testing org times.
-func TestMain(m *testing.M) {
-	unittest.MainTest(m, &unittest.TestOptions{
-		GiteaRootPath: filepath.Join("..", "..", ".."),
-		FixtureFiles: []string{
-			"user.yml",
-			"org_user.yml",
-			"repository.yml",
-			"issue.yml",
-			"milestone.yml",
-			"tracked_time.yml",
-		},
-	})
-}
-
 // TestTimesPrepareDB prepares the database for the following tests.
 func TestTimesPrepareDB(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
@@ -113,7 +97,7 @@ func TestTimesByRepos(t *testing.T) {
 		t.Run(kase.name, func(t *testing.T) {
 			org, err := organization.GetOrgByID(db.DefaultContext, kase.orgname)
 			assert.NoError(t, err)
-			results, err := org.GetTimesByRepos(kase.unixfrom, kase.unixto)
+			results, err := organization.GetTimesByRepos(org, kase.unixfrom, kase.unixto)
 			assert.NoError(t, err)
 			assert.Equal(t, kase.expected, results)
 		})
@@ -217,7 +201,7 @@ func TestTimesByMilestones(t *testing.T) {
 		t.Run(kase.name, func(t *testing.T) {
 			org, err := organization.GetOrgByID(db.DefaultContext, kase.orgname)
 			assert.NoError(t, err)
-			results, err := org.GetTimesByMilestones(kase.unixfrom, kase.unixto)
+			results, err := organization.GetTimesByMilestones(org, kase.unixfrom, kase.unixto)
 			assert.NoError(t, err)
 			assert.Equal(t, kase.expected, results)
 		})
@@ -300,7 +284,7 @@ func TestTimesByMembers(t *testing.T) {
 		t.Run(kase.name, func(t *testing.T) {
 			org, err := organization.GetOrgByID(db.DefaultContext, kase.orgname)
 			assert.NoError(t, err)
-			results, err := org.GetTimesByMembers(kase.unixfrom, kase.unixto)
+			results, err := organization.GetTimesByMembers(org, kase.unixfrom, kase.unixto)
 			assert.NoError(t, err)
 			assert.Equal(t, kase.expected, results)
 		})

routers/web/org/times.go

@@ -9,6 +9,7 @@ import (
 	"net/http"
 	"time"
 
+	"code.gitea.io/gitea/models/organization"
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/setting"
@@ -70,7 +71,7 @@ func TimesByRepos(ctx *context.Context) {
 	// Set submenu tab
 	ctx.Data["TabIsByRepos"] = true
 
-	results, err := ctx.Org.Organization.GetTimesByRepos(unixfrom, unixto)
+	results, err := organization.GetTimesByRepos(ctx.Org.Organization, unixfrom, unixto)
 	if err != nil {
 		ctx.ServerError("getTimesByRepos", err)
 		return
@@ -97,7 +98,7 @@ func TimesByMilestones(ctx *context.Context) {
 	ctx.Data["TabIsByMilestones"] = true
 
 	// Get the data from the DB
-	results, err := ctx.Org.Organization.GetTimesByMilestones(unixfrom, unixto)
+	results, err := organization.GetTimesByMilestones(ctx.Org.Organization, unixfrom, unixto)
 	if err != nil {
 		ctx.ServerError("getTimesByMilestones", err)
 		return
@@ -136,7 +137,7 @@ func TimesByMembers(ctx *context.Context) {
 	ctx.Data["TabIsByMembers"] = true
 
 	// Get the data from the DB
-	results, err := ctx.Org.Organization.GetTimesByMembers(unixfrom, unixto)
+	results, err := organization.GetTimesByMembers(ctx.Org.Organization, unixfrom, unixto)
 	if err != nil {
 		ctx.ServerError("getTimesByMembers", err)
 		return