From d453533beb197d25b25530dc5f0e3c3c0742d8d1 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sat, 17 Oct 2020 06:23:08 +0200 Subject: [Refactor] Move APIFormat functions into convert package (#12856) * USER APIFormat -> ToUser * Migrate more and mark APIFormat deprecated * models.Comment APIFormat() -> convert.ToComment * models.Release APIFormat() -> convert.ToRelease * models.Attachments APIFormat() -> convert.ToReleaseAttachments * models.CommitStatus APIFormat() -> convert.ToCommitStatus * finish migration to convert.ToUser * Move Test * Imprufe Test * fix test Co-authored-by: techknowlogick --- models/repo.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'models/repo.go') diff --git a/models/repo.go b/models/repo.go index efdd7049de..5198026329 100644 --- a/models/repo.go +++ b/models/repo.go @@ -410,8 +410,17 @@ func (repo *Repository) innerAPIFormat(e Engine, mode AccessMode, isParent bool) numReleases, _ := GetReleaseCountByRepoID(repo.ID, FindReleasesOptions{IncludeDrafts: false, IncludeTags: true}) return &api.Repository{ - ID: repo.ID, - Owner: repo.Owner.APIFormat(), + ID: repo.ID, + // TODO use convert.ToUser(repo.Owner) + Owner: &api.User{ + ID: repo.Owner.ID, + UserName: repo.Owner.Name, + FullName: repo.Owner.FullName, + Email: repo.Owner.GetEmail(), + AvatarURL: repo.Owner.AvatarLink(), + LastLogin: repo.Owner.LastLoginUnix.AsTime(), + Created: repo.Owner.CreatedUnix.AsTime(), + }, Name: repo.Name, FullName: repo.FullName(), Description: repo.Description, -- cgit v1.2.3