mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 19:17:32 +00:00
refactor: cleanup unused code (#7130)
* refactor: drop unused code * refactor: drop unused code
This commit is contained in:
@@ -1,51 +0,0 @@
|
||||
package model
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"reflect"
|
||||
|
||||
es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models"
|
||||
"github.com/zitadel/zitadel/internal/zerrors"
|
||||
)
|
||||
|
||||
type OrgMember struct {
|
||||
es_models.ObjectRoot `json:"-"`
|
||||
|
||||
UserID string `json:"userId,omitempty"`
|
||||
Roles []string `json:"roles,omitempty"`
|
||||
}
|
||||
|
||||
func (m *OrgMember) AppendEvents(events ...*es_models.Event) error {
|
||||
for _, event := range events {
|
||||
err := m.AppendEvent(event)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *OrgMember) AppendEvent(event *es_models.Event) error {
|
||||
m.ObjectRoot.AppendEvent(event)
|
||||
|
||||
return m.SetData(event)
|
||||
}
|
||||
|
||||
func (m *OrgMember) SetData(event *es_models.Event) error {
|
||||
err := json.Unmarshal(event.Data, m)
|
||||
if err != nil {
|
||||
return zerrors.ThrowInternal(err, "EVENT-Hz7Mb", "unable to unmarshal data")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *OrgMember) Changes(updatedMember *OrgMember) map[string]interface{} {
|
||||
changes := make(map[string]interface{}, 2)
|
||||
|
||||
if !reflect.DeepEqual(m.Roles, updatedMember.Roles) {
|
||||
changes["roles"] = updatedMember.Roles
|
||||
changes["userId"] = m.UserID
|
||||
}
|
||||
|
||||
return changes
|
||||
}
|
@@ -97,13 +97,3 @@ func (o *Org) SetData(event eventstore.Event) error {
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (o *Org) Changes(changed *Org) map[string]interface{} {
|
||||
changes := make(map[string]interface{}, 2)
|
||||
|
||||
if changed.Name != "" && changed.Name != o.Name {
|
||||
changes["name"] = changed.Name
|
||||
}
|
||||
|
||||
return changes
|
||||
}
|
||||
|
@@ -116,47 +116,3 @@ func TestAppendEvent(t *testing.T) {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestChanges(t *testing.T) {
|
||||
type args struct {
|
||||
existingOrg *Org
|
||||
newOrg *Org
|
||||
}
|
||||
type res struct {
|
||||
changesLen int
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
res res
|
||||
}{
|
||||
{
|
||||
name: "org name changes",
|
||||
args: args{
|
||||
existingOrg: &Org{Name: "Name"},
|
||||
newOrg: &Org{Name: "NameChanged"},
|
||||
},
|
||||
res: res{
|
||||
changesLen: 1,
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "no changes",
|
||||
args: args{
|
||||
existingOrg: &Org{Name: "Name"},
|
||||
newOrg: &Org{Name: "Name"},
|
||||
},
|
||||
res: res{
|
||||
changesLen: 0,
|
||||
},
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
changes := tt.args.existingOrg.Changes(tt.args.newOrg)
|
||||
if len(changes) != tt.res.changesLen {
|
||||
t.Errorf("got wrong changes len: expected: %v, actual: %v ", tt.res.changesLen, len(changes))
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user