push 5 in 6 milestones

2025-12-04 22:13:36 +00:00 · 2023-06-29 12:18:16 +02:00
parent 2b8dac40de
commit 41bb4f77a9
5 changed files with 109 additions and 66 deletions
--- a/internal/query/projection/milestones.go
+++ b/internal/query/projection/milestones.go
@@ -19,11 +19,12 @@ import (
 const (
 	MilestonesProjectionTable = "projections.milestones"

-	MilestoneColumnInstanceID    = "instance_id"
-	MilestoneColumnType          = "type"
-	MilestoneColumnPrimaryDomain = "primary_domain"
-	MilestoneColumnReachedDate   = "reached_date"
-	MilestoneColumnPushedDate    = "pushed_date"
+	MilestoneColumnInstanceID     = "instance_id"
+	MilestoneColumnType           = "type"
+	MilestoneColumnPrimaryDomain  = "primary_domain"
+	MilestoneColumnReachedDate    = "reached_date"
+	MilestoneColumnPushedDate     = "last_pushed_date"
+	MilestoneColumnIgnoredProject = "ignore_project"
 )

 type milestoneProjection struct {
@@ -41,6 +42,7 @@ func newMilestoneProjection(ctx context.Context, config crdb.StatementHandlerCon
 			crdb.NewColumn(MilestoneColumnReachedDate, crdb.ColumnTypeTimestamp, crdb.Nullable()),
 			crdb.NewColumn(MilestoneColumnPushedDate, crdb.ColumnTypeTimestamp, crdb.Nullable()),
 			crdb.NewColumn(MilestoneColumnPrimaryDomain, crdb.ColumnTypeText, crdb.Nullable()),
+			crdb.NewColumn(MilestoneColumnIgnoredProject, crdb.ColumnTypeText, crdb.Nullable()),
 		},
 			crdb.NewPrimaryKey(MilestoneColumnInstanceID, MilestoneColumnType),
 		),
@@ -73,7 +75,7 @@ func (p *milestoneProjection) reducers() []handler.AggregateReducer {
 			EventRedusers: []handler.EventReducer{
 				{
 					Event:  project.ProjectAddedType,
-					Reduce: p.milestoneReached(milestone.ProjectCreated),
+					Reduce: p.reduceProjectAdded,
 				},
 				{
 					Event:  project.ApplicationAddedType,
@@ -102,6 +104,41 @@ func (p *milestoneProjection) reducers() []handler.AggregateReducer {
 	}
 }

+func (p *milestoneProjection) milestoneReached(msType milestone.Type) func(event eventstore.Event) (*handler.Statement, error) {
+	return func(event eventstore.Event) (*handler.Statement, error) {
+		printEvent(event)
+		if isSystemEvent(event) {
+			return crdb.NewNoOpStatement(event), nil
+		}
+		return crdb.NewUpdateStatement(event, []handler.Column{
+			handler.NewCol(MilestoneColumnReachedDate, event.CreationDate()),
+		},
+			[]handler.Condition{
+				handler.NewCond(MilestoneColumnInstanceID, event.Aggregate().InstanceID),
+				handler.NewCond(MilestoneColumnType, msType),
+				crdb.NewIsNullCond(MilestoneColumnReachedDate),
+			}), nil
+	}
+}
+
+func (p *milestoneProjection) reducePushed(event eventstore.Event) (*handler.Statement, error) {
+	printEvent(event)
+	e, ok := event.(*milestone.PushedEvent)
+	if !ok {
+		return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-XJGXK", "reduce.wrong.event.type %s", milestone.PushedEventType)
+	}
+	return crdb.NewUpdateStatement(
+		event,
+		[]handler.Column{
+			handler.NewCol(MilestoneColumnPushedDate, event.CreationDate()),
+		},
+		[]handler.Condition{
+			handler.NewCond(MilestoneColumnInstanceID, event.Aggregate().InstanceID),
+			handler.NewCond(MilestoneColumnType, e.MilestoneType),
+		},
+	), nil
+}
+
 func (p *milestoneProjection) reduceInstanceAdded(event eventstore.Event) (*handler.Statement, error) {
 	e, ok := event.(*instance.InstanceAddedEvent)
 	if !ok {
@@ -127,66 +164,74 @@ func (p *milestoneProjection) reduceInstanceDomainPrimarySet(event eventstore.Ev
 	if !ok {
 		return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Sfrgf", "reduce.wrong.event.type %s", instance.InstanceDomainPrimarySetEventType)
 	}
-	allTypes := milestone.AllTypes()
-	statements := make([]func(eventstore.Event) crdb.Exec, 0, len(allTypes))
-	for _, msType := range allTypes {
-		statements = append(statements, crdb.AddUpdateStatement(
-			[]handler.Column{
-				handler.NewCol(MilestoneColumnPrimaryDomain, e.Domain),
-			},
-			[]handler.Condition{
-				handler.NewCond(MilestoneColumnInstanceID, e.Aggregate().InstanceID),
-				handler.NewCond(MilestoneColumnType, msType),
-				crdb.NewIsNullCond(MilestoneColumnPushedDate),
-			},
-		))
-	}
-	return crdb.NewMultiStatement(e, statements...), nil
+	return crdb.NewUpdateStatement(
+		e,
+		[]handler.Column{
+			handler.NewCol(MilestoneColumnPrimaryDomain, e.Domain),
+		},
+		[]handler.Condition{
+			handler.NewCond(MilestoneColumnInstanceID, e.Aggregate().InstanceID),
+			crdb.NewIsNullCond(MilestoneColumnPushedDate),
+		},
+	), nil
 }

-func (p *milestoneProjection) milestoneReached(msType milestone.Type) func(event eventstore.Event) (*handler.Statement, error) {
-	return func(event eventstore.Event) (*handler.Statement, error) {
-		printEvent(event)
-		if event.EditorUser() == "" || event.EditorService() == "" {
-			return crdb.NewNoOpStatement(event), nil
-		}
-		return crdb.NewUpdateStatement(
-			event,
-			[]handler.Column{
-				handler.NewCol(MilestoneColumnReachedDate, event.CreationDate()),
-			},
-			[]handler.Condition{
-				handler.NewCond(MilestoneColumnInstanceID, event.Aggregate().InstanceID),
-				handler.NewCond(MilestoneColumnType, msType),
-				crdb.NewIsNullCond(MilestoneColumnReachedDate),
-				crdb.NewIsNullCond(MilestoneColumnPushedDate),
-			},
-		), nil
-	}
-}
-
-func (p *milestoneProjection) reducePushed(event eventstore.Event) (*handler.Statement, error) {
-	printEvent(event)
-	e, ok := event.(*milestone.PushedEvent)
-	if !ok {
-		return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-XJGXK", "reduce.wrong.event.type %s", milestone.PushedEventType)
+func (p *milestoneProjection) reduceProjectAdded(event eventstore.Event) (*handler.Statement, error) {
+	if !isSystemEvent(event) {
+		return p.milestoneReached(milestone.ProjectCreated)(event)
 	}
 	return crdb.NewUpdateStatement(
 		event,
 		[]handler.Column{
-			handler.NewCol(MilestoneColumnPushedDate, event.CreationDate()),
+			handler.NewCol(MilestoneColumnIgnoredProject, event.Aggregate().ID),
 		},
 		[]handler.Condition{
 			handler.NewCond(MilestoneColumnInstanceID, event.Aggregate().InstanceID),
-			handler.NewCond(MilestoneColumnType, e.MilestoneType),
+			handler.NewCond(MilestoneColumnType, milestone.AuthenticationSucceededOnApplication),
+			crdb.NewIsNullCond(MilestoneColumnReachedDate),
 		},
 	), nil
 }

 func (p *milestoneProjection) reduceUserTokenAdded(event eventstore.Event) (*handler.Statement, error) {
-	return crdb.NewNoOpStatement(event), nil
+	printEvent(event)
+	e, ok := event.(*user.UserTokenAddedEvent)
+	if !ok {
+		return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-3xhJ7", "reduce.wrong.event.type %s", user.UserTokenAddedType)
+	}
+	return crdb.NewMultiStatement(
+		e,
+		crdb.AddUpdateStatement(
+			[]handler.Column{
+				handler.NewCol(MilestoneColumnReachedDate, event.CreationDate()),
+			},
+			[]handler.Condition{
+				handler.NewCond(MilestoneColumnInstanceID, event.Aggregate().InstanceID),
+				handler.NewCond(MilestoneColumnType, milestone.AuthenticationSucceededOnInstance),
+				crdb.NewIsNullCond(MilestoneColumnReachedDate),
+			},
+		),
+		/*		crdb.AddUpdateStatement(
+				[]handler.Column{
+					handler.NewCol(MilestoneColumnReachedDate, event.CreationDate()),
+				},
+				[]handler.Condition{
+					handler.NewCond(MilestoneColumnInstanceID, event.Aggregate().InstanceID),
+					handler.NewCond(MilestoneColumnType, milestone.AuthenticationSucceededOnApplication),
+					crdb.NewExpressionCond(func(param string) (clause string, needsParam bool) {
+						return fmt.Sprintf("%s")
+					}),
+					crdb.NewIsNullCond(MilestoneColumnReachedDate),
+				},
+			),*/
+	), nil
 }

+func isSystemEvent(event eventstore.Event) bool {
+	return event.EditorUser() == "" || event.EditorService() == ""
+}
+
+// TODO: Remove
 func printEvent(event eventstore.Event) {
 	bytes, err := json.MarshalIndent(event, "", "    ")
 	if err != nil {