Skip to content

slug validation and search #1407

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
merged 2 commits into from
Dec 30, 2024
Merged

slug validation and search #1407

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
081791f
slug validation
dragonpoo Dec 20, 2024
9fd3f28
search by slugs
dragonpoo Dec 20, 2024
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
Next Next commit
slug validation
  • Loading branch information
@dragonpoo
dragonpoo committed Dec 27, 2024
commit 081791f8701a9f8f549094e6a8a04f22b7abc20c
4 changes: 3 additions & 1 deletion ...omain/src/main/java/org/lowcoder/domain/application/repository/ApplicationRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ public interface ApplicationRepository extends ReactiveMongoRepository<Applicati
* Find all agency applications
*/
Flux<Application> findByPublicToAllIsTrueAndAgencyProfileIsTrue();
Mono<Boolean> existsBySlug(String slug);

@Query("{ 'organizationId': ?0, 'slug': ?1 }")
Mono<Boolean> existsByOrganizationIdAndSlug(String organizationId, String slug);

}
15 changes: 8 additions & 7 deletions ...-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import org.lowcoder.domain.permission.model.ResourceType;
import org.lowcoder.domain.permission.service.ResourcePermissionService;
import org.lowcoder.domain.user.repository.UserRepository;
import org.lowcoder.domain.util.SlugUtils;
import org.lowcoder.infra.annotation.NonEmptyMono;
import org.lowcoder.infra.mongo.MongoUpsertHelper;
import org.lowcoder.sdk.constants.FieldName;
Expand Down Expand Up @@ -349,15 +350,15 @@ public Mono<Map<String, Object>> getLiveDSLByApplicationId(String applicationId)

@Override
public Mono<Application> updateSlug(String applicationId, String newSlug) {
return repository.existsBySlug(newSlug).flatMap(exists -> {
return repository.findById(applicationId).flatMap(application -> repository.existsByOrganizationIdAndSlug(application.getOrganizationId(), newSlug).flatMap(exists -> {
if (!SlugUtils.validate(newSlug)) {
return Mono.error(new BizException(BizError.INVALID_SLUG, "Slug format is invalid"));
}
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);
});
});
application.setSlug(newSlug);
return repository.save(application);
}));
}
}
4 changes: 4 additions & 0 deletions ...omain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
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.util.SlugUtils;
import org.lowcoder.infra.annotation.PossibleEmptyMono;
import org.lowcoder.infra.mongo.MongoUpsertHelper;
import org.lowcoder.sdk.config.CommonConfig;
Expand Down Expand Up @@ -292,6 +293,9 @@ private String buildCommonSettingsUpdateTimeKey(String key) {
@Override
public Mono<Organization> updateSlug(String organizationId, String newSlug) {
return repository.existsBySlug(newSlug).flatMap(exists -> {
if (!SlugUtils.validate(newSlug)) {
return Mono.error(new BizException(BizError.INVALID_SLUG, "Slug format is invalid"));
}
if (exists) {
return Mono.error(new BizException(BizError.DUPLICATE_ENTRY, "Slug already exists"));
}
Expand Down
7 changes: 7 additions & 0 deletions server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/util/SlugUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package org.lowcoder.domain.util;

public class SlugUtils {
public static Boolean validate(String slug) {
return slug.matches("^[a-zA-Z0-9_-]*$");
}
}
3 changes: 2 additions & 1 deletion server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BizError.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,8 @@ public enum BizError {
ILLEGAL_BUNDLE_PERMISSION_ID(500, 6404),

//slug 6501 - 6501
DUPLICATE_ENTRY(403, 6501);
DUPLICATE_ENTRY(403, 6501),
INVALID_SLUG(403, 6502);

static {
checkDuplicates(values(), BizError::getBizErrorCode);
Expand Down