Commitafa3104

committed

Finalize fixes

1 parente2bc358 commitafa3104Copy full SHA for afa3104

File tree

-10

lines changed

-10

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,7 @@ public interface UserRepository extends ReactiveMongoRepository<User, String> {`
`16`	`16`
`17`	`17`	`Mono<User>findByConnections_SourceAndConnections_RawId(Stringsource,StringrawId);`
`18`	`18`
`19`		`-Flux<User>findByConnections_RawId(StringrawId);`
`20`		`-`
`21`	`19`	`Flux<User>findByConnections_SourceAndConnections_RawIdIn(Stringsource,Collection<String>rawIds);`
`22`	`20`
	`21`	`+Mono<User>findByName(StringrawUuid);`
`23`	`22`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public interface UserService {`
`34`	`34`
`35`	`35`	`Mono<User>findByAuthUserSourceAndRawId(AuthUserauthUser);`
`36`	`36`
`37`		`-Flux<User>findByAuthUserRawId(AuthUserauthUser);`
	`37`	`+Mono<User>findByAuthUserRawId(AuthUserauthUser);`
`38`	`38`
`39`	`39`	`Mono<User>createNewUserByAuthUser(AuthUserauthUser);`
`40`	`40`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -111,8 +111,8 @@ public Mono<User> findBySourceAndId(String source, String sourceUuid) {`
`111`	`111`	`returnrepository.findByConnections_SourceAndConnections_RawId(source,sourceUuid);`
`112`	`112`	`}`
`113`	`113`
`114`		`-publicFlux<User>findByRawId(StringrawUuid) {`
`115`		`-returnrepository.findByConnections_RawId(rawUuid);`
	`114`	`+publicMono<User>findByName(StringrawUuid) {`
	`115`	`+returnrepository.findByName(rawUuid);`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`@Override`
`@@ -152,8 +152,8 @@ public Mono<User> findByAuthUserSourceAndRawId(AuthUser authUser) {`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`@Override`
`155`		`-publicFlux<User>findByAuthUserRawId(AuthUserauthUser) {`
`156`		`-returnfindByRawId(authUser.getUid());`
	`155`	`+publicMono<User>findByAuthUserRawId(AuthUserauthUser) {`
	`156`	`+returnfindByName(authUser.getUsername());`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`@Override`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ protected Mono<AuthUser> getAuthUser(AuthToken authToken) {`
`116`	`116`	`}`
`117`	`117`	`AuthUserauthUser =AuthUser.builder()`
`118`	`118`	`.uid(MapUtils.getString(map,"sub"))`
`119`		`- .username(MapUtils.getString(map,"name"))`
	`119`	`+ .username(MapUtils.getString(map,"email"))`
`120`	`120`	`.rawUserInfo(map)`
`121`	`121`	`.build();`
`122`	`122`	`returnMono.just(authUser);`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -208,8 +208,8 @@ protected Mono<FindByAuthUser> findByAuthUserSourceAndRawId(AuthUser authUser) {`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`protectedMono<FindByAuthUser>findByAuthUserRawId(AuthUserauthUser) {`
`211`		`-returnuserService.findByAuthUserRawId(authUser).collectList()`
`212`		`- .map(user ->newFindByAuthUser(true,user.stream().findFirst().get()))`
	`211`	`+returnuserService.findByAuthUserRawId(authUser)`
	`212`	`+ .map(user ->newFindByAuthUser(true,user))`
`213`	`213`	`.defaultIfEmpty(newFindByAuthUser(false,null));`
`214`	`214`	`}`
`215`	`215`

Comments

(0)