Skip to content

Commit a357498

Browse files
KN4CK3Rlunny
KN4CK3R
and
lunny
authored
Move convert package to services (#22264)
Addition to #22256 The `convert` package relies heavily on different models which is [disallowed by our definition of modules](https://github.com/go-gitea/gitea/blob/main/CONTRIBUTING.md#design-guideline). This helps to prevent possible import cycles. Co-authored-by: Lunny Xiao <[email protected]>
1 parent 309e86a commit a357498

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+75
-75
lines changed

Diff for: ‎cmd/dump_repo.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ import (
1010
"os"
1111
"strings"
1212

13-
"code.gitea.io/gitea/modules/convert"
1413
"code.gitea.io/gitea/modules/git"
1514
"code.gitea.io/gitea/modules/log"
1615
base "code.gitea.io/gitea/modules/migration"
1716
"code.gitea.io/gitea/modules/setting"
1817
"code.gitea.io/gitea/modules/structs"
1918
"code.gitea.io/gitea/modules/util"
19+
"code.gitea.io/gitea/services/convert"
2020
"code.gitea.io/gitea/services/migrations"
2121

2222
"github.com/urfave/cli"

Diff for: ‎modules/eventsource/manager_run.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import (
99

1010
activities_model "code.gitea.io/gitea/models/activities"
1111
issues_model "code.gitea.io/gitea/models/issues"
12-
"code.gitea.io/gitea/modules/convert"
1312
"code.gitea.io/gitea/modules/graceful"
1413
"code.gitea.io/gitea/modules/json"
1514
"code.gitea.io/gitea/modules/log"
1615
"code.gitea.io/gitea/modules/process"
1716
"code.gitea.io/gitea/modules/setting"
1817
"code.gitea.io/gitea/modules/timeutil"
18+
"code.gitea.io/gitea/services/convert"
1919
)
2020

2121
// Init starts this eventsource

Diff for: ‎modules/notification/webhook/webhook.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ import (
1414
"code.gitea.io/gitea/models/unit"
1515
user_model "code.gitea.io/gitea/models/user"
1616
"code.gitea.io/gitea/models/webhook"
17-
"code.gitea.io/gitea/modules/convert"
1817
"code.gitea.io/gitea/modules/git"
1918
"code.gitea.io/gitea/modules/log"
2019
"code.gitea.io/gitea/modules/notification/base"
2120
"code.gitea.io/gitea/modules/repository"
2221
"code.gitea.io/gitea/modules/setting"
2322
api "code.gitea.io/gitea/modules/structs"
23+
"code.gitea.io/gitea/services/convert"
2424
webhook_services "code.gitea.io/gitea/services/webhook"
2525
)
2626

Diff for: ‎routers/api/packages/composer/composer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ import (
1414
"code.gitea.io/gitea/models/db"
1515
packages_model "code.gitea.io/gitea/models/packages"
1616
"code.gitea.io/gitea/modules/context"
17-
"code.gitea.io/gitea/modules/convert"
1817
packages_module "code.gitea.io/gitea/modules/packages"
1918
composer_module "code.gitea.io/gitea/modules/packages/composer"
2019
"code.gitea.io/gitea/modules/setting"
2120
"code.gitea.io/gitea/modules/util"
2221
"code.gitea.io/gitea/routers/api/packages/helper"
22+
"code.gitea.io/gitea/services/convert"
2323
packages_service "code.gitea.io/gitea/services/packages"
2424

2525
"github.com/hashicorp/go-version"

Diff for: ‎routers/api/v1/admin/org.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import (
1111
"code.gitea.io/gitea/models/organization"
1212
user_model "code.gitea.io/gitea/models/user"
1313
"code.gitea.io/gitea/modules/context"
14-
"code.gitea.io/gitea/modules/convert"
1514
api "code.gitea.io/gitea/modules/structs"
1615
"code.gitea.io/gitea/modules/web"
1716
"code.gitea.io/gitea/routers/api/v1/utils"
17+
"code.gitea.io/gitea/services/convert"
1818
)
1919

2020
// CreateOrg api for create organization

Diff for: ‎routers/api/v1/admin/user.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"code.gitea.io/gitea/models/db"
1717
user_model "code.gitea.io/gitea/models/user"
1818
"code.gitea.io/gitea/modules/context"
19-
"code.gitea.io/gitea/modules/convert"
2019
"code.gitea.io/gitea/modules/log"
2120
"code.gitea.io/gitea/modules/password"
2221
"code.gitea.io/gitea/modules/setting"
@@ -26,6 +25,7 @@ import (
2625
"code.gitea.io/gitea/routers/api/v1/user"
2726
"code.gitea.io/gitea/routers/api/v1/utils"
2827
asymkey_service "code.gitea.io/gitea/services/asymkey"
28+
"code.gitea.io/gitea/services/convert"
2929
"code.gitea.io/gitea/services/mailer"
3030
user_service "code.gitea.io/gitea/services/user"
3131
)

Diff for: ‎routers/api/v1/notify/repo.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010

1111
activities_model "code.gitea.io/gitea/models/activities"
1212
"code.gitea.io/gitea/modules/context"
13-
"code.gitea.io/gitea/modules/convert"
1413
"code.gitea.io/gitea/modules/log"
1514
"code.gitea.io/gitea/modules/structs"
15+
"code.gitea.io/gitea/services/convert"
1616
)
1717

1818
func statusStringToNotificationStatus(status string) activities_model.NotificationStatus {

Diff for: ‎routers/api/v1/notify/threads.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"code.gitea.io/gitea/models/db"
1212
issues_model "code.gitea.io/gitea/models/issues"
1313
"code.gitea.io/gitea/modules/context"
14-
"code.gitea.io/gitea/modules/convert"
14+
"code.gitea.io/gitea/services/convert"
1515
)
1616

1717
// GetThread get notification by ID

Diff for: ‎routers/api/v1/notify/user.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
activities_model "code.gitea.io/gitea/models/activities"
1111
"code.gitea.io/gitea/modules/context"
12-
"code.gitea.io/gitea/modules/convert"
1312
"code.gitea.io/gitea/modules/structs"
13+
"code.gitea.io/gitea/services/convert"
1414
)
1515

1616
// ListNotifications list users's notification threads

Diff for: ‎routers/api/v1/org/hook.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88

99
"code.gitea.io/gitea/models/webhook"
1010
"code.gitea.io/gitea/modules/context"
11-
"code.gitea.io/gitea/modules/convert"
1211
api "code.gitea.io/gitea/modules/structs"
1312
"code.gitea.io/gitea/modules/web"
1413
"code.gitea.io/gitea/routers/api/v1/utils"
14+
"code.gitea.io/gitea/services/convert"
1515
)
1616

1717
// ListHooks list an organziation's webhooks

Diff for: ‎routers/api/v1/org/label.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import (
1111

1212
issues_model "code.gitea.io/gitea/models/issues"
1313
"code.gitea.io/gitea/modules/context"
14-
"code.gitea.io/gitea/modules/convert"
1514
api "code.gitea.io/gitea/modules/structs"
1615
"code.gitea.io/gitea/modules/web"
1716
"code.gitea.io/gitea/routers/api/v1/utils"
17+
"code.gitea.io/gitea/services/convert"
1818
)
1919

2020
// ListLabels list all the labels of an organization

Diff for: ‎routers/api/v1/org/member.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import (
1010
"code.gitea.io/gitea/models"
1111
"code.gitea.io/gitea/models/organization"
1212
"code.gitea.io/gitea/modules/context"
13-
"code.gitea.io/gitea/modules/convert"
1413
"code.gitea.io/gitea/modules/setting"
1514
api "code.gitea.io/gitea/modules/structs"
1615
"code.gitea.io/gitea/routers/api/v1/user"
1716
"code.gitea.io/gitea/routers/api/v1/utils"
17+
"code.gitea.io/gitea/services/convert"
1818
)
1919

2020
// listMembers list an organization's members

Diff for: ‎routers/api/v1/org/org.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
"code.gitea.io/gitea/models/perm"
1313
user_model "code.gitea.io/gitea/models/user"
1414
"code.gitea.io/gitea/modules/context"
15-
"code.gitea.io/gitea/modules/convert"
1615
api "code.gitea.io/gitea/modules/structs"
1716
"code.gitea.io/gitea/modules/web"
1817
"code.gitea.io/gitea/routers/api/v1/user"
1918
"code.gitea.io/gitea/routers/api/v1/utils"
19+
"code.gitea.io/gitea/services/convert"
2020
"code.gitea.io/gitea/services/org"
2121
)
2222

Diff for: ‎routers/api/v1/org/team.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ import (
1515
repo_model "code.gitea.io/gitea/models/repo"
1616
unit_model "code.gitea.io/gitea/models/unit"
1717
"code.gitea.io/gitea/modules/context"
18-
"code.gitea.io/gitea/modules/convert"
1918
"code.gitea.io/gitea/modules/log"
2019
api "code.gitea.io/gitea/modules/structs"
2120
"code.gitea.io/gitea/modules/web"
2221
"code.gitea.io/gitea/routers/api/v1/user"
2322
"code.gitea.io/gitea/routers/api/v1/utils"
23+
"code.gitea.io/gitea/services/convert"
2424
org_service "code.gitea.io/gitea/services/org"
2525
)
2626

Diff for: ‎routers/api/v1/packages/package.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88

99
"code.gitea.io/gitea/models/packages"
1010
"code.gitea.io/gitea/modules/context"
11-
"code.gitea.io/gitea/modules/convert"
1211
api "code.gitea.io/gitea/modules/structs"
1312
"code.gitea.io/gitea/modules/util"
1413
"code.gitea.io/gitea/routers/api/v1/utils"
14+
"code.gitea.io/gitea/services/convert"
1515
packages_service "code.gitea.io/gitea/services/packages"
1616
)
1717

Diff for: ‎routers/api/v1/repo/branch.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import (
1414
"code.gitea.io/gitea/models/organization"
1515
user_model "code.gitea.io/gitea/models/user"
1616
"code.gitea.io/gitea/modules/context"
17-
"code.gitea.io/gitea/modules/convert"
1817
"code.gitea.io/gitea/modules/git"
1918
api "code.gitea.io/gitea/modules/structs"
2019
"code.gitea.io/gitea/modules/web"
2120
"code.gitea.io/gitea/routers/api/v1/utils"
21+
"code.gitea.io/gitea/services/convert"
2222
pull_service "code.gitea.io/gitea/services/pull"
2323
repo_service "code.gitea.io/gitea/services/repository"
2424
)

Diff for: ‎routers/api/v1/repo/collaborators.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import (
1414
repo_model "code.gitea.io/gitea/models/repo"
1515
user_model "code.gitea.io/gitea/models/user"
1616
"code.gitea.io/gitea/modules/context"
17-
"code.gitea.io/gitea/modules/convert"
1817
repo_module "code.gitea.io/gitea/modules/repository"
1918
api "code.gitea.io/gitea/modules/structs"
2019
"code.gitea.io/gitea/modules/web"
2120
"code.gitea.io/gitea/routers/api/v1/utils"
21+
"code.gitea.io/gitea/services/convert"
2222
)
2323

2424
// ListCollaborators list a repository's collaborators

Diff for: ‎routers/api/v1/repo/commits.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212

1313
user_model "code.gitea.io/gitea/models/user"
1414
"code.gitea.io/gitea/modules/context"
15-
"code.gitea.io/gitea/modules/convert"
1615
"code.gitea.io/gitea/modules/git"
1716
"code.gitea.io/gitea/modules/setting"
1817
api "code.gitea.io/gitea/modules/structs"
1918
"code.gitea.io/gitea/routers/api/v1/utils"
19+
"code.gitea.io/gitea/services/convert"
2020
)
2121

2222
// GetSingleCommit get a commit via sha

Diff for: ‎routers/api/v1/repo/fork.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
repo_model "code.gitea.io/gitea/models/repo"
1515
user_model "code.gitea.io/gitea/models/user"
1616
"code.gitea.io/gitea/modules/context"
17-
"code.gitea.io/gitea/modules/convert"
1817
api "code.gitea.io/gitea/modules/structs"
1918
"code.gitea.io/gitea/modules/web"
2019
"code.gitea.io/gitea/routers/api/v1/utils"
20+
"code.gitea.io/gitea/services/convert"
2121
repo_service "code.gitea.io/gitea/services/repository"
2222
)
2323

Diff for: ‎routers/api/v1/repo/git_hook.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"net/http"
88

99
"code.gitea.io/gitea/modules/context"
10-
"code.gitea.io/gitea/modules/convert"
1110
"code.gitea.io/gitea/modules/git"
1211
api "code.gitea.io/gitea/modules/structs"
1312
"code.gitea.io/gitea/modules/web"
13+
"code.gitea.io/gitea/services/convert"
1414
)
1515

1616
// ListGitHooks list all Git hooks of a repository

Diff for: ‎routers/api/v1/repo/hook.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import (
1010
"code.gitea.io/gitea/models/perm"
1111
"code.gitea.io/gitea/models/webhook"
1212
"code.gitea.io/gitea/modules/context"
13-
"code.gitea.io/gitea/modules/convert"
1413
"code.gitea.io/gitea/modules/git"
1514
"code.gitea.io/gitea/modules/setting"
1615
api "code.gitea.io/gitea/modules/structs"
1716
"code.gitea.io/gitea/modules/web"
1817
"code.gitea.io/gitea/routers/api/v1/utils"
18+
"code.gitea.io/gitea/services/convert"
1919
webhook_service "code.gitea.io/gitea/services/webhook"
2020
)
2121

Diff for: ‎routers/api/v1/repo/issue.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"code.gitea.io/gitea/models/unit"
2020
user_model "code.gitea.io/gitea/models/user"
2121
"code.gitea.io/gitea/modules/context"
22-
"code.gitea.io/gitea/modules/convert"
2322
issue_indexer "code.gitea.io/gitea/modules/indexer/issues"
2423
"code.gitea.io/gitea/modules/notification"
2524
"code.gitea.io/gitea/modules/setting"
@@ -28,6 +27,7 @@ import (
2827
"code.gitea.io/gitea/modules/util"
2928
"code.gitea.io/gitea/modules/web"
3029
"code.gitea.io/gitea/routers/api/v1/utils"
30+
"code.gitea.io/gitea/services/convert"
3131
issue_service "code.gitea.io/gitea/services/issue"
3232
)
3333

Diff for: ‎routers/api/v1/repo/issue_attachment.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import (
99
issues_model "code.gitea.io/gitea/models/issues"
1010
repo_model "code.gitea.io/gitea/models/repo"
1111
"code.gitea.io/gitea/modules/context"
12-
"code.gitea.io/gitea/modules/convert"
1312
"code.gitea.io/gitea/modules/log"
1413
"code.gitea.io/gitea/modules/setting"
1514
api "code.gitea.io/gitea/modules/structs"
1615
"code.gitea.io/gitea/modules/web"
1716
"code.gitea.io/gitea/services/attachment"
17+
"code.gitea.io/gitea/services/convert"
1818
issue_service "code.gitea.io/gitea/services/issue"
1919
)
2020

Diff for: ‎routers/api/v1/repo/issue_comment.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
repo_model "code.gitea.io/gitea/models/repo"
1515
user_model "code.gitea.io/gitea/models/user"
1616
"code.gitea.io/gitea/modules/context"
17-
"code.gitea.io/gitea/modules/convert"
1817
api "code.gitea.io/gitea/modules/structs"
1918
"code.gitea.io/gitea/modules/web"
2019
"code.gitea.io/gitea/routers/api/v1/utils"
20+
"code.gitea.io/gitea/services/convert"
2121
issue_service "code.gitea.io/gitea/services/issue"
2222
)
2323

Diff for: ‎routers/api/v1/repo/issue_comment_attachment.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import (
99
issues_model "code.gitea.io/gitea/models/issues"
1010
repo_model "code.gitea.io/gitea/models/repo"
1111
"code.gitea.io/gitea/modules/context"
12-
"code.gitea.io/gitea/modules/convert"
1312
"code.gitea.io/gitea/modules/log"
1413
"code.gitea.io/gitea/modules/setting"
1514
api "code.gitea.io/gitea/modules/structs"
1615
"code.gitea.io/gitea/modules/web"
1716
"code.gitea.io/gitea/services/attachment"
17+
"code.gitea.io/gitea/services/convert"
1818
issue_service "code.gitea.io/gitea/services/issue"
1919
)
2020

Diff for: ‎routers/api/v1/repo/issue_label.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99

1010
issues_model "code.gitea.io/gitea/models/issues"
1111
"code.gitea.io/gitea/modules/context"
12-
"code.gitea.io/gitea/modules/convert"
1312
api "code.gitea.io/gitea/modules/structs"
1413
"code.gitea.io/gitea/modules/web"
14+
"code.gitea.io/gitea/services/convert"
1515
issue_service "code.gitea.io/gitea/services/issue"
1616
)
1717

Diff for: ‎routers/api/v1/repo/issue_reaction.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99

1010
issues_model "code.gitea.io/gitea/models/issues"
1111
"code.gitea.io/gitea/modules/context"
12-
"code.gitea.io/gitea/modules/convert"
1312
api "code.gitea.io/gitea/modules/structs"
1413
"code.gitea.io/gitea/modules/web"
1514
"code.gitea.io/gitea/routers/api/v1/utils"
15+
"code.gitea.io/gitea/services/convert"
1616
)
1717

1818
// GetIssueCommentReactions list reactions of a comment from an issue

Diff for: ‎routers/api/v1/repo/issue_stopwatch.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
issues_model "code.gitea.io/gitea/models/issues"
1111
"code.gitea.io/gitea/modules/context"
12-
"code.gitea.io/gitea/modules/convert"
1312
"code.gitea.io/gitea/routers/api/v1/utils"
13+
"code.gitea.io/gitea/services/convert"
1414
)
1515

1616
// StartIssueStopwatch creates a stopwatch for the given issue.

Diff for: ‎routers/api/v1/repo/issue_subscription.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
issues_model "code.gitea.io/gitea/models/issues"
1111
user_model "code.gitea.io/gitea/models/user"
1212
"code.gitea.io/gitea/modules/context"
13-
"code.gitea.io/gitea/modules/convert"
1413
api "code.gitea.io/gitea/modules/structs"
1514
"code.gitea.io/gitea/routers/api/v1/utils"
15+
"code.gitea.io/gitea/services/convert"
1616
)
1717

1818
// AddIssueSubscription Subscribe user to issue

Diff for: ‎routers/api/v1/repo/issue_tracked_time.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import (
1313
"code.gitea.io/gitea/models/unit"
1414
user_model "code.gitea.io/gitea/models/user"
1515
"code.gitea.io/gitea/modules/context"
16-
"code.gitea.io/gitea/modules/convert"
1716
api "code.gitea.io/gitea/modules/structs"
1817
"code.gitea.io/gitea/modules/web"
1918
"code.gitea.io/gitea/routers/api/v1/utils"
19+
"code.gitea.io/gitea/services/convert"
2020
)
2121

2222
// ListTrackedTimes list all the tracked times of an issue

Diff for: ‎routers/api/v1/repo/key.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ import (
1515
"code.gitea.io/gitea/models/perm"
1616
repo_model "code.gitea.io/gitea/models/repo"
1717
"code.gitea.io/gitea/modules/context"
18-
"code.gitea.io/gitea/modules/convert"
1918
"code.gitea.io/gitea/modules/setting"
2019
api "code.gitea.io/gitea/modules/structs"
2120
"code.gitea.io/gitea/modules/web"
2221
"code.gitea.io/gitea/routers/api/v1/utils"
2322
asymkey_service "code.gitea.io/gitea/services/asymkey"
23+
"code.gitea.io/gitea/services/convert"
2424
)
2525

2626
// appendPrivateInformation appends the owner and key type information to api.PublicKey

0 commit comments

Comments
 (0)