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

OrganizationPlugin to WorkspacePlugin

Browse Source
This commit is contained in:
Sidhant Goel 2022-05-06 23:08:19 +05:30
parent a4e4c00826
commit f514847847
No known key found for this signature in database
GPG Key ID: 0784E3B2D2D6C980
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Organization.java
View File

@ -31,7 +31,7 @@ public class Organization extends BaseDomain {
private String email;
private Set<OrganizationPlugin> plugins;
private Set<WorkspacePlugin> plugins;
private String slug;

2
app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Workspace.java
View File

@ -30,7 +30,7 @@ public class Workspace extends BaseDomain {
private String email;
private Set<OrganizationPlugin> plugins;
private Set<WorkspacePlugin> plugins;
private String slug;

2
app/server/appsmith-server/src/main/java/com/appsmith/server/domains/OrganizationPlugin.java → app/server/appsmith-server/src/main/java/com/appsmith/server/domains/WorkspacePlugin.java
View File

@ -15,7 +15,7 @@ import lombok.ToString;
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = false)
public class OrganizationPlugin extends BaseDomain {
public class WorkspacePlugin extends BaseDomain {
String pluginId;

14
app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java
View File

@ -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<String> 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<String> 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<String> 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()

14
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PluginServiceCEImpl.java
View File

@ -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<PluginRepository, Plugin, S
List<String> 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<PluginRepository, Plugin, S
@Override
public Flux<Workspace> installDefaultPlugins(List<Plugin> plugins) {
final List<OrganizationPlugin> newOrganizationPlugins = plugins
final List<WorkspacePlugin> 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<PluginRepository, Plugin, S
//i.e. the rest of the code flow would only happen when there is a plugin found for the organization that can
//be uninstalled.
.flatMap(organization -> {
Set<OrganizationPlugin> organizationPluginList = organization.getPlugins();
Set<WorkspacePlugin> 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<PluginRepository, Plugin, S
.then(organizationService.getById(pluginDTO.getOrganizationId()))
.flatMap(organization -> {
Set<OrganizationPlugin> organizationPluginList = organization.getPlugins();
Set<WorkspacePlugin> 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);

4
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java
View File

@ -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<WorkspaceRepository, Wor
Also, since all our deployments are single node, this logic will still work
*/
.flatMap(org -> 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);

6
app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/SeedMongoData.java
View File

@ -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<Workspace> 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<OrganizationPlugin> orgPlugins = tuple.getT1();
final Set<WorkspacePlugin> orgPlugins = tuple.getT1();
final Object[] orgArray = tuple.getT2();
Workspace organization = new Workspace();