feat: branch merge applying

dkrizan · dkrizan · commit 6b3a8bd57165 · 2025-10-31T16:54:13.000+01:00
diff --git a/backend/data/src/main/kotlin/io/tolgee/constants/Message.kt b/backend/data/src/main/kotlin/io/tolgee/constants/Message.kt
@@ -315,6 +315,8 @@ enum class Message {
   ORIGIN_BRANCH_NOT_FOUND,
   BRANCH_MERGE_NOT_FOUND,
   BRANCH_MERGE_CHANGE_NOT_FOUND,
+  BRANCH_MERGE_REVISION_NOT_VALID,
+  BRANCH_MERGE_CONFLICTS_NOT_RESOLVED,
   ;
 
   val code: String
diff --git a/backend/data/src/main/kotlin/io/tolgee/development/testDataBuilder/data/BranchTestData.kt b/backend/data/src/main/kotlin/io/tolgee/development/testDataBuilder/data/BranchTestData.kt
@@ -43,6 +43,7 @@ class BranchTestData(
       isProtected = true
       isDefault = true
       createdAt = currentDateProvider.date
+      revision = 10
     }.build {
       mainBranch = self
       addBranch {
@@ -51,6 +52,7 @@ class BranchTestData(
         isProtected = false
         isDefault = false
         originBranch = this
+        revision = 15
       }.build {
         featureBranch = self
       }
diff --git a/backend/data/src/main/kotlin/io/tolgee/model/branching/BranchMerge.kt b/backend/data/src/main/kotlin/io/tolgee/model/branching/BranchMerge.kt
@@ -43,4 +43,13 @@ class BranchMerge : StandardAuditModel(), EntityWithId {
     cascade = [CascadeType.ALL]
   )
   var changes: MutableList<BranchMergeChange> = mutableListOf()
+
+  val isRevisionValid: Boolean
+    get() = sourceRevision == sourceBranch.revision && targetRevision == targetBranch.revision
+
+  val isResolved: Boolean
+    get() = changes.none { !it.isResolved }
+
+  val isReadyToMerge: Boolean
+    get() = isRevisionValid && isResolved
 }
diff --git a/backend/data/src/main/kotlin/io/tolgee/model/branching/BranchMergeChange.kt b/backend/data/src/main/kotlin/io/tolgee/model/branching/BranchMergeChange.kt
@@ -52,4 +52,7 @@ class BranchMergeChange : StandardAuditModel(), EntityWithId {
   @Column(nullable = true)
   @Enumerated(EnumType.STRING)
   var resolution: BranchKeyMergeResolutionType? = null
+
+  val isResolved: Boolean
+    get() = resolution != null
 }
diff --git a/backend/data/src/main/kotlin/io/tolgee/model/key/Key.kt b/backend/data/src/main/kotlin/io/tolgee/model/key/Key.kt
@@ -150,5 +150,13 @@ class Key(
   override fun merge(source: Key) {
     this.isPlural = source.isPlural
     this.pluralArgName = source.pluralArgName
+    this.translations.forEach { translation ->
+      translation.merge(source.translations.find { it.language == translation.language }!!)
+    }
+    this.keyMeta?.let { meta ->
+      source.keyMeta?.let { sourceMeta ->
+        meta.merge(sourceMeta)
+      }
+    }
   }
 }
diff --git a/backend/data/src/main/kotlin/io/tolgee/model/translation/Translation.kt b/backend/data/src/main/kotlin/io/tolgee/model/translation/Translation.kt
@@ -214,6 +214,7 @@ class Translation(
   override fun merge(source: Translation) {
     this.text = source.text
     this.state = source.state
-    this.labels = source.labels
+    this.labels.clear()
+    this.labels.addAll(source.labels)
   }
 }
diff --git a/backend/data/src/main/kotlin/io/tolgee/service/branching/BranchService.kt b/backend/data/src/main/kotlin/io/tolgee/service/branching/BranchService.kt
@@ -15,7 +15,7 @@ interface BranchService {
   fun createBranch(projectId: Long, name: String, originBranchId: Long): Branch
   fun deleteBranch(projectId: Long, branchId: Long)
   fun dryRunMergeBranch(projectId: Long, request: DryRunMergeBranchRequest): BranchMerge
-  fun getBranchMerge(projectId: Long, mergeId: Long): BranchMergeView
+  fun getBranchMergeView(projectId: Long, mergeId: Long): BranchMergeView
   fun getBranchMergeConflicts(
     projectId: Long,
     branchMergeId: Long,
diff --git a/backend/data/src/main/kotlin/io/tolgee/service/branching/BranchServiceOssStub.kt b/backend/data/src/main/kotlin/io/tolgee/service/branching/BranchServiceOssStub.kt
@@ -32,7 +32,7 @@ class BranchServiceOssStub : BranchService {
     throw UnsupportedOperationException()
   }
 
-  override fun getBranchMerge(projectId: Long, mergeId: Long): BranchMergeView {
+  override fun getBranchMergeView(projectId: Long, mergeId: Long): BranchMergeView {
     throw UnsupportedOperationException()
   }
 
diff --git a/ee/backend/app/src/main/kotlin/io/tolgee/ee/api/v2/controllers/branching/BranchController.kt b/ee/backend/app/src/main/kotlin/io/tolgee/ee/api/v2/controllers/branching/BranchController.kt
@@ -113,7 +113,7 @@ class BranchController(
   fun getBranchMergeSessionPreview(
     @PathVariable mergeId: Long,
   ): BranchMergeModel {
-    val merge = branchService.getBranchMerge(projectHolder.project.id, mergeId)
+    val merge = branchService.getBranchMergeView(projectHolder.project.id, mergeId)
     return branchMergeModelAssembler.toModel(merge)
   }
 
diff --git a/ee/backend/app/src/main/kotlin/io/tolgee/ee/repository/branching/BranchMergeRepository.kt b/ee/backend/app/src/main/kotlin/io/tolgee/ee/repository/branching/BranchMergeRepository.kt
@@ -7,6 +7,16 @@ import org.springframework.data.jpa.repository.Query
 
 interface BranchMergeRepository : JpaRepository<BranchMerge, Long> {
 
+  @Query(
+    """
+      select bm from BranchMerge bm 
+      join fetch bm.sourceBranch sb
+      join fetch bm.targetBranch tb
+      where sb.project.id = :projectId and bm.id = :mergeId
+    """
+  )
+  fun findMerge(projectId: Long, mergeId: Long): BranchMerge?
+
   @Query(
     """
     select new io.tolgee.dtos.queryResults.branching.BranchMergeView(
diff --git a/ee/backend/app/src/main/kotlin/io/tolgee/ee/service/branching/BranchMergeService.kt b/ee/backend/app/src/main/kotlin/io/tolgee/ee/service/branching/BranchMergeService.kt
@@ -160,8 +160,17 @@ class BranchMergeService(
   fun getMerge(
     projectId: Long,
     mergeId: Long,
-  ): BranchMergeView? {
+  ): BranchMerge {
+    return branchMergeRepository.findMerge(projectId, mergeId)
+      ?: throw NotFoundException(Message.BRANCH_MERGE_NOT_FOUND)
+  }
+
+  fun getMergeView(
+    projectId: Long,
+    mergeId: Long,
+  ): BranchMergeView {
     return branchMergeRepository.findBranchMergeView(projectId, mergeId)
+      ?: throw NotFoundException(Message.BRANCH_MERGE_NOT_FOUND)
   }
 
   fun getConflicts(
diff --git a/ee/backend/app/src/main/kotlin/io/tolgee/ee/service/branching/BranchServiceImpl.kt b/ee/backend/app/src/main/kotlin/io/tolgee/ee/service/branching/BranchServiceImpl.kt
@@ -10,11 +10,11 @@ import io.tolgee.dtos.request.translation.TranslationFilters
 import io.tolgee.ee.repository.branching.BranchRepository
 import io.tolgee.events.OnBranchDeleted
 import io.tolgee.exceptions.BadRequestException
-import io.tolgee.exceptions.NotFoundException
 import io.tolgee.exceptions.PermissionException
 import io.tolgee.model.Project
 import io.tolgee.model.branching.Branch
 import io.tolgee.model.branching.BranchMerge
+import io.tolgee.model.enums.BranchKeyMergeResolutionType
 import io.tolgee.security.authentication.AuthenticationFacade
 import io.tolgee.service.branching.BranchCopyService
 import io.tolgee.service.branching.BranchService
@@ -108,9 +108,8 @@ class BranchServiceImpl(
     return branchMergeService.dryRun(sourceBranch, targetBranch)
   }
 
-  override fun getBranchMerge(projectId: Long, mergeId: Long): BranchMergeView {
-    return branchMergeService.getMerge(projectId, mergeId)
-      ?: throw NotFoundException(Message.BRANCH_MERGE_NOT_FOUND)
+  override fun getBranchMergeView(projectId: Long, mergeId: Long): BranchMergeView {
+    return branchMergeService.getMergeView(projectId, mergeId)
   }
 
   @Transactional
@@ -152,5 +151,21 @@ class BranchServiceImpl(
     conflict.resolution = request.resolve
   }
 
-  override fun applyMerge(projectId: Long, mergeId: Long) {}
+  @Transactional
+  override fun applyMerge(projectId: Long, mergeId: Long) {
+    val merge = branchMergeService.getMerge(projectId, mergeId)
+    if (!merge.isReadyToMerge) {
+      if (!merge.isRevisionValid) {
+        throw BadRequestException(Message.BRANCH_MERGE_REVISION_NOT_VALID)
+      }
+      if (!merge.isResolved) {
+        throw BadRequestException(Message.BRANCH_MERGE_CONFLICTS_NOT_RESOLVED)
+      }
+    }
+    merge.changes.forEach { change ->
+      if (change.resolution == BranchKeyMergeResolutionType.SOURCE) {
+        change.targetKey.merge(change.sourceKey)
+      }
+    }
+  }
 }
diff --git a/ee/backend/tests/src/test/kotlin/io/tolgee/ee/api/v2/controllers/branching/BranchControllerTest.kt b/ee/backend/tests/src/test/kotlin/io/tolgee/ee/api/v2/controllers/branching/BranchControllerTest.kt
@@ -15,6 +15,7 @@ import io.tolgee.fixtures.andIsOk
 import io.tolgee.fixtures.isValidId
 import io.tolgee.fixtures.mapResponseTo
 import io.tolgee.fixtures.node
+import io.tolgee.fixtures.waitForNotThrowing
 import io.tolgee.model.branching.Branch
 import io.tolgee.model.branching.BranchMergeChange
 import io.tolgee.model.enums.BranchKeyMergeChangeType
@@ -193,7 +194,7 @@ class BranchControllerTest : ProjectAuthControllerTest("/v2/projects/") {
   @ProjectJWTAuthTestMethod
   fun `resolves merge conflict`() {
     val keys = createConflictKeys()
-    val change = createMergeWithConflict(keys.first, keys.second)
+    val change = createMergeWithConflict(keys.second, keys.first)
     val mergeId = change.branchMerge.id
 
     performProjectAuthGet("branches/merge/$mergeId/conflicts")
@@ -220,6 +221,26 @@ class BranchControllerTest : ProjectAuthControllerTest("/v2/projects/") {
       }
   }
 
+  @Test
+  @ProjectJWTAuthTestMethod
+  fun `merges resolved feature branch into main`() {
+    val keys = createConflictKeys()
+    // wait for revision numbers of branches to increase after conflict keys are created
+    waitForNotThrowing(timeout = 10000, pollTime = 250) {
+      testData.featureBranch.refresh().revision.assert.isGreaterThan(15)
+      testData.mainBranch.refresh().revision.assert.isGreaterThan(10)
+    }
+    val change = createMergeWithConflict(
+      keys.second,
+      keys.first,
+      BranchKeyMergeResolutionType.SOURCE
+    )
+    val mergeId = change.branchMerge.id
+
+    performProjectAuthPost("branches/merge/$mergeId/apply").andIsOk
+    translationService.find(keys.first.translations.first().id)!!.text.assert.isEqualTo("new translation")
+  }
+
   private fun createConflictKeys(): Pair<Key, Key> {
     val date = currentDateProvider.date
 
@@ -284,18 +305,25 @@ class BranchControllerTest : ProjectAuthControllerTest("/v2/projects/") {
     return Pair(conflictKeyMain, conflictKeyFeature)
   }
 
-  private fun createMergeWithConflict(sourceKey: Key, targetKey: Key): BranchMergeChange {
+  private fun createMergeWithConflict(
+    sourceKey: Key,
+    targetKey: Key,
+    resolutionType: BranchKeyMergeResolutionType? = null
+  ): BranchMergeChange {
     lateinit var change: BranchMergeChange
+    val sourceBranch = testData.featureBranch.refresh()
+    val targetBranch = testData.mainBranch.refresh()
     val branchMerge = testData.projectBuilder.addBranchMerge {
-      sourceBranch = testData.featureBranch
-      targetBranch = testData.mainBranch
-      sourceRevision = 2
-      targetRevision = 1
+      this.sourceBranch = sourceBranch
+      this.targetBranch = targetBranch
+      sourceRevision = sourceBranch.revision
+      targetRevision = targetBranch.revision
     }.build {
       change = addChange {
         this.change = BranchKeyMergeChangeType.CONFLICT
         this.sourceKey = sourceKey
         this.targetKey = targetKey
+        this.resolution = resolutionType
         branchMerge.changes.add(this)
       }.self
     }.self

Original file line number	Diff line number	Diff line change
`@@ -315,6 +315,8 @@ enum class Message {`
`315`	`315`	`ORIGIN_BRANCH_NOT_FOUND,`
`316`	`316`	`BRANCH_MERGE_NOT_FOUND,`
`317`	`317`	`BRANCH_MERGE_CHANGE_NOT_FOUND,`
	`318`	`+ BRANCH_MERGE_REVISION_NOT_VALID,`
	`319`	`+ BRANCH_MERGE_CONFLICTS_NOT_RESOLVED,`
`318`	`320`	`;`
`319`	`321`
`320`	`322`	`val code: String`
Original file line number	Diff line number	Diff line change
`@@ -43,4 +43,13 @@ class BranchMerge : StandardAuditModel(), EntityWithId {`
`43`	`43`	`cascade = [CascadeType.ALL]`
`44`	`44`	`)`
`45`	`45`	`var changes: MutableList<BranchMergeChange> = mutableListOf()`
	`46`	`+`
	`47`	`+ val isRevisionValid: Boolean`
	`48`	`+ get() = sourceRevision == sourceBranch.revision && targetRevision == targetBranch.revision`
	`49`	`+`
	`50`	`+ val isResolved: Boolean`
	`51`	`+ get() = changes.none { !it.isResolved }`
	`52`	`+`
	`53`	`+ val isReadyToMerge: Boolean`
	`54`	`+ get() = isRevisionValid && isResolved`
`46`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,4 +52,7 @@ class BranchMergeChange : StandardAuditModel(), EntityWithId {`
`52`	`52`	`@Column(nullable = true)`
`53`	`53`	`@Enumerated(EnumType.STRING)`
`54`	`54`	`var resolution: BranchKeyMergeResolutionType? = null`
	`55`	`+`
	`56`	`+ val isResolved: Boolean`
	`57`	`+ get() = resolution != null`
`55`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -150,5 +150,13 @@ class Key(`
`150`	`150`	`override fun merge(source: Key) {`
`151`	`151`	`this.isPlural = source.isPlural`
`152`	`152`	`this.pluralArgName = source.pluralArgName`
	`153`	`+ this.translations.forEach { translation ->`
	`154`	`+ translation.merge(source.translations.find { it.language == translation.language }!!)`
	`155`	`+ }`
	`156`	`+ this.keyMeta?.let { meta ->`
	`157`	`+ source.keyMeta?.let { sourceMeta ->`
	`158`	`+ meta.merge(sourceMeta)`
	`159`	`+ }`
	`160`	`+ }`
`153`	`161`	`}`
`154`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -214,6 +214,7 @@ class Translation(`
`214`	`214`	`override fun merge(source: Translation) {`
`215`	`215`	`this.text = source.text`
`216`	`216`	`this.state = source.state`
`217`		`- this.labels = source.labels`
	`217`	`+ this.labels.clear()`
	`218`	`+ this.labels.addAll(source.labels)`
`218`	`219`	`}`
`219`	`220`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class BranchServiceOssStub : BranchService {`
`32`	`32`	`throw UnsupportedOperationException()`
`33`	`33`	`}`
`34`	`34`
`35`		`- override fun getBranchMerge(projectId: Long, mergeId: Long): BranchMergeView {`
	`35`	`+ override fun getBranchMergeView(projectId: Long, mergeId: Long): BranchMergeView {`
`36`	`36`	`throw UnsupportedOperationException()`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ class BranchController(`
`113`	`113`	`fun getBranchMergeSessionPreview(`
`114`	`114`	`@PathVariable mergeId: Long,`
`115`	`115`	`): BranchMergeModel {`
`116`		`- val merge = branchService.getBranchMerge(projectHolder.project.id, mergeId)`
	`116`	`+ val merge = branchService.getBranchMergeView(projectHolder.project.id, mergeId)`
`117`	`117`	`return branchMergeModelAssembler.toModel(merge)`
`118`	`118`	`}`
`119`	`119`