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

OrganizationPluginStatus to WorkspacePluginStatus

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

4
app/server/appsmith-server/src/main/java/com/appsmith/server/domains/OrganizationPlugin.java
View File

@ -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;
}

2
app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/PluginOrgDTO.java
View File

@ -11,5 +11,5 @@ public class PluginOrgDTO {
String organizationId;
OrganizationPluginStatus status;
WorkspacePluginStatus status;
}

2
app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/OrganizationPluginStatus.java → app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/WorkspacePluginStatus.java
View File

@ -1,5 +1,5 @@
package com.appsmith.server.dtos;
public enum OrganizationPluginStatus {
public enum WorkspacePluginStatus {
FREE, TRIAL, ACTIVATED
}

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

@ -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));
}
}

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

@ -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<PluginRepository, Plugin, S
.stream()
.filter(plugin -> 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<PluginRepository, Plugin, S
});
}
private Mono<Workspace> storeOrganizationPlugin(PluginOrgDTO pluginDTO, OrganizationPluginStatus status) {
private Mono<Workspace> storeOrganizationPlugin(PluginOrgDTO pluginDTO, WorkspacePluginStatus status) {
Mono<Workspace> pluginInOrganizationMono = organizationService
.findByIdAndPluginsPluginId(pluginDTO.getOrganizationId(), pluginDTO.getPluginId());

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

@ -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<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(), OrganizationPluginStatus.FREE))
.map(obj -> new OrganizationPlugin(obj.getId(), WorkspacePluginStatus.FREE))
.collect(Collectors.toSet())
.map(pluginList -> {
org.setPlugins(pluginList);

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

@ -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<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(), OrganizationPluginStatus.FREE))
.map(plugin -> new OrganizationPlugin(plugin.getId(), WorkspacePluginStatus.FREE))
.collect(Collectors.toSet())
.cache()
.repeat()