Skip to content

Hide events based on new tombstone rows #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
elffjs wants to merge 1 commit into from
Closed

Hide events based on new tombstone rows #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/99designs/gqlgen v0.17.89
github.com/ClickHouse/clickhouse-go/v2 v2.45.0
github.com/DIMO-Network/clickhouse-infra v0.0.8
github.com/DIMO-Network/cloudevent v0.2.8
github.com/DIMO-Network/cloudevent v0.2.9
github.com/DIMO-Network/model-garage v1.0.11
github.com/DIMO-Network/server-garage v0.1.1
github.com/DIMO-Network/shared v1.1.7
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7Oputl
github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
github.com/DIMO-Network/clickhouse-infra v0.0.8 h1:54HPXKvNjmn9T0d9ZLYgUm4DnwTavE+Z8admrf39mJI=
github.com/DIMO-Network/clickhouse-infra v0.0.8/go.mod h1:XS80lhSJNWBWGgZ+m4j7++zFj1wAXfmtV2gJfhGlabQ=
github.com/DIMO-Network/cloudevent v0.2.8 h1:Q0xGQVPlOshF2LSX/m15Qzi2n4BI0EQDgOM71gEbNsY=
github.com/DIMO-Network/cloudevent v0.2.8/go.mod h1:I/9NcpMozV5Fw194WimhbkAsJtKVZf5UKYJ9hgc8Cdg=
github.com/DIMO-Network/cloudevent v0.2.9 h1:8MxbZtNReMHbwPUGQc2+G5THf08dFxju+npKZFZygJc=
github.com/DIMO-Network/cloudevent v0.2.9/go.mod h1:I/9NcpMozV5Fw194WimhbkAsJtKVZf5UKYJ9hgc8Cdg=
github.com/DIMO-Network/model-garage v1.0.11 h1:aLvIyeo58p9pVgz+d3DnU5k5Fxvxh6mq/jE2s3LxXoc=
github.com/DIMO-Network/model-garage v1.0.11/go.mod h1:oi7EGKQVxFVpXRsu2H+YbizbKcx06aQg2N1Yu4GqOp8=
github.com/DIMO-Network/server-garage v0.1.1 h1:EYmyy+Fgi2BNW0Bufn04BViDtb8BCWaN7C7BbEuoI5s=
Expand Down
10 changes: 6 additions & 4 deletions internal/fetch/rpc/rpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ func (s *Server) GetLatestIndex(ctx context.Context, req *grpc.GetLatestIndexReq
var err error

if req.GetAdvancedOptions() != nil {
index, err = s.eventService.GetLatestIndexAdvanced(ctx, req.GetAdvancedOptions())
// gRPC callers see no tombstone suppression by default; the GraphQL
// includeDeleted flag is the public surface for opting in.
index, err = s.eventService.GetLatestIndexAdvanced(ctx, req.GetAdvancedOptions(), true)
} else {
index, err = s.eventService.GetLatestIndex(ctx, req.GetOptions())
}
Expand All @@ -63,7 +65,7 @@ func (s *Server) ListIndexes(ctx context.Context, req *grpc.ListIndexesRequest)
var err error

if req.GetAdvancedOptions() != nil {
indexObjs, err = s.eventService.ListIndexesAdvanced(ctx, int(req.GetLimit()), req.GetAdvancedOptions())
indexObjs, err = s.eventService.ListIndexesAdvanced(ctx, int(req.GetLimit()), req.GetAdvancedOptions(), true)
} else {
indexObjs, err = s.eventService.ListIndexes(ctx, int(req.GetLimit()), req.GetOptions())
}
Expand Down Expand Up @@ -92,7 +94,7 @@ func (s *Server) ListCloudEvents(ctx context.Context, req *grpc.ListCloudEventsR
var err error

if req.GetAdvancedOptions() != nil {
metaList, err = s.eventService.ListIndexesAdvanced(ctx, int(req.GetLimit()), req.GetAdvancedOptions())
metaList, err = s.eventService.ListIndexesAdvanced(ctx, int(req.GetLimit()), req.GetAdvancedOptions(), true)
} else {
metaList, err = s.eventService.ListIndexes(ctx, int(req.GetLimit()), req.GetOptions())
}
Expand Down Expand Up @@ -121,7 +123,7 @@ func (s *Server) GetLatestCloudEvent(ctx context.Context, req *grpc.GetLatestClo
var err error

if req.GetAdvancedOptions() != nil {
metadata, err = s.eventService.GetLatestIndexAdvanced(ctx, req.GetAdvancedOptions())
metadata, err = s.eventService.GetLatestIndexAdvanced(ctx, req.GetAdvancedOptions(), true)
} else {
metadata, err = s.eventService.GetLatestIndex(ctx, req.GetOptions())
}
Expand Down
12 changes: 6 additions & 6 deletions internal/graph/cloud_events.resolvers.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions internal/graph/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,11 @@ func resolveLimit(limit *int) int {
}
return defaultLimit
}

// resolveIncludeDeleted maps the GraphQL `includeDeleted` argument (which has
// a default of false in the schema, but may arrive as nil when the caller did
// not supply a value at all) to the eventrepo flag. False means tombstoned
// attestations are suppressed; true means they are returned.
func resolveIncludeDeleted(p *bool) bool {
return p != nil && *p
}
53 changes: 37 additions & 16 deletions internal/graph/generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading