From a4e4c00826806ba2e5a96481afb3cee782a37434 Mon Sep 17 00:00:00 2001 From: Sidhant Goel Date: Fri, 6 May 2022 23:07:45 +0530 Subject: [PATCH] OrganizationPluginStatus to WorkspacePluginStatus --- .../com/appsmith/server/domains/OrganizationPlugin.java | 4 ++-- .../main/java/com/appsmith/server/dtos/PluginOrgDTO.java | 2 +- ...nizationPluginStatus.java => WorkspacePluginStatus.java} | 2 +- .../com/appsmith/server/migrations/DatabaseChangelog.java | 6 +++--- .../appsmith/server/services/ce/PluginServiceCEImpl.java | 6 +++--- .../appsmith/server/services/ce/WorkspaceServiceCEImpl.java | 4 ++-- .../com/appsmith/server/configurations/SeedMongoData.java | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) rename app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/{OrganizationPluginStatus.java => WorkspacePluginStatus.java} (62%) diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/OrganizationPlugin.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/OrganizationPlugin.java index a1c15dd380..9259f8795d 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/OrganizationPlugin.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/OrganizationPlugin.java @@ -1,7 +1,7 @@ package com.appsmith.server.domains; import com.appsmith.external.models.BaseDomain; -import com.appsmith.server.dtos.OrganizationPluginStatus; +import com.appsmith.server.dtos.WorkspacePluginStatus; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -19,6 +19,6 @@ public class OrganizationPlugin extends BaseDomain { String pluginId; - OrganizationPluginStatus status; + WorkspacePluginStatus status; } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/PluginOrgDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/PluginOrgDTO.java index 84de0d6ee4..1c8e41e84a 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/PluginOrgDTO.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/PluginOrgDTO.java @@ -11,5 +11,5 @@ public class PluginOrgDTO { String organizationId; - OrganizationPluginStatus status; + WorkspacePluginStatus status; } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/OrganizationPluginStatus.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/WorkspacePluginStatus.java similarity index 62% rename from app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/OrganizationPluginStatus.java rename to app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/WorkspacePluginStatus.java index 23b0a55b98..e51acd2e69 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/OrganizationPluginStatus.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/WorkspacePluginStatus.java @@ -1,5 +1,5 @@ package com.appsmith.server.dtos; -public enum OrganizationPluginStatus { +public enum WorkspacePluginStatus { FREE, TRIAL, ACTIVATED } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java index 7326f485de..201da83a30 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java @@ -65,7 +65,7 @@ import com.appsmith.server.domains.UserRole; import com.appsmith.server.dtos.ActionCollectionDTO; import com.appsmith.server.dtos.ActionDTO; import com.appsmith.server.dtos.DslActionDTO; -import com.appsmith.server.dtos.OrganizationPluginStatus; +import com.appsmith.server.dtos.WorkspacePluginStatus; import com.appsmith.server.dtos.PageDTO; import com.appsmith.server.helpers.GitDeployKeyGenerator; import com.appsmith.server.helpers.TextUtils; @@ -248,7 +248,7 @@ public class DatabaseChangelog { if (!installedPlugins.contains(pluginId)) { organization.getPlugins() - .add(new OrganizationPlugin(pluginId, OrganizationPluginStatus.FREE)); + .add(new OrganizationPlugin(pluginId, WorkspacePluginStatus.FREE)); } mongockTemplate.save(organization); @@ -518,7 +518,7 @@ public class DatabaseChangelog { for (Plugin defaultPlugin : defaultPlugins) { if (!installedPlugins.contains(defaultPlugin.getId())) { organization.getPlugins() - .add(new OrganizationPlugin(defaultPlugin.getId(), OrganizationPluginStatus.FREE)); + .add(new OrganizationPlugin(defaultPlugin.getId(), WorkspacePluginStatus.FREE)); } } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PluginServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PluginServiceCEImpl.java index 258ba0c812..bf9159cf15 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PluginServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PluginServiceCEImpl.java @@ -7,7 +7,7 @@ import com.appsmith.server.domains.OrganizationPlugin; import com.appsmith.server.domains.Plugin; import com.appsmith.server.domains.PluginType; import com.appsmith.server.dtos.InstallPluginRedisDTO; -import com.appsmith.server.dtos.OrganizationPluginStatus; +import com.appsmith.server.dtos.WorkspacePluginStatus; import com.appsmith.server.dtos.PluginOrgDTO; import com.appsmith.server.exceptions.AppsmithError; import com.appsmith.server.exceptions.AppsmithException; @@ -195,7 +195,7 @@ public class PluginServiceCEImpl extends BaseService Boolean.TRUE.equals(plugin.getDefaultInstall())) .map(plugin -> { - return new OrganizationPlugin(plugin.getId(), OrganizationPluginStatus.ACTIVATED); + return new OrganizationPlugin(plugin.getId(), WorkspacePluginStatus.ACTIVATED); }) .collect(Collectors.toList()); return organizationService.getAll() @@ -236,7 +236,7 @@ public class PluginServiceCEImpl extends BaseService storeOrganizationPlugin(PluginOrgDTO pluginDTO, OrganizationPluginStatus status) { + private Mono storeOrganizationPlugin(PluginOrgDTO pluginDTO, WorkspacePluginStatus status) { Mono pluginInOrganizationMono = organizationService .findByIdAndPluginsPluginId(pluginDTO.getOrganizationId(), pluginDTO.getPluginId()); diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java index 12a33fcb84..7bfbde4cda 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java @@ -11,7 +11,7 @@ import com.appsmith.server.domains.Workspace; import com.appsmith.server.domains.OrganizationPlugin; import com.appsmith.server.domains.User; import com.appsmith.server.domains.UserRole; -import com.appsmith.server.dtos.OrganizationPluginStatus; +import com.appsmith.server.dtos.WorkspacePluginStatus; import com.appsmith.server.exceptions.AppsmithError; import com.appsmith.server.exceptions.AppsmithException; import com.appsmith.server.repositories.ApplicationRepository; @@ -179,7 +179,7 @@ public class WorkspaceServiceCEImpl extends BaseService pluginRepository.findByDefaultInstall(true) - .map(obj -> new OrganizationPlugin(obj.getId(), OrganizationPluginStatus.FREE)) + .map(obj -> new OrganizationPlugin(obj.getId(), WorkspacePluginStatus.FREE)) .collect(Collectors.toSet()) .map(pluginList -> { org.setPlugins(pluginList); diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/SeedMongoData.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/SeedMongoData.java index 96bd85096e..522cad532a 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/SeedMongoData.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/SeedMongoData.java @@ -11,7 +11,7 @@ import com.appsmith.server.domains.PluginType; import com.appsmith.server.domains.User; import com.appsmith.server.domains.UserRole; import com.appsmith.server.domains.UserState; -import com.appsmith.server.dtos.OrganizationPluginStatus; +import com.appsmith.server.dtos.WorkspacePluginStatus; import com.appsmith.server.repositories.ApplicationRepository; import com.appsmith.server.repositories.WorkspaceRepository; import com.appsmith.server.repositories.PageRepository; @@ -177,7 +177,7 @@ public class SeedMongoData { // Seed the organization data into the DB Flux organizationFlux = mongoTemplate .find(new Query().addCriteria(where("name").in(pluginData[0][0], pluginData[1][0], pluginData[2][0])), Plugin.class) - .map(plugin -> new OrganizationPlugin(plugin.getId(), OrganizationPluginStatus.FREE)) + .map(plugin -> new OrganizationPlugin(plugin.getId(), WorkspacePluginStatus.FREE)) .collect(Collectors.toSet()) .cache() .repeat()