fix: Prevent slug regenerating for server content storage (#2288)

tolgee · Apr 29, 2024 · 0a8372f · 0a8372f
1 parent b157214
commit 0a8372f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/...otlin/io/tolgee/api/v2/controllers/contentDelivery/ContentDeliveryConfigControllerTest.kt b/...otlin/io/tolgee/api/v2/controllers/contentDelivery/ContentDeliveryConfigControllerTest.kt
@@ -305,6 +305,28 @@ class ContentDeliveryConfigControllerTest : ProjectAuthControllerTest("/v2/proje
     }
   }
 
+  @Test
+  @ProjectJWTAuthTestMethod
+  fun `does not regenerate slug when not using custom storage`() {
+    val slug = testData.defaultServerContentDeliveryConfig.self.slug
+    performProjectAuthPut(
+      "content-delivery-configs/${testData.defaultServerContentDeliveryConfig.self.id}",
+      mapOf("name" to "S3 new"),
+    ).andIsOk.andAssertThatJson {
+      node("slug").isEqualTo(slug)
+    }
+  }
+
+  @Test
+  @ProjectJWTAuthTestMethod
+  fun `throws when custom slug is used with default storage`() {
+    val slug = testData.defaultServerContentDeliveryConfig.self.slug
+    performProjectAuthPut(
+      "content-delivery-configs/${testData.defaultServerContentDeliveryConfig.self.id}",
+      mapOf("name" to "S3 new", "slug" to "hello"),
+    ).andIsBadRequest
+  }
+
   private fun createWithCustomSlug() =
     performProjectAuthPost(
       "content-delivery-configs",

diff --git a/...nd/data/src/main/kotlin/io/tolgee/service/contentDelivery/ContentDeliveryConfigService.kt b/...nd/data/src/main/kotlin/io/tolgee/service/contentDelivery/ContentDeliveryConfigService.kt
@@ -146,6 +146,10 @@ class ContentDeliveryConfigService(
     val wasCustomStorage = config.contentStorage != null
     val nowCustomStorage = dto.contentStorageId != null
 
+    if (!wasCustomStorage && !nowCustomStorage && desiredSlug == null) {
+      return
+    }
+
     if (desiredSlug == null) {
       config.slug = generateSlug()
       config.customSlug = false