Skip to content

chore: refactor the crud method to custom repo class #38138

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

chore: refactor the crud method to custom repo class #38138

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac0e8ed
refactor the crud method to custom repo class
AnaghHegde Dec 12, 2024
df7dc42
review comment
AnaghHegde Dec 13, 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 ...erver/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceRepositoryCE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,19 @@
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

import java.util.List;

public interface CustomDatasourceRepositoryCE extends AppsmithRepository<Datasource> {

Flux<Datasource> findAllByWorkspaceId(String workspaceId, AclPermission permission);

Mono<Datasource> findByNameAndWorkspaceId(String name, String workspaceId, AclPermission aclPermission);

Flux<Datasource> findByWorkspaceId(String workspaceId, AclPermission aclPermission);

Flux<Datasource> findAllByWorkspaceIdWithoutPermissions(String workspaceId);

Comment thread
AnaghHegde marked this conversation as resolved.
Outdated
Flux<Datasource> findByIdIn(List<String> ids);

Mono<Long> countByDeletedAtNull();

@abhvsn abhvsn Dec 13, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Are we not adding Flux<Datasource> findAllByWorkspaceId(String workspaceId); or this is not used in CE and EE?

@AnaghHegde AnaghHegde Dec 18, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This was not used anywhere in the code base. Hence removing this.

}
27 changes: 27 additions & 0 deletions ...r/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceRepositoryCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@
import com.appsmith.external.models.Datasource;
import com.appsmith.server.acl.AclPermission;
import com.appsmith.server.helpers.ce.bridge.Bridge;
import com.appsmith.server.helpers.ce.bridge.BridgeQuery;
import com.appsmith.server.repositories.BaseAppsmithRepositoryImpl;
import org.springframework.data.domain.Sort;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

import java.util.List;

public class CustomDatasourceRepositoryCEImpl extends BaseAppsmithRepositoryImpl<Datasource>
implements CustomDatasourceRepositoryCE {

Expand All @@ -28,4 +31,28 @@ public Mono<Datasource> findByNameAndWorkspaceId(String name, String workspaceId
.permission(aclPermission)
.one();
}

@Override
public Flux<Datasource> findByWorkspaceId(String workspaceId, AclPermission aclPermission) {

@abhvsn abhvsn Dec 13, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is not present in DatasourceRepoisitoryCE, are we adding this as a new methods?

@AnaghHegde AnaghHegde Dec 13, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This is a duplicate since the method already exists in custom implementation.

final BridgeQuery<Datasource> q = Bridge.equal(Datasource.Fields.workspaceId, workspaceId);
return queryBuilder().criteria(q).permission(aclPermission).all();
}

@Override
public Flux<Datasource> findAllByWorkspaceIdWithoutPermissions(String workspaceId) {
Comment thread
AnaghHegde marked this conversation as resolved.
Outdated
final BridgeQuery<Datasource> q = Bridge.equal(Datasource.Fields.workspaceId, workspaceId);
return queryBuilder().criteria(q).all();
}

@Override
public Flux<Datasource> findByIdIn(List<String> ids) {
final BridgeQuery<Datasource> q = Bridge.in(Datasource.Fields.id, ids);
return queryBuilder().criteria(q).all();
}

@Override
public Mono<Long> countByDeletedAtNull() {
final BridgeQuery<Datasource> q = Bridge.isNull(Datasource.Fields.deletedAt);
return queryBuilder().criteria(q).count();
}
}
11 changes: 2 additions & 9 deletions ...mith-server/src/main/java/com/appsmith/server/repositories/ce/DatasourceRepositoryCE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,12 @@
import com.appsmith.server.projections.IdPoliciesOnly;
import com.appsmith.server.repositories.BaseRepository;
import com.appsmith.server.repositories.CustomDatasourceRepository;
import org.springframework.stereotype.Repository;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

import java.util.List;
import java.util.Set;

@Repository
public interface DatasourceRepositoryCE extends BaseRepository<Datasource, String>, CustomDatasourceRepository {

Flux<Datasource> findByIdIn(List<String> ids);

Flux<Datasource> findAllByWorkspaceId(String workspaceId);

Mono<Long> countByDeletedAtNull();

Flux<IdPoliciesOnly> findIdsAndPolicyMapByIdIn(Set<String> datasourceIds);
}