diff --git a/internal/admin/repository/eventsourcing/handler/styling.go b/internal/admin/repository/eventsourcing/handler/styling.go index a9dfba01087..00e15668b18 100644 --- a/internal/admin/repository/eventsourcing/handler/styling.go +++ b/internal/admin/repository/eventsourcing/handler/styling.go @@ -102,10 +102,6 @@ func (s *Styling) Reducers() []handler.AggregateReducer { Event: org.LabelPolicyFontRemovedEventType, Reduce: s.processLabelPolicy, }, - { - Event: org.LabelPolicyAssetsRemovedEventType, - Reduce: s.processLabelPolicy, - }, { Event: org.LabelPolicyActivatedEventType, Reduce: s.processLabelPolicy, @@ -167,10 +163,6 @@ func (s *Styling) Reducers() []handler.AggregateReducer { Event: instance.LabelPolicyFontRemovedEventType, Reduce: s.processLabelPolicy, }, - { - Event: instance.LabelPolicyAssetsRemovedEventType, - Reduce: s.processLabelPolicy, - }, { Event: instance.LabelPolicyActivatedEventType, Reduce: s.processLabelPolicy, @@ -212,9 +204,7 @@ func (m *Styling) processLabelPolicy(event eventstore.Event) (_ *handler.Stateme instance.LabelPolicyFontAddedEventType, org.LabelPolicyFontAddedEventType, instance.LabelPolicyFontRemovedEventType, - org.LabelPolicyFontRemovedEventType, - instance.LabelPolicyAssetsRemovedEventType, - org.LabelPolicyAssetsRemovedEventType: + org.LabelPolicyFontRemovedEventType: policy, err = m.view.StylingByAggregateIDAndState(event.Aggregate().ID, event.Aggregate().InstanceID, int32(domain.LabelPolicyStatePreview)) if err != nil { @@ -343,7 +333,7 @@ const fontFaceTemplate = ` func (m *Styling) uploadFilesToStorage(instanceID, aggregateID, contentType string, reader io.Reader, size int64) error { fileName := domain.CssPath + "/" + domain.CssVariablesFileName - //TODO: handle location as soon as possible + // TODO: handle location as soon as possible _, err := m.static.PutObject(context.Background(), instanceID, "", aggregateID, fileName, contentType, static.ObjectTypeStyling, reader, size) return err } diff --git a/internal/command/org_policy_label.go b/internal/command/org_policy_label.go index 1b815585e7a..dd8cf3fb1b1 100644 --- a/internal/command/org_policy_label.go +++ b/internal/command/org_policy_label.go @@ -455,15 +455,6 @@ func (c *Commands) removeLabelPolicyIfExists(ctx context.Context, orgID string) return org.NewLabelPolicyRemovedEvent(ctx, orgAgg), nil } -func (c *Commands) removeLabelPolicyAssets(ctx context.Context, existingPolicy *OrgLabelPolicyWriteModel) (*org.LabelPolicyAssetsRemovedEvent, error) { - err := c.removeAssetsFolder(ctx, existingPolicy.AggregateID, static.ObjectTypeStyling) - if err != nil { - return nil, err - } - orgAgg := OrgAggregateFromWriteModel(&existingPolicy.WriteModel) - return org.NewLabelPolicyAssetsRemovedEvent(ctx, orgAgg), nil -} - func (c *Commands) orgLabelPolicyWriteModelByID(ctx context.Context, orgID string) (_ *OrgLabelPolicyWriteModel, err error) { ctx, span := tracing.NewSpan(ctx) defer func() { span.EndWithError(err) }() diff --git a/internal/iam/repository/view/model/label_policy.go b/internal/iam/repository/view/model/label_policy.go index 2e3966661fb..f68ff6d5795 100644 --- a/internal/iam/repository/view/model/label_policy.go +++ b/internal/iam/repository/view/model/label_policy.go @@ -159,14 +159,6 @@ func (i *LabelPolicyView) AppendEvent(event eventstore.Event) (err error) { case instance.LabelPolicyActivatedEventType, org.LabelPolicyActivatedEventType: i.State = int32(domain.LabelPolicyStateActive) - case instance.LabelPolicyAssetsRemovedEventType, - org.LabelPolicyAssetsRemovedEventType: - i.LogoURL = "" - i.IconURL = "" - i.LogoDarkURL = "" - i.IconDarkURL = "" - i.FontURL = "" - i.State = int32(domain.LabelPolicyStatePreview) } return err } diff --git a/internal/query/projection/label_policy.go b/internal/query/projection/label_policy.go index dd9c1d07dbb..b97fba58d82 100644 --- a/internal/query/projection/label_policy.go +++ b/internal/query/projection/label_policy.go @@ -153,10 +153,6 @@ func (p *labelPolicyProjection) Reducers() []handler.AggregateReducer { Event: org.LabelPolicyFontRemovedEventType, Reduce: p.reduceFontRemoved, }, - { - Event: org.LabelPolicyAssetsRemovedEventType, - Reduce: p.reduceAssetsRemoved, - }, { Event: org.OrgRemovedEventType, Reduce: p.reduceOwnerRemoved, @@ -218,10 +214,6 @@ func (p *labelPolicyProjection) Reducers() []handler.AggregateReducer { Event: instance.LabelPolicyFontRemovedEventType, Reduce: p.reduceFontRemoved, }, - { - Event: instance.LabelPolicyAssetsRemovedEventType, - Reduce: p.reduceAssetsRemoved, - }, { Event: instance.InstanceRemovedEventType, Reduce: reduceInstanceRemovedHelper(LabelPolicyInstanceIDCol), @@ -584,32 +576,6 @@ func (p *labelPolicyProjection) reduceFontRemoved(event eventstore.Event) (*hand }), nil } -func (p *labelPolicyProjection) reduceAssetsRemoved(event eventstore.Event) (*handler.Statement, error) { - switch event.(type) { - case *org.LabelPolicyAssetsRemovedEvent, *instance.LabelPolicyAssetsRemovedEvent: - //ok - default: - return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-qi39A", "reduce.wrong.event.type %v", []eventstore.EventType{org.LabelPolicyAssetsRemovedEventType, instance.LabelPolicyAssetsRemovedEventType}) - } - - return handler.NewUpdateStatement( - event, - []handler.Column{ - handler.NewCol(LabelPolicyChangeDateCol, event.CreatedAt()), - handler.NewCol(LabelPolicySequenceCol, event.Sequence()), - handler.NewCol(LabelPolicyLightLogoURLCol, nil), - handler.NewCol(LabelPolicyLightIconURLCol, nil), - handler.NewCol(LabelPolicyDarkLogoURLCol, nil), - handler.NewCol(LabelPolicyDarkIconURLCol, nil), - handler.NewCol(LabelPolicyFontURLCol, nil), - }, - []handler.Condition{ - handler.NewCond(LabelPolicyIDCol, event.Aggregate().ID), - handler.NewCond(LabelPolicyStateCol, domain.LabelPolicyStatePreview), - handler.NewCond(LabelPolicyInstanceIDCol, event.Aggregate().InstanceID), - }), nil -} - func (p *labelPolicyProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { diff --git a/internal/query/projection/label_policy_test.go b/internal/query/projection/label_policy_test.go index 4fbc8b17a5d..87cd06a0f19 100644 --- a/internal/query/projection/label_policy_test.go +++ b/internal/query/projection/label_policy_test.go @@ -495,41 +495,6 @@ func TestLabelPolicyProjection_reduces(t *testing.T) { }, }, }, - { - name: "org reduceAssetsRemoved", - args: args{ - event: getEvent( - testEvent( - org.LabelPolicyAssetsRemovedEventType, - org.AggregateType, - nil, - ), org.LabelPolicyAssetsRemovedEventMapper), - }, - reduce: (&labelPolicyProjection{}).reduceAssetsRemoved, - want: wantReduce{ - aggregateType: eventstore.AggregateType("org"), - sequence: 15, - executer: &testExecuter{ - executions: []execution{ - { - expectedStmt: "UPDATE projections.label_policies3 SET (change_date, sequence, light_logo_url, light_icon_url, dark_logo_url, dark_icon_url, font_url) = ($1, $2, $3, $4, $5, $6, $7) WHERE (id = $8) AND (state = $9) AND (instance_id = $10)", - expectedArgs: []interface{}{ - anyArg{}, - uint64(15), - nil, - nil, - nil, - nil, - nil, - "agg-id", - domain.LabelPolicyStatePreview, - "instance-id", - }, - }, - }, - }, - }, - }, { name: "instance reduceAdded", args: args{ @@ -958,41 +923,6 @@ func TestLabelPolicyProjection_reduces(t *testing.T) { }, }, }, - { - name: "instance reduceAssetsRemoved", - args: args{ - event: getEvent( - testEvent( - instance.LabelPolicyAssetsRemovedEventType, - instance.AggregateType, - nil, - ), instance.LabelPolicyAssetsRemovedEventMapper), - }, - reduce: (&labelPolicyProjection{}).reduceAssetsRemoved, - want: wantReduce{ - aggregateType: eventstore.AggregateType("instance"), - sequence: 15, - executer: &testExecuter{ - executions: []execution{ - { - expectedStmt: "UPDATE projections.label_policies3 SET (change_date, sequence, light_logo_url, light_icon_url, dark_logo_url, dark_icon_url, font_url) = ($1, $2, $3, $4, $5, $6, $7) WHERE (id = $8) AND (state = $9) AND (instance_id = $10)", - expectedArgs: []interface{}{ - anyArg{}, - uint64(15), - nil, - nil, - nil, - nil, - nil, - "agg-id", - domain.LabelPolicyStatePreview, - "instance-id", - }, - }, - }, - }, - }, - }, { name: "org.reduceOwnerRemoved", reduce: (&labelPolicyProjection{}).reduceOwnerRemoved, diff --git a/internal/repository/instance/eventstore.go b/internal/repository/instance/eventstore.go index b8089152bb7..f9d68ddcac9 100644 --- a/internal/repository/instance/eventstore.go +++ b/internal/repository/instance/eventstore.go @@ -53,7 +53,6 @@ func init() { eventstore.RegisterFilterEventMapper(AggregateType, LabelPolicyIconDarkRemovedEventType, LabelPolicyIconDarkRemovedEventMapper) eventstore.RegisterFilterEventMapper(AggregateType, LabelPolicyFontAddedEventType, LabelPolicyFontAddedEventMapper) eventstore.RegisterFilterEventMapper(AggregateType, LabelPolicyFontRemovedEventType, LabelPolicyFontRemovedEventMapper) - eventstore.RegisterFilterEventMapper(AggregateType, LabelPolicyAssetsRemovedEventType, LabelPolicyAssetsRemovedEventMapper) eventstore.RegisterFilterEventMapper(AggregateType, LoginPolicyAddedEventType, LoginPolicyAddedEventMapper) eventstore.RegisterFilterEventMapper(AggregateType, LoginPolicyChangedEventType, LoginPolicyChangedEventMapper) eventstore.RegisterFilterEventMapper(AggregateType, DomainPolicyAddedEventType, DomainPolicyAddedEventMapper) diff --git a/internal/repository/instance/policy_label.go b/internal/repository/instance/policy_label.go index f76013b3ed2..ce17fdd16f3 100644 --- a/internal/repository/instance/policy_label.go +++ b/internal/repository/instance/policy_label.go @@ -24,8 +24,6 @@ var ( LabelPolicyFontAddedEventType = instanceEventTypePrefix + policy.LabelPolicyFontAddedEventType LabelPolicyFontRemovedEventType = instanceEventTypePrefix + policy.LabelPolicyFontRemovedEventType - - LabelPolicyAssetsRemovedEventType = instanceEventTypePrefix + policy.LabelPolicyAssetsRemovedEventType ) type LabelPolicyAddedEvent struct { @@ -438,20 +436,6 @@ func (e *LabelPolicyAssetsRemovedEvent) UniqueConstraints() []*eventstore.Unique return nil } -func NewLabelPolicyAssetsRemovedEvent( - ctx context.Context, - aggregate *eventstore.Aggregate, -) *LabelPolicyAssetsRemovedEvent { - return &LabelPolicyAssetsRemovedEvent{ - LabelPolicyAssetsRemovedEvent: *policy.NewLabelPolicyAssetsRemovedEvent( - eventstore.NewBaseEventForPush( - ctx, - aggregate, - LabelPolicyAssetsRemovedEventType), - ), - } -} - func LabelPolicyAssetsRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyAssetsRemovedEventMapper(event) if err != nil { diff --git a/internal/repository/org/eventstore.go b/internal/repository/org/eventstore.go index 289bbbc6088..74052acc4b2 100644 --- a/internal/repository/org/eventstore.go +++ b/internal/repository/org/eventstore.go @@ -34,7 +34,6 @@ func init() { eventstore.RegisterFilterEventMapper(AggregateType, LabelPolicyIconDarkRemovedEventType, LabelPolicyIconDarkRemovedEventMapper) eventstore.RegisterFilterEventMapper(AggregateType, LabelPolicyFontAddedEventType, LabelPolicyFontAddedEventMapper) eventstore.RegisterFilterEventMapper(AggregateType, LabelPolicyFontRemovedEventType, LabelPolicyFontRemovedEventMapper) - eventstore.RegisterFilterEventMapper(AggregateType, LabelPolicyAssetsRemovedEventType, LabelPolicyAssetsRemovedEventMapper) eventstore.RegisterFilterEventMapper(AggregateType, LoginPolicyAddedEventType, LoginPolicyAddedEventMapper) eventstore.RegisterFilterEventMapper(AggregateType, LoginPolicyChangedEventType, LoginPolicyChangedEventMapper) eventstore.RegisterFilterEventMapper(AggregateType, LoginPolicyRemovedEventType, LoginPolicyRemovedEventMapper) diff --git a/internal/repository/org/policy_label.go b/internal/repository/org/policy_label.go index a467b6f5e4e..bee0c20e29e 100644 --- a/internal/repository/org/policy_label.go +++ b/internal/repository/org/policy_label.go @@ -25,8 +25,6 @@ var ( LabelPolicyFontAddedEventType = orgEventTypePrefix + policy.LabelPolicyFontAddedEventType LabelPolicyFontRemovedEventType = orgEventTypePrefix + policy.LabelPolicyFontRemovedEventType - - LabelPolicyAssetsRemovedEventType = orgEventTypePrefix + policy.LabelPolicyAssetsRemovedEventType ) type LabelPolicyAddedEvent struct { @@ -466,20 +464,6 @@ func (e *LabelPolicyAssetsRemovedEvent) UniqueConstraints() []*eventstore.Unique return nil } -func NewLabelPolicyAssetsRemovedEvent( - ctx context.Context, - aggregate *eventstore.Aggregate, -) *LabelPolicyAssetsRemovedEvent { - return &LabelPolicyAssetsRemovedEvent{ - LabelPolicyAssetsRemovedEvent: *policy.NewLabelPolicyAssetsRemovedEvent( - eventstore.NewBaseEventForPush( - ctx, - aggregate, - LabelPolicyAssetsRemovedEventType), - ), - } -} - func LabelPolicyAssetsRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyAssetsRemovedEventMapper(event) if err != nil { diff --git a/internal/repository/policy/label.go b/internal/repository/policy/label.go index b004b2377de..443aa0d3f59 100644 --- a/internal/repository/policy/label.go +++ b/internal/repository/policy/label.go @@ -25,8 +25,6 @@ const ( LabelPolicyFontAddedEventType = "policy.label.font.added" LabelPolicyFontRemovedEventType = "policy.label.font.removed" - LabelPolicyAssetsRemovedEventType = "policy.label.assets.removed" - LabelPolicyRemovedEventType = "policy.label.removed" ) @@ -70,7 +68,6 @@ func NewLabelPolicyAddedEvent( disableWatermark bool, themeMode domain.LabelPolicyThemeMode, ) *LabelPolicyAddedEvent { - return &LabelPolicyAddedEvent{ BaseEvent: *base, PrimaryColor: primaryColor,