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

fix: check for repoName while deleting apps (#8866)

Browse Source 
* check for repoName while deleting apps

* Added tests
This commit is contained in:
Anagh Hegde 2021-10-29 12:51:31 +05:30 committed by GitHub
parent 3fd5edad11
commit ebb9665d42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java
View File

@ -319,10 +319,9 @@ public class ApplicationPageServiceImpl implements ApplicationPageService {
return applicationMono return applicationMono
.flatMapMany(application -> { .flatMapMany(application -> {
GitApplicationMetadata gitData = application.getGitApplicationMetadata(); GitApplicationMetadata gitData = application.getGitApplicationMetadata();
if (gitData != null && !StringUtils.isEmpty(gitData.getDefaultApplicationId())) { if (gitData != null && !StringUtils.isEmpty(gitData.getDefaultApplicationId()) && !StringUtils.isEmpty(gitData.getRepoName())) {
GitApplicationMetadata gitApplicationMetadata = application.getGitApplicationMetadata(); String repoName = gitData.getRepoName();
String repoName = gitApplicationMetadata.getRepoName(); Path repoPath = Paths.get(application.getOrganizationId(), gitData.getDefaultApplicationId(), repoName);
Path repoPath = Paths.get(application.getOrganizationId(), gitApplicationMetadata.getDefaultApplicationId(), repoName);
// Delete git repo from local and delete the applications from DB // Delete git repo from local and delete the applications from DB
return gitFileUtils.detachRemote(repoPath) return gitFileUtils.detachRemote(repoPath)
.flatMapMany(isCleared -> applicationService .flatMapMany(isCleared -> applicationService

42
app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java
View File

@ -1437,4 +1437,46 @@ public class ApplicationServiceTest {
.verifyComplete(); .verifyComplete();
} }
@Test
@WithUserDetails(value = "api_user")
public void deleteApplication_withNullGitData_Success() {
Application testApplication = new Application();
String appName = "deleteApplication_withNullGitData_Success";
testApplication.setName(appName);
Application application = applicationPageService.createApplication(testApplication, orgId).block();
Mono<Application> applicationMono = applicationPageService.deleteApplication(application.getId());
StepVerifier
.create(applicationMono)
.assertNext(application1 -> {
assertThat(application1.isDeleted()).isTrue();
})
.verifyComplete();
}
@Test
@WithUserDetails(value = "api_user")
public void deleteApplication_WithDeployKeysNotConnectedToRemote_Success() {
Application testApplication = new Application();
String appName = "deleteApplication_WithDeployKeysNotConnectedToRemote_Success";
testApplication.setName(appName);
GitApplicationMetadata gitApplicationMetadata = new GitApplicationMetadata();
GitAuth gitAuth = new GitAuth();
gitAuth.setPrivateKey("privateKey");
gitAuth.setPublicKey("publicKey");
gitApplicationMetadata.setGitAuth(gitAuth);
testApplication.setGitApplicationMetadata(gitApplicationMetadata);
Application application = applicationPageService.createApplication(testApplication, orgId).block();
Mono<Application> applicationMono = applicationPageService.deleteApplication(application.getId());
StepVerifier
.create(applicationMono)
.assertNext(application1 -> {
assertThat(application1.isDeleted()).isTrue();
})
.verifyComplete();
}
} }