Skip to content

chore: refactor datasource storage to use custom repo method #38143

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 4 commits into from
Dec 18, 2024
Merged

chore: refactor datasource storage to use custom repo method #38143

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
04d8994
refactor datasource storage to use custom repo method
AnaghHegde Dec 13, 2024
ff19aa2
remove the rference for curd method
AnaghHegde Dec 13, 2024
13aa454
Merge branch 'release' of github.com:appsmithorg/appsmith into chore/…
AnaghHegde Dec 13, 2024
977d50e
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
5 changes: 4 additions & 1 deletion ...rc/main/java/com/appsmith/server/repositories/ce/CustomDatasourceStorageRepositoryCE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,8 @@

import com.appsmith.external.models.DatasourceStorage;
import com.appsmith.server.repositories.AppsmithRepository;
import reactor.core.publisher.Mono;

public interface CustomDatasourceStorageRepositoryCE extends AppsmithRepository<DatasourceStorage> {}
public interface CustomDatasourceStorageRepositoryCE extends AppsmithRepository<DatasourceStorage> {
Mono<DatasourceStorage> findByDatasourceIdAndEnvironmentId(String datasourceId, String environmentId);
}
13 changes: 12 additions & 1 deletion ...ain/java/com/appsmith/server/repositories/ce/CustomDatasourceStorageRepositoryCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
package com.appsmith.server.repositories.ce;

import com.appsmith.external.models.DatasourceStorage;
import com.appsmith.server.helpers.ce.bridge.Bridge;
import com.appsmith.server.helpers.ce.bridge.BridgeQuery;
import com.appsmith.server.repositories.BaseAppsmithRepositoryImpl;
import reactor.core.publisher.Mono;

public class CustomDatasourceStorageRepositoryCEImpl extends BaseAppsmithRepositoryImpl<DatasourceStorage>
implements CustomDatasourceStorageRepositoryCE {}
implements CustomDatasourceStorageRepositoryCE {
@Override
public Mono<DatasourceStorage> findByDatasourceIdAndEnvironmentId(String datasourceId, String environmentId) {
final BridgeQuery<DatasourceStorage> q = Bridge.<DatasourceStorage>equal(
DatasourceStorage.Fields.datasourceId, datasourceId)
.equal(DatasourceStorage.Fields.environmentId, environmentId);
return queryBuilder().criteria(q).one();
}
Comment thread
AnaghHegde marked this conversation as resolved.
}
9 changes: 5 additions & 4 deletions ...rver/src/main/java/com/appsmith/server/repositories/ce/DatasourceStorageRepositoryCE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

import com.appsmith.external.models.DatasourceStorage;
import com.appsmith.server.repositories.BaseRepository;
import com.appsmith.server.repositories.CustomDatasourceStorageRepository;
import org.springframework.stereotype.Repository;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

public interface DatasourceStorageRepositoryCE extends BaseRepository<DatasourceStorage, String> {
@Repository
public interface DatasourceStorageRepositoryCE
extends BaseRepository<DatasourceStorage, String>, CustomDatasourceStorageRepository {
Flux<DatasourceStorage> findByDatasourceId(String datasourceId);
Comment thread
AnaghHegde marked this conversation as resolved.
Outdated

Mono<DatasourceStorage> findByDatasourceIdAndEnvironmentId(String datasourceId, String environmentId);
}