Dec 20, 2024 · Nov 20, 2024 · Dec 4, 2024 · Dec 5, 2024 · Dec 5, 2024 · Dec 5, 2024
diff --git a/...lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java b/...lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java
                                .applicationId(application.getId())
                                .applicationDSL(application.getEditingApplicationDSL())
                                .build())
                        .map(applicationRecordService::insert))
                        .flatMap(applicationRecordService::insert))
                .flatMap(permission -> applicationService.findById(applicationId)
                        .map(applicationUpdated -> ApplicationView.builder()
                                .applicationInfoView(buildView(applicationUpdated, permission.getResourceRole().getValue()))
diff --git a/...ice/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java b/...ice/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java
 package org.lowcoder.api.application;

 import io.sentry.protocol.App;
 import lombok.RequiredArgsConstructor;
 import org.lowcoder.api.application.view.*;
 import org.lowcoder.api.framework.view.PageResponseView;
 import org.lowcoder.domain.application.model.ApplicationRequestType;
 import org.lowcoder.domain.application.model.ApplicationStatus;
 import org.lowcoder.domain.application.model.ApplicationType;
 import org.lowcoder.domain.application.service.ApplicationRecordService;
 import org.lowcoder.domain.folder.service.FolderElementRelationService;
 import org.lowcoder.domain.permission.model.ResourceRole;
 import org.springframework.web.bind.annotation.PathVariable;
 import reactor.core.publisher.Mono;

 import java.util.List;
 import java.util.Objects;

 import static org.apache.commons.collections4.SetUtils.emptyIfNull;
 import static org.lowcoder.plugin.api.event.LowcoderEvent.EventType.*;
    private final SessionUserService sessionUserService;
    private final GidService gidService;
    private final FolderElementRelationService folderElementRelationService;
    private final ApplicationRecordService applicationRecordService;

    @Override
    public Mono<ResponseView<ApplicationView>> create(@RequestBody CreateApplicationRequest createApplicationRequest) {

    @Override
    public Mono<ResponseView<ApplicationView>> publish(@PathVariable String applicationId,
                                                       @RequestBody ApplicationPublishRequest applicationPublishRequest) {
                                                       @RequestBody(required = false) ApplicationPublishRequest applicationPublishRequest) {
        return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
            applicationApiService.publish(appId, applicationPublishRequest)
                    applicationRecordService.getLatestRecordByApplicationId(applicationId)
                        .map(applicationRecord -> {
                            String tag = applicationRecord.getTag(); // Assuming format is 1.0.0
                            String newtag = "1.0.0";

                            if (tag != null && tag.matches("\\d+\\.\\d+\\.\\d+")) { // Validate tag format
                                String[] parts = tag.split("\\."); // Split by "."
                                int major = Integer.parseInt(parts[0]);
                                int minor = Integer.parseInt(parts[1]);
                                int patch = Integer.parseInt(parts[2]);

                                patch++; // Increment the patch version
                                newtag = String.format("%d.%d.%d", major, minor, patch);
                            }

                            return newtag;
                        })
                        .switchIfEmpty(Mono.just("1.0.0"))
                        .flatMap(newtag -> applicationApiService.publish(appId, Objects.requireNonNullElse(applicationPublishRequest, new ApplicationPublishRequest("", newtag))))
                .map(ResponseView::success));
    }

diff --git a/...vice/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java b/...vice/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java
 )
    @PostMapping("/{applicationId}/publish")
 public Mono<ResponseView<ApplicationView>> publish(@PathVariable String applicationId,
 @RequestBody ApplicationPublishRequest applicationPublishRequest);
 @RequestBody(required = false) ApplicationPublishRequest applicationPublishRequest);

 @Operation(
 tags = TAG_APPLICATION_MANAGEMENT,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -374,7 +374,7 @@ public Mono<ApplicationView> publish(String applicationId, ApplicationPublishReq
		.applicationId(application.getId())
		.applicationDSL(application.getEditingApplicationDSL())
		.build())
		.map(applicationRecordService::insert))
		.flatMap(applicationRecordService::insert))
		.flatMap(permission -> applicationService.findById(applicationId)
		.map(applicationUpdated -> ApplicationView.builder()
		.applicationInfoView(buildView(applicationUpdated, permission.getResourceRole().getValue()))
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,5 +1,6 @@
		package org.lowcoder.api.application;

		import io.sentry.protocol.App;
		import lombok.RequiredArgsConstructor;
		import org.lowcoder.api.application.view.*;
		import org.lowcoder.api.framework.view.PageResponseView;
Expand All		@@ -13,6 +14,7 @@
		import org.lowcoder.domain.application.model.ApplicationRequestType;
		import org.lowcoder.domain.application.model.ApplicationStatus;
		import org.lowcoder.domain.application.model.ApplicationType;
		import org.lowcoder.domain.application.service.ApplicationRecordService;
		import org.lowcoder.domain.folder.service.FolderElementRelationService;
		import org.lowcoder.domain.permission.model.ResourceRole;
		import org.springframework.web.bind.annotation.PathVariable;
Expand All		@@ -22,6 +24,7 @@
		import reactor.core.publisher.Mono;

		import java.util.List;
		import java.util.Objects;

		import static org.apache.commons.collections4.SetUtils.emptyIfNull;
		import static org.lowcoder.plugin.api.event.LowcoderEvent.EventType.*;
Expand All		@@ -38,6 +41,7 @@ public class ApplicationController implements ApplicationEndpoints {
		private final SessionUserService sessionUserService;
		private final GidService gidService;
		private final FolderElementRelationService folderElementRelationService;
		private final ApplicationRecordService applicationRecordService;

		@Override
		public Mono<ResponseView<ApplicationView>> create(@RequestBody CreateApplicationRequest createApplicationRequest) {
Expand DownExpand Up		@@ -130,9 +134,27 @@ public Mono<ResponseView<ApplicationView>> update(@PathVariable String applicati

		@Override
		public Mono<ResponseView<ApplicationView>> publish(@PathVariable String applicationId,
		@RequestBody ApplicationPublishRequest applicationPublishRequest) {
		@RequestBody(required = false) ApplicationPublishRequest applicationPublishRequest) {
		return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
		applicationApiService.publish(appId, applicationPublishRequest)
		applicationRecordService.getLatestRecordByApplicationId(applicationId)
		.map(applicationRecord -> {
		String tag = applicationRecord.getTag(); // Assuming format is 1.0.0
		String newtag = "1.0.0";

		if (tag != null && tag.matches("\\d+\\.\\d+\\.\\d+")) { // Validate tag format
		String[] parts = tag.split("\\."); // Split by "."
		int major = Integer.parseInt(parts[0]);
		int minor = Integer.parseInt(parts[1]);
		int patch = Integer.parseInt(parts[2]);

		patch++; // Increment the patch version
		newtag = String.format("%d.%d.%d", major, minor, patch);
		}

		return newtag;
		})
		.switchIfEmpty(Mono.just("1.0.0"))
		.flatMap(newtag -> applicationApiService.publish(appId, Objects.requireNonNullElse(applicationPublishRequest, new ApplicationPublishRequest("", newtag))))
		.map(ResponseView::success));
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -134,7 +134,7 @@ public Mono<ResponseView<ApplicationView>> update(@PathVariable String applicati
		)
		@PostMapping("/{applicationId}/publish")
		public Mono<ResponseView<ApplicationView>> publish(@PathVariable String applicationId,
		@RequestBody ApplicationPublishRequest applicationPublishRequest);
		@RequestBody(required = false) ApplicationPublishRequest applicationPublishRequest);

		@Operation(
		tags = TAG_APPLICATION_MANAGEMENT,
Expand Down