Thanks to visit codestin.com
Credit goes to github.com

Skip to content

myorg endpoint #1777

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 5 commits into from
Jun 18, 2025
Merged

myorg endpoint #1777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6db11bc
Fixed pagination for myorg endpoint.
dragonpoo Jun 17, 2025
3cefa1f
Fixed pagination for myorg endpoint.
dragonpoo Jun 17, 2025
1889d6c
Fixed pagination for myorg endpoint.(sort)
dragonpoo Jun 18, 2025
5015a71
Filter orgs to return only those with an active state.
dragonpoo Jun 18, 2025
10cf573
Merge branch 'dev' into fix/myorg
dragonpoo Jun 18, 2025
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
5 changes: 2 additions & 3 deletions ...ain/src/main/java/org/lowcoder/domain/organization/repository/OrganizationRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public interface OrganizationRepository extends ReactiveMongoRepository<Organiza

Flux<Organization> findByOrganizationDomainIsNotNull();
Mono<Boolean> existsBySlug(String slug);

Flux<Organization> findByIdInAndNameContainingIgnoreCase(List<String> ids, String name, Pageable pageable);
Mono<Long> countByIdInAndNameContainingIgnoreCase(List<String> ids, String name);
Flux<Organization> findByIdInAndNameContainingIgnoreCaseAndState(List<String> ids, String name, OrganizationState state, Pageable pageable);
Mono<Long> countByIdInAndNameContainingIgnoreCaseAndState(List<String> ids, String name, OrganizationState state);
}
4 changes: 2 additions & 2 deletions ...omain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ public Flux<Organization> findUserOrgs(String userId, String orgName, Pageable p
if (orgIds.isEmpty()) {
return Flux.empty();
}
return repository.findByIdInAndNameContainingIgnoreCase(orgIds, orgName, pageable);
return repository.findByIdInAndNameContainingIgnoreCaseAndState(orgIds, orgName, ACTIVE, pageable);
});
}

Expand All @@ -344,7 +344,7 @@ public Mono<Long> countUserOrgs(String userId, String orgName) {
if (orgIds.isEmpty()) {
return Mono.just(0L);
}
return repository.countByIdInAndNameContainingIgnoreCase(orgIds, filter);
return repository.countByIdInAndNameContainingIgnoreCaseAndState(orgIds, filter, ACTIVE);
});
}
}
3 changes: 2 additions & 1 deletion ...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 @@ -23,6 +23,7 @@
import org.lowcoder.sdk.config.CommonConfig;
import org.lowcoder.sdk.constants.AuthSourceConstants;
import org.lowcoder.sdk.exception.BizError;
import org.springframework.data.domain.Sort;
import org.springframework.http.HttpStatus;
import org.springframework.http.codec.multipart.Part;
import org.springframework.web.bind.annotation.*;
Expand Down Expand Up @@ -80,7 +81,7 @@ public Mono<ResponseView<?>> getUserOrgs(ServerWebExchange exchange,
@RequestParam(required = false, defaultValue = "10") Integer pageSize) {
return sessionUserService.getVisitor()
.flatMap(user -> {
Pageable pageable = PageRequest.of(pageNum - 1, pageSize);
Pageable pageable = PageRequest.of(pageNum - 1, pageSize, Sort.by(Sort.Direction.DESC, "updatedAt"));
String filter = orgName == null ? "" : orgName;
return organizationService.findUserOrgs(user.getId(), filter, pageable)
.map(OrgView::new)
Expand Down
Loading