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

fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! refactor(api): moving organization API resourced based

Browse Source
This commit is contained in:
Iraq Jaber
2025-05-04 16:58:25 +02:00
parent e7d1939012
commit 492ac01af4
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/api/grpc/management/org.go
View File

@@ -98,7 +98,7 @@ func (s *Server) AddOrg(ctx context.Context, req *mgmt_pb.AddOrgRequest) (*mgmt_
func (s *Server) UpdateOrg(ctx context.Context, req *mgmt_pb.UpdateOrgRequest) (*mgmt_pb.UpdateOrgResponse, error) {
ctxData := authz.GetCtxData(ctx)
org, err := s.command.UpdateOrg(ctx, ctxData.OrgID, req.Name)
org, err := s.command.ChangeOrg(ctx, ctxData.OrgID, req.Name)
if err != nil {
return nil, err
}

2
internal/api/grpc/org/v2beta/org.go
View File

@@ -26,7 +26,7 @@ func (s *Server) CreateOrganization(ctx context.Context, request *v2beta_org.Cre
}
func (s *Server) UpdateOrganization(ctx context.Context, request *v2beta_org.UpdateOrganizationRequest) (*v2beta_org.UpdateOrganizationResponse, error) {
org, err := s.command.UpdateOrg(ctx, request.Id, request.Name)
org, err := s.command.ChangeOrg(ctx, request.Id, request.Name)
if err != nil {
return nil, err
}

10
internal/command/org.go
View File

@@ -342,7 +342,7 @@ func (c *Commands) addOrgWithIDAndMember(ctx context.Context, name, userID, reso
return orgWriteModelToOrg(addedOrg), nil
}
func (c *Commands) UpdateOrg(ctx context.Context, orgID, name string) (*domain.ObjectDetails, error) {
func (c *Commands) ChangeOrg(ctx context.Context, orgID, name string) (*domain.ObjectDetails, error) {
name = strings.TrimSpace(name)
if orgID == "" || name == "" {
return nil, zerrors.ThrowInvalidArgument(nil, "EVENT-Mf9sd", "Errors.Org.Invalid")
@@ -353,10 +353,10 @@ func (c *Commands) UpdateOrg(ctx context.Context, orgID, name string) (*domain.O
return nil, err
}
if !isOrgStateExists(orgWriteModel.State) {
return writeModelToObjectDetails(&orgWriteModel.WriteModel), nil
return nil, zerrors.ThrowNotFound(nil, "ORG-1MRds", "Errors.Org.NotFound")
}
if orgWriteModel.Name == name {
return writeModelToObjectDetails(&orgWriteModel.WriteModel), nil
return nil, zerrors.ThrowPreconditionFailed(nil, "ORG-4VSdf", "Errors.Org.NotChanged")
}
orgAgg := OrgAggregateFromWriteModel(&orgWriteModel.WriteModel)
events := make([]eventstore.Command, 0)
@@ -388,7 +388,7 @@ func (c *Commands) DeactivateOrg(ctx context.Context, orgID string) (*domain.Obj
return nil, zerrors.ThrowNotFound(nil, "ORG-oL9nT", "Errors.Org.NotFound")
}
if orgWriteModel.State == domain.OrgStateInactive {
return writeModelToObjectDetails(&orgWriteModel.WriteModel), nil
return nil, zerrors.ThrowPreconditionFailed(nil, "EVENT-Dbs2g", "Errors.Org.AlreadyDeactivated")
}
orgAgg := OrgAggregateFromWriteModel(&orgWriteModel.WriteModel)
pushedEvents, err := c.eventstore.Push(ctx, org.NewOrgDeactivatedEvent(ctx, orgAgg))
@@ -411,7 +411,7 @@ func (c *Commands) ReactivateOrg(ctx context.Context, orgID string) (*domain.Obj
return nil, zerrors.ThrowNotFound(nil, "ORG-Dgf3g", "Errors.Org.NotFound")
}
if orgWriteModel.State == domain.OrgStateActive {
return writeModelToObjectDetails(&orgWriteModel.WriteModel), nil
return nil, zerrors.ThrowPreconditionFailed(nil, "EVENT-bfnrh", "Errors.Org.AlreadyActive")
}
orgAgg := OrgAggregateFromWriteModel(&orgWriteModel.WriteModel)
pushedEvents, err := c.eventstore.Push(ctx, org.NewOrgReactivatedEvent(ctx, orgAgg))

2
internal/command/org_test.go
View File

@@ -756,7 +756,7 @@ func TestCommandSide_ChangeOrg(t *testing.T) {
r := &Commands{
eventstore: tt.fields.eventstore,
}
_, err := r.UpdateOrg(tt.args.ctx, tt.args.orgID, tt.args.name)
_, err := r.ChangeOrg(tt.args.ctx, tt.args.orgID, tt.args.name)
if tt.res.err == nil {
assert.NoError(t, err)
}