From 93736d8a9f6400702e79af5dc2fe9b4a60d38e73 Mon Sep 17 00:00:00 2001 From: Nabapadma-sarker Date: Sat, 23 Sep 2023 01:59:08 -0400 Subject: [PATCH 1/6] new url variable added to Repository struct --- models/repo/repo.go | 5 +++++ modules/structs/repo.go | 1 + routers/web/repo/repo.go | 1 + services/convert/repository.go | 1 + 4 files changed, 8 insertions(+) diff --git a/models/repo/repo.go b/models/repo/repo.go index 0b0c029993a9..2c54d2c10dea 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -310,6 +310,11 @@ func (repo *Repository) HTMLURL() string { return setting.AppURL + url.PathEscape(repo.OwnerName) + "/" + url.PathEscape(repo.Name) } +// URL returns the repository URL +func (repo *Repository) URL() string { + return setting.AppURL + url.PathEscape(repo.OwnerName) + "/" + url.PathEscape(repo.Name) +} + // CommitLink make link to by commit full ID // note: won't check whether it's an right id func (repo *Repository) CommitLink(commitID string) (result string) { diff --git a/modules/structs/repo.go b/modules/structs/repo.go index 6a2ba4836bb9..3974c4db3ab1 100644 --- a/modules/structs/repo.go +++ b/modules/structs/repo.go @@ -63,6 +63,7 @@ type Repository struct { Language string `json:"language"` LanguagesURL string `json:"languages_url"` HTMLURL string `json:"html_url"` + URL string `json:"url"` Link string `json:"link"` SSHURL string `json:"ssh_url"` CloneURL string `json:"clone_url"` diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go index b31ebb1971b9..26c58472ad7e 100644 --- a/routers/web/repo/repo.go +++ b/routers/web/repo/repo.go @@ -626,6 +626,7 @@ func SearchRepo(ctx *context.Context) { Mirror: repo.IsMirror, Stars: repo.NumStars, HTMLURL: repo.HTMLURL(), + URL: repo.URL(), Link: repo.Link(), Internal: !repo.IsPrivate && repo.Owner.Visibility == api.VisibleTypePrivate, }, diff --git a/services/convert/repository.go b/services/convert/repository.go index 6f77b4932e4f..128ed54681c9 100644 --- a/services/convert/repository.go +++ b/services/convert/repository.go @@ -181,6 +181,7 @@ func innerToRepo(ctx context.Context, repo *repo_model.Repository, permissionInR Parent: parent, Mirror: repo.IsMirror, HTMLURL: repo.HTMLURL(), + URL: repo.URL(), SSHURL: cloneLink.SSH, CloneURL: cloneLink.HTTPS, OriginalURL: repo.SanitizedOriginalURL(), From c91b5f8e1b92312409558638248024b76cea27ff Mon Sep 17 00:00:00 2001 From: Nabapadma-sarker Date: Sat, 23 Sep 2023 08:31:20 -0400 Subject: [PATCH 2/6] repeted function removed. --- models/repo/repo.go | 5 ----- routers/web/repo/repo.go | 2 +- services/convert/repository.go | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/models/repo/repo.go b/models/repo/repo.go index 2c54d2c10dea..0b0c029993a9 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -310,11 +310,6 @@ func (repo *Repository) HTMLURL() string { return setting.AppURL + url.PathEscape(repo.OwnerName) + "/" + url.PathEscape(repo.Name) } -// URL returns the repository URL -func (repo *Repository) URL() string { - return setting.AppURL + url.PathEscape(repo.OwnerName) + "/" + url.PathEscape(repo.Name) -} - // CommitLink make link to by commit full ID // note: won't check whether it's an right id func (repo *Repository) CommitLink(commitID string) (result string) { diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go index 26c58472ad7e..a598edcda340 100644 --- a/routers/web/repo/repo.go +++ b/routers/web/repo/repo.go @@ -626,7 +626,7 @@ func SearchRepo(ctx *context.Context) { Mirror: repo.IsMirror, Stars: repo.NumStars, HTMLURL: repo.HTMLURL(), - URL: repo.URL(), + URL: repo.HTMLURL(), Link: repo.Link(), Internal: !repo.IsPrivate && repo.Owner.Visibility == api.VisibleTypePrivate, }, diff --git a/services/convert/repository.go b/services/convert/repository.go index 128ed54681c9..4fbdff9d7231 100644 --- a/services/convert/repository.go +++ b/services/convert/repository.go @@ -181,7 +181,7 @@ func innerToRepo(ctx context.Context, repo *repo_model.Repository, permissionInR Parent: parent, Mirror: repo.IsMirror, HTMLURL: repo.HTMLURL(), - URL: repo.URL(), + URL: repo.HTMLURL(), SSHURL: cloneLink.SSH, CloneURL: cloneLink.HTTPS, OriginalURL: repo.SanitizedOriginalURL(), From 70004f313eb686d6015ae345251daedb6997f9f5 Mon Sep 17 00:00:00 2001 From: Nabapadma-sarker Date: Sat, 23 Sep 2023 12:24:56 -0400 Subject: [PATCH 3/6] swagger updated. --- templates/swagger/v1_json.tmpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index 4b43200bc607..7c4ba1e08fec 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -22112,6 +22112,10 @@ "format": "date-time", "x-go-name": "Updated" }, + "url": { + "type": "string", + "x-go-name": "URL" + }, "watchers_count": { "type": "integer", "format": "int64", From 02af30de742ada31d1065e1704729ce18657fea6 Mon Sep 17 00:00:00 2001 From: Nabapadma-sarker Date: Sun, 24 Sep 2023 09:28:30 -0400 Subject: [PATCH 4/6] url means APIURL --- routers/web/repo/repo.go | 2 +- services/convert/repository.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go index a598edcda340..b1c850ddace4 100644 --- a/routers/web/repo/repo.go +++ b/routers/web/repo/repo.go @@ -626,7 +626,7 @@ func SearchRepo(ctx *context.Context) { Mirror: repo.IsMirror, Stars: repo.NumStars, HTMLURL: repo.HTMLURL(), - URL: repo.HTMLURL(), + URL: repo.APIURL(), Link: repo.Link(), Internal: !repo.IsPrivate && repo.Owner.Visibility == api.VisibleTypePrivate, }, diff --git a/services/convert/repository.go b/services/convert/repository.go index 4fbdff9d7231..af9a622f764d 100644 --- a/services/convert/repository.go +++ b/services/convert/repository.go @@ -181,7 +181,7 @@ func innerToRepo(ctx context.Context, repo *repo_model.Repository, permissionInR Parent: parent, Mirror: repo.IsMirror, HTMLURL: repo.HTMLURL(), - URL: repo.HTMLURL(), + URL: repo.APIURL(), SSHURL: cloneLink.SSH, CloneURL: cloneLink.HTTPS, OriginalURL: repo.SanitizedOriginalURL(), From e5e41bf9f62d2e6cb8a31135790412da8d008b7e Mon Sep 17 00:00:00 2001 From: Nabapadma-sarker Date: Sun, 24 Sep 2023 09:33:00 -0400 Subject: [PATCH 5/6] repoAPIURL reused. --- services/convert/repository.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/convert/repository.go b/services/convert/repository.go index af9a622f764d..71038cd0629c 100644 --- a/services/convert/repository.go +++ b/services/convert/repository.go @@ -181,7 +181,7 @@ func innerToRepo(ctx context.Context, repo *repo_model.Repository, permissionInR Parent: parent, Mirror: repo.IsMirror, HTMLURL: repo.HTMLURL(), - URL: repo.APIURL(), + URL: repoAPIURL, SSHURL: cloneLink.SSH, CloneURL: cloneLink.HTTPS, OriginalURL: repo.SanitizedOriginalURL(), From 60c9f6a39e400e791d84434c0895b70675be6666 Mon Sep 17 00:00:00 2001 From: Nabapadma-sarker Date: Sun, 24 Sep 2023 10:00:59 -0400 Subject: [PATCH 6/6] repo/repo.go file no need to change. --- routers/web/repo/repo.go | 1 - 1 file changed, 1 deletion(-) diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go index b1c850ddace4..b31ebb1971b9 100644 --- a/routers/web/repo/repo.go +++ b/routers/web/repo/repo.go @@ -626,7 +626,6 @@ func SearchRepo(ctx *context.Context) { Mirror: repo.IsMirror, Stars: repo.NumStars, HTMLURL: repo.HTMLURL(), - URL: repo.APIURL(), Link: repo.Link(), Internal: !repo.IsPrivate && repo.Owner.Visibility == api.VisibleTypePrivate, },