Commit f6a5890

Thomasrludomikula

Thomasr

authored and

committed

Fix an issue returning wrong message with duplicated slug

1 parent 11e825a commit f6a5890Copy full SHA for f6a5890

File tree

-7

lines changed

-7

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -356,10 +356,10 @@ public Mono<Map<String, Object>> getLiveDSLByApplicationId(String applicationId)`
`356`	`356`	`public Mono<Application> updateSlug(String applicationId, String newSlug) {`
`357`	`357`	`return repository.findById(applicationId).flatMap(application -> repository.existsByOrganizationIdAndSlug(application.getOrganizationId(), newSlug).flatMap(exists -> {`
`358`	`358`	`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"));`
`360`	`360`	`}`
`361`	`361`	`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"));`
`363`	`363`	`}`
`364`	`364`	`application.setSlug(newSlug);`
`365`	`365`	`return repository.save(application);`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -294,10 +294,10 @@ private String buildCommonSettingsUpdateTimeKey(String key) {`
`294`	`294`	`public Mono<Organization> updateSlug(String organizationId, String newSlug) {`
`295`	`295`	`return repository.existsBySlug(newSlug).flatMap(exists -> {`
`296`	`296`	`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"));`
`298`	`298`	`}`
`299`	`299`	`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"));`
`301`	`301`	`}`
`302`	`302`	`return repository.findById(organizationId)`
`303`	`303`	`.flatMap(organization -> {`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -154,8 +154,8 @@ public enum BizError {`
`154`	`154`	`ILLEGAL_BUNDLE_PERMISSION_ID(500, 6404),`
`155`	`155`
`156`	`156`	`//slug 6501 - 6501`
`157`		`- DUPLICATE_ENTRY(403, 6501),`
`158`		`- INVALID_SLUG(403, 6502);`
	`157`	`+ SLUG_DUPLICATE_ENTRY(403, 6501),`
	`158`	`+ SLUG_INVALID(403, 6502);`
`159`	`159`
`160`	`160`	`static {`
`161`	`161`	`checkDuplicates(values(), BizError::getBizErrorCode);`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -282,4 +282,6 @@ ORG_DELETED_FOR_ENTERPRISE_MODE=Provided enterpriseOrgId workspace has been dele`
`282`	`282`	`DISABLE_AUTH_CONFIG_FORBIDDEN=Can not disable current administrator''s last identity provider.`
`283`	`283`	`USER_NOT_EXIST=User not exist.`
`284`	`284`	`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`

Comments

(0)