Skip to content

Updated myorg endpoint #1838

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
Parent: Dev -> Main - v2.7.5
merged 1 commit into from
Jul 3, 2025
Merged

Updated myorg endpoint #1838

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 26 additions & 3 deletions ...service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@
import org.lowcoder.api.framework.view.ResponseView;
import org.lowcoder.api.home.SessionUserService;
import org.lowcoder.api.home.UserHomeApiService;
import org.lowcoder.api.home.UserHomepageView;
import org.lowcoder.api.usermanagement.view.OrgView;
import org.lowcoder.api.usermanagement.view.UpdateUserRequest;
import org.lowcoder.api.usermanagement.view.UserProfileView;
import org.lowcoder.domain.organization.model.MemberRole;
import org.lowcoder.domain.organization.model.OrgMember;
import org.lowcoder.domain.organization.model.Organization;
import org.lowcoder.domain.organization.service.OrgMemberService;
import org.lowcoder.domain.organization.service.OrganizationService;
import org.lowcoder.domain.user.constant.UserStatusType;
Expand All @@ -34,7 +36,10 @@
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import static org.lowcoder.sdk.exception.BizError.INVALID_USER_STATUS;
import static org.lowcoder.sdk.util.ExceptionUtils.ofError;
Expand Down Expand Up @@ -83,13 +88,31 @@ public Mono<ResponseView<?>> getUserOrgs(ServerWebExchange exchange,
.flatMap(user -> {
Pageable pageable = PageRequest.of(pageNum - 1, pageSize, Sort.by(Sort.Direction.DESC, "updatedAt"));
String filter = orgName == null ? "" : orgName;
Mono<String> currentOrgIdMono = sessionUserService.getVisitorOrgMemberCache()
.map(OrgMember::getOrgId);
return organizationService.findUserOrgs(user.getId(), filter, pageable)
.map(OrgView::new)
.collectList()
.zipWith(organizationService.countUserOrgs(user.getId(), filter))
.map(tuple -> PageResponseView.success(
tuple.getT1(), pageNum, pageSize, tuple.getT2().intValue()
));
.zipWith(currentOrgIdMono)
.map(tuple -> {
List<OrgView> orgViews = tuple.getT1().getT1();
long total = tuple.getT1().getT2();
String currentOrgId = tuple.getT2();

// Create a list of maps each containing orgView and isCurrentOrg
List<Map<String, Object>> resultList = orgViews.stream()
.map(orgView -> {
Map<String, Object> map = new HashMap<>();
map.put("orgView", orgView);
map.put("isCurrentOrg", orgView.getOrgId().equals(currentOrgId));
return map;
})
.sorted((a, b) -> Boolean.compare((Boolean) b.get("isCurrentOrg"), (Boolean) a.get("isCurrentOrg")))
.collect(Collectors.toList());

return PageResponseView.success(resultList, pageNum, pageSize, (int) total);
});
})
.map(ResponseView::success);
}
Expand Down
Loading