From 4402b3524791e5c44292f1366a8a7845e9e2c60b Mon Sep 17 00:00:00 2001
From: Vishnu Gp <vishnu@appsmith.com>
Date: Wed, 16 Nov 2022 20:15:38 +0530
Subject: [PATCH] fix: Error deleting application when soft-deleted entities
 are present in the application (#18185)

* fix: Error deleting application when soft-deleted entities are present in the application

* Review changes
---
 .../com/appsmith/server/repositories/BaseRepositoryImpl.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/BaseRepositoryImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/BaseRepositoryImpl.java
index 3e87db487b..a789eed423 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/BaseRepositoryImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/BaseRepositoryImpl.java
@@ -146,7 +146,10 @@ public class BaseRepositoryImpl<T extends BaseDomain, ID extends Serializable> e
     public Mono<T> archive(T entity) {
         Assert.notNull(entity, "The given entity must not be null!");
         Assert.notNull(entity.getId(), "The given entity's id must not be null!");
-        Assert.isTrue(!entity.isDeleted(), "The given entity is already deleted");
+        // Entity is already deleted
+        if (entity.isDeleted()) {
+            return Mono.just(entity);
+        }
 
         entity.setDeleted(true);
         entity.setDeletedAt(Instant.now());