mirror of
https://github.com/zitadel/zitadel.git
synced 2025-06-13 02:18:33 +00:00
fix(query): add user metadata projection (#3021)
* fix: add metadata projection * cleanup
This commit is contained in:
parent
d2e07636c9
commit
c2e6fd8f40
@ -65,6 +65,7 @@ func Start(ctx context.Context, sqlClient *sql.DB, es *eventstore.Eventstore, co
|
|||||||
NewProjectGrantMemberProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["project_grant_members"]))
|
NewProjectGrantMemberProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["project_grant_members"]))
|
||||||
NewAuthNKeyProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["authn_keys"]))
|
NewAuthNKeyProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["authn_keys"]))
|
||||||
NewUserGrantProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["user_grants"]))
|
NewUserGrantProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["user_grants"]))
|
||||||
|
NewUserMetadataProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["user_metadata"]))
|
||||||
_, err := NewKeyProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["keys"]), defaults.KeyConfig, keyChan)
|
_, err := NewKeyProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["keys"]), defaults.KeyConfig, keyChan)
|
||||||
|
|
||||||
return err
|
return err
|
||||||
|
115
internal/query/projection/user_metadata.go
Normal file
115
internal/query/projection/user_metadata.go
Normal file
@ -0,0 +1,115 @@
|
|||||||
|
package projection
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
|
"github.com/caos/logging"
|
||||||
|
|
||||||
|
"github.com/caos/zitadel/internal/errors"
|
||||||
|
"github.com/caos/zitadel/internal/eventstore"
|
||||||
|
"github.com/caos/zitadel/internal/eventstore/handler"
|
||||||
|
"github.com/caos/zitadel/internal/eventstore/handler/crdb"
|
||||||
|
"github.com/caos/zitadel/internal/repository/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
type UserMetadataProjection struct {
|
||||||
|
crdb.StatementHandler
|
||||||
|
}
|
||||||
|
|
||||||
|
const UserMetadataProjectionTable = "zitadel.projections.user_metadata"
|
||||||
|
|
||||||
|
func NewUserMetadataProjection(ctx context.Context, config crdb.StatementHandlerConfig) *UserMetadataProjection {
|
||||||
|
p := &UserMetadataProjection{}
|
||||||
|
config.ProjectionName = UserMetadataProjectionTable
|
||||||
|
config.Reducers = p.reducers()
|
||||||
|
p.StatementHandler = crdb.NewStatementHandler(ctx, config)
|
||||||
|
return p
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *UserMetadataProjection) reducers() []handler.AggregateReducer {
|
||||||
|
return []handler.AggregateReducer{
|
||||||
|
{
|
||||||
|
Aggregate: user.AggregateType,
|
||||||
|
EventRedusers: []handler.EventReducer{
|
||||||
|
{
|
||||||
|
Event: user.MetadataSetType,
|
||||||
|
Reduce: p.reduceMetadataSet,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Event: user.MetadataRemovedType,
|
||||||
|
Reduce: p.reduceMetadataRemoved,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Event: user.MetadataRemovedAllType,
|
||||||
|
Reduce: p.reduceMetadataRemovedAll,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Event: user.UserRemovedType,
|
||||||
|
Reduce: p.reduceMetadataRemovedAll,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
UserMetadataColumnUserID = "user_id"
|
||||||
|
UserMetadataColumnResourceOwner = "resource_owner"
|
||||||
|
UserMetadataColumnCreationDate = "creation_date"
|
||||||
|
UserMetadataColumnChangeDate = "change_date"
|
||||||
|
UserMetadataColumnSequence = "sequence"
|
||||||
|
UserMetadataColumnKey = "key"
|
||||||
|
UserMetadataColumnValue = "value"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (p *UserMetadataProjection) reduceMetadataSet(event eventstore.Event) (*handler.Statement, error) {
|
||||||
|
e, ok := event.(*user.MetadataSetEvent)
|
||||||
|
if !ok {
|
||||||
|
logging.LogWithFields("HANDL-Sgn5w", "seq", event.Sequence(), "expectedType", user.MetadataSetType).Error("wrong event type")
|
||||||
|
return nil, errors.ThrowInvalidArgument(nil, "HANDL-Ghn52", "reduce.wrong.event.type")
|
||||||
|
}
|
||||||
|
return crdb.NewUpsertStatement(
|
||||||
|
e,
|
||||||
|
[]handler.Column{
|
||||||
|
handler.NewCol(UserMetadataColumnUserID, e.Aggregate().ID),
|
||||||
|
handler.NewCol(UserMetadataColumnResourceOwner, e.Aggregate().ResourceOwner),
|
||||||
|
handler.NewCol(UserMetadataColumnCreationDate, e.CreationDate()),
|
||||||
|
handler.NewCol(UserMetadataColumnChangeDate, e.CreationDate()),
|
||||||
|
handler.NewCol(UserMetadataColumnSequence, e.Sequence()),
|
||||||
|
handler.NewCol(UserMetadataColumnKey, e.Key),
|
||||||
|
handler.NewCol(UserMetadataColumnValue, e.Value),
|
||||||
|
},
|
||||||
|
), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *UserMetadataProjection) reduceMetadataRemoved(event eventstore.Event) (*handler.Statement, error) {
|
||||||
|
e, ok := event.(*user.MetadataRemovedEvent)
|
||||||
|
if !ok {
|
||||||
|
logging.LogWithFields("HANDL-Dbfg2", "seq", event.Sequence(), "expectedType", user.MetadataRemovedType).Error("wrong event type")
|
||||||
|
return nil, errors.ThrowInvalidArgument(nil, "HANDL-Bm542", "reduce.wrong.event.type")
|
||||||
|
}
|
||||||
|
return crdb.NewDeleteStatement(
|
||||||
|
e,
|
||||||
|
[]handler.Condition{
|
||||||
|
handler.NewCond(UserMetadataColumnUserID, e.Aggregate().ID),
|
||||||
|
handler.NewCond(UserMetadataColumnKey, e.Key),
|
||||||
|
},
|
||||||
|
), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *UserMetadataProjection) reduceMetadataRemovedAll(event eventstore.Event) (*handler.Statement, error) {
|
||||||
|
switch event.(type) {
|
||||||
|
case *user.MetadataRemovedAllEvent,
|
||||||
|
*user.UserRemovedEvent:
|
||||||
|
//ok
|
||||||
|
default:
|
||||||
|
logging.LogWithFields("HANDL-Dfbh2", "seq", event.Sequence(), "expectedTypes", []eventstore.EventType{user.MetadataRemovedAllType, user.UserRemovedType}).Error("wrong event type")
|
||||||
|
return nil, errors.ThrowInvalidArgument(nil, "HANDL-Bmnf2", "reduce.wrong.event.type")
|
||||||
|
}
|
||||||
|
return crdb.NewDeleteStatement(
|
||||||
|
event,
|
||||||
|
[]handler.Condition{
|
||||||
|
handler.NewCond(UserMetadataColumnUserID, event.Aggregate().ID),
|
||||||
|
},
|
||||||
|
), nil
|
||||||
|
}
|
157
internal/query/projection/user_metadata_test.go
Normal file
157
internal/query/projection/user_metadata_test.go
Normal file
@ -0,0 +1,157 @@
|
|||||||
|
package projection
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/caos/zitadel/internal/errors"
|
||||||
|
"github.com/caos/zitadel/internal/eventstore"
|
||||||
|
"github.com/caos/zitadel/internal/eventstore/handler"
|
||||||
|
"github.com/caos/zitadel/internal/eventstore/repository"
|
||||||
|
"github.com/caos/zitadel/internal/repository/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestUserMetadataProjection_reduces(t *testing.T) {
|
||||||
|
type args struct {
|
||||||
|
event func(t *testing.T) eventstore.Event
|
||||||
|
}
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
args args
|
||||||
|
reduce func(event eventstore.Event) (*handler.Statement, error)
|
||||||
|
want wantReduce
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "reduceMetadataSet",
|
||||||
|
args: args{
|
||||||
|
event: getEvent(testEvent(
|
||||||
|
repository.EventType(user.MetadataSetType),
|
||||||
|
user.AggregateType,
|
||||||
|
[]byte(`{
|
||||||
|
"key": "key",
|
||||||
|
"value": "dmFsdWU="
|
||||||
|
}`),
|
||||||
|
), user.MetadataSetEventMapper),
|
||||||
|
},
|
||||||
|
reduce: (&UserMetadataProjection{}).reduceMetadataSet,
|
||||||
|
want: wantReduce{
|
||||||
|
aggregateType: user.AggregateType,
|
||||||
|
sequence: 15,
|
||||||
|
previousSequence: 10,
|
||||||
|
projection: UserMetadataProjectionTable,
|
||||||
|
executer: &testExecuter{
|
||||||
|
executions: []execution{
|
||||||
|
{
|
||||||
|
expectedStmt: "UPSERT INTO zitadel.projections.user_metadata (user_id, resource_owner, creation_date, change_date, sequence, key, value) VALUES ($1, $2, $3, $4, $5, $6, $7)",
|
||||||
|
expectedArgs: []interface{}{
|
||||||
|
"agg-id",
|
||||||
|
"ro-id",
|
||||||
|
anyArg{},
|
||||||
|
anyArg{},
|
||||||
|
uint64(15),
|
||||||
|
"key",
|
||||||
|
[]byte("value"),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "reduceMetadataRemoved",
|
||||||
|
args: args{
|
||||||
|
event: getEvent(testEvent(
|
||||||
|
repository.EventType(user.MetadataRemovedType),
|
||||||
|
user.AggregateType,
|
||||||
|
[]byte(`{
|
||||||
|
"key": "key"
|
||||||
|
}`),
|
||||||
|
), user.MetadataRemovedEventMapper),
|
||||||
|
},
|
||||||
|
reduce: (&UserMetadataProjection{}).reduceMetadataRemoved,
|
||||||
|
want: wantReduce{
|
||||||
|
aggregateType: user.AggregateType,
|
||||||
|
sequence: 15,
|
||||||
|
previousSequence: 10,
|
||||||
|
projection: UserMetadataProjectionTable,
|
||||||
|
executer: &testExecuter{
|
||||||
|
executions: []execution{
|
||||||
|
{
|
||||||
|
expectedStmt: "DELETE FROM zitadel.projections.user_metadata WHERE (user_id = $1) AND (key = $2)",
|
||||||
|
expectedArgs: []interface{}{
|
||||||
|
"agg-id",
|
||||||
|
"key",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "reduceMetadataRemovedAll",
|
||||||
|
args: args{
|
||||||
|
event: getEvent(testEvent(
|
||||||
|
repository.EventType(user.MetadataRemovedAllType),
|
||||||
|
user.AggregateType,
|
||||||
|
nil,
|
||||||
|
), user.MetadataRemovedAllEventMapper),
|
||||||
|
},
|
||||||
|
reduce: (&UserMetadataProjection{}).reduceMetadataRemovedAll,
|
||||||
|
want: wantReduce{
|
||||||
|
aggregateType: user.AggregateType,
|
||||||
|
sequence: 15,
|
||||||
|
previousSequence: 10,
|
||||||
|
projection: UserMetadataProjectionTable,
|
||||||
|
executer: &testExecuter{
|
||||||
|
executions: []execution{
|
||||||
|
{
|
||||||
|
expectedStmt: "DELETE FROM zitadel.projections.user_metadata WHERE (user_id = $1)",
|
||||||
|
expectedArgs: []interface{}{
|
||||||
|
"agg-id",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "reduceMetadataRemovedAll (user removed)",
|
||||||
|
args: args{
|
||||||
|
event: getEvent(testEvent(
|
||||||
|
repository.EventType(user.UserRemovedType),
|
||||||
|
user.AggregateType,
|
||||||
|
nil,
|
||||||
|
), user.UserRemovedEventMapper),
|
||||||
|
},
|
||||||
|
reduce: (&UserMetadataProjection{}).reduceMetadataRemovedAll,
|
||||||
|
want: wantReduce{
|
||||||
|
aggregateType: user.AggregateType,
|
||||||
|
sequence: 15,
|
||||||
|
previousSequence: 10,
|
||||||
|
projection: UserMetadataProjectionTable,
|
||||||
|
executer: &testExecuter{
|
||||||
|
executions: []execution{
|
||||||
|
{
|
||||||
|
expectedStmt: "DELETE FROM zitadel.projections.user_metadata WHERE (user_id = $1)",
|
||||||
|
expectedArgs: []interface{}{
|
||||||
|
"agg-id",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
event := baseEvent(t)
|
||||||
|
got, err := tt.reduce(event)
|
||||||
|
if _, ok := err.(errors.InvalidArgument); !ok {
|
||||||
|
t.Errorf("no wrong event mapping: %v, got: %v", err, got)
|
||||||
|
}
|
||||||
|
|
||||||
|
event = tt.args.event(t)
|
||||||
|
got, err = tt.reduce(event)
|
||||||
|
assertReduce(t, got, err, tt.want)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
13
migrations/cockroach/V1.106__user_metadata.sql
Normal file
13
migrations/cockroach/V1.106__user_metadata.sql
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
CREATE TABLE zitadel.projections.user_metadata (
|
||||||
|
user_id STRING NOT NULL
|
||||||
|
, resource_owner STRING NOT NULL
|
||||||
|
, creation_date TIMESTAMPTZ NOT NULL
|
||||||
|
, change_date TIMESTAMPTZ NOT NULL
|
||||||
|
, sequence INT8 NOT NULL
|
||||||
|
|
||||||
|
, key STRING NOT NULL
|
||||||
|
, value BYTES
|
||||||
|
|
||||||
|
, PRIMARY KEY (user_id, key)
|
||||||
|
, INDEX idx_ro (resource_owner)
|
||||||
|
);
|
Loading…
x
Reference in New Issue
Block a user