Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: resolving for failing datasource tests (#23741)

Browse Source 
Resolution for failing Ci and server test cases for datasources
This commit is contained in:
Manish Kumar 2023-05-25 22:01:30 +05:30 committed by GitHub
parent d443880837
commit 55056dacda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/DatasourceServiceCEImpl.java
View File

@ -705,14 +705,19 @@ public class DatasourceServiceCEImpl implements DatasourceServiceCE {
HashMap<String, DatasourceStorageDTO> storages = new HashMap<>();
datasource.setDatasourceStorages(storages);
Mono<String> trueEnvironmentIdMono = Mono.just(environmentId);
Mono<String> trueEnvironmentIdMono;
if (StringUtils.hasText(datasource.getWorkspaceId())) {
trueEnvironmentIdMono = getTrueEnvironmentId(datasource.getWorkspaceId(), environmentId);
} else if (StringUtils.hasText(datasource.getId())) {
trueEnvironmentIdMono = findById(datasourceDTO.getId(), datasourcePermission.getReadPermission())
trueEnvironmentIdMono = findById(datasource.getId(), datasourcePermission.getReadPermission())
.flatMap(datasource1 -> getTrueEnvironmentId(datasource1.getWorkspaceId(), environmentId));
} else {
if (!StringUtils.hasText(environmentId)) {
return Mono.error(new AppsmithException(AppsmithError.INVALID_DATASOURCE, FieldName.DATASOURCE, "Please provide valid metadata for datasource object"));
}
trueEnvironmentIdMono = Mono.just(environmentId);
}
return trueEnvironmentIdMono