From 45caf60b29e4ece33d4cf4f5b66dc7d232bebe29 Mon Sep 17 00:00:00 2001
From: Shrikant Sharat Kandula <shrikant@appsmith.com>
Date: Thu, 8 Feb 2024 17:50:31 +0530
Subject: [PATCH] Revert "chore: remove BaseDomain on WorkspacePlugin (#30958)"

This reverts commit df6dce26e9cebcd3e48297070bad2a4e998c3220.
---
 .../main/java/com/appsmith/server/domains/WorkspacePlugin.java | 3 ++-
 .../com/appsmith/server/plugins/base/PluginServiceCEImpl.java  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/WorkspacePlugin.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/WorkspacePlugin.java
index 2b8f82ccf3..1ed5e33738 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/WorkspacePlugin.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/WorkspacePlugin.java
@@ -1,5 +1,6 @@
 package com.appsmith.server.domains;
 
+import com.appsmith.external.models.BaseDomain;
 import com.appsmith.server.dtos.WorkspacePluginStatus;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -14,7 +15,7 @@ import lombok.ToString;
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
-public class WorkspacePlugin {
+public class WorkspacePlugin extends BaseDomain {
 
     String pluginId;
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceCEImpl.java
index eb11aea0e1..e9bc03e801 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceCEImpl.java
@@ -134,6 +134,7 @@ public class PluginServiceCEImpl extends BaseService<PluginRepository, Plugin, S
                     }
 
                     List<String> pluginIds = org.getPlugins().stream()
+                            .filter(plugin -> !plugin.isDeleted())
                             .map(WorkspacePlugin::getPluginId)
                             .collect(Collectors.toList());
                     Query query = new Query();