Added slug to organization and application

Thomasr · ludomikula · commit 86fa6789cb07 · 2024-12-20T11:27:26.000+01:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java
@@ -3,13 +3,11 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.f4b6a3.uuid.UuidCreator;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
-import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.lowcoder.domain.application.ApplicationUtil;
 import org.lowcoder.domain.application.service.ApplicationRecordService;
@@ -20,11 +18,13 @@
 import org.lowcoder.sdk.util.JsonUtils;
 import org.springframework.data.annotation.Transient;
 import org.springframework.data.mongodb.core.mapping.Document;
-import org.springframework.util.StringUtils;
 import reactor.core.publisher.Mono;
 
 import java.time.Instant;
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
 import java.util.function.Supplier;
 
 import static com.google.common.base.Suppliers.memoize;
@@ -39,6 +39,9 @@
 public class Application extends HasIdAndAuditing {
     @Getter
     private String gid;
+    @Setter
+    @Getter
+    private String slug;
     private String organizationId;
     private String name;
     private Integer applicationType;
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/repository/ApplicationRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/repository/ApplicationRepository.java
@@ -67,4 +67,6 @@ public interface ApplicationRepository extends ReactiveMongoRepository<Applicati
      * Find all agency applications
      */
     Flux<Application> findByPublicToAllIsTrueAndAgencyProfileIsTrue();
+    Mono<Boolean> existsBySlug(String slug);
+
 }
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationService.java
@@ -73,4 +73,6 @@ public interface ApplicationService {
 
     Mono<Boolean> updateLastEditedAt(String applicationId, Instant time, String visitorId);
     Mono<Map<String, Object>> getLiveDSLByApplicationId(String applicationId);
+
+    Mono<Application> updateSlug(String applicationId, String newSlug);
 }
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationServiceImpl.java
@@ -14,23 +14,16 @@
 import org.lowcoder.domain.application.model.ApplicationRequestType;
 import org.lowcoder.domain.application.model.ApplicationStatus;
 import org.lowcoder.domain.application.repository.ApplicationRepository;
-import org.lowcoder.domain.organization.repository.OrganizationRepository;
-import org.lowcoder.domain.organization.service.OrgMemberService;
 import org.lowcoder.domain.permission.model.ResourceRole;
 import org.lowcoder.domain.permission.model.ResourceType;
 import org.lowcoder.domain.permission.service.ResourcePermissionService;
-import org.lowcoder.domain.query.model.LibraryQuery;
-import org.lowcoder.domain.query.model.LibraryQueryRecord;
-import org.lowcoder.domain.query.service.LibraryQueryRecordService;
 import org.lowcoder.domain.user.repository.UserRepository;
-import org.lowcoder.domain.user.service.UserService;
 import org.lowcoder.infra.annotation.NonEmptyMono;
 import org.lowcoder.infra.mongo.MongoUpsertHelper;
 import org.lowcoder.sdk.constants.FieldName;
 import org.lowcoder.sdk.exception.BizError;
 import org.lowcoder.sdk.exception.BizException;
 import org.lowcoder.sdk.models.HasIdAndAuditing;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.google.common.collect.Lists;
@@ -353,4 +346,18 @@ public Mono<Map<String, Object>> getLiveDSLByApplicationId(String applicationId)
                 .switchIfEmpty(findById(applicationId)
                         .map(Application::getEditingApplicationDSL));
     }
+
+    @Override
+    public Mono<Application> updateSlug(String applicationId, String newSlug) {
+        return repository.existsBySlug(newSlug).flatMap(exists -> {
+            if (exists) {
+                return Mono.error(new BizException(BizError.DUPLICATE_ENTRY, "Slug already exists"));
+            }
+            return repository.findById(applicationId)
+                    .flatMap(application -> {
+                        application.setSlug(newSlug);
+                        return repository.save(application);
+                    });
+        });
+    }
 }
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/Organization.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/Organization.java
@@ -1,14 +1,10 @@
 package org.lowcoder.domain.organization.model;
 
-import static java.util.Optional.ofNullable;
-import static org.apache.commons.lang3.ObjectUtils.firstNonNull;
-import static org.lowcoder.infra.util.AssetUtils.toAssetPath;
-
-import java.util.*;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonView;
-import com.github.f4b6a3.uuid.UuidCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -17,16 +13,14 @@
 import org.lowcoder.domain.mongodb.BeforeMongodbWrite;
 import org.lowcoder.domain.mongodb.MongodbInterceptorContext;
 import org.lowcoder.sdk.auth.AbstractAuthConfig;
-import org.lowcoder.sdk.config.JsonViews;
 import org.lowcoder.sdk.models.HasIdAndAuditing;
 import org.springframework.data.mongodb.core.mapping.Document;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.*;
 
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import static java.util.Optional.ofNullable;
+import static org.apache.commons.lang3.ObjectUtils.firstNonNull;
+import static org.lowcoder.infra.util.AssetUtils.toAssetPath;
 
 
 @Getter
@@ -41,6 +35,8 @@ public class Organization extends HasIdAndAuditing implements BeforeMongodbWrite
     @Getter
     private String gid;
 
+    private String slug;
+
     private String name;
 
     private Boolean isAutoGeneratedOrganization;
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/repository/OrganizationRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/repository/OrganizationRepository.java
@@ -27,4 +27,5 @@ public interface OrganizationRepository extends ReactiveMongoRepository<Organiza
     Mono<Organization> findByOrganizationDomain_DomainAndState(String domain, OrganizationState state);
 
     Flux<Organization> findByOrganizationDomainIsNotNull();
+    Mono<Boolean> existsBySlug(String slug);
 }
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationService.java
@@ -48,4 +48,6 @@ public interface OrganizationService {
     Mono<Organization> getByDomain();
 
     Mono<Boolean> updateCommonSettings(String orgId, String key, Object value);
+
+    Mono<Organization> updateSlug(String organizationId, String newSlug);
 }
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java
@@ -16,7 +16,6 @@
 import org.lowcoder.domain.organization.repository.OrganizationRepository;
 import org.lowcoder.domain.user.model.User;
 import org.lowcoder.domain.user.repository.UserRepository;
-import org.lowcoder.domain.user.service.UserService;
 import org.lowcoder.infra.annotation.PossibleEmptyMono;
 import org.lowcoder.infra.mongo.MongoUpsertHelper;
 import org.lowcoder.sdk.config.CommonConfig;
@@ -35,10 +34,8 @@
 import reactor.core.publisher.Mono;
 
 import java.util.Collection;
-import java.util.List;
 import java.util.Locale;
 
-import static org.lowcoder.domain.authentication.AuthenticationService.DEFAULT_AUTH_CONFIG;
 import static org.lowcoder.domain.organization.model.OrganizationState.ACTIVE;
 import static org.lowcoder.domain.organization.model.OrganizationState.DELETED;
 import static org.lowcoder.domain.util.QueryDslUtils.fieldName;
@@ -291,4 +288,18 @@ public Mono<Boolean> updateCommonSettings(String orgId, String key, Object value
     private String buildCommonSettingsUpdateTimeKey(String key) {
         return key + "_updateTime";
     }
+
+    @Override
+    public Mono<Organization> updateSlug(String organizationId, String newSlug) {
+        return repository.existsBySlug(newSlug).flatMap(exists -> {
+            if (exists) {
+                return Mono.error(new BizException(BizError.DUPLICATE_ENTRY, "Slug already exists"));
+            }
+            return repository.findById(organizationId)
+                    .flatMap(organization -> {
+                        organization.setSlug(newSlug);
+                        return repository.save(organization);
+                    });
+        });
+    }
 }
diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BizError.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BizError.java
@@ -152,7 +152,9 @@ public enum BizError {
     BUNDLE_NOT_EXIST(500, 6402),
     BUNDLE_NAME_CONFLICT(500, 6403),
     ILLEGAL_BUNDLE_PERMISSION_ID(500, 6404),
-    ;
+
+    //slug 6501 - 6501
+    DUPLICATE_ENTRY(403, 6501);
 
     static {
         checkDuplicates(values(), BizError::getBizErrorCode);
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java
@@ -62,4 +62,6 @@ Mono<Boolean> grantPermission(String applicationId,
 
     // Falk: why we have request.publicToMarketplace() - but here only agencyProfile? Not from request?
     Mono<Boolean> setApplicationAsAgencyProfile(String applicationId, boolean agencyProfile);
+
+    Mono<Application> updateSlug(String applicationId, String slug);
 }
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java
@@ -600,6 +600,11 @@ public Mono<Boolean> setApplicationAsAgencyProfile(String applicationId, boolean
                         (applicationId, agencyProfile));
     }
 
+    @Override
+    public Mono<Application> updateSlug(String applicationId, String slug) {
+        return applicationService.updateSlug(applicationId, slug);
+    }
+
     private Map<String, Object> sanitizeDsl(Map<String, Object> applicationDsl) {
         if (applicationDsl.get("queries") instanceof List<?> queries) {
             List<Map<String, Object>> list = queries.stream().map(this::doSanitizeQuery).toList();
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java
@@ -1,6 +1,5 @@
 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;
@@ -165,6 +164,12 @@ public Mono<ResponseView<Boolean>> updateEditState(@PathVariable String applicat
                 .map(ResponseView::success));
     }
 
+    @Override
+    public Mono<ResponseView<Application>> updateSlug(@PathVariable String applicationId, @RequestBody String slug) {
+        return applicationApiService.updateSlug(applicationId, slug)
+                .map(ResponseView::success);
+    }
+
     @Override
     public Mono<ResponseView<UserHomepageView>> getUserHomePage(@RequestParam(required = false, defaultValue = "0") int applicationType) {
         ApplicationType type = ApplicationType.fromValue(applicationType);
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java
@@ -146,6 +146,9 @@ public Mono<ResponseView<ApplicationView>> publish(@PathVariable String applicat
 	public Mono<ResponseView<Boolean>> updateEditState(@PathVariable String applicationId,
 														@RequestBody UpdateEditStateRequest updateEditStateRequest);
 
+	@PutMapping("/{applicationId}/slug")
+	public Mono<ResponseView<Application>> updateSlug(@PathVariable String applicationId, @RequestBody String slug);
+
 	@Operation(
 			tags = TAG_APPLICATION_MANAGEMENT,
 		    operationId = "getUserHomepageApplication",
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java
@@ -166,4 +166,10 @@ public Mono<ResponseView<Long>> getOrgApiUsageCount(String orgId, Boolean lastMo
                 .map(ResponseView::success));
     }
 
+    @Override
+    public Mono<ResponseView<Organization>> updateSlug(@PathVariable String orgId, @RequestBody String slug) {
+        return organizationService.updateSlug(orgId, slug)
+                .map(ResponseView::success);
+    }
+
 }
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationEndpoints.java
@@ -181,6 +181,9 @@ public Mono<ResponseView<Boolean>> removeUserFromOrg(@PathVariable String orgId,
 	@GetMapping("/{orgId}/api-usage")
 	public Mono<ResponseView<Long>> getOrgApiUsageCount(@PathVariable String orgId, @RequestParam(required = false) Boolean lastMonthOnly);
 
+	@PutMapping("/{orgId}/slug")
+    Mono<ResponseView<Organization>> updateSlug(@PathVariable String orgId, @RequestBody String slug);
+
     public record UpdateOrgCommonSettingsRequest(String key, Object value) {
 
     }
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceTest.java
@@ -20,6 +20,7 @@
 import org.lowcoder.domain.application.model.ApplicationStatus;
 import org.lowcoder.domain.application.model.ApplicationType;
 import org.lowcoder.domain.application.service.ApplicationService;
+import org.lowcoder.domain.organization.model.Organization;
 import org.lowcoder.domain.permission.model.ResourceHolder;
 import org.lowcoder.domain.permission.model.ResourceRole;
 import org.lowcoder.sdk.constants.FieldName;
@@ -332,4 +333,24 @@ public void testAppCreateAndRetrievalByGID() {
                 })
                 .verifyComplete();
     }
+
+    @Test
+    @WithMockUser
+    public void testUpdateSlug() {
+        // Create a dummy application
+        Mono<String> applicationMono = createApplication("SlugTestApp", null)
+                .map(applicationView -> applicationView.getApplicationInfoView().getApplicationId());
+
+        // Assume updateSlug is performed by passing applicationId and the new slug
+        Mono<Application> updatedApplicationMono = applicationMono
+                .flatMap(applicationId -> applicationApiService.updateSlug(applicationId, "new-slug-value"));
+
+        // Verify the application updates with the new slug
+        StepVerifier.create(updatedApplicationMono)
+                .assertNext(application -> {
+                    Assertions.assertNotNull(application.getSlug(), "Slug should not be null");
+                    Assertions.assertEquals("new-slug-value", application.getSlug(), "Slug should be updated to 'new-slug-value'");
+                })
+                .verifyComplete();
+    }
 }
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/OrganizationServiceTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/OrganizationServiceTest.java
@@ -0,0 +1,52 @@
+package org.lowcoder.api.service;
+
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.lowcoder.api.common.mockuser.WithMockUser;
+import org.lowcoder.domain.organization.model.Organization;
+import org.lowcoder.domain.organization.service.OrganizationService;
+import org.lowcoder.sdk.models.HasIdAndAuditing;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+@SpringBootTest
+//@RunWith(SpringRunner.class)
+@ActiveProfiles("OrganizationApiServiceTest")
+@Slf4j(topic = "OrganizationApiServiceTest")
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class OrganizationServiceTest {
+
+    private OrganizationService organizationService;
+
+    private Mono<Organization> createOrganization(String name) {
+        Organization organization = Organization.builder()
+                .name(name)
+                .build();
+        return organizationService.create(organization, "", false);
+    }
+
+    @Test
+    @WithMockUser
+    public void testUpdateSlug() {
+        // Create a dummy organization
+        Mono<String> organizationMono = createOrganization("SlugTestOrganization")
+                .map(HasIdAndAuditing::getId);
+
+        // Assume updateSlug is performed by passing organizationId and the new slug
+        Mono<Organization> updatedOrganizationMono = organizationMono
+                .flatMap(organizationId -> organizationService.updateSlug(organizationId, "new-slug-value"));
+
+        // Verify the organization updates with the new slug
+        StepVerifier.create(updatedOrganizationMono)
+                .assertNext(organization -> {
+                    Assertions.assertNotNull(organization.getSlug(), "Slug should not be null");
+                    Assertions.assertEquals("new-slug-value", organization.getSlug(), "Slug should be updated to 'new-slug-value'");
+                })
+                .verifyComplete();
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -67,4 +67,6 @@ public interface ApplicationRepository extends ReactiveMongoRepository<Applicati`
`67`	`67`	`* Find all agency applications`
`68`	`68`	`*/`
`69`	`69`	`Flux<Application> findByPublicToAllIsTrueAndAgencyProfileIsTrue();`
	`70`	`+ Mono<Boolean> existsBySlug(String slug);`
	`71`	`+`
`70`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,4 +73,6 @@ public interface ApplicationService {`
`73`	`73`
`74`	`74`	`Mono<Boolean> updateLastEditedAt(String applicationId, Instant time, String visitorId);`
`75`	`75`	`Mono<Map<String, Object>> getLiveDSLByApplicationId(String applicationId);`
	`76`	`+`
	`77`	`+ Mono<Application> updateSlug(String applicationId, String newSlug);`
`76`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,5 @@ public interface OrganizationRepository extends ReactiveMongoRepository<Organiza`
`27`	`27`	`Mono<Organization> findByOrganizationDomain_DomainAndState(String domain, OrganizationState state);`
`28`	`28`
`29`	`29`	`Flux<Organization> findByOrganizationDomainIsNotNull();`
	`30`	`+ Mono<Boolean> existsBySlug(String slug);`
`30`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,4 +48,6 @@ public interface OrganizationService {`
`48`	`48`	`Mono<Organization> getByDomain();`
`49`	`49`
`50`	`50`	`Mono<Boolean> updateCommonSettings(String orgId, String key, Object value);`
	`51`	`+`
	`52`	`+ Mono<Organization> updateSlug(String organizationId, String newSlug);`
`51`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,4 +62,6 @@ Mono<Boolean> grantPermission(String applicationId,`
`62`	`62`
`63`	`63`	`// Falk: why we have request.publicToMarketplace() - but here only agencyProfile? Not from request?`
`64`	`64`	`Mono<Boolean> setApplicationAsAgencyProfile(String applicationId, boolean agencyProfile);`
	`65`	`+`
	`66`	`+ Mono<Application> updateSlug(String applicationId, String slug);`
`65`	`67`	`}`