Skip to content

Group API with adminUserCount & userCount #1283

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 5, 2024
Merged

Group API with adminUserCount & userCount #1283

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
4e11434
add group admin count and user count to list api
dragonpoo Nov 5, 2024
831abed
modify admin user count for all user group
dragonpoo Nov 5, 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
44 changes: 40 additions & 4 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 @@ -12,6 +12,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;

import com.github.f4b6a3.uuid.UuidCreator;
import lombok.RequiredArgsConstructor;
Expand All @@ -29,12 +30,15 @@
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.domain.organization.service.OrganizationService;
import org.lowcoder.domain.user.model.User;
import org.lowcoder.domain.user.service.UserService;
import org.lowcoder.infra.util.TupleUtils;
import org.lowcoder.sdk.exception.BizError;
import org.springframework.stereotype.Service;

import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.util.function.Tuple2;

Expand All @@ -48,6 +52,8 @@ public class GroupApiServiceImpl implements GroupApiService {
private final UserService userService;
private final GroupService groupService;
private final AbstractBizThresholdChecker bizThresholdChecker;
private final OrganizationService organizationService;
private final OrgMemberService orgMemberService;

@Override
public Mono<GroupMemberAggregateView> getGroupMembers(String groupId, int page, int count) {
Expand Down Expand Up @@ -180,6 +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);
if (orgMember.isAdmin() || orgMember.isSuperAdmin()) {
MemberRole memberRole;
if(orgMember.isAdmin()) {
Expand All @@ -189,17 +196,46 @@ public Mono<List<GroupView>> getGroups() {
}
return groupService.getByOrgId(orgId)
.sort()
.flatMapSequential(group -> GroupView.from(group, memberRole.getValue()))
.flatMapSequential(group -> groupMemberService.getAllGroupAdmin(group.getId())
.zipWith(groupMemberService.getGroupMembers(group.getId(), 0, -1))
.zipWith(orgAdminCountMono, TupleUtils::merge)
.flatMap(tuple -> {
var adminMembers = tuple.getT1();
var users = tuple.getT2();
var orgAdminCount = tuple.getT3();
if(group.isAllUsersGroup()) {
return GroupView.from(group, memberRole.getValue(), orgAdminCount, users.size());
} else {
return GroupView.from(group, memberRole.getValue(), adminMembers.size(), users.size());
}
})
)
.collectList();
}
return groupMemberService.getUserGroupMembersInOrg(orgId, orgMember.getUserId())
.flatMap(groupMembers -> {
.zipWith(orgAdminCountMono)
.flatMap(tuple -> {
List<GroupMember> groupMembers = tuple.getT1();
int orgAdminCount = 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 -> GroupView.from(group,
groupMemberMap.get(group.getId()).getRole().getValue()))
.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();
if(group.isAllUsersGroup()) {
return GroupView.from(group,
groupMemberMap.get(group.getId()).getRole().getValue(),
orgAdminCount,
allMembers.size());
} else {
return GroupView.from(group,
groupMemberMap.get(group.getId()).getRole().getValue(),
adminMembers.size(),
allMembers.size());
}
})
.collectList();
});
});
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -51,7 +51,7 @@ public class GroupController implements GroupEndpoints
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()))
.flatMap(group -> GroupView.from(group, MemberRole.ADMIN.getValue(), 1, 1))
.map(ResponseView::success);
}

Expand Down
6 changes: 5 additions & 1 deletion ...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
Expand Up @@ -23,8 +23,10 @@ public class GroupView {
private String dynamicRule;
private boolean isSyncGroup;
private boolean isSyncDelete;
private int adminUserCount;
private int userCount;

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