feat: add tenant column to eventstore (#3314)

* feat: add tenant column to eventstore

* feat: read tenant from context on push and filter

* Update 07_events_table.sql

* pass tenant to queryFactory

* fix some query tests

* init in tests

* add missing sql files

Co-authored-by: Livio Amstutz <livio.a@gmail.com>

internal/eventstore/v1/models/aggregate.go

@@ -23,6 +23,7 @@ type Aggregate struct {
 	editorService string
 	editorUser    string
 	resourceOwner string
+	tenant        string
 	Events        []*Event
 	Precondition  *precondition
 }
@@ -55,6 +56,7 @@ func (a *Aggregate) AppendEvent(typ EventType, payload interface{}) (*Aggregate,
 		EditorService:    a.editorService,
 		EditorUser:       a.editorUser,
 		ResourceOwner:    a.resourceOwner,
+		Tenant:           a.tenant,
 	}
 
 	a.Events = append(a.Events, e)

internal/eventstore/v1/models/aggregate_creator.go

@@ -20,6 +20,7 @@ func (c *AggregateCreator) NewAggregate(ctx context.Context, id string, typ Aggr
 	ctxData := authz.GetCtxData(ctx)
 	editorUser := ctxData.UserID
 	resourceOwner := ctxData.OrgID
+	tenant := ctxData.TenantID
 
 	aggregate := &Aggregate{
 		ID:               id,
@@ -30,6 +31,7 @@ func (c *AggregateCreator) NewAggregate(ctx context.Context, id string, typ Aggr
 		editorService:    c.serviceName,
 		editorUser:       editorUser,
 		resourceOwner:    resourceOwner,
+		tenant:           tenant,
 	}
 
 	for _, opt := range opts {

internal/eventstore/v1/models/event.go

@@ -28,6 +28,7 @@ type Event struct {
 	EditorService    string
 	EditorUser       string
 	ResourceOwner    string
+	Tenant           string
 }
 
 func eventData(i interface{}) ([]byte, error) {

internal/eventstore/v1/models/field.go

@@ -11,4 +11,5 @@ const (
 	Field_EditorUser
 	Field_EventType
 	Field_CreationDate
+	Field_Tenant
 )

internal/eventstore/v1/models/object.go

@@ -8,6 +8,7 @@ type ObjectRoot struct {
 	AggregateID   string    `json:"-"`
 	Sequence      uint64    `json:"-"`
 	ResourceOwner string    `json:"-"`
+	Tenant        string    `json:"-"`
 	CreationDate  time.Time `json:"-"`
 	ChangeDate    time.Time `json:"-"`
 }
@@ -21,6 +22,9 @@ func (o *ObjectRoot) AppendEvent(event *Event) {
 	if o.ResourceOwner == "" {
 		o.ResourceOwner = event.ResourceOwner
 	}
+	if o.Tenant == "" {
+		o.Tenant = event.Tenant
+	}
 
 	o.ChangeDate = event.CreationDate
 	if o.CreationDate.IsZero() {

internal/eventstore/v1/models/search_query.go

@@ -17,6 +17,7 @@ type SearchQueryFactory struct {
 	sequenceTo     uint64
 	eventTypes     []EventType
 	resourceOwner  string
+	tenant         string
 	creationDate   time.Time
 }
 
@@ -62,6 +63,8 @@ func FactoryFromSearchQuery(query *SearchQuery) *SearchQueryFactory {
 			}
 		case Field_ResourceOwner:
 			factory = factory.ResourceOwner(filter.value.(string))
+		case Field_Tenant:
+			factory = factory.Tenant(filter.value.(string))
 		case Field_EventType:
 			factory = factory.EventTypes(filter.value.([]EventType)...)
 		case Field_EditorService, Field_EditorUser:
@@ -120,6 +123,11 @@ func (factory *SearchQueryFactory) ResourceOwner(resourceOwner string) *SearchQu
 	return factory
 }
 
+func (factory *SearchQueryFactory) Tenant(tenant string) *SearchQueryFactory {
+	factory.tenant = tenant
+	return factory
+}
+
 func (factory *SearchQueryFactory) CreationDateNewer(time time.Time) *SearchQueryFactory {
 	factory.creationDate = time
 	return factory
@@ -151,6 +159,7 @@ func (factory *SearchQueryFactory) Build() (*searchQuery, error) {
 		factory.sequenceToFilter,
 		factory.eventTypeFilter,
 		factory.resourceOwnerFilter,
+		factory.tenantFilter,
 		factory.creationDateNewerFilter,
 	} {
 		if filter := f(); filter != nil {
@@ -222,6 +231,13 @@ func (factory *SearchQueryFactory) resourceOwnerFilter() *Filter {
 	return NewFilter(Field_ResourceOwner, factory.resourceOwner, Operation_Equals)
 }
 
+func (factory *SearchQueryFactory) tenantFilter() *Filter {
+	if factory.tenant == "" {
+		return nil
+	}
+	return NewFilter(Field_Tenant, factory.tenant, Operation_Equals)
+}
+
 func (factory *SearchQueryFactory) creationDateNewerFilter() *Filter {
 	if factory.creationDate.IsZero() {
 		return nil

internal/eventstore/v1/models/search_query_old.go

@@ -69,6 +69,10 @@ func (q *SearchQuery) ResourceOwnerFilter(resourceOwner string) *SearchQuery {
 	return q.setFilter(NewFilter(Field_ResourceOwner, resourceOwner, Operation_Equals))
 }
 
+func (q *SearchQuery) TenantFilter(tenant string) *SearchQuery {
+	return q.setFilter(NewFilter(Field_Tenant, tenant, Operation_Equals))
+}
+
 func (q *SearchQuery) CreationDateNewerFilter(time time.Time) *SearchQuery {
 	return q.setFilter(NewFilter(Field_CreationDate, time, Operation_Greater))
 }