Commit1ff153e

Thomasr

authored and

committed

Fix org list by email

1 parent49a4a61 commit1ff153eCopy full SHA for 1ff153e

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ public interface UserService {`
`27`	`27`	`Mono<Map<String,User>>getByIds(Collection<String>ids);`
`28`	`28`
`29`	`29`	`Mono<User>findBySourceAndId(StringconnectionSource,StringconnectionSourceUuid);`
	`30`	`+Mono<User>findByEmailDeep(Stringemail);`
`30`	`31`
`31`	`32`	`Mono<Boolean>saveProfilePhoto(PartfilePart,Usert2);`
`32`	`33`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,7 @@ public Mono<User> findByName(String rawUuid) {`
`112`	`112`	`returnrepository.findByName(rawUuid);`
`113`	`113`	`}`
`114`	`114`
	`115`	`+@Override`
`115`	`116`	`publicMono<User>findByEmailDeep(Stringemail) {`
`116`	`117`	`if(StringUtils.isEmpty(email))returnMono.empty();`
`117`	`118`	`returnrepository.findByEmailOrConnections_Email(email,email).next();`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`importorg.lowcoder.domain.organization.service.OrganizationService;`
`18`	`18`	`importorg.lowcoder.domain.plugin.DatasourceMetaInfo;`
`19`	`19`	`importorg.lowcoder.domain.plugin.service.DatasourceMetaInfoService;`
	`20`	`+importorg.lowcoder.domain.user.service.UserService;`
`20`	`21`	`importorg.springframework.beans.factory.annotation.Autowired;`
`21`	`22`	`importorg.springframework.http.codec.multipart.Part;`
`22`	`23`	`importorg.springframework.web.bind.annotation.*;`
`@@ -41,10 +42,12 @@ public class OrganizationController implements OrganizationEndpoints`
`41`	`42`	`privateOrgMemberServiceorgMemberService;`
`42`	`43`	`@Autowired`
`43`	`44`	`privateOrganizationServiceorganizationService;`
	`45`	`+@Autowired`
	`46`	`+privateUserServiceuserService;`
`44`	`47`
`45`	`48`	`@Override`
`46`		`-publicMono<ResponseView<List<OrgView>>>getOrganizationByUser(@PathVariableStringuserId) {`
`47`		`-returnorgMemberService.getAllActiveOrgs(userId)`
	`49`	`+publicMono<ResponseView<List<OrgView>>>getOrganizationByUser(@PathVariableStringemail) {`
	`50`	`+returnuserService.findByEmailDeep(email).flux().flatMap(user ->orgMemberService.getAllActiveOrgs(user.getId()))`
`48`	`51`	`.flatMap(orgMember ->organizationService.getById(orgMember.getOrgId()))`
`49`	`52`	`.map(OrgView::new)`
`50`	`53`	`.collectList()`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@ public interface OrganizationEndpoints`
`43`	`43`	`summary ="Get a list of specified user's organization",`
`44`	`44`	`description ="Get a list of specified user's organization"`
`45`	`45`	`)`
`46`		`-@GetMapping("/byuser/{userId}")`
`47`		`-publicMono<ResponseView<List<OrgView>>>getOrganizationByUser(@PathVariableStringuserId);`
	`46`	`+@GetMapping("/byuser/{email}")`
	`47`	`+publicMono<ResponseView<List<OrgView>>>getOrganizationByUser(@PathVariableStringemail);`
`48`	`48`
`49`	`49`	`@Operation(`
`50`	`50`	`tags =TAG_ORGANIZATION_MANAGEMENT,`

Comments

(0)