TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 15:17:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove idcondition

Browse Source
This commit is contained in:
adlerhurst
2025-08-05 10:03:15 +02:00
parent e48c565ab6
commit 5a75e9d558
4 changed files with 63 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
backend/v3/domain/organization.go
View File

@@ -125,8 +125,10 @@ func NewActivateOrganizationCommand(instanceID, orgID string) *ActivateOrganizat
func (cmd *ActivateOrganizationCommand) Execute(ctx context.Context, opts *CommandOpts) (err error) {
repo := orgRepo(opts.DB)
_, err = repo.Update(ctx,
database.And(
repo.InstanceIDCondition(cmd.InstanceID),
repo.IDCondition(cmd.OrgID),
cmd.InstanceID,
),
repo.SetState(OrgStateActive),
)
return err
@@ -160,8 +162,10 @@ func NewDeactivateOrganizationCommand(instanceID, orgID string) *DeactivateOrgan
func (cmd *DeactivateOrganizationCommand) Execute(ctx context.Context, opts *CommandOpts) (err error) {
repo := orgRepo(opts.DB)
_, err = repo.Update(ctx,
database.And(
repo.InstanceIDCondition(cmd.InstanceID),
repo.IDCondition(cmd.OrgID),
cmd.InstanceID,
),
repo.SetState(OrgStateInactive),
)
return err
@@ -192,8 +196,10 @@ func NewDeleteOrganizationCommand(instanceID, orgID string) *DeleteOrganizationC
func (cmd *DeleteOrganizationCommand) Execute(ctx context.Context, opts *CommandOpts) (err error) {
repo := orgRepo(opts.DB)
_, err = repo.Delete(ctx,
database.And(
repo.InstanceIDCondition(cmd.InstanceID),
repo.IDCondition(cmd.OrgID),
cmd.InstanceID,
),
)
return err
}
@@ -238,8 +244,10 @@ func (cmd *UpdateOrganizationCommand) Execute(ctx context.Context, opts *Command
}
_, err = cmd.repo.Update(ctx,
database.And(
cmd.repo.InstanceIDCondition(cmd.InstanceID),
cmd.repo.IDCondition(cmd.OrgID),
cmd.InstanceID,
),
cmd.changes...,
)
return err

15
backend/v3/domain/organization_repository.go
View File

@@ -16,8 +16,8 @@ type OrganizationRepository interface {
List(ctx context.Context, opts ...database.QueryOption) ([]*Organization, error)
Create(ctx context.Context, instance *Organization) error
Update(ctx context.Context, id OrgIdentifierCondition, instance_id string, changes ...database.Change) (int64, error)
Delete(ctx context.Context, id OrgIdentifierCondition, instance_id string) (int64, error)
Update(ctx context.Context, condition database.Condition, changes ...database.Change) (int64, error)
Delete(ctx context.Context, condition database.Condition) (int64, error)
// Domains returns the domain sub repository for the organization.
// If shouldLoad is true, the domains will be loaded from the database and written to the [Organization].Domains field.
@@ -25,13 +25,6 @@ type OrganizationRepository interface {
Domains(shouldLoad bool) OrganizationDomainRepository
}
// OrgIdentifierCondition is used to help specify a single Organization,
// it will either be used as the organization ID or organization name,
// as organizations can be identified either using (instanceID + ID) OR (instanceID + name)
type OrgIdentifierCondition interface {
database.Condition
}
// organizationColumns define all the columns of the instance table.
type organizationColumns interface {
// IDColumn returns the column for the id field.
@@ -57,9 +50,9 @@ type organizationColumns interface {
// organizationConditions define all the conditions for the instance table.
type organizationConditions interface {
// IDCondition returns an equal filter on the id field.
IDCondition(id string) OrgIdentifierCondition
IDCondition(id string) database.Condition
// NameCondition returns a filter on the name field.
NameCondition(name string) OrgIdentifierCondition
NameCondition(op database.TextOperation, name string) database.Condition
// InstanceIDCondition returns a filter on the instance id field.
InstanceIDCondition(instanceID string) database.Condition
// StateCondition returns a filter on the name field.

27
backend/v3/storage/database/repository/org.go
View File

@@ -103,35 +103,24 @@ func (o *org) Create(ctx context.Context, organization *domain.Organization) err
}
// Update implements [domain.OrganizationRepository].
func (o *org) Update(ctx context.Context, id domain.OrgIdentifierCondition, instanceID string, changes ...database.Change) (int64, error) {
func (o *org) Update(ctx context.Context, condition database.Condition, changes ...database.Change) (int64, error) {
if len(changes) == 0 {
return 0, database.ErrNoChanges
}
builder := database.StatementBuilder{}
builder.WriteString(`UPDATE zitadel.organizations SET `)
instanceIDCondition := o.InstanceIDCondition(instanceID)
conditions := []database.Condition{id, instanceIDCondition}
database.Changes(changes).Write(&builder)
writeCondition(&builder, database.And(conditions...))
writeCondition(&builder, condition)
stmt := builder.String()
rowsAffected, err := o.client.Exec(ctx, stmt, builder.Args()...)
rowsAffected, err := o.client.Exec(ctx, builder.String(), builder.Args()...)
return rowsAffected, err
}
// Delete implements [domain.OrganizationRepository].
func (o *org) Delete(ctx context.Context, id domain.OrgIdentifierCondition, instanceID string) (int64, error) {
func (o *org) Delete(ctx context.Context, condition database.Condition) (int64, error) {
builder := database.StatementBuilder{}
builder.WriteString(`DELETE FROM zitadel.organizations`)
instanceIDCondition := o.InstanceIDCondition(instanceID)
conditions := []database.Condition{id, instanceIDCondition}
writeCondition(&builder, database.And(conditions...))
writeCondition(&builder, condition)
return o.client.Exec(ctx, builder.String(), builder.Args()...)
}
@@ -155,13 +144,13 @@ func (o org) SetState(state domain.OrgState) database.Change {
// -------------------------------------------------------------
// IDCondition implements [domain.organizationConditions].
func (o org) IDCondition(id string) domain.OrgIdentifierCondition {
func (o org) IDCondition(id string) database.Condition {
return database.NewTextCondition(o.IDColumn(true), database.TextOperationEqual, id)
}
// NameCondition implements [domain.organizationConditions].
func (o org) NameCondition(name string) domain.OrgIdentifierCondition {
return database.NewTextCondition(o.NameColumn(true), database.TextOperationEqual, name)
func (o org) NameCondition(op database.TextOperation, name string) database.Condition {
return database.NewTextCondition(o.NameColumn(true), op, name)
}
// InstanceIDCondition implements [domain.organizationConditions].

41
backend/v3/storage/database/repository/org_test.go
View File

@@ -320,8 +320,10 @@ func TestUpdateOrganization(t *testing.T) {
// delete instance
_, err = organizationRepo.Delete(ctx,
database.And(
organizationRepo.IDCondition(org.ID),
org.InstanceID,
organizationRepo.InstanceIDCondition(org.InstanceID),
),
)
require.NoError(t, err)
@@ -378,8 +380,10 @@ func TestUpdateOrganization(t *testing.T) {
// update org
beforeUpdate := time.Now()
rowsAffected, err := organizationRepo.Update(ctx,
database.And(
organizationRepo.IDCondition(createdOrg.ID),
createdOrg.InstanceID,
organizationRepo.InstanceIDCondition(createdOrg.InstanceID),
),
tt.update...,
)
afterUpdate := time.Now()
@@ -443,7 +447,7 @@ func TestGetOrganization(t *testing.T) {
type test struct {
name string
testFunc func(ctx context.Context, t *testing.T) *domain.Organization
orgIdentifierCondition domain.OrgIdentifierCondition
condition database.Condition
err error
}
@@ -468,7 +472,7 @@ func TestGetOrganization(t *testing.T) {
return &org
},
orgIdentifierCondition: orgRepo.IDCondition(organizationId),
condition: orgRepo.IDCondition(organizationId),
}
}(),
func() test {
@@ -491,7 +495,7 @@ func TestGetOrganization(t *testing.T) {
return &org
},
orgIdentifierCondition: orgRepo.NameCondition(organizationName),
condition: orgRepo.NameCondition(database.TextOperationEqual, organizationName),
}
}(),
{
@@ -503,7 +507,7 @@ func TestGetOrganization(t *testing.T) {
}
return &org
},
orgIdentifierCondition: orgRepo.NameCondition("non-existent-instance-name"),
condition: orgRepo.NameCondition(database.TextOperationEqual, "non-existent-instance-name"),
err: new(database.NoRowFoundError),
},
}
@@ -521,7 +525,7 @@ func TestGetOrganization(t *testing.T) {
returnedOrg, err := orgRepo.Get(ctx,
database.WithCondition(
database.And(
tt.orgIdentifierCondition,
tt.condition,
orgRepo.InstanceIDCondition(org.InstanceID),
),
),
@@ -823,7 +827,7 @@ func TestDeleteOrganization(t *testing.T) {
type test struct {
name string
testFunc func(ctx context.Context, t *testing.T)
orgIdentifierCondition domain.OrgIdentifierCondition
condition database.Condition
noOfDeletedRows int64
}
tests := []test{
@@ -851,7 +855,7 @@ func TestDeleteOrganization(t *testing.T) {
organizations[i] = &org
}
},
orgIdentifierCondition: organizationRepo.IDCondition(organizationId),
condition: organizationRepo.IDCondition(organizationId),
noOfDeletedRows: noOfOrganizations,
}
}(),
@@ -879,16 +883,16 @@ func TestDeleteOrganization(t *testing.T) {
organizations[i] = &org
}
},
orgIdentifierCondition: organizationRepo.NameCondition(organizationName),
condition: organizationRepo.NameCondition(database.TextOperationEqual, organizationName),
noOfDeletedRows: noOfOrganizations,
}
}(),
func() test {
organizationRepo := repository.OrganizationRepository(pool)
non_existent_organization_name := gofakeit.Name()
nonExistentOrgName := gofakeit.Name()
return test{
name: "delete non existent organization",
orgIdentifierCondition: organizationRepo.NameCondition(non_existent_organization_name),
condition: organizationRepo.NameCondition(database.TextOperationEqual, nonExistentOrgName),
}
}(),
func() test {
@@ -917,13 +921,15 @@ func TestDeleteOrganization(t *testing.T) {
// delete organization
affectedRows, err := organizationRepo.Delete(ctx,
organizationRepo.NameCondition(organizationName),
organizations[0].InstanceID,
database.And(
organizationRepo.NameCondition(database.TextOperationEqual, organizationName),
organizationRepo.InstanceIDCondition(organizations[0].InstanceID),
),
)
assert.Equal(t, int64(1), affectedRows)
require.NoError(t, err)
},
orgIdentifierCondition: organizationRepo.NameCondition(organizationName),
condition: organizationRepo.NameCondition(database.TextOperationEqual, organizationName),
// this test should return 0 affected rows as the org was already deleted
noOfDeletedRows: 0,
}
@@ -940,8 +946,7 @@ func TestDeleteOrganization(t *testing.T) {
// delete organization
noOfDeletedRows, err := organizationRepo.Delete(ctx,
tt.orgIdentifierCondition,
instanceId,
tt.condition,
)
require.NoError(t, err)
assert.Equal(t, noOfDeletedRows, tt.noOfDeletedRows)
@@ -950,7 +955,7 @@ func TestDeleteOrganization(t *testing.T) {
organization, err := organizationRepo.Get(ctx,
database.WithCondition(
database.And(
tt.orgIdentifierCondition,
tt.condition,
organizationRepo.InstanceIDCondition(instanceId),
),
),