Skip to content

chore: Allow side effects for organization configuration updates #39692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nidhi-nair merged 1 commit into from
Mar 12, 2025
Merged

chore: Allow side effects for organization configuration updates #39692

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions ...smith-server/src/main/java/com/appsmith/server/services/ce/OrganizationServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

import static com.appsmith.external.constants.spans.OrganizationSpan.FETCH_DEFAULT_ORGANIZATION_SPAN;
Expand Down Expand Up @@ -116,6 +118,11 @@ public Mono<Organization> updateOrganizationConfiguration(
.flatMap(tuple2 -> {
Organization organization = tuple2.getT2();
OrganizationConfiguration oldConfig = tuple2.getT1();
List<Mono<Boolean>> sideEffectsMonos =
calculateOrganizationConfigurationUpdateSideEffects(oldConfig, organizationConfiguration);

Mono<List<Boolean>> allSideEffectsMono =
Flux.fromIterable(sideEffectsMonos).flatMap(x -> x).collectList();
AppsmithBeanUtils.copyNestedNonNullProperties(organizationConfiguration, oldConfig);
organization.setOrganizationConfiguration(oldConfig);
Mono<Organization> updatedOrganizationMono = repository
Expand All @@ -126,10 +133,16 @@ public Mono<Organization> updateOrganizationConfiguration(
// hence it will not be evaluated again
return updatedOrganizationMono
.then(Mono.defer(() -> evictOrganizationCache))
.then(Mono.defer(() -> allSideEffectsMono))
.then(updatedOrganizationMono);
});
}

protected List<Mono<Boolean>> calculateOrganizationConfigurationUpdateSideEffects(
OrganizationConfiguration oldConfig, OrganizationConfiguration organizationConfiguration) {
return new ArrayList<>();
}

@Override
public Mono<Organization> findById(String organizationId, AclPermission permission) {
return repository
Expand Down Expand Up @@ -243,6 +256,7 @@ protected Mono<Organization> getClientPertinentOrganization(

// Only copy the values that are pertinent to the client
organizationConfiguration.copyNonSensitiveValues(dbOrganization.getOrganizationConfiguration());
clientOrganization.setId(dbOrganization.getId());
clientOrganization.setUserPermissions(dbOrganization.getUserPermissions());

return Mono.just(clientOrganization);
Expand Down