From 4353cf96c003cf55adfaf28b494a9d78c5226202 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 3 Dec 2020 15:05:48 +0100
Subject: [PATCH] Move LFSLock APIFormat into convert package (#13808)

---
 models/lfs_lock.go         | 14 --------------
 modules/convert/convert.go | 14 ++++++++++++++
 modules/lfs/locks.go       | 15 ++++++++-------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/models/lfs_lock.go b/models/lfs_lock.go
index 3e56a7960b..913c54a49c 100644
--- a/models/lfs_lock.go
+++ b/models/lfs_lock.go
@@ -7,12 +7,10 @@ package models
 import (
 	"fmt"
 	"path"
-	"strconv"
 	"strings"
 	"time"
 
 	"code.gitea.io/gitea/modules/log"
-	api "code.gitea.io/gitea/modules/structs"
 
 	"xorm.io/xorm"
 )
@@ -52,18 +50,6 @@ func cleanPath(p string) string {
 	return path.Clean("/" + p)[1:]
 }
 
-// APIFormat convert a Release to lfs.LFSLock
-func (l *LFSLock) APIFormat() *api.LFSLock {
-	return &api.LFSLock{
-		ID:       strconv.FormatInt(l.ID, 10),
-		Path:     l.Path,
-		LockedAt: l.Created.Round(time.Second),
-		Owner: &api.LFSLockOwner{
-			Name: l.Owner.DisplayName(),
-		},
-	}
-}
-
 // CreateLFSLock creates a new lock.
 func CreateLFSLock(lock *LFSLock) (*LFSLock, error) {
 	err := CheckLFSAccessForRepo(lock.Owner, lock.Repo, AccessModeWrite)
diff --git a/modules/convert/convert.go b/modules/convert/convert.go
index 9b20c683be..4d4d9396fe 100644
--- a/modules/convert/convert.go
+++ b/modules/convert/convert.go
@@ -7,6 +7,8 @@ package convert
 
 import (
 	"fmt"
+	"strconv"
+	"time"
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/git"
@@ -365,3 +367,15 @@ func ToCommitStatus(status *models.CommitStatus) *api.Status {
 
 	return apiStatus
 }
+
+// ToLFSLock convert a LFSLock to api.LFSLock
+func ToLFSLock(l *models.LFSLock) *api.LFSLock {
+	return &api.LFSLock{
+		ID:       strconv.FormatInt(l.ID, 10),
+		Path:     l.Path,
+		LockedAt: l.Created.Round(time.Second),
+		Owner: &api.LFSLockOwner{
+			Name: l.Owner.DisplayName(),
+		},
+	}
+}
diff --git a/modules/lfs/locks.go b/modules/lfs/locks.go
index ec9da40ec7..a529afe1b9 100644
--- a/modules/lfs/locks.go
+++ b/modules/lfs/locks.go
@@ -11,6 +11,7 @@ import (
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
@@ -60,7 +61,7 @@ func handleLockListOut(ctx *context.Context, repo *models.Repository, lock *mode
 		return
 	}
 	ctx.JSON(200, api.LFSLockList{
-		Locks: []*api.LFSLock{lock.APIFormat()},
+		Locks: []*api.LFSLock{convert.ToLFSLock(lock)},
 	})
 }
 
@@ -140,7 +141,7 @@ func GetListLockHandler(ctx *context.Context) {
 	lockListAPI := make([]*api.LFSLock, len(lockList))
 	next := ""
 	for i, l := range lockList {
-		lockListAPI[i] = l.APIFormat()
+		lockListAPI[i] = convert.ToLFSLock(l)
 	}
 	if limit > 0 && len(lockList) == limit {
 		next = strconv.Itoa(cursor + 1)
@@ -198,7 +199,7 @@ func PostLockHandler(ctx *context.Context) {
 	if err != nil {
 		if models.IsErrLFSLockAlreadyExist(err) {
 			ctx.JSON(409, api.LFSLockError{
-				Lock:    lock.APIFormat(),
+				Lock:    convert.ToLFSLock(lock),
 				Message: "already created lock",
 			})
 			return
@@ -216,7 +217,7 @@ func PostLockHandler(ctx *context.Context) {
 		})
 		return
 	}
-	ctx.JSON(201, api.LFSLockResponse{Lock: lock.APIFormat()})
+	ctx.JSON(201, api.LFSLockResponse{Lock: convert.ToLFSLock(lock)})
 }
 
 // VerifyLockHandler list locks for verification
@@ -274,9 +275,9 @@ func VerifyLockHandler(ctx *context.Context) {
 	lockTheirsListAPI := make([]*api.LFSLock, 0, len(lockList))
 	for _, l := range lockList {
 		if l.Owner.ID == ctx.User.ID {
-			lockOursListAPI = append(lockOursListAPI, l.APIFormat())
+			lockOursListAPI = append(lockOursListAPI, convert.ToLFSLock(l))
 		} else {
-			lockTheirsListAPI = append(lockTheirsListAPI, l.APIFormat())
+			lockTheirsListAPI = append(lockTheirsListAPI, convert.ToLFSLock(l))
 		}
 	}
 	ctx.JSON(200, api.LFSLockListVerify{
@@ -340,5 +341,5 @@ func UnLockHandler(ctx *context.Context) {
 		})
 		return
 	}
-	ctx.JSON(200, api.LFSLockResponse{Lock: lock.APIFormat()})
+	ctx.JSON(200, api.LFSLockResponse{Lock: convert.ToLFSLock(lock)})
 }