mirror of
https://github.com/zitadel/zitadel.git
synced 2025-01-10 04:33:39 +00:00
9e32740eb8
* start org * refactor(eventstore): filter in sql for querier * feat(eventstore): Aggregate precondition preconditions are checked right before insert. Insert is still transaction save * feat(eventstore): check preconditions in repository * test(eventstore): test precondition in models * test(eventstore): precondition-tests * start org * refactor(eventstore): filter in sql for querier * feat(eventstore): Aggregate precondition preconditions are checked right before insert. Insert is still transaction save * feat(admin): start implement org * feat(eventstore): check preconditions in repository * fix(eventstore): data as NULL if empty refactor(eventstore): naming in sequence methods * feat(admin): org command side * feat(management): start org-repo * feat(org): member * fix: replace ObjectRoot.ID with ObjectRoot.AggregateID * aggregateID * add remove,change member * refactor(org): namings * refactor(eventstore): querier as type * fix(precondition): rename validation from precondition to validation * test(eventstore): isErr func instead of wantErr bool * fix(tests): Data * fix(eventstore): correct check for existing events in push, simplify insert statement * fix(eventstore): aggregate id public * test(org): eventsourcing * test(org): eventstore * test(org): deactivate, reactivate, orgbyid * test(org): getMemberByIDs * tests * running tests * add user repo to admin * thorw not found if no org found * eventstore tests done * lauft * validate if user is already member of org * modules * delete unused file * add member validation test * return error if unable to validat member * generate org id once, set resourceowner of org * Update internal/admin/repository/eventsourcing/eventstore/org.go * Update internal/admin/repository/eventsourcing/eventstore/org.go * Update internal/org/repository/eventsourcing/member_model.go * Update internal/org/repository/eventsourcing/org.go * Update internal/org/repository/eventsourcing/org.go * Update internal/org/repository/eventsourcing/org_member.go * Update internal/org/repository/eventsourcing/org_member.go * Update internal/org/repository/eventsourcing/org_model.go * Update internal/org/repository/eventsourcing/org.go * Update internal/org/repository/eventsourcing/org_model.go * Update internal/org/repository/eventsourcing/org_model.go * typo * correct user events * usercreate for setuporg instead of userregister * set data * mod * mod * tests * cleanup code * code styling * return member on add and change * change username in startup * girignore * orgID as parameter in re-/deactive org * startup config * migration for admin_api-user * probes fro admin * move unique org Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
97 lines
2.3 KiB
Go
97 lines
2.3 KiB
Go
package eventsourcing
|
|
|
|
import (
|
|
"encoding/json"
|
|
"reflect"
|
|
|
|
"github.com/caos/zitadel/internal/errors"
|
|
es_models "github.com/caos/zitadel/internal/eventstore/models"
|
|
"github.com/caos/zitadel/internal/org/model"
|
|
)
|
|
|
|
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 errors.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
|
|
}
|
|
|
|
func OrgMemberFromEvent(member *OrgMember, event *es_models.Event) (*OrgMember, error) {
|
|
if member == nil {
|
|
member = new(OrgMember)
|
|
}
|
|
member.ObjectRoot.AppendEvent(event)
|
|
err := json.Unmarshal(event.Data, member)
|
|
if err != nil {
|
|
return nil, errors.ThrowInternal(err, "EVENT-D4qxo", "invalid event data")
|
|
}
|
|
return member, nil
|
|
}
|
|
|
|
func OrgMembersFromModel(members []*model.OrgMember) []*OrgMember {
|
|
convertedMembers := make([]*OrgMember, len(members))
|
|
for i, m := range members {
|
|
convertedMembers[i] = OrgMemberFromModel(m)
|
|
}
|
|
return convertedMembers
|
|
}
|
|
|
|
func OrgMemberFromModel(member *model.OrgMember) *OrgMember {
|
|
return &OrgMember{
|
|
ObjectRoot: member.ObjectRoot,
|
|
UserID: member.UserID,
|
|
Roles: member.Roles,
|
|
}
|
|
}
|
|
|
|
func OrgMembersToModel(members []*OrgMember) []*model.OrgMember {
|
|
convertedMembers := make([]*model.OrgMember, len(members))
|
|
for i, m := range members {
|
|
convertedMembers[i] = OrgMemberToModel(m)
|
|
}
|
|
return convertedMembers
|
|
}
|
|
|
|
func OrgMemberToModel(member *OrgMember) *model.OrgMember {
|
|
return &model.OrgMember{
|
|
ObjectRoot: member.ObjectRoot,
|
|
UserID: member.UserID,
|
|
Roles: member.Roles,
|
|
}
|
|
}
|