From f514847847e80be4678713edb3c7820e9bf38bb1 Mon Sep 17 00:00:00 2001 From: Sidhant Goel Date: Fri, 6 May 2022 23:08:19 +0530 Subject: [PATCH] OrganizationPlugin to WorkspacePlugin --- .../com/appsmith/server/domains/Organization.java | 2 +- .../com/appsmith/server/domains/Workspace.java | 2 +- ...rganizationPlugin.java => WorkspacePlugin.java} | 2 +- .../server/migrations/DatabaseChangelog.java | 14 +++++++------- .../server/services/ce/PluginServiceCEImpl.java | 14 +++++++------- .../server/services/ce/WorkspaceServiceCEImpl.java | 4 ++-- .../server/configurations/SeedMongoData.java | 6 +++--- 7 files changed, 22 insertions(+), 22 deletions(-) rename app/server/appsmith-server/src/main/java/com/appsmith/server/domains/{OrganizationPlugin.java => WorkspacePlugin.java} (89%) diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Organization.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Organization.java index aff704247f..32290d23dd 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Organization.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Organization.java @@ -31,7 +31,7 @@ public class Organization extends BaseDomain { private String email; - private Set plugins; + private Set plugins; private String slug; diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Workspace.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Workspace.java index 527d9fce0b..f6f5a6788a 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Workspace.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Workspace.java @@ -30,7 +30,7 @@ public class Workspace extends BaseDomain { private String email; - private Set plugins; + private Set plugins; private String slug; 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/WorkspacePlugin.java similarity index 89% rename from app/server/appsmith-server/src/main/java/com/appsmith/server/domains/OrganizationPlugin.java rename to app/server/appsmith-server/src/main/java/com/appsmith/server/domains/WorkspacePlugin.java index 9259f8795d..8d308b6b1e 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/WorkspacePlugin.java @@ -15,7 +15,7 @@ import lombok.ToString; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = false) -public class OrganizationPlugin extends BaseDomain { +public class WorkspacePlugin extends BaseDomain { String pluginId; 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 201da83a30..d42af6c76e 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 @@ -36,7 +36,7 @@ import com.appsmith.server.domains.NewAction; import com.appsmith.server.domains.NewPage; import com.appsmith.server.domains.Notification; import com.appsmith.server.domains.Organization; -import com.appsmith.server.domains.OrganizationPlugin; +import com.appsmith.server.domains.WorkspacePlugin; import com.appsmith.server.domains.Page; import com.appsmith.server.domains.PasswordResetToken; import com.appsmith.server.domains.Permission; @@ -244,11 +244,11 @@ public class DatabaseChangelog { } final Set installedPlugins = organization.getPlugins() - .stream().map(OrganizationPlugin::getPluginId).collect(Collectors.toSet()); + .stream().map(WorkspacePlugin::getPluginId).collect(Collectors.toSet()); if (!installedPlugins.contains(pluginId)) { organization.getPlugins() - .add(new OrganizationPlugin(pluginId, WorkspacePluginStatus.FREE)); + .add(new WorkspacePlugin(pluginId, WorkspacePluginStatus.FREE)); } mongockTemplate.save(organization); @@ -513,12 +513,12 @@ public class DatabaseChangelog { } final Set installedPlugins = organization.getPlugins() - .stream().map(OrganizationPlugin::getPluginId).collect(Collectors.toSet()); + .stream().map(WorkspacePlugin::getPluginId).collect(Collectors.toSet()); for (Plugin defaultPlugin : defaultPlugins) { if (!installedPlugins.contains(defaultPlugin.getId())) { organization.getPlugins() - .add(new OrganizationPlugin(defaultPlugin.getId(), WorkspacePluginStatus.FREE)); + .add(new WorkspacePlugin(defaultPlugin.getId(), WorkspacePluginStatus.FREE)); } } @@ -3129,11 +3129,11 @@ public class DatabaseChangelog { final Set installedPlugins = organization .getPlugins() .stream() - .map(OrganizationPlugin::getPluginId) + .map(WorkspacePlugin::getPluginId) .collect(Collectors.toSet()); if (installedPlugins.contains(mongoUqiPlugin.getId())) { - OrganizationPlugin mongoUqiOrganizationPlugin = organization.getPlugins() + WorkspacePlugin mongoUqiOrganizationPlugin = organization.getPlugins() .stream() .filter(organizationPlugin -> organizationPlugin.getPluginId().equals(mongoUqiPlugin.getId())) .findFirst() 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 bf9159cf15..f34cd85b3b 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 @@ -3,7 +3,7 @@ package com.appsmith.server.services.ce; import com.appsmith.external.models.Datasource; import com.appsmith.server.constants.FieldName; import com.appsmith.server.domains.Workspace; -import com.appsmith.server.domains.OrganizationPlugin; +import com.appsmith.server.domains.WorkspacePlugin; import com.appsmith.server.domains.Plugin; import com.appsmith.server.domains.PluginType; import com.appsmith.server.dtos.InstallPluginRedisDTO; @@ -132,7 +132,7 @@ public class PluginServiceCEImpl extends BaseService pluginIds = org.getPlugins() .stream() - .map(OrganizationPlugin::getPluginId) + .map(WorkspacePlugin::getPluginId) .collect(Collectors.toList()); Query query = new Query(); query.addCriteria(Criteria.where(FieldName.ID).in(pluginIds)); @@ -191,11 +191,11 @@ public class PluginServiceCEImpl extends BaseService installDefaultPlugins(List plugins) { - final List newOrganizationPlugins = plugins + final List newOrganizationPlugins = plugins .stream() .filter(plugin -> Boolean.TRUE.equals(plugin.getDefaultInstall())) .map(plugin -> { - return new OrganizationPlugin(plugin.getId(), WorkspacePluginStatus.ACTIVATED); + return new WorkspacePlugin(plugin.getId(), WorkspacePluginStatus.ACTIVATED); }) .collect(Collectors.toList()); return organizationService.getAll() @@ -229,7 +229,7 @@ public class PluginServiceCEImpl extends BaseService { - Set organizationPluginList = organization.getPlugins(); + Set organizationPluginList = organization.getPlugins(); organizationPluginList.removeIf(listPlugin -> listPlugin.getPluginId().equals(pluginDTO.getPluginId())); organization.setPlugins(organizationPluginList); return organizationService.save(organization); @@ -271,12 +271,12 @@ public class PluginServiceCEImpl extends BaseService { - Set organizationPluginList = organization.getPlugins(); + Set organizationPluginList = organization.getPlugins(); if (organizationPluginList == null) { organizationPluginList = new HashSet<>(); } - OrganizationPlugin organizationPlugin = new OrganizationPlugin(); + WorkspacePlugin organizationPlugin = new WorkspacePlugin(); organizationPlugin.setPluginId(pluginDTO.getPluginId()); organizationPlugin.setStatus(status); organizationPluginList.add(organizationPlugin); 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 7bfbde4cda..0a67efade5 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 @@ -8,7 +8,7 @@ import com.appsmith.server.constants.Constraint; import com.appsmith.server.constants.FieldName; import com.appsmith.server.domains.Asset; import com.appsmith.server.domains.Workspace; -import com.appsmith.server.domains.OrganizationPlugin; +import com.appsmith.server.domains.WorkspacePlugin; import com.appsmith.server.domains.User; import com.appsmith.server.domains.UserRole; import com.appsmith.server.dtos.WorkspacePluginStatus; @@ -179,7 +179,7 @@ public class WorkspaceServiceCEImpl extends BaseService pluginRepository.findByDefaultInstall(true) - .map(obj -> new OrganizationPlugin(obj.getId(), WorkspacePluginStatus.FREE)) + .map(obj -> new WorkspacePlugin(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 522cad532a..c462782872 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 @@ -4,7 +4,7 @@ import com.appsmith.external.models.Policy; import com.appsmith.server.acl.AppsmithRole; import com.appsmith.server.domains.Application; import com.appsmith.server.domains.Workspace; -import com.appsmith.server.domains.OrganizationPlugin; +import com.appsmith.server.domains.WorkspacePlugin; import com.appsmith.server.domains.Page; import com.appsmith.server.domains.Plugin; import com.appsmith.server.domains.PluginType; @@ -177,13 +177,13 @@ 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(), WorkspacePluginStatus.FREE)) + .map(plugin -> new WorkspacePlugin(plugin.getId(), WorkspacePluginStatus.FREE)) .collect(Collectors.toSet()) .cache() .repeat() .zipWithIterable(List.of(orgData)) .map(tuple -> { - final Set orgPlugins = tuple.getT1(); + final Set orgPlugins = tuple.getT1(); final Object[] orgArray = tuple.getT2(); Workspace organization = new Workspace();