mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-13 03:24:26 +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>
38 lines
1.0 KiB
Go
38 lines
1.0 KiB
Go
package grpc
|
|
|
|
import (
|
|
"github.com/caos/logging"
|
|
org_model "github.com/caos/zitadel/internal/org/model"
|
|
"github.com/golang/protobuf/ptypes"
|
|
)
|
|
|
|
func addOrgMemberToModel(member *AddOrgMemberRequest) *org_model.OrgMember {
|
|
memberModel := org_model.NewOrgMember(member.OrgId, member.UserId)
|
|
memberModel.Roles = member.Roles
|
|
|
|
return memberModel
|
|
}
|
|
|
|
func changeOrgMemberToModel(member *ChangeOrgMemberRequest) *org_model.OrgMember {
|
|
memberModel := org_model.NewOrgMember(member.OrgId, member.UserId)
|
|
memberModel.Roles = member.Roles
|
|
|
|
return memberModel
|
|
}
|
|
|
|
func orgMemberFromModel(member *org_model.OrgMember) *OrgMember {
|
|
creationDate, err := ptypes.TimestampProto(member.CreationDate)
|
|
logging.Log("GRPC-jC5wY").OnError(err).Debug("date parse failed")
|
|
|
|
changeDate, err := ptypes.TimestampProto(member.ChangeDate)
|
|
logging.Log("GRPC-Nc2jJ").OnError(err).Debug("date parse failed")
|
|
|
|
return &OrgMember{
|
|
UserId: member.UserID,
|
|
CreationDate: creationDate,
|
|
ChangeDate: changeDate,
|
|
Roles: member.Roles,
|
|
Sequence: member.Sequence,
|
|
}
|
|
}
|