Skip to content

Commit de226ad

Browse files
committed
Fix Bark webhook payload formatting and test adjustments
Refine string formatting in Bark webhook handler for repo events, handle cases with nil repository in package payloads, and update related test assertions for clarity.
1 parent c7f8358 commit de226ad

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

services/webhook/bark.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,10 +230,10 @@ func (bc barkConvertor) Repository(p *api.RepositoryPayload) (BarkPayload, error
230230
switch p.Action {
231231
case api.HookRepoCreated:
232232
title = fmt.Sprintf("[%s] Repository created", p.Repository.FullName)
233-
body = p.Sender.UserName + "created repository"
233+
body = p.Sender.UserName + " created repository"
234234
case api.HookRepoDeleted:
235235
title = fmt.Sprintf("[%s] Repository deleted", p.Repository.FullName)
236-
body = p.Sender.UserName + "deleted repository"
236+
body = p.Sender.UserName + " deleted repository"
237237
default:
238238
return BarkPayload{}, nil
239239
}
@@ -266,15 +266,20 @@ func (bc barkConvertor) Release(p *api.ReleasePayload) (BarkPayload, error) {
266266

267267
// Package implements PayloadConvertor Package method
268268
func (bc barkConvertor) Package(p *api.PackagePayload) (BarkPayload, error) {
269-
title := fmt.Sprintf("[%s] Package %s", p.Repository.FullName, p.Action)
269+
repoFullName := ""
270+
if p.Repository != nil {
271+
repoFullName = p.Repository.FullName
272+
}
273+
274+
title := fmt.Sprintf("[%s] Package %s", repoFullName, p.Action)
270275
body := fmt.Sprintf("%s %s package %s:%s",
271276
p.Sender.UserName, p.Action, p.Package.Name, p.Package.Version)
272277

273278
return BarkPayload{
274279
Title: title,
275280
Body: body,
276281
URL: p.Package.HTMLURL,
277-
Group: bc.getGroup(p.Repository.FullName),
282+
Group: bc.getGroup(repoFullName),
278283
Sound: bc.Sound,
279284
}, nil
280285
}

services/webhook/bark_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ func TestBarkPayload(t *testing.T) {
124124
t.Run("Review", func(t *testing.T) {
125125
p := pullRequestTestPayload()
126126
p.Action = api.HookIssueReviewed
127+
p.Review = nil // Remove review content for clean test
127128

128129
pl, err := bc.Review(p, webhook_module.HookEventPullRequestReviewApproved)
129130
require.NoError(t, err)
@@ -152,9 +153,9 @@ func TestBarkPayload(t *testing.T) {
152153
pl, err := bc.Package(p)
153154
require.NoError(t, err)
154155

155-
assert.Equal(t, "[test/repo] Package published", pl.Title)
156-
assert.Contains(t, pl.Body, "user1 published package")
157-
assert.Equal(t, "test/repo", pl.Group)
156+
assert.Equal(t, "[] Package created", pl.Title)
157+
assert.Contains(t, pl.Body, "user1 created package")
158+
assert.Empty(t, pl.Group)
158159
})
159160

160161
t.Run("Wiki", func(t *testing.T) {

0 commit comments

Comments
 (0)