Skip to content

chore: refactor crud methods #38158

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
AnaghHegde merged 5 commits into from
Dec 19, 2024
Merged

chore: refactor crud methods #38158

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
ee9030b
refactor crud methods
AnaghHegde Dec 13, 2024
05237eb
review comment
AnaghHegde Dec 14, 2024
be4b9ad
Merge branch 'release' of github.com:appsmithorg/appsmith into chore/…
AnaghHegde Dec 18, 2024
a0d0bd3
Merge branch 'release' of github.com:appsmithorg/appsmith into chore/…
AnaghHegde Dec 19, 2024
c7efa63
fix iterator to list conversion issue
AnaghHegde Dec 19, 2024
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
10 changes: 10 additions & 0 deletions ...server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,14 @@ Flux<NewAction> findAllPublishedActionsByContextIdAndContextType(
String contextId, CreatorContextType contextType, AclPermission permission, boolean includeJs);

Flux<NewAction> findAllByApplicationIds(List<String> branchedArtifactIds, List<String> includedFields);

// @Meta(cursorBatchSize = 10000)
// TODO Implement cursor with batch size
Flux<NewAction> findByApplicationId(String applicationId);

// @Meta(cursorBatchSize = 10000)
// TODO Implement cursor with batch size
Copy link
Contributor

@abhvsn abhvsn Dec 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's use the .all() method to implement the batching, which will make sure all the DB calls by default will be batched.

Flux<NewAction> findAllByIdIn(Iterable<String> ids);

Mono<Long> countByDeletedAtNull();
}
21 changes: 21 additions & 0 deletions ...er/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.stream.StreamSupport;

import static org.springframework.data.mongodb.core.aggregation.Aggregation.group;
import static org.springframework.data.mongodb.core.aggregation.Aggregation.match;
Expand Down Expand Up @@ -488,4 +489,24 @@ public Flux<NewAction> findAllByApplicationIds(List<String> applicationIds, List
.fields(includedFields)
.all();
}

@Override
public Flux<NewAction> findByApplicationId(String applicationId) {
return queryBuilder()
.criteria(Bridge.equal(NewAction.Fields.applicationId, applicationId))
.all();
}

@Override
public Flux<NewAction> findAllByIdIn(Iterable<String> ids) {
List<String> idList = StreamSupport.stream(ids.spliterator(), false).toList();
return queryBuilder().criteria(Bridge.in(NewAction.Fields.id, idList)).all();
}

@Override
public Mono<Long> countByDeletedAtNull() {
return queryBuilder()
.criteria(Bridge.exists(NewAction.Fields.deletedAt))
.count();
}
}
10 changes: 0 additions & 10 deletions ...smith-server/src/main/java/com/appsmith/server/repositories/ce/NewActionRepositoryCE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,12 @@
import com.appsmith.server.projections.IdPoliciesOnly;
import com.appsmith.server.repositories.BaseRepository;
import com.appsmith.server.repositories.CustomNewActionRepository;
import org.springframework.data.mongodb.repository.Meta;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

import java.util.List;

public interface NewActionRepositoryCE extends BaseRepository<NewAction, String>, CustomNewActionRepository {

@Meta(cursorBatchSize = 10000)
Flux<NewAction> findByApplicationId(String applicationId);

@Meta(cursorBatchSize = 10000)
Flux<NewAction> findAllByIdIn(Iterable<String> ids);

Mono<Long> countByDeletedAtNull();

Flux<IdPoliciesOnly> findIdsAndPolicyMapByApplicationIdIn(List<String> applicationIds);

Flux<IdAndDatasourceIdNewActionView> findIdAndDatasourceIdByApplicationIdIn(List<String> applicationIds);
Expand Down