Skip to content

Commit 1ff153e

Browse files
dragonpooludomikula
authored andcommittedOct 23, 2024·
Fix org list by email
1 parent 49a4a61 commit 1ff153e

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed
 

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public interface UserService {
2727
Mono<Map<String, User>> getByIds(Collection<String> ids);
2828

2929
Mono<User> findBySourceAndId(String connectionSource, String connectionSourceUuid);
30+
Mono<User> findByEmailDeep(String email);
3031

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

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ public Mono<User> findByName(String rawUuid) {
112112
return repository.findByName(rawUuid);
113113
}
114114

115+
@Override
115116
public Mono<User> findByEmailDeep(String email) {
116117
if(StringUtils.isEmpty(email)) return Mono.empty();
117118
return repository.findByEmailOrConnections_Email(email, email).next();

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.lowcoder.domain.organization.service.OrganizationService;
1818
import org.lowcoder.domain.plugin.DatasourceMetaInfo;
1919
import org.lowcoder.domain.plugin.service.DatasourceMetaInfoService;
20+
import org.lowcoder.domain.user.service.UserService;
2021
import org.springframework.beans.factory.annotation.Autowired;
2122
import org.springframework.http.codec.multipart.Part;
2223
import org.springframework.web.bind.annotation.*;
@@ -41,10 +42,12 @@ public class OrganizationController implements OrganizationEndpoints
4142
private OrgMemberService orgMemberService;
4243
@Autowired
4344
private OrganizationService organizationService;
45+
@Autowired
46+
private UserService userService;
4447

4548
@Override
46-
public Mono<ResponseView<List<OrgView>>> getOrganizationByUser(@PathVariable String userId) {
47-
return orgMemberService.getAllActiveOrgs(userId)
49+
public Mono<ResponseView<List<OrgView>>> getOrganizationByUser(@PathVariable String email) {
50+
return userService.findByEmailDeep(email).flux().flatMap(user -> orgMemberService.getAllActiveOrgs(user.getId()))
4851
.flatMap(orgMember -> organizationService.getById(orgMember.getOrgId()))
4952
.map(OrgView::new)
5053
.collectList()

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationEndpoints.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ public interface OrganizationEndpoints
4343
summary = "Get a list of specified user's organization",
4444
description = "Get a list of specified user's organization"
4545
)
46-
@GetMapping("/byuser/{userId}")
47-
public Mono<ResponseView<List<OrgView>>> getOrganizationByUser(@PathVariable String userId);
46+
@GetMapping("/byuser/{email}")
47+
public Mono<ResponseView<List<OrgView>>> getOrganizationByUser(@PathVariable String email);
4848

4949
@Operation(
5050
tags = TAG_ORGANIZATION_MANAGEMENT,

0 commit comments

Comments
 (0)
Please sign in to comment.