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

fix: Custom texts (#2875)

Browse Source 
* feat: delete org

* fix: return is default on custom message text

* fix(projeciton): print stack trace on recover panic

* chore: print panic line

* fix: custom message text retunr nil, nil

* fix: custom message text template

* fix: remove isDefault from selection (#2876)

* fix: custom message text query

Co-authored-by: adlerhurst <silvan.reusser@gmail.com>
Co-authored-by: Max Peintner <max@caos.ch>
This commit is contained in:
Fabi
2021-12-21 15:18:05 +01:00
committed by GitHub
parent fc08229679
commit cf727b7fff
8 changed files with 44 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
internal/query/message_text.go
View File

@@ -161,12 +161,24 @@ func (q *Queries) DefaultMessageTextByTypeAndLanguageFromFileSystem(messageType,
func (q *Queries) CustomMessageTextByTypeAndLanguage(ctx context.Context, aggregateID, messageType, language string) (*MessageText, error) {
stmt, scan := prepareMessageTextQuery()
query, args, err := stmt.Where(
sq.Eq{
MessageTextColAggregateID.identifier(): aggregateID,
MessageTextColType.identifier(): messageType,
MessageTextColLanguage.identifier(): language,
sq.And{
sq.Eq{
MessageTextColLanguage.identifier(): language,
},
sq.Eq{
MessageTextColType.identifier(): messageType,
},
sq.Or{
sq.Eq{
MessageTextColAggregateID.identifier(): aggregateID,
},
sq.Eq{
MessageTextColAggregateID.identifier(): domain.IAMID,
},
},
},
).
OrderBy(MessageTextColAggregateID.identifier()).
Limit(1).ToSql()
if err != nil {
return nil, errors.ThrowInternal(err, "QUERY-1b9mf", "Errors.Query.SQLStatement")

15
internal/query/projection/message_texts.go
View File

@@ -147,7 +147,7 @@ func (p *MessageTextProjection) reduceRemoved(event eventstore.EventReader) (*ha
return nil, errors.ThrowInvalidArgument(nil, "PROJE-fm0ge", "reduce.wrong.event.type")
}
if !isMessageTemplate(templateEvent.Template) {
return nil, nil
return crdb.NewNoOpStatement(event), nil
}
cols := []handler.Column{
handler.NewCol(MessageTextChangeDateCol, templateEvent.CreationDate()),
@@ -186,16 +186,21 @@ func (p *MessageTextProjection) reduceRemoved(event eventstore.EventReader) (*ha
}
func (p *MessageTextProjection) reduceTemplateRemoved(event eventstore.EventReader) (*handler.Statement, error) {
templateEvent, ok := event.(*org.CustomTextTemplateRemovedEvent)
if !ok {
var templateEvent policy.CustomTextTemplateRemovedEvent
switch e := event.(type) {
case *org.CustomTextTemplateRemovedEvent:
templateEvent = e.CustomTextTemplateRemovedEvent
case *iam.CustomTextTemplateRemovedEvent:
templateEvent = e.CustomTextTemplateRemovedEvent
default:
logging.LogWithFields("PROJE-m03ng", "seq", event.Sequence(), "expectedType", org.CustomTextTemplateRemovedEventType).Error("wrong event type")
return nil, errors.ThrowInvalidArgument(nil, "PROJE-2n9rs", "reduce.wrong.event.type")
}
if !isMessageTemplate(templateEvent.Template) {
return nil, nil
return crdb.NewNoOpStatement(event), nil
}
return crdb.NewDeleteStatement(
templateEvent,
event,
[]handler.Condition{
handler.NewCond(MessageTextAggregateIDCol, templateEvent.Aggregate().ID),
handler.NewCond(MessageTextTypeCol, templateEvent.Template),