Commit 27d870d

authored

Merge pull request #1 from lowcoder-org/dev

Dev

2 parents 791cff1 + e5bbd35 commit 27d870dCopy full SHA for 27d870d

File tree

+53

-3

lines changed

+53

-3

lines changed

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`import java.util.Set;`
`13`	`13`	`import java.util.function.Supplier;`
`14`	`14`
	`15`	`+import lombok.Setter;`
`15`	`16`	`import org.apache.commons.collections4.MapUtils;`
`16`	`17`	`import org.apache.commons.lang3.BooleanUtils;`
`17`	`18`	`import org.lowcoder.domain.query.model.ApplicationQuery;`
`@@ -38,10 +39,13 @@ public class Application extends HasIdAndAuditing {`
`38`	`39`
`39`	`40`	`private final Map<String, Object> publishedApplicationDSL;`
`40`	`41`
`41`		`- private final Boolean publicToAll;`
`42`		`- private final Boolean publicToMarketplace;`
	`42`	`+ @Setter`
	`43`	`+ private Boolean publicToAll;`
	`44`	`+ @Setter`
	`45`	`+ private Boolean publicToMarketplace;`
`43`	`46`
`44`		`- private final Boolean agencyProfile;`
	`47`	`+ @Setter`
	`48`	`+ private Boolean agencyProfile;`
`45`	`49`
`46`	`50`	`private Map<String, Object> editingApplicationDSL;`
`47`	`51`
`@@ -161,4 +165,5 @@ public Map<String, Object> getEditingApplicationDSL() {`
`161`	`165`	`public Object getLiveContainerSize() {`
`162`	`166`	`return liveContainerSize.get();`
`163`	`167`	`}`
	`168`	`+`
`164`	`169`	`}`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -220,4 +220,8 @@ public Mono<Set<String>> getPublicApplicationIds(Collection<String> applicationI`
`220`	`220`
`221`	`221`
`222`	`222`	`}`
	`223`	`+`
	`224`	`+ public Flux<Application> findAll() {`
	`225`	`+ return repository.findAll();`
	`226`	`+ }`
`223`	`227`	`}`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`import org.lowcoder.infra.config.model.ServerConfig;`
`19`	`19`	`import org.lowcoder.infra.eventlog.EventLog;`
`20`	`20`	`import org.lowcoder.infra.serverlog.ServerLog;`
	`21`	`+import org.lowcoder.runner.migrations.job.AddPtmFieldsJob;`
`21`	`22`	`import org.lowcoder.runner.migrations.job.CompleteAuthType;`
`22`	`23`	`import org.lowcoder.runner.migrations.job.MigrateAuthConfigJob;`
`23`	`24`	`import org.springframework.data.domain.Sort;`
`@@ -182,6 +183,11 @@ public void addOrgIdIndexOnServerLog(MongockTemplate mongoTemplate) {`
`182`	`183`	`);`
`183`	`184`	`}`
`184`	`185`
	`186`	`+ @ChangeSet(order = "020", id = "add-ptm-fields-to-applications", author = "")`
	`187`	`+ public void addPtmFieldsToApplicatgions(AddPtmFieldsJob addPtmFieldsJob) {`
	`188`	`+ addPtmFieldsJob.migrateApplicationsToInitPtmFields();`
	`189`	`+ }`
	`190`	`+`
`185`	`191`	`public static Index makeIndex(String... fields) {`
`186`	`192`	`if (fields.length == 1) {`
`187`	`193`	`return new Index(fields[0], Sort.Direction.ASC).named(fields[0]);`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,6 @@`
	`1`	`+package org.lowcoder.runner.migrations.job;`
	`2`	`+`
	`3`	`+public interface AddPtmFieldsJob {`
	`4`	`+`
	`5`	`+ void migrateApplicationsToInitPtmFields();`
	`6`	`+}`

Lines changed: 29 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,29 @@`
	`1`	`+package org.lowcoder.runner.migrations.job;`
	`2`	`+`
	`3`	`+import org.lowcoder.domain.application.service.ApplicationService;`
	`4`	`+import org.springframework.beans.factory.annotation.Autowired;`
	`5`	`+import org.springframework.stereotype.Component;`
	`6`	`+`
	`7`	`+@Component`
	`8`	`+public class AddPtmFieldsJobImpl implements AddPtmFieldsJob {`
	`9`	`+`
	`10`	`+ @Autowired`
	`11`	`+ private ApplicationService applicationService;`
	`12`	`+`
	`13`	`+ @Override`
	`14`	`+ public void migrateApplicationsToInitPtmFields() {`
	`15`	`+ applicationService.findAll()`
	`16`	`+ .doOnNext(application -> {`
	`17`	`+ if(!application.isPublicToAll()) {`
	`18`	`+ application.setPublicToAll(Boolean.FALSE);`
	`19`	`+ }`
	`20`	`+ if(!application.isPublicToMarketplace()) {`
	`21`	`+ application.setPublicToMarketplace(Boolean.FALSE);`
	`22`	`+ }`
	`23`	`+ if(!application.agencyProfile()) {`
	`24`	`+ application.setAgencyProfile(Boolean.FALSE);`
	`25`	`+ }`
	`26`	`+ }).flatMap(application -> applicationService.updateById(application.getId(), application))`
	`27`	`+ .blockLast();`
	`28`	`+ }`
	`29`	`+}`

Comments

(0)