mirror of
https://github.com/andwati/zitadel.git
synced 2026-11-21 20:38:47 +00:00
feat(group): manage users in user groups (#10940)
# Which Problems Are Solved 1. Adding users to user groups and removing users from user groups. 2. Searching for users in user groups by group IDs or user IDs # How the Problems Are Solved By adding: 1. The API definitions to manage users in users groups 3. The command-layer implementation of adding users/removing users to/from user groups. 4. The projection table group_users1 5. Query-side implementation to search for users in user groups # Additional Changes 1. Remove debug statements from unit tests. 2. Fix removal of groups when orgs are removed 3. Add unit tests for groups projection # Additional Context * Related to #9702 * Follow-up for PRs * https://github.com/zitadel/zitadel/pull/10455 * https://github.com/zitadel/zitadel/pull/10758 * https://github.com/zitadel/zitadel/pull/10853
This commit is contained in:
@@ -16,29 +16,43 @@ type GroupWriteModel struct {
|
||||
Description string
|
||||
|
||||
State domain.GroupState
|
||||
|
||||
UserIDs []string
|
||||
existingUserIDs map[string]struct{}
|
||||
}
|
||||
|
||||
// NewGroupWriteModel initializes a new instance of GroupWriteModel from the given Group.
|
||||
func NewGroupWriteModel(id, orgID string) *GroupWriteModel {
|
||||
func NewGroupWriteModel(groupID, orgID string, userIDs []string) *GroupWriteModel {
|
||||
return &GroupWriteModel{
|
||||
WriteModel: eventstore.WriteModel{
|
||||
AggregateID: id,
|
||||
AggregateID: groupID,
|
||||
ResourceOwner: orgID,
|
||||
},
|
||||
UserIDs: userIDs,
|
||||
existingUserIDs: make(map[string]struct{}),
|
||||
}
|
||||
}
|
||||
|
||||
func (g *GroupWriteModel) GetWriteModel() *eventstore.WriteModel {
|
||||
return &g.WriteModel
|
||||
}
|
||||
|
||||
// Query constructs a search query for retrieving group-related events based on the GroupWriteModel attributes.
|
||||
func (g *GroupWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
eventTypes := []eventstore.EventType{
|
||||
group.GroupAddedEventType,
|
||||
group.GroupChangedEventType,
|
||||
group.GroupRemovedEventType,
|
||||
}
|
||||
if g.UserIDs != nil {
|
||||
eventTypes = append(eventTypes, group.GroupUsersAddedEventType, group.GroupUsersRemovedEventType)
|
||||
}
|
||||
return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
||||
ResourceOwner(g.ResourceOwner).
|
||||
AddQuery().
|
||||
AggregateTypes(group.AggregateType).
|
||||
AggregateIDs(g.AggregateID).
|
||||
EventTypes(
|
||||
group.GroupAddedEventType,
|
||||
group.GroupChangedEventType,
|
||||
group.GroupRemovedEventType).Builder()
|
||||
EventTypes(eventTypes...).Builder()
|
||||
}
|
||||
|
||||
func (g *GroupWriteModel) Reduce() error {
|
||||
@@ -58,6 +72,14 @@ func (g *GroupWriteModel) Reduce() error {
|
||||
}
|
||||
case *group.GroupRemovedEvent:
|
||||
g.State = domain.GroupStateRemoved
|
||||
case *group.GroupUsersAddedEvent:
|
||||
for _, userID := range e.UserIDs {
|
||||
g.existingUserIDs[userID] = struct{}{}
|
||||
}
|
||||
case *group.GroupUsersRemovedEvent:
|
||||
for _, userID := range e.UserIDs {
|
||||
delete(g.existingUserIDs, userID)
|
||||
}
|
||||
}
|
||||
}
|
||||
return g.WriteModel.Reduce()
|
||||
|
||||
Reference in New Issue
Block a user