Skip to content

Commit bfaa0f9

Browse files
committed
fix: make list webhooks params optional
1 parent 4f5a6c7 commit bfaa0f9

File tree

5 files changed

+36
-29
lines changed

5 files changed

+36
-29
lines changed

server/graph/generated/generated.go

Lines changed: 17 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/graph/schema.graphqls

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ type TestEndpointResponse {
355355
}
356356

357357
input ListWebhookLogRequest {
358-
pagination: PaginationInput!
358+
pagination: PaginationInput
359359
webhook_id: String
360360
}
361361

@@ -429,5 +429,5 @@ type Query {
429429
_env: Env!
430430
_webhook(params: WebhookRequest!): Webhook!
431431
_webhooks(params: PaginatedInput): Webhooks!
432-
_webhook_logs(params: ListWebhookLogRequest!): WebhookLogs!
432+
_webhook_logs(params: ListWebhookLogRequest): WebhookLogs!
433433
}

server/graph/schema.resolvers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ func (r *queryResolver) Webhooks(ctx context.Context, params *model.PaginatedInp
147147
return resolvers.WebhooksResolver(ctx, params)
148148
}
149149

150-
func (r *queryResolver) WebhookLogs(ctx context.Context, params model.ListWebhookLogRequest) (*model.WebhookLogs, error) {
150+
func (r *queryResolver) WebhookLogs(ctx context.Context, params *model.ListWebhookLogRequest) (*model.WebhookLogs, error) {
151151
return resolvers.WebhookLogsResolver(ctx, params)
152152
}
153153

server/resolvers/webhook_logs.go

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
)
1313

1414
// WebhookLogsResolver resolver for getting the list of webhook_logs based on pagination & webhook identifier
15-
func WebhookLogsResolver(ctx context.Context, params model.ListWebhookLogRequest) (*model.WebhookLogs, error) {
15+
func WebhookLogsResolver(ctx context.Context, params *model.ListWebhookLogRequest) (*model.WebhookLogs, error) {
1616
gc, err := utils.GinContextFromContext(ctx)
1717
if err != nil {
1818
log.Debug("Failed to get GinContext: ", err)
@@ -24,11 +24,20 @@ func WebhookLogsResolver(ctx context.Context, params model.ListWebhookLogRequest
2424
return nil, fmt.Errorf("unauthorized")
2525
}
2626

27-
pagination := utils.GetPagination(&model.PaginatedInput{
28-
Pagination: params.Pagination,
29-
})
27+
var pagination model.Pagination
28+
var webhookID string
3029

31-
webhookLogs, err := db.Provider.ListWebhookLogs(ctx, pagination, utils.StringValue(params.WebhookID))
30+
if params != nil {
31+
pagination = utils.GetPagination(&model.PaginatedInput{
32+
Pagination: params.Pagination,
33+
})
34+
webhookID = utils.StringValue(params.WebhookID)
35+
} else {
36+
pagination = utils.GetPagination(nil)
37+
webhookID = ""
38+
}
39+
40+
webhookLogs, err := db.Provider.ListWebhookLogs(ctx, pagination, webhookID)
3241
if err != nil {
3342
log.Debug("failed to get webhook logs: ", err)
3443
return nil, err

server/test/webhook_logs_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ func webhookLogsTest(t *testing.T, s TestSetup) {
2727
assert.NoError(t, err)
2828
assert.NotEmpty(t, webhooks)
2929

30-
webhookLogs, err := resolvers.WebhookLogsResolver(ctx, model.ListWebhookLogRequest{})
30+
webhookLogs, err := resolvers.WebhookLogsResolver(ctx, nil)
3131
assert.NoError(t, err)
3232
assert.Greater(t, len(webhookLogs.WebhookLogs), 1)
3333

3434
for _, w := range webhooks.Webhooks {
35-
webhookLogs, err := resolvers.WebhookLogsResolver(ctx, model.ListWebhookLogRequest{
35+
webhookLogs, err := resolvers.WebhookLogsResolver(ctx, &model.ListWebhookLogRequest{
3636
WebhookID: &w.ID,
3737
})
3838
assert.NoError(t, err)

0 commit comments

Comments
 (0)