diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-11-19 21:39:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-19 21:39:57 +0800 |
| commit | fc3d0826096943b979717ed46c9a4cfd86e06106 (patch) | |
| tree | 3143882ccf4dea3a8bf2a0de9c8da9a4efec26ce /services/attachment | |
| parent | 7a0347315995b25bcb2dca4786504fb699b5f004 (diff) | |
| download | gitea-fc3d0826096943b979717ed46c9a4cfd86e06106.tar.gz gitea-fc3d0826096943b979717ed46c9a4cfd86e06106.zip | |
Move attachment into models/repo/ (#17650)
* Move attachment into models/repo/
* Fix test
* Fix bug
Diffstat (limited to 'services/attachment')
| -rw-r--r-- | services/attachment/attachment.go | 8 | ||||
| -rw-r--r-- | services/attachment/attachment_test.go | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/services/attachment/attachment.go b/services/attachment/attachment.go index f747ccec3e..e3b65a239b 100644 --- a/services/attachment/attachment.go +++ b/services/attachment/attachment.go @@ -10,8 +10,8 @@ import ( "fmt" "io" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/models/db" + repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/modules/storage" "code.gitea.io/gitea/modules/upload" "code.gitea.io/gitea/modules/util" @@ -20,7 +20,7 @@ import ( ) // NewAttachment creates a new attachment object, but do not verify. -func NewAttachment(attach *models.Attachment, file io.Reader) (*models.Attachment, error) { +func NewAttachment(attach *repo_model.Attachment, file io.Reader) (*repo_model.Attachment, error) { if attach.RepoID == 0 { return nil, fmt.Errorf("attachment %s should belong to a repository", attach.Name) } @@ -40,7 +40,7 @@ func NewAttachment(attach *models.Attachment, file io.Reader) (*models.Attachmen } // UploadAttachment upload new attachment into storage and update database -func UploadAttachment(file io.Reader, actorID, repoID, releaseID int64, fileName string, allowedTypes string) (*models.Attachment, error) { +func UploadAttachment(file io.Reader, actorID, repoID, releaseID int64, fileName string, allowedTypes string) (*repo_model.Attachment, error) { buf := make([]byte, 1024) n, _ := util.ReadAtMost(file, buf) buf = buf[:n] @@ -49,7 +49,7 @@ func UploadAttachment(file io.Reader, actorID, repoID, releaseID int64, fileName return nil, err } - return NewAttachment(&models.Attachment{ + return NewAttachment(&repo_model.Attachment{ RepoID: repoID, UploaderID: actorID, ReleaseID: releaseID, diff --git a/services/attachment/attachment_test.go b/services/attachment/attachment_test.go index 5bb5db11ec..a992fbf151 100644 --- a/services/attachment/attachment_test.go +++ b/services/attachment/attachment_test.go @@ -10,6 +10,7 @@ import ( "testing" "code.gitea.io/gitea/models" + repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" "github.com/stretchr/testify/assert" @@ -29,14 +30,14 @@ func TestUploadAttachment(t *testing.T) { assert.NoError(t, err) defer f.Close() - attach, err := NewAttachment(&models.Attachment{ + attach, err := NewAttachment(&repo_model.Attachment{ RepoID: 1, UploaderID: user.ID, Name: filepath.Base(fPath), }, f) assert.NoError(t, err) - attachment, err := models.GetAttachmentByUUID(attach.UUID) + attachment, err := repo_model.GetAttachmentByUUID(attach.UUID) assert.NoError(t, err) assert.EqualValues(t, user.ID, attachment.UploaderID) assert.Equal(t, int64(0), attachment.DownloadCount) |