Skip to content

Commit 3249c0c

Browse files
lunnylunny
authored
Extract actions on deletereleasebyid from models to release service (#8219)
* extract actions on deletereleasebyid from models to release service * fix tests
1 parent ecd4bfd commit 3249c0c

File tree

6 files changed

+81
-70
lines changed

6 files changed

+81
-70
lines changed

‎models/attachment.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,3 +255,9 @@ func updateAttachment(e Engine, atta *Attachment) error {
255255
_, err := sess.Cols("name", "issue_id", "release_id", "comment_id", "download_count").Update(atta)
256256
return err
257257
}
258+
259+
// DeleteAttachmentsByRelease deletes all attachments associated with the given release.
260+
func DeleteAttachmentsByRelease(releaseID int64) error {
261+
_, err := x.Where("release_id = ?", releaseID).Delete(&Attachment{})
262+
return err
263+
}

‎models/release.go

Lines changed: 4 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,10 @@ package models
77

88
import (
99
"fmt"
10-
"os"
1110
"sort"
1211
"strings"
1312

1413
"code.gitea.io/gitea/modules/git"
15-
"code.gitea.io/gitea/modules/log"
16-
"code.gitea.io/gitea/modules/process"
1714
"code.gitea.io/gitea/modules/setting"
1815
api "code.gitea.io/gitea/modules/structs"
1916
"code.gitea.io/gitea/modules/timeutil"
@@ -319,70 +316,10 @@ func SortReleases(rels []*Release) {
319316
sort.Sort(sorter)
320317
}
321318

322-
// DeleteReleaseByID deletes a release and corresponding Git tag by given ID.
323-
func DeleteReleaseByID(id int64, doer *User, delTag bool) error {
324-
rel, err := GetReleaseByID(id)
325-
if err != nil {
326-
return fmt.Errorf("GetReleaseByID: %v", err)
327-
}
328-
329-
repo, err := GetRepositoryByID(rel.RepoID)
330-
if err != nil {
331-
return fmt.Errorf("GetRepositoryByID: %v", err)
332-
}
333-
334-
if delTag {
335-
_, stderr, err := process.GetManager().ExecDir(-1, repo.RepoPath(),
336-
fmt.Sprintf("DeleteReleaseByID (git tag -d): %d", rel.ID),
337-
git.GitExecutable, "tag", "-d", rel.TagName)
338-
if err != nil && !strings.Contains(stderr, "not found") {
339-
return fmt.Errorf("git tag -d: %v - %s", err, stderr)
340-
}
341-
342-
if _, err = x.ID(rel.ID).Delete(new(Release)); err != nil {
343-
return fmt.Errorf("Delete: %v", err)
344-
}
345-
} else {
346-
rel.IsTag = true
347-
rel.IsDraft = false
348-
rel.IsPrerelease = false
349-
rel.Title = ""
350-
rel.Note = ""
351-
352-
if _, err = x.ID(rel.ID).AllCols().Update(rel); err != nil {
353-
return fmt.Errorf("Update: %v", err)
354-
}
355-
}
356-
357-
rel.Repo = repo
358-
if err = rel.LoadAttributes(); err != nil {
359-
return fmt.Errorf("LoadAttributes: %v", err)
360-
}
361-
362-
if _, err := x.Delete(&Attachment{ReleaseID: id}); err != nil {
363-
return err
364-
}
365-
366-
for i := range rel.Attachments {
367-
attachment := rel.Attachments[i]
368-
if err := os.RemoveAll(attachment.LocalPath()); err != nil {
369-
return err
370-
}
371-
}
372-
373-
mode, _ := AccessLevel(doer, rel.Repo)
374-
if err := PrepareWebhooks(rel.Repo, HookEventRelease, &api.ReleasePayload{
375-
Action: api.HookReleaseDeleted,
376-
Release: rel.APIFormat(),
377-
Repository: rel.Repo.APIFormat(mode),
378-
Sender: doer.APIFormat(),
379-
}); err != nil {
380-
log.Error("PrepareWebhooks: %v", err)
381-
} else {
382-
go HookQueue.Add(rel.Repo.ID)
383-
}
384-
385-
return nil
319+
// DeleteReleaseByID deletes a release from database by given ID.
320+
func DeleteReleaseByID(id int64) error {
321+
_, err := x.ID(id).Delete(new(Release))
322+
return err
386323
}
387324

388325
// SyncReleasesWithTags synchronizes release table with repository tags

‎routers/api/v1/repo/release.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ func DeleteRelease(ctx *context.APIContext) {
316316
ctx.NotFound()
317317
return
318318
}
319-
if err := models.DeleteReleaseByID(id, ctx.User, false); err != nil {
319+
if err := releaseservice.DeleteReleaseByID(id, ctx.User, false); err != nil {
320320
ctx.Error(500, "DeleteReleaseByID", err)
321321
return
322322
}

‎routers/repo/release.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ func EditReleasePost(ctx *context.Context, form auth.EditReleaseForm) {
291291

292292
// DeleteRelease delete a release
293293
func DeleteRelease(ctx *context.Context) {
294-
if err := models.DeleteReleaseByID(ctx.QueryInt64("id"), ctx.User, true); err != nil {
294+
if err := releaseservice.DeleteReleaseByID(ctx.QueryInt64("id"), ctx.User, true); err != nil {
295295
ctx.Flash.Error("DeleteReleaseByID: " + err.Error())
296296
} else {
297297
ctx.Flash.Success(ctx.Tr("repo.release.deletion_success"))

‎services/release/release.go

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ package release
66

77
import (
88
"fmt"
9+
"os"
910
"strings"
1011

1112
"code.gitea.io/gitea/models"
1213
"code.gitea.io/gitea/modules/git"
1314
"code.gitea.io/gitea/modules/log"
15+
"code.gitea.io/gitea/modules/process"
1416
api "code.gitea.io/gitea/modules/structs"
1517
"code.gitea.io/gitea/modules/timeutil"
1618
)
@@ -132,3 +134,69 @@ func UpdateRelease(doer *models.User, gitRepo *git.Repository, rel *models.Relea
132134

133135
return err
134136
}
137+
138+
// DeleteReleaseByID deletes a release and corresponding Git tag by given ID.
139+
func DeleteReleaseByID(id int64, doer *models.User, delTag bool) error {
140+
rel, err := models.GetReleaseByID(id)
141+
if err != nil {
142+
return fmt.Errorf("GetReleaseByID: %v", err)
143+
}
144+
145+
repo, err := models.GetRepositoryByID(rel.RepoID)
146+
if err != nil {
147+
return fmt.Errorf("GetRepositoryByID: %v", err)
148+
}
149+
150+
if delTag {
151+
_, stderr, err := process.GetManager().ExecDir(-1, repo.RepoPath(),
152+
fmt.Sprintf("DeleteReleaseByID (git tag -d): %d", rel.ID),
153+
git.GitExecutable, "tag", "-d", rel.TagName)
154+
if err != nil && !strings.Contains(stderr, "not found") {
155+
return fmt.Errorf("git tag -d: %v - %s", err, stderr)
156+
}
157+
158+
if err := models.DeleteReleaseByID(id); err != nil {
159+
return fmt.Errorf("DeleteReleaseByID: %v", err)
160+
}
161+
} else {
162+
rel.IsTag = true
163+
rel.IsDraft = false
164+
rel.IsPrerelease = false
165+
rel.Title = ""
166+
rel.Note = ""
167+
168+
if err = models.UpdateRelease(rel); err != nil {
169+
return fmt.Errorf("Update: %v", err)
170+
}
171+
}
172+
173+
rel.Repo = repo
174+
if err = rel.LoadAttributes(); err != nil {
175+
return fmt.Errorf("LoadAttributes: %v", err)
176+
}
177+
178+
if err := models.DeleteAttachmentsByRelease(rel.ID); err != nil {
179+
return fmt.Errorf("DeleteAttachments: %v", err)
180+
}
181+
182+
for i := range rel.Attachments {
183+
attachment := rel.Attachments[i]
184+
if err := os.RemoveAll(attachment.LocalPath()); err != nil {
185+
log.Error("Delete attachment %s of release %s failed: %v", attachment.UUID, rel.ID, err)
186+
}
187+
}
188+
189+
mode, _ := models.AccessLevel(doer, rel.Repo)
190+
if err := models.PrepareWebhooks(rel.Repo, models.HookEventRelease, &api.ReleasePayload{
191+
Action: api.HookReleaseDeleted,
192+
Release: rel.APIFormat(),
193+
Repository: rel.Repo.APIFormat(mode),
194+
Sender: doer.APIFormat(),
195+
}); err != nil {
196+
log.Error("PrepareWebhooks: %v", err)
197+
} else {
198+
go models.HookQueue.Add(rel.Repo.ID)
199+
}
200+
201+
return nil
202+
}

‎services/release/release_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ func TestRelease_MirrorDelete(t *testing.T) {
150150

151151
release, err := models.GetRelease(repo.ID, "v0.2")
152152
assert.NoError(t, err)
153-
assert.NoError(t, models.DeleteReleaseByID(release.ID, user, true))
153+
assert.NoError(t, DeleteReleaseByID(release.ID, user, true))
154154

155155
ok = models.RunMirrorSync(mirror.Mirror)
156156
assert.True(t, ok)

0 commit comments

Comments
 (0)