feat: add branch support to CDN content delivery configs (#3466)

## Summary

- Links CDN configs to branches via a foreign key (`branch_id`) instead
of the plain `filterBranch` string column
- Adds branch selector to the CDN config dialog when branching is
enabled
- Shows branch name chip on CDN list items
- Cleans up CDN configs when a branch is deleted
- Migrates existing configs to the default branch during branching
enablement
- Feature guard rejects CDN create/update with `filterBranch` when
BRANCHING feature is disabled

## Test plan

- [x] All 12 `ContentDeliveryConfigBranchingTest` tests pass, including:
  - Create/update CDN config with specific branch
  - Create without branch defaults to default branch
  - Non-existent branch returns 404
  - Delete branch cascades to CDN configs
  - Feature guard rejects create when branching not enabled
  - Feature guard rejects update when branching not enabled

🤖 Generated with [Claude Code](https://claude.com/claude-code)

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

Author: dkrizan

backend/api/src/main/kotlin/io/tolgee/hateoas/contentDelivery/ContentDeliveryConfigModel.kt

@@ -1,5 +1,6 @@
 package io.tolgee.hateoas.contentDelivery
 
+import io.swagger.v3.oas.annotations.media.Schema
 import io.tolgee.dtos.IExportParams
 import io.tolgee.formats.ExportFormat
 import io.tolgee.formats.ExportMessageFormat
@@ -23,6 +24,10 @@ class ContentDeliveryConfigModel(
   val lastPublished: Long?,
   val lastPublishedFiles: Collection<String>,
   override var escapeHtml: Boolean?,
+  @Schema(
+    description = "Branch name this CDN config is associated with. Null means default branch or no branching.",
+  )
+  val branchName: String? = null,
 ) : RepresentationModel<ContentDeliveryConfigModel>(),
   Serializable,
   IExportParams {
@@ -40,5 +45,7 @@ class ContentDeliveryConfigModel(
   override var messageFormat: ExportMessageFormat? = null
   override var supportArrays: Boolean = false
   override var fileStructureTemplate: String? = null
-  override var filterBranch: String? = null
+  override var filterBranch: String?
+    get() = branchName
+    set(_) {} // no-op; branchName is the source of truth
 }

backend/api/src/main/kotlin/io/tolgee/hateoas/contentDelivery/ContentDeliveryConfigModelAssembler.kt

@@ -28,6 +28,7 @@ class ContentDeliveryConfigModelAssembler(
       lastPublished = entity.lastPublished?.time,
       lastPublishedFiles = entity.lastPublishedFiles ?: listOf(),
       escapeHtml = entity.escapeHtml,
+      branchName = entity.branch?.name,
     ).also {
       it.copyPropsFrom(entity)
     }

backend/data/src/main/kotlin/io/tolgee/development/testDataBuilder/data/ContentDeliveryConfigBranchingTestData.kt

@@ -0,0 +1,71 @@
+package io.tolgee.development.testDataBuilder.data
+
+import io.tolgee.model.automations.AutomationAction
+import io.tolgee.model.automations.AutomationTrigger
+import io.tolgee.model.automations.AutomationTriggerType
+import io.tolgee.model.branching.Branch
+
+class ContentDeliveryConfigBranchingTestData : BaseTestData() {
+  var mainBranch: Branch
+  var featureBranch: Branch
+
+  val mainBranchCdnConfig =
+    projectBuilder.addContentDeliveryConfig {
+      name = "Main CDN"
+    }
+
+  val featureBranchCdnConfig =
+    projectBuilder.addContentDeliveryConfig {
+      name = "Feature CDN"
+    }
+
+  val defaultServerContentDeliveryConfig =
+    projectBuilder.addContentDeliveryConfig {
+      name = "Default server"
+    }
+
+  val automation =
+    projectBuilder.addAutomation {
+      this.triggers.add(
+        AutomationTrigger(this)
+          .also { it.type = AutomationTriggerType.TRANSLATION_DATA_MODIFICATION },
+      )
+      this.actions.add(
+        AutomationAction(this).also { it.contentDeliveryConfig = defaultServerContentDeliveryConfig.self },
+      )
+    }
+
+  val keyWithTranslation =
+    this.projectBuilder.addKey("key") {
+      addTranslation("en", "Hello")
+    }
+
+  init {
+    projectBuilder.apply {
+      self.useBranching = true
+
+      mainBranch =
+        addBranch {
+          name = "main"
+          project = projectBuilder.self
+          isProtected = true
+          isDefault = true
+        }.self
+
+      featureBranch =
+        addBranch {
+          name = "feature"
+          project = projectBuilder.self
+          isProtected = false
+          isDefault = false
+          originBranch = mainBranch
+        }.self
+
+      mainBranchCdnConfig.self.branch = mainBranch
+      featureBranchCdnConfig.self.branch = featureBranch
+      defaultServerContentDeliveryConfig.self.branch = mainBranch
+
+      keyWithTranslation.self.branch = mainBranch
+    }
+  }
+}

backend/data/src/main/kotlin/io/tolgee/model/contentDelivery/ContentDeliveryConfig.kt

@@ -11,6 +11,8 @@ import io.tolgee.formats.ExportMessageFormat
 import io.tolgee.model.Project
 import io.tolgee.model.StandardAuditModel
 import io.tolgee.model.automations.AutomationAction
+import io.tolgee.model.branching.Branch
+import io.tolgee.model.branching.EntityWithBranch
 import io.tolgee.model.enums.TranslationState
 import jakarta.persistence.Column
 import jakarta.persistence.Entity
@@ -21,6 +23,7 @@ import jakarta.persistence.Index
 import jakarta.persistence.ManyToOne
 import jakarta.persistence.OneToMany
 import jakarta.persistence.Table
+import jakarta.persistence.Transient
 import org.hibernate.annotations.ColumnDefault
 import org.hibernate.annotations.Type
 import java.util.Date
@@ -31,13 +34,15 @@ import java.util.Date
   indexes = [
     Index(columnList = "project_id"),
     Index(columnList = "content_storage_id"),
+    Index(columnList = "branch_id"),
   ],
 )
 class ContentDeliveryConfig(
   @ManyToOne(fetch = FetchType.LAZY)
   var project: Project,
 ) : StandardAuditModel(),
-  IExportParams {
+  IExportParams,
+  EntityWithBranch {
   @ActivityLoggedProp
   @ActivityDescribingProp
   lateinit var name: String
@@ -139,6 +144,15 @@ class ContentDeliveryConfig(
   @ActivityLoggedProp
   override var escapeHtml: Boolean? = false
 
-  @ActivityLoggedProp
-  override var filterBranch: String? = null
+  @get:Transient
+  override var filterBranch: String?
+    get() = branch?.name
+    set(value) {} // no-op; branch FK is the source of truth
+
+  @ManyToOne(fetch = FetchType.LAZY, optional = true)
+  var branch: Branch? = null
+
+  override fun resolveBranch(): Branch? = branch
+
+  override fun resolveProject(): Project? = project
 }

backend/data/src/main/kotlin/io/tolgee/repository/contentDelivery/ContentDeliveryConfigRepository.kt

@@ -24,6 +24,7 @@ interface ContentDeliveryConfigRepository : JpaRepository<ContentDeliveryConfig?
     """
     from ContentDeliveryConfig e
     left join fetch e.automationActions
+    left join fetch e.branch
     where e.project.id in :projectId
   """,
     countQuery = """
@@ -50,4 +51,17 @@ interface ContentDeliveryConfigRepository : JpaRepository<ContentDeliveryConfig?
   ): ContentDeliveryConfig
 
   fun countByProject(project: Project): Int
+
+  @Query(
+    """
+    from ContentDeliveryConfig e
+    left join fetch e.automationActions
+    left join fetch e.branch
+    where e.project.id = :projectId and e.branch.id = :branchId
+  """,
+  )
+  fun findAllByProjectIdAndBranchId(
+    projectId: Long,
+    branchId: Long,
+  ): List<ContentDeliveryConfig>
 }

backend/data/src/main/kotlin/io/tolgee/service/contentDelivery/ContentDeliveryConfigService.kt

@@ -13,14 +13,16 @@ import io.tolgee.model.contentDelivery.ContentDeliveryConfig
 import io.tolgee.model.contentDelivery.ContentStorage
 import io.tolgee.repository.contentDelivery.ContentDeliveryConfigRepository
 import io.tolgee.service.automations.AutomationService
+import io.tolgee.service.branching.BranchService
+import io.tolgee.service.project.ProjectFeatureGuard
 import io.tolgee.service.project.ProjectService
 import io.tolgee.util.SlugGenerator
 import jakarta.persistence.EntityManager
-import jakarta.transaction.Transactional
 import org.springframework.context.annotation.Lazy
 import org.springframework.data.domain.Page
 import org.springframework.data.domain.Pageable
 import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
 import kotlin.random.Random
 
 @Suppress("SpringJavaInjectionPointsAutowiringInspection")
@@ -35,17 +37,22 @@ class ContentDeliveryConfigService(
   @Lazy
   private val contentDeliveryUploader: ContentDeliveryUploader,
   private val enabledFeaturesProvider: EnabledFeaturesProvider,
+  @Lazy
+  private val branchService: BranchService,
+  private val projectFeatureGuard: ProjectFeatureGuard,
 ) {
   @Transactional
   fun create(
     projectId: Long,
     dto: ContentDeliveryConfigRequest,
   ): ContentDeliveryConfig {
+    projectFeatureGuard.checkIfUsed(Feature.BRANCHING, dto.filterBranch)
     val project = entityManager.getReference(Project::class.java, projectId)
     checkMultipleConfigsFeature(project)
     val config = ContentDeliveryConfig(project)
     config.name = dto.name
     config.contentStorage = getStorage(projectId, dto.contentStorageId)
+    config.branch = branchService.getActiveOrDefault(projectId, dto.filterBranch)
     config.copyPropsFrom(dto)
     setSlugForCreation(config, dto)
     config.pruneBeforePublish = dto.pruneBeforePublish
@@ -130,13 +137,15 @@ class ContentDeliveryConfigService(
     id: Long,
     dto: ContentDeliveryConfigRequest,
   ): ContentDeliveryConfig {
+    projectFeatureGuard.checkIfUsed(Feature.BRANCHING, dto.filterBranch)
     checkMultipleConfigsFeature(projectService.get(projectId), maxCurrentAllowed = 1)
     val config = get(projectId, id)
     handleUpdateSlug(config, dto)
     config.contentStorage = getStorage(projectId, dto.contentStorageId)
     config.name = dto.name
     config.pruneBeforePublish = dto.pruneBeforePublish
     config.zip = dto.zip
+    config.branch = branchService.getActiveOrDefault(projectId, dto.filterBranch)
     config.copyPropsFrom(dto)
     handleUpdateAutoPublish(dto, config)
     return save(config)
@@ -214,4 +223,18 @@ class ContentDeliveryConfigService(
   fun save(config: ContentDeliveryConfig): ContentDeliveryConfig {
     return contentDeliveryConfigRepository.save(config)
   }
+
+  @Transactional
+  fun deleteAllByBranchId(
+    projectId: Long,
+    branchId: Long,
+  ) {
+    val configs = contentDeliveryConfigRepository.findAllByProjectIdAndBranchId(projectId, branchId)
+    configs.forEach { config ->
+      config.automationActions.map { it.automation }.forEach {
+        automationService.delete(it)
+      }
+      contentDeliveryConfigRepository.deleteById(config.id)
+    }
+  }
 }

backend/data/src/main/resources/db/changelog/schema.xml

@@ -5057,4 +5057,25 @@
             </column>
         </addColumn>
     </changeSet>
+    <changeSet author="danielkrizan (generated)" id="1770751028716-1">
+        <addColumn tableName="content_delivery_config">
+            <column name="branch_id" type="BIGINT"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="danielkrizan (generated)" id="1770751028716-2">
+        <createIndex indexName="IDXmpg39yyj1lqn91onyyb64471v" tableName="content_delivery_config">
+            <column name="branch_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="danielkrizan (generated)" id="1770751028716-3">
+        <addForeignKeyConstraint baseColumnNames="branch_id" baseTableName="content_delivery_config" constraintName="FK5jtc226unswiodyqp8r4isds6" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="branch" validate="true"/>
+    </changeSet>
+    <changeSet author="danielkrizan (generated)" id="1770751028716-4">
+        <dropColumn columnName="filter_branch" tableName="content_delivery_config"/>
+        <rollback>
+            <addColumn tableName="content_delivery_config">
+                <column name="filter_branch" type="VARCHAR(255)"/>
+            </addColumn>
+        </rollback>
+    </changeSet>
 </databaseChangeLog>

backend/development/src/main/kotlin/io/tolgee/controllers/internal/e2eData/ContentDeliveryBranchingE2eDataController.kt

@@ -0,0 +1,14 @@
+package io.tolgee.controllers.internal.e2eData
+
+import io.tolgee.controllers.internal.InternalController
+import io.tolgee.development.testDataBuilder.builders.TestDataBuilder
+import io.tolgee.development.testDataBuilder.data.ContentDeliveryConfigBranchingTestData
+
+@InternalController(["internal/e2e-data/content-delivery-branching"])
+class ContentDeliveryBranchingE2eDataController : AbstractE2eDataController() {
+  override val testData: TestDataBuilder
+    get() {
+      val data = ContentDeliveryConfigBranchingTestData()
+      return data.root
+    }
+}

e2e/cypress/common/apiCalls/testData/testData.ts

@@ -67,6 +67,10 @@ export const languagePermissionsData = generateTestDataObject(
 export const contentDeliveryTestData =
   generateTestDataObject('content-delivery');
 
+export const contentDeliveryBranchingTestData = generateTestDataObject(
+  'content-delivery-branching'
+);
+
 export const generateExampleKeys = (
   projectId: number,
   numberOfExamples: number