Skip to content

Deployment ID and timestamp are unique for each run #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Svit93 merged 1 commit into from
Dec 3, 2025
Merged

Deployment ID and timestamp are unique for each run #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions migration-library/src/main/kotlin/com/quadient/migration/service/deploy/DeployClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ sealed class DeployClient(
protected val output: InspireOutput,
) {
protected val logger = LoggerFactory.getLogger(this::class.java)!!
protected val deploymentId = Uuid.random()
protected val deploymentTimestamp = Clock.System.now()
val postProcessors: MutableList<(DeploymentResult) -> Unit> = mutableListOf()

init {
Expand Down Expand Up @@ -135,6 +133,9 @@ sealed class DeployClient(
}

fun deployStyles() {
val deploymentId = Uuid.random()
val deploymentTimestamp = Clock.System.now()

val textStyles = textStyleRepository.listAllModel().filter { it.definition is TextStyleDefinitionModel }
val paragraphStyles =
paragraphStyleRepository.listAllModel().filter { it.definition is ParagraphStyleDefinitionModel }
Expand Down Expand Up @@ -256,7 +257,7 @@ sealed class DeployClient(
return deployOrder
}

protected fun deployImages(documentObjects: List<DocumentObjectModel>): DeploymentResult {
protected fun deployImages(documentObjects: List<DocumentObjectModel>, deploymentId: Uuid, deploymentTimestamp: Instant): DeploymentResult {
val deploymentResult = DeploymentResult(deploymentId)

val uniqueImageRefs = documentObjects.flatMap {
Expand Down Expand Up @@ -408,7 +409,7 @@ sealed class DeployClient(
fun progressReportInternal(objects: List<DocumentObjectModel>, deployId: Uuid? = null): ProgressReport {
val lastDeployment = deployId?.let { LastDeployment(it, Clock.System.now()) } ?: getLastDeployEvent()

val report = ProgressReport(deploymentId, mutableMapOf())
val report = ProgressReport(deployId ?: Uuid.random(), mutableMapOf())

val queue: MutableList<RefModel> = mutableListOf()
val alreadyVisitedRefs = mutableSetOf<Pair<String, KClass<*>>>()
Expand Down
4 changes: 3 additions & 1 deletion ...ion-library/src/main/kotlin/com/quadient/migration/service/deploy/DesignerDeployClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,12 @@ class DesignerDeployClient(
}

override fun deployDocumentObjectsInternal(documentObjects: List<DocumentObjectModel>): DeploymentResult {
val deploymentId = kotlin.uuid.Uuid.random()
val deploymentTimestamp = kotlinx.datetime.Clock.System.now()
val deploymentResult = DeploymentResult(deploymentId)

val orderedDocumentObject = deployOrder(documentObjects)
deploymentResult += deployImages(orderedDocumentObject)
deploymentResult += deployImages(orderedDocumentObject, deploymentId, deploymentTimestamp)

for (it in orderedDocumentObject) {
val targetPath = documentObjectBuilder.getDocumentObjectPath(it)
Expand Down
4 changes: 3 additions & 1 deletion ...-library/src/main/kotlin/com/quadient/migration/service/deploy/InteractiveDeployClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,13 @@ class InteractiveDeployClient(
}

override fun deployDocumentObjectsInternal(documentObjects: List<DocumentObjectModel>): DeploymentResult {
val deploymentId = kotlin.uuid.Uuid.random()
val deploymentTimestamp = kotlinx.datetime.Clock.System.now()
val deploymentResult = DeploymentResult(deploymentId)

val orderedDocumentObject = deployOrder(documentObjects)

deploymentResult += deployImages(orderedDocumentObject)
deploymentResult += deployImages(orderedDocumentObject, deploymentId, deploymentTimestamp)

for (it in orderedDocumentObject) {
val targetPath = documentObjectBuilder.getDocumentObjectPath(it)
Expand Down