Skip to content

BE: Fixed consumer groups fts search #1481

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −4
Open

BE: Fixed consumer groups fts search #1481

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 api/src/main/java/io/kafbat/ui/controller/ConsumerGroupsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ public Mono<ResponseEntity<ConsumerGroupsPageResponseDTO>> getConsumerGroupsPage
Optional.ofNullable(page).filter(i -> i > 0).orElse(1),
Optional.ofNullable(perPage).filter(i -> i > 0).orElse(defaultConsumerGroupsPageSize),
search,
fts,
Optional.ofNullable(orderBy).orElse(ConsumerGroupOrderingDTO.NAME),
Optional.ofNullable(sortOrderDto).orElse(SortOrderDTO.ASC)
)
Expand Down
11 changes: 7 additions & 4 deletions api/src/main/java/io/kafbat/ui/service/ConsumerGroupService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,12 @@ public Mono<ConsumerGroupsPage> getConsumerGroupsPage(
int pageNum,
int perPage,
@Nullable String search,
Boolean fts,
ConsumerGroupOrderingDTO orderBy,
SortOrderDTO sortOrderDto) {
return adminClientService.get(cluster).flatMap(ac ->
ac.listConsumerGroups()
.map(listing -> filterGroups(listing, search)
.map(listing -> filterGroups(listing, search, fts)
)
.flatMapIterable(lst -> lst)
.filterWhen(cg -> accessControlService.isConsumerGroupAccessible(cg.groupId(), cluster.getName()))
Expand All @@ -169,9 +170,11 @@ public Mono<ConsumerGroupsPage> getConsumerGroupsPage(
(allGroups.size() / perPage) + (allGroups.size() % perPage == 0 ? 0 : 1))))));
}

private Collection<ConsumerGroupListing> filterGroups(Collection<ConsumerGroupListing> groups, String search) {
ClustersProperties.ClusterFtsProperties fts = clustersProperties.getFts();
ConsumerGroupFilter filter = new ConsumerGroupFilter(groups, fts.isEnabled(), fts.getConsumers());
private Collection<ConsumerGroupListing> filterGroups(Collection<ConsumerGroupListing> groups, String search,
Boolean useFts) {
ClustersProperties.ClusterFtsProperties ftsProperties = clustersProperties.getFts();
boolean fts = ftsProperties.use(useFts);
ConsumerGroupFilter filter = new ConsumerGroupFilter(groups, fts, ftsProperties.getConsumers());
return filter.find(search);
}

Expand Down
Loading