diff --git a/server/graph/generated/generated.go b/server/graph/generated/generated.go index ebb680f..736f0f1 100644 --- a/server/graph/generated/generated.go +++ b/server/graph/generated/generated.go @@ -173,7 +173,7 @@ type ComplexityRoot struct { ValidateJwtToken func(childComplexity int, params model.ValidateJWTTokenInput) int VerificationRequests func(childComplexity int, params *model.PaginatedInput) int Webhook func(childComplexity int, params model.WebhookRequest) int - WebhookLogs func(childComplexity int, params model.ListWebhookLogRequest) int + WebhookLogs func(childComplexity int, params *model.ListWebhookLogRequest) int Webhooks func(childComplexity int, params *model.PaginatedInput) int } @@ -301,7 +301,7 @@ type QueryResolver interface { Env(ctx context.Context) (*model.Env, error) Webhook(ctx context.Context, params model.WebhookRequest) (*model.Webhook, error) Webhooks(ctx context.Context, params *model.PaginatedInput) (*model.Webhooks, error) - WebhookLogs(ctx context.Context, params model.ListWebhookLogRequest) (*model.WebhookLogs, error) + WebhookLogs(ctx context.Context, params *model.ListWebhookLogRequest) (*model.WebhookLogs, error) } type executableSchema struct { @@ -1220,7 +1220,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return 0, false } - return e.complexity.Query.WebhookLogs(childComplexity, args["params"].(model.ListWebhookLogRequest)), true + return e.complexity.Query.WebhookLogs(childComplexity, args["params"].(*model.ListWebhookLogRequest)), true case "Query._webhooks": if e.complexity.Query.Webhooks == nil { @@ -2026,7 +2026,7 @@ type TestEndpointResponse { } input ListWebhookLogRequest { - pagination: PaginationInput! + pagination: PaginationInput webhook_id: String } @@ -2100,7 +2100,7 @@ type Query { _env: Env! _webhook(params: WebhookRequest!): Webhook! _webhooks(params: PaginatedInput): Webhooks! - _webhook_logs(params: ListWebhookLogRequest!): WebhookLogs! + _webhook_logs(params: ListWebhookLogRequest): WebhookLogs! } `, BuiltIn: false}, } @@ -2503,10 +2503,10 @@ func (ec *executionContext) field_Query__webhook_args(ctx context.Context, rawAr func (ec *executionContext) field_Query__webhook_logs_args(ctx context.Context, rawArgs map[string]interface{}) (map[string]interface{}, error) { var err error args := map[string]interface{}{} - var arg0 model.ListWebhookLogRequest + var arg0 *model.ListWebhookLogRequest if tmp, ok := rawArgs["params"]; ok { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("params")) - arg0, err = ec.unmarshalNListWebhookLogRequest2githubᚗcomᚋauthorizerdevᚋauthorizerᚋserverᚋgraphᚋmodelᚐListWebhookLogRequest(ctx, tmp) + arg0, err = ec.unmarshalOListWebhookLogRequest2ᚖgithubᚗcomᚋauthorizerdevᚋauthorizerᚋserverᚋgraphᚋmodelᚐListWebhookLogRequest(ctx, tmp) if err != nil { return nil, err } @@ -6493,7 +6493,7 @@ func (ec *executionContext) _Query__webhook_logs(ctx context.Context, field grap fc.Args = args resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return ec.resolvers.Query().WebhookLogs(rctx, args["params"].(model.ListWebhookLogRequest)) + return ec.resolvers.Query().WebhookLogs(rctx, args["params"].(*model.ListWebhookLogRequest)) }) if err != nil { ec.Error(ctx, err) @@ -9675,7 +9675,7 @@ func (ec *executionContext) unmarshalInputListWebhookLogRequest(ctx context.Cont var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("pagination")) - it.Pagination, err = ec.unmarshalNPaginationInput2ᚖgithubᚗcomᚋauthorizerdevᚋauthorizerᚋserverᚋgraphᚋmodelᚐPaginationInput(ctx, v) + it.Pagination, err = ec.unmarshalOPaginationInput2ᚖgithubᚗcomᚋauthorizerdevᚋauthorizerᚋserverᚋgraphᚋmodelᚐPaginationInput(ctx, v) if err != nil { return it, err } @@ -12329,11 +12329,6 @@ func (ec *executionContext) unmarshalNInviteMemberInput2githubᚗcomᚋauthorize return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) unmarshalNListWebhookLogRequest2githubᚗcomᚋauthorizerdevᚋauthorizerᚋserverᚋgraphᚋmodelᚐListWebhookLogRequest(ctx context.Context, v interface{}) (model.ListWebhookLogRequest, error) { - res, err := ec.unmarshalInputListWebhookLogRequest(ctx, v) - return res, graphql.ErrorOnPath(ctx, err) -} - func (ec *executionContext) unmarshalNLoginInput2githubᚗcomᚋauthorizerdevᚋauthorizerᚋserverᚋgraphᚋmodelᚐLoginInput(ctx context.Context, v interface{}) (model.LoginInput, error) { res, err := ec.unmarshalInputLoginInput(ctx, v) return res, graphql.ErrorOnPath(ctx, err) @@ -12373,11 +12368,6 @@ func (ec *executionContext) marshalNPagination2ᚖgithubᚗcomᚋauthorizerdev return ec._Pagination(ctx, sel, v) } -func (ec *executionContext) unmarshalNPaginationInput2ᚖgithubᚗcomᚋauthorizerdevᚋauthorizerᚋserverᚋgraphᚋmodelᚐPaginationInput(ctx context.Context, v interface{}) (*model.PaginationInput, error) { - res, err := ec.unmarshalInputPaginationInput(ctx, v) - return &res, graphql.ErrorOnPath(ctx, err) -} - func (ec *executionContext) unmarshalNResendVerifyEmailInput2githubᚗcomᚋauthorizerdevᚋauthorizerᚋserverᚋgraphᚋmodelᚐResendVerifyEmailInput(ctx context.Context, v interface{}) (model.ResendVerifyEmailInput, error) { res, err := ec.unmarshalInputResendVerifyEmailInput(ctx, v) return res, graphql.ErrorOnPath(ctx, err) @@ -13122,6 +13112,14 @@ func (ec *executionContext) marshalOInt642ᚖint64(ctx context.Context, sel ast. return graphql.MarshalInt64(*v) } +func (ec *executionContext) unmarshalOListWebhookLogRequest2ᚖgithubᚗcomᚋauthorizerdevᚋauthorizerᚋserverᚋgraphᚋmodelᚐListWebhookLogRequest(ctx context.Context, v interface{}) (*model.ListWebhookLogRequest, error) { + if v == nil { + return nil, nil + } + res, err := ec.unmarshalInputListWebhookLogRequest(ctx, v) + return &res, graphql.ErrorOnPath(ctx, err) +} + func (ec *executionContext) unmarshalOMap2map(ctx context.Context, v interface{}) (map[string]interface{}, error) { if v == nil { return nil, nil diff --git a/server/graph/schema.graphqls b/server/graph/schema.graphqls index 1a6395f..3930f51 100644 --- a/server/graph/schema.graphqls +++ b/server/graph/schema.graphqls @@ -355,7 +355,7 @@ type TestEndpointResponse { } input ListWebhookLogRequest { - pagination: PaginationInput! + pagination: PaginationInput webhook_id: String } @@ -429,5 +429,5 @@ type Query { _env: Env! _webhook(params: WebhookRequest!): Webhook! _webhooks(params: PaginatedInput): Webhooks! - _webhook_logs(params: ListWebhookLogRequest!): WebhookLogs! + _webhook_logs(params: ListWebhookLogRequest): WebhookLogs! } diff --git a/server/graph/schema.resolvers.go b/server/graph/schema.resolvers.go index 1776835..59398f9 100644 --- a/server/graph/schema.resolvers.go +++ b/server/graph/schema.resolvers.go @@ -147,7 +147,7 @@ func (r *queryResolver) Webhooks(ctx context.Context, params *model.PaginatedInp return resolvers.WebhooksResolver(ctx, params) } -func (r *queryResolver) WebhookLogs(ctx context.Context, params model.ListWebhookLogRequest) (*model.WebhookLogs, error) { +func (r *queryResolver) WebhookLogs(ctx context.Context, params *model.ListWebhookLogRequest) (*model.WebhookLogs, error) { return resolvers.WebhookLogsResolver(ctx, params) } diff --git a/server/resolvers/webhook_logs.go b/server/resolvers/webhook_logs.go index beb2145..0b24e48 100644 --- a/server/resolvers/webhook_logs.go +++ b/server/resolvers/webhook_logs.go @@ -12,7 +12,7 @@ import ( ) // WebhookLogsResolver resolver for getting the list of webhook_logs based on pagination & webhook identifier -func WebhookLogsResolver(ctx context.Context, params model.ListWebhookLogRequest) (*model.WebhookLogs, error) { +func WebhookLogsResolver(ctx context.Context, params *model.ListWebhookLogRequest) (*model.WebhookLogs, error) { gc, err := utils.GinContextFromContext(ctx) if err != nil { log.Debug("Failed to get GinContext: ", err) @@ -24,11 +24,20 @@ func WebhookLogsResolver(ctx context.Context, params model.ListWebhookLogRequest return nil, fmt.Errorf("unauthorized") } - pagination := utils.GetPagination(&model.PaginatedInput{ - Pagination: params.Pagination, - }) + var pagination model.Pagination + var webhookID string - webhookLogs, err := db.Provider.ListWebhookLogs(ctx, pagination, utils.StringValue(params.WebhookID)) + if params != nil { + pagination = utils.GetPagination(&model.PaginatedInput{ + Pagination: params.Pagination, + }) + webhookID = utils.StringValue(params.WebhookID) + } else { + pagination = utils.GetPagination(nil) + webhookID = "" + } + + webhookLogs, err := db.Provider.ListWebhookLogs(ctx, pagination, webhookID) if err != nil { log.Debug("failed to get webhook logs: ", err) return nil, err diff --git a/server/test/webhook_logs_test.go b/server/test/webhook_logs_test.go index 543c0c5..4be6889 100644 --- a/server/test/webhook_logs_test.go +++ b/server/test/webhook_logs_test.go @@ -27,12 +27,12 @@ func webhookLogsTest(t *testing.T, s TestSetup) { assert.NoError(t, err) assert.NotEmpty(t, webhooks) - webhookLogs, err := resolvers.WebhookLogsResolver(ctx, model.ListWebhookLogRequest{}) + webhookLogs, err := resolvers.WebhookLogsResolver(ctx, nil) assert.NoError(t, err) assert.Greater(t, len(webhookLogs.WebhookLogs), 1) for _, w := range webhooks.Webhooks { - webhookLogs, err := resolvers.WebhookLogsResolver(ctx, model.ListWebhookLogRequest{ + webhookLogs, err := resolvers.WebhookLogsResolver(ctx, &model.ListWebhookLogRequest{ WebhookID: &w.ID, }) assert.NoError(t, err)