TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 01:37:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup! Merge branch 'main' into fix_adding_org_same_id_twice

Browse Source
This commit is contained in:
Iraq Jaber
2025-07-02 15:17:27 +02:00
parent 046ee1ecc5
commit 8389f5ca98
6 changed files with 104 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/eventstore/v3/push.go
View File

@@ -67,7 +67,7 @@ func (es *Eventstore) writeCommands(ctx context.Context, client database.Context
return nil, err
}
if err = handleUniqueConstraints(ctx, tx, commands); err != nil {
if err = HandleUniqueConstraints(ctx, tx, commands); err != nil {
return nil, err
}

2
internal/eventstore/v3/push_without_func.go
View File

@@ -57,7 +57,7 @@ func (es *Eventstore) pushWithoutFunc(ctx context.Context, client database.Conte
return nil, err
}
if err = handleUniqueConstraints(ctx, tx, commands); err != nil {
if err = HandleUniqueConstraints(ctx, tx, commands); err != nil {
return nil, err
}

2
internal/eventstore/v3/unique_constraints.go
View File

@@ -25,7 +25,7 @@ var (
addConstraintStmt string
)
func handleUniqueConstraints(ctx context.Context, tx database.Tx, commands []eventstore.Command) (err error) {
func HandleUniqueConstraints(ctx context.Context, tx database.Tx, commands []eventstore.Command) (err error) {
ctx, span := tracing.NewSpan(ctx)
defer func() { span.EndWithError(err) }()

5
internal/repository/org/org.go
View File

@@ -12,6 +12,7 @@ import (
const (
uniqueOrgname = "org_name"
uniqueOrgID = "org_id"
OrgAddedEventType = orgEventTypePrefix + "added"
OrgChangedEventType = orgEventTypePrefix + "changed"
OrgDeactivatedEventType = orgEventTypePrefix + "deactivated"
@@ -25,14 +26,14 @@ const (
func NewAddOrgIDUniqueConstraint(orgID string) *eventstore.UniqueConstraint {
return eventstore.NewAddEventUniqueConstraint(
uniqueOrgname,
uniqueOrgID,
orgID,
"Errors.Org.AlreadyExists")
}
func NewRemoveOrgIDUniqueConstraint(orgID string) *eventstore.UniqueConstraint {
return eventstore.NewRemoveUniqueConstraint(
uniqueOrgname,
uniqueOrgID,
orgID)
}