Skip to content

Commit f6a5890

Browse files
dragonpooludomikula
authored andcommitted
Fix an issue returning wrong message with duplicated slug
1 parent 11e825a commit f6a5890

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,10 +356,10 @@ public Mono<Map<String, Object>> getLiveDSLByApplicationId(String applicationId)
356356
public Mono<Application> updateSlug(String applicationId, String newSlug) {
357357
return repository.findById(applicationId).flatMap(application -> repository.existsByOrganizationIdAndSlug(application.getOrganizationId(), newSlug).flatMap(exists -> {
358358
if (!SlugUtils.validate(newSlug)) {
359-
return Mono.error(new BizException(BizError.INVALID_SLUG, "Slug format is invalid"));
359+
return Mono.error(new BizException(BizError.SLUG_INVALID, "SLUG_INVALID"));
360360
}
361361
if (exists) {
362-
return Mono.error(new BizException(BizError.DUPLICATE_ENTRY, "Slug already exists"));
362+
return Mono.error(new BizException(BizError.SLUG_DUPLICATE_ENTRY, "SLUG_DUPLICATE_ENTRY"));
363363
}
364364
application.setSlug(newSlug);
365365
return repository.save(application);

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,10 +294,10 @@ private String buildCommonSettingsUpdateTimeKey(String key) {
294294
public Mono<Organization> updateSlug(String organizationId, String newSlug) {
295295
return repository.existsBySlug(newSlug).flatMap(exists -> {
296296
if (!SlugUtils.validate(newSlug)) {
297-
return Mono.error(new BizException(BizError.INVALID_SLUG, "Slug format is invalid"));
297+
return Mono.error(new BizException(BizError.SLUG_INVALID, "SLUG_INVALID"));
298298
}
299299
if (exists) {
300-
return Mono.error(new BizException(BizError.DUPLICATE_ENTRY, "Slug already exists"));
300+
return Mono.error(new BizException(BizError.SLUG_DUPLICATE_ENTRY, "SLUG_DUPLICATE_ENTRY"));
301301
}
302302
return repository.findById(organizationId)
303303
.flatMap(organization -> {

server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BizError.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ public enum BizError {
154154
ILLEGAL_BUNDLE_PERMISSION_ID(500, 6404),
155155

156156
//slug 6501 - 6501
157-
DUPLICATE_ENTRY(403, 6501),
158-
INVALID_SLUG(403, 6502);
157+
SLUG_DUPLICATE_ENTRY(403, 6501),
158+
SLUG_INVALID(403, 6502);
159159

160160
static {
161161
checkDuplicates(values(), BizError::getBizErrorCode);

server/api-service/lowcoder-sdk/src/main/resources/locale_en.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,4 +282,6 @@ ORG_DELETED_FOR_ENTERPRISE_MODE=Provided enterpriseOrgId workspace has been dele
282282
DISABLE_AUTH_CONFIG_FORBIDDEN=Can not disable current administrator''s last identity provider.
283283
USER_NOT_EXIST=User not exist.
284284
DUPLICATE_AUTH_CONFIG_ADDITION=Provider auth type already added to organization
285-
EMAIL_PROVIDER_DISABLED=Email provider is disabled.
285+
EMAIL_PROVIDER_DISABLED=Email provider is disabled.
286+
SLUG_DUPLICATE_ENTRY=Slug already exists
287+
SLUG_INVALID=Slug format is invalid

0 commit comments

Comments
 (0)