Skip to content

Modify counting logic based on org role #1285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 7, 2024
Merged

Modify counting logic based on org role #1285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed6d362
Modify counting logic based on org role
dragonpoo Nov 5, 2024
9ca6647
Add statistic fields to group list api
dragonpoo Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions ...ce/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupApiServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ public Mono<List<GroupView>> getGroups() {
return sessionUserService.getVisitorOrgMemberCache()
.flatMap(orgMember -> {
String orgId = orgMember.getOrgId();
Mono<Integer> orgAdminCountMono = orgMemberService.getAllOrgAdmins(orgId).map(List::size);
Mono<List<OrgMember>> orgAdminsMono = orgMemberService.getAllOrgAdmins(orgId);
if (orgMember.isAdmin() || orgMember.isSuperAdmin()) {
MemberRole memberRole;
if(orgMember.isAdmin()) {
Expand All @@ -196,44 +196,45 @@ public Mono<List<GroupView>> getGroups() {
}
return groupService.getByOrgId(orgId)
.sort()
.flatMapSequential(group -> groupMemberService.getAllGroupAdmin(group.getId())
.zipWith(groupMemberService.getGroupMembers(group.getId(), 0, -1))
.zipWith(orgAdminCountMono, TupleUtils::merge)
.flatMapSequential(group -> groupMemberService.getGroupMembers(group.getId(), 0, -1)
.zipWith(orgAdminsMono)
.flatMap(tuple -> {
var adminMembers = tuple.getT1();
var users = tuple.getT2();
var orgAdminCount = tuple.getT3();
var users = tuple.getT1().stream().filter(user -> user.getRole() != MemberRole.SUPER_ADMIN).toList();
var orgAdmins = tuple.getT2();
var adminMembers = orgAdmins.stream().filter(orgAdmin -> users.stream().anyMatch(member -> member.getUserId().equals(orgAdmin.getUserId()))).toList();
if(group.isAllUsersGroup()) {
return GroupView.from(group, memberRole.getValue(), orgAdminCount, users.size());
return GroupView.from(group, memberRole.getValue(), orgAdmins.size(), users.size(), users.stream().map(GroupMember::getUserId).toList());
} else {
return GroupView.from(group, memberRole.getValue(), adminMembers.size(), users.size());
return GroupView.from(group, memberRole.getValue(), adminMembers.size(), users.size(), users.stream().map(GroupMember::getUserId).toList());
}
})
)
.collectList();
}
return groupMemberService.getUserGroupMembersInOrg(orgId, orgMember.getUserId())
.zipWith(orgAdminCountMono)
.zipWith(orgAdminsMono)
.flatMap(tuple -> {
List<GroupMember> groupMembers = tuple.getT1();
int orgAdminCount = tuple.getT2();
List<OrgMember> orgAdmins = tuple.getT2();
List<String> groupIds = collectList(groupMembers, GroupMember::getGroupId);
Map<String, GroupMember> groupMemberMap = collectMap(groupMembers, GroupMember::getGroupId, it -> it);
return groupService.getByIds(groupIds)
.sort()
.flatMapSequential(group -> {
var adminMembers = groupMembers.stream().filter(groupMember -> groupMember.getGroupId().equals(group.getId()) && groupMember.getRole() == MemberRole.ADMIN).toList();
var allMembers = groupMembers.stream().filter(groupMember -> groupMember.getGroupId().equals(group.getId())).toList();
var allMembers = groupMembers.stream().filter(groupMember -> groupMember.getGroupId().equals(group.getId()) && groupMember.getRole() != MemberRole.SUPER_ADMIN).toList();
var adminMembers = orgAdmins.stream().filter(orgAdmin -> allMembers.stream().anyMatch(member -> member.getUserId().equals(orgAdmin.getUserId()))).toList();
if(group.isAllUsersGroup()) {
return GroupView.from(group,
groupMemberMap.get(group.getId()).getRole().getValue(),
orgAdminCount,
allMembers.size());
orgAdmins.size(),
allMembers.size(),
allMembers.stream().map(GroupMember::getUserId).toList());
} else {
return GroupView.from(group,
groupMemberMap.get(group.getId()).getRole().getValue(),
adminMembers.size(),
allMembers.size());
allMembers.size(),
allMembers.stream().map(GroupMember::getUserId).toList());
}
})
.collectList();
Expand Down
51 changes: 41 additions & 10 deletions ...ervice/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,15 @@
import org.apache.commons.lang3.StringUtils;
import org.lowcoder.api.framework.view.ResponseView;
import org.lowcoder.api.home.SessionUserService;
import org.lowcoder.api.usermanagement.view.AddMemberRequest;
import org.lowcoder.api.usermanagement.view.CreateGroupRequest;
import org.lowcoder.api.usermanagement.view.GroupMemberAggregateView;
import org.lowcoder.api.usermanagement.view.GroupView;
import org.lowcoder.api.usermanagement.view.UpdateGroupRequest;
import org.lowcoder.api.usermanagement.view.UpdateRoleRequest;
import org.lowcoder.api.usermanagement.view.*;
import org.lowcoder.api.util.BusinessEventPublisher;
import org.lowcoder.api.util.GidService;
import org.lowcoder.domain.group.model.GroupMember;
import org.lowcoder.domain.group.service.GroupMemberService;
import org.lowcoder.domain.group.service.GroupService;
import org.lowcoder.domain.organization.model.MemberRole;
import org.lowcoder.domain.organization.model.OrgMember;
import org.lowcoder.domain.organization.service.OrgMemberService;
import org.lowcoder.sdk.exception.BizError;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
Expand All @@ -46,12 +44,14 @@ public class GroupController implements GroupEndpoints
private GroupService groupService;
@Autowired
private GidService gidService;
@Autowired
private OrgMemberService orgMemberService;

@Override
public Mono<ResponseView<GroupView>> create(@Valid @RequestBody CreateGroupRequest newGroup) {
return groupApiService.create(newGroup)
.delayUntil(group -> businessEventPublisher.publishGroupCreateEvent(group))
.flatMap(group -> GroupView.from(group, MemberRole.ADMIN.getValue(), 1, 1))
.flatMap(group -> GroupView.from(group, MemberRole.ADMIN.getValue(), 1, 1, List.of()))
.map(ResponseView::success);
}

Expand All @@ -75,9 +75,40 @@ public Mono<ResponseView<Boolean>> delete(@PathVariable String groupId) {
}

@Override
public Mono<ResponseView<List<GroupView>>> getOrgGroups() {
return groupApiService.getGroups()
.map(ResponseView::success);
public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups() {
return groupApiService.getGroups().flatMap(groupList -> {
if(groupList.isEmpty()) return Mono.just(new GroupListResponseView<>(ResponseView.SUCCESS,
"", List.of(), 0, 0, 0, 0));
return sessionUserService.getVisitorOrgMemberCache()
.map(OrgMember::getOrgId)
.flatMap(orgId -> orgMemberService.getOrganizationMembers(orgId)
.collectList()
.zipWith(groupService.getDevGroup(orgId).flatMap(devGroup -> groupMemberService.getGroupMembers(devGroup.getId(), 0, -1)))
.map(tuple -> {
List<OrgMember> orgMembers = tuple.getT1();
List<GroupMember> devMembers = tuple.getT2();
int totalAdmins = orgMembers.stream().filter(OrgMember::isAdmin).toList().size();
int totalAdminsAndDevelopers = orgMembers.stream()
.filter(orgMember -> orgMember.isAdmin() ||
devMembers.stream().anyMatch(devMember -> devMember.getUserId().equals(orgMember.getUserId()))).toList().size();
int totalDevelopersOnly = orgMembers.stream()
.filter(orgMember -> !orgMember.isAdmin() && !orgMember.isSuperAdmin() &&
devMembers.stream().anyMatch(devMember -> devMember.getUserId().equals(orgMember.getUserId()))).toList().size();
int totalOtherMembers = orgMembers.stream()
.filter(orgMember -> !orgMember.isAdmin() && !orgMember.isSuperAdmin() &&
devMembers.stream().noneMatch(devMember -> devMember.getUserId().equals(orgMember.getUserId()))).toList().size();

return new GroupListResponseView<>(ResponseView.SUCCESS,
"",
groupList,
totalAdmins,
totalAdminsAndDevelopers,
totalDevelopersOnly,
totalOtherMembers);
})
);
}
);
}


Expand Down
9 changes: 2 additions & 7 deletions ...service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupEndpoints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@
import jakarta.validation.Valid;

import org.lowcoder.api.framework.view.ResponseView;
import org.lowcoder.api.usermanagement.view.AddMemberRequest;
import org.lowcoder.api.usermanagement.view.CreateGroupRequest;
import org.lowcoder.api.usermanagement.view.GroupMemberAggregateView;
import org.lowcoder.api.usermanagement.view.GroupView;
import org.lowcoder.api.usermanagement.view.UpdateGroupRequest;
import org.lowcoder.api.usermanagement.view.UpdateRoleRequest;
import org.lowcoder.api.usermanagement.view.*;
import org.lowcoder.infra.constant.NewUrl;
import org.lowcoder.infra.constant.Url;
import org.springframework.web.bind.annotation.DeleteMapping;
Expand Down Expand Up @@ -68,7 +63,7 @@ public Mono<ResponseView<Boolean>> update(@PathVariable String groupId,
description = "Retrieve a list of User Groups within Lowcoder, providing an overview of available groups, based on the access rights of the currently impersonated User."
)
@GetMapping("/list")
public Mono<ResponseView<List<GroupView>>> getOrgGroups();
public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups();

@Operation(
tags = TAG_GROUP_MEMBERS,
Expand Down
22 changes: 22 additions & 0 deletions ...oder-server/src/main/java/org/lowcoder/api/usermanagement/view/GroupListResponseView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package org.lowcoder.api.usermanagement.view;

import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Getter;
import org.lowcoder.api.framework.view.ResponseView;
import org.lowcoder.sdk.exception.BizError;

@JsonInclude(JsonInclude.Include.NON_NULL)
@Getter
public class GroupListResponseView<T> extends ResponseView<T> {
private final int totalAdminsAndDevelopers;
private final int totalDevelopersOnly;
private final int totalAdmins;
private final int totalOtherMembers;
public GroupListResponseView(int code, String message, T data, int totalAdmins, int totalAdminsAndDevelopers, int totalDevelopersOnly, int totalOtherMembers) {
super(code, message, data);
this.totalAdmins = totalAdmins;
this.totalDevelopersOnly = totalDevelopersOnly;
this.totalAdminsAndDevelopers = totalAdminsAndDevelopers;
this.totalOtherMembers = totalOtherMembers;
}
}
10 changes: 5 additions & 5 deletions ...service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/GroupView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package org.lowcoder.api.usermanagement.view;

import java.util.List;
import java.util.Locale;
import java.util.Map;

import org.lowcoder.domain.group.model.Group;
import org.lowcoder.sdk.util.LocaleUtils;
Expand All @@ -23,10 +25,9 @@ public class GroupView {
private String dynamicRule;
private boolean isSyncGroup;
private boolean isSyncDelete;
private int adminUserCount;
private int userCount;
private Map<String, Object> stats;

public static Mono<GroupView> from(Group group, String memberRole, int adminCount, int userCount) {
public static Mono<GroupView> from(Group group, String memberRole, int adminCount, int userCount, List<String> users) {
return Mono.deferContextual(contextView -> {
Locale locale = LocaleUtils.getLocale(contextView);
GroupView groupView = GroupView.builder()
Expand All @@ -40,8 +41,7 @@ public static Mono<GroupView> from(Group group, String memberRole, int adminCoun
.dynamicRule(group.getDynamicRule())
.isSyncGroup(group.isSyncGroup())
.isSyncDelete(group.isSyncDeleted())
.adminUserCount(adminCount)
.userCount(userCount)
.stats(Map.of("adminUserCount", adminCount, "userCount", userCount, "users", users))
.build();
return Mono.just(groupView);
});
Expand Down
Loading