fix: add v1 events (#1525)

* fix: add v1 events

* add v1 events to queries

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

internal/command/unique_constraints_model.go

@@ -200,6 +200,8 @@ func (rm *UniqueConstraintReadModel) Query() *eventstore.SearchQueryBuilder {
 			project.GrantMemberRemovedType,
 			project.RoleAddedType,
 			project.RoleRemovedType,
+			user.UserV1AddedType,
+			user.UserV1RegisteredType,
 			user.HumanAddedType,
 			user.HumanRegisteredType,
 			user.MachineAddedEventType,

internal/command/user_grant_model.go

@@ -151,7 +151,9 @@ func (wm *UserGrantPreConditionReadModel) Reduce() error {
 func (wm *UserGrantPreConditionReadModel) Query() *eventstore.SearchQueryBuilder {
 	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, user.AggregateType, project.AggregateType).
 		AggregateIDs(wm.UserID, wm.ProjectID).
-		EventTypes(user.HumanAddedType,
+		EventTypes(user.UserV1AddedType,
+			user.HumanAddedType,
+			user.UserV1RegisteredType,
 			user.HumanRegisteredType,
 			user.MachineAddedEventType,
 			user.UserRemovedType,

internal/command/user_human_address_model.go

@@ -73,7 +73,10 @@ func (wm *HumanAddressWriteModel) Query() *eventstore.SearchQueryBuilder {
 	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, user.AggregateType).
 		AggregateIDs(wm.AggregateID).
 		ResourceOwner(wm.ResourceOwner).
-		EventTypes(user.HumanAddedType,
+		EventTypes(user.UserV1AddedType,
+			user.UserV1RegisteredType,
+			user.UserV1AddressChangedType,
+			user.HumanAddedType,
 			user.HumanRegisteredType,
 			user.HumanAddressChangedType,
 			user.UserRemovedType)

internal/command/user_human_email_model.go

@@ -2,9 +2,10 @@ package command
 
 import (
 	"context"
-	"github.com/caos/zitadel/internal/eventstore"
 	"time"
 
+	"github.com/caos/zitadel/internal/eventstore"
+
 	"github.com/caos/zitadel/internal/crypto"
 	"github.com/caos/zitadel/internal/domain"
 	"github.com/caos/zitadel/internal/repository/user"
@@ -66,12 +67,19 @@ func (wm *HumanEmailWriteModel) Reduce() error {
 func (wm *HumanEmailWriteModel) Query() *eventstore.SearchQueryBuilder {
 	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, user.AggregateType).
 		AggregateIDs(wm.AggregateID).
-		EventTypes(user.HumanAddedType,
+		EventTypes(user.UserV1AddedType,
+			user.HumanAddedType,
+			user.UserV1RegisteredType,
 			user.HumanRegisteredType,
+			user.UserV1InitialCodeAddedType,
 			user.HumanInitialCodeAddedType,
+			user.UserV1InitializedCheckSucceededType,
 			user.HumanInitializedCheckSucceededType,
+			user.UserV1EmailChangedType,
 			user.HumanEmailChangedType,
+			user.UserV1EmailCodeAddedType,
 			user.HumanEmailCodeAddedType,
+			user.UserV1EmailVerifiedType,
 			user.HumanEmailVerifiedType,
 			user.UserRemovedType)
 	if wm.ResourceOwner != "" {

internal/command/user_human_init_model.go

@@ -68,11 +68,17 @@ func (wm *HumanInitCodeWriteModel) Reduce() error {
 func (wm *HumanInitCodeWriteModel) Query() *eventstore.SearchQueryBuilder {
 	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, user.AggregateType).
 		AggregateIDs(wm.AggregateID).
-		EventTypes(user.HumanAddedType,
+		EventTypes(user.UserV1AddedType,
+			user.HumanAddedType,
+			user.UserV1RegisteredType,
 			user.HumanRegisteredType,
+			user.UserV1EmailChangedType,
 			user.HumanEmailChangedType,
+			user.UserV1EmailVerifiedType,
 			user.HumanEmailVerifiedType,
+			user.UserV1InitialCodeAddedType,
 			user.HumanInitialCodeAddedType,
+			user.UserV1InitializedCheckSucceededType,
 			user.HumanInitializedCheckSucceededType,
 			user.UserRemovedType)
 	if wm.ResourceOwner != "" {

internal/command/user_human_model.go

@@ -70,6 +70,8 @@ func (wm *HumanWriteModel) Reduce() error {
 			wm.reduceHumanPhoneChangedEvent(e)
 		case *user.HumanPhoneVerifiedEvent:
 			wm.reduceHumanPhoneVerifiedEvent()
+		case *user.HumanPhoneRemovedEvent:
+			wm.reduceHumanPhoneRemovedEvent()
 		case *user.HumanPasswordChangedEvent:
 			wm.reduceHumanPasswordChangedEvent(e)
 		case *user.UserLockedEvent:
@@ -109,12 +111,24 @@ func (wm *HumanWriteModel) Query() *eventstore.SearchQueryBuilder {
 			user.HumanEmailVerifiedType,
 			user.HumanPhoneChangedType,
 			user.HumanPhoneVerifiedType,
+			user.HumanPhoneRemovedType,
 			user.HumanPasswordChangedType,
 			user.UserLockedType,
 			user.UserUnlockedType,
 			user.UserDeactivatedType,
 			user.UserReactivatedType,
-			user.UserRemovedType)
+			user.UserRemovedType,
+			user.UserV1AddedType,
+			user.UserV1RegisteredType,
+			user.UserV1InitialCodeAddedType,
+			user.UserV1InitializedCheckSucceededType,
+			user.UserV1ProfileChangedType,
+			user.UserV1EmailChangedType,
+			user.UserV1EmailVerifiedType,
+			user.UserV1PhoneChangedType,
+			user.UserV1PhoneVerifiedType,
+			user.UserV1PhoneRemovedType,
+			user.UserV1PasswordChangedType)
 }
 
 func (wm *HumanWriteModel) reduceHumanAddedEvent(e *user.HumanAddedEvent) {
@@ -196,6 +210,11 @@ func (wm *HumanWriteModel) reduceHumanPhoneVerifiedEvent() {
 	wm.IsPhoneVerified = true
 }
 
+func (wm *HumanWriteModel) reduceHumanPhoneRemovedEvent() {
+	wm.Phone = ""
+	wm.IsPhoneVerified = false
+}
+
 func (wm *HumanWriteModel) reduceHumanAddressChangedEvent(e *user.HumanAddressChangedEvent) {
 	if e.Country != nil {
 		wm.Country = *e.Country

internal/command/user_human_otp_model.go

@@ -46,7 +46,10 @@ func (wm *HumanOTPWriteModel) Query() *eventstore.SearchQueryBuilder {
 		EventTypes(user.HumanMFAOTPAddedType,
 			user.HumanMFAOTPVerifiedType,
 			user.HumanMFAOTPRemovedType,
-			user.UserRemovedType)
+			user.UserRemovedType,
+			user.UserV1MFAOTPAddedType,
+			user.UserV1MFAOTPVerifiedType,
+			user.UserV1MFAOTPRemovedType)
 	if wm.ResourceOwner != "" {
 		query.ResourceOwner(wm.ResourceOwner)
 	}

internal/command/user_human_password_model.go

@@ -75,7 +75,14 @@ func (wm *HumanPasswordWriteModel) Query() *eventstore.SearchQueryBuilder {
 			user.HumanPasswordChangedType,
 			user.HumanPasswordCodeAddedType,
 			user.HumanEmailVerifiedType,
-			user.UserRemovedType)
+			user.UserRemovedType,
+			user.UserV1AddedType,
+			user.UserV1RegisteredType,
+			user.UserV1InitialCodeAddedType,
+			user.UserV1InitializedCheckSucceededType,
+			user.UserV1PasswordChangedType,
+			user.UserV1PasswordCodeAddedType,
+			user.UserV1EmailVerifiedType)
 	if wm.ResourceOwner != "" {
 		query.ResourceOwner(wm.ResourceOwner)
 	}

internal/command/user_human_phone_model.go

@@ -85,7 +85,15 @@ func (wm *HumanPhoneWriteModel) Query() *eventstore.SearchQueryBuilder {
 			user.HumanPhoneVerifiedType,
 			user.HumanPhoneCodeAddedType,
 			user.HumanPhoneRemovedType,
-			user.UserRemovedType)
+			user.UserRemovedType,
+			user.UserV1AddedType,
+			user.UserV1RegisteredType,
+			user.UserV1InitialCodeAddedType,
+			user.UserV1InitializedCheckSucceededType,
+			user.UserV1PhoneCodeAddedType,
+			user.UserV1PhoneChangedType,
+			user.UserV1PhoneVerifiedType,
+			user.UserV1PhoneRemovedType)
 }
 
 func (wm *HumanPhoneWriteModel) NewChangedEvent(

internal/command/user_human_profile_model.go

@@ -84,7 +84,10 @@ func (wm *HumanProfileWriteModel) Query() *eventstore.SearchQueryBuilder {
 		EventTypes(user.HumanAddedType,
 			user.HumanRegisteredType,
 			user.HumanProfileChangedType,
-			user.UserRemovedType)
+			user.UserRemovedType,
+			user.UserV1AddedType,
+			user.UserV1RegisteredType,
+			user.UserV1ProfileChangedType)
 }
 
 func (wm *HumanProfileWriteModel) NewChangedEvent(

internal/command/user_model.go

@@ -80,7 +80,10 @@ func (wm *UserWriteModel) Query() *eventstore.SearchQueryBuilder {
 			user.UserUnlockedType,
 			user.UserDeactivatedType,
 			user.UserReactivatedType,
-			user.UserRemovedType)
+			user.UserRemovedType,
+			user.UserV1AddedType,
+			user.UserV1RegisteredType,
+			user.UserV1InitializedCheckSucceededType)
 	if wm.ResourceOwner != "" {
 		query.ResourceOwner(wm.ResourceOwner)
 	}