Skip to content

Fix getOrganizationByUser endpoint #1252

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 1 commit into from
Oct 23, 2024
Merged

Fix getOrganizationByUser endpoint #1252

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions ...i-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public interface UserService {
Mono<Map<String, User>> getByIds(Collection<String> ids);

Mono<User> findBySourceAndId(String connectionSource, String connectionSourceUuid);
Mono<User> findByEmailDeep(String email);

Mono<Boolean> saveProfilePhoto(Part filePart, User t2);

Expand Down
1 change: 1 addition & 0 deletions ...rvice/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ public Mono<User> findByName(String rawUuid) {
return repository.findByName(rawUuid);
}

@Override
public Mono<User> findByEmailDeep(String email) {
if(StringUtils.isEmpty(email)) return Mono.empty();
return repository.findByEmailOrConnections_Email(email, email).next();
Expand Down
7 changes: 5 additions & 2 deletions ...lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.lowcoder.domain.organization.service.OrganizationService;
import org.lowcoder.domain.plugin.DatasourceMetaInfo;
import org.lowcoder.domain.plugin.service.DatasourceMetaInfoService;
import org.lowcoder.domain.user.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.codec.multipart.Part;
import org.springframework.web.bind.annotation.*;
Expand All @@ -41,10 +42,12 @@ public class OrganizationController implements OrganizationEndpoints
private OrgMemberService orgMemberService;
@Autowired
private OrganizationService organizationService;
@Autowired
private UserService userService;

@Override
public Mono<ResponseView<List<OrgView>>> getOrganizationByUser(@PathVariable String userId) {
return orgMemberService.getAllActiveOrgs(userId)
public Mono<ResponseView<List<OrgView>>> getOrganizationByUser(@PathVariable String email) {
return userService.findByEmailDeep(email).flux().flatMap(user -> orgMemberService.getAllActiveOrgs(user.getId()))
.flatMap(orgMember -> organizationService.getById(orgMember.getOrgId()))
.map(OrgView::new)
.collectList()
Expand Down
4 changes: 2 additions & 2 deletions .../lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationEndpoints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ public interface OrganizationEndpoints
summary = "Get a list of specified user's organization",
description = "Get a list of specified user's organization"
)
@GetMapping("/byuser/{userId}")
public Mono<ResponseView<List<OrgView>>> getOrganizationByUser(@PathVariable String userId);
@GetMapping("/byuser/{email}")
public Mono<ResponseView<List<OrgView>>> getOrganizationByUser(@PathVariable String email);

@Operation(
tags = TAG_ORGANIZATION_MANAGEMENT,
Expand Down
Loading