Feature/mig 562 base template model and mapping

migration-examples/src/main/groovy/com/quadient/migration/example/common/mapping/AttachmentsImport.groovy

@@ -89,10 +89,6 @@ static void run(Migration migration, Path attachmentsFilePath) {
         }
     }
 
-    def batches = mappings.entrySet().collate(1000)
-    for (int i = 0; i < batches.size(); i++) {
-        log.info "Upserting mappings batch ${i + 1}/${batches.size()} (${batches[i].size()} items)"
-        migration.mappingRepository.upsertBatch(batches[i].collectEntries())
-    }
+    Mapping.upsertBatched(migration.mappingRepository, mappings, "attachment mappings", log)
     migration.mappingRepository.applyAllAttachmentMappings()
 }

migration-examples/src/main/groovy/com/quadient/migration/example/common/mapping/DisplayRulesImport.groovy

@@ -7,6 +7,7 @@
 package com.quadient.migration.example.common.mapping
 
 import com.quadient.migration.api.Migration
+import com.quadient.migration.api.dto.migrationmodel.BaseTemplateLocation
 import com.quadient.migration.api.dto.migrationmodel.MappingItem
 import com.quadient.migration.example.common.util.Csv
 import com.quadient.migration.example.common.util.Mapping
@@ -56,7 +57,7 @@ static void run(Migration migration, File file) {
         def newInternal = Csv.deserialize(values.get("internal"), boolean)
         existingMapping.internal = newInternal
 
-        def newBaseTemplate = Csv.deserialize(values.get("baseTemplate"), String.class)
+        def newBaseTemplate = Csv.deserialize(values.get("baseTemplate"), BaseTemplateLocation.class)
         existingMapping.baseTemplate = newBaseTemplate
 
         def newTargetFolder = Csv.deserialize(values.get("targetFolder"), String.class)
@@ -83,10 +84,6 @@ static void run(Migration migration, File file) {
         }
     }
 
-    def batches = mappings.entrySet().collate(1000)
-    for (int i = 0; i < batches.size(); i++) {
-        log.info "Upserting mappings batch ${i + 1}/${batches.size()} (${batches[i].size()} items)"
-        migration.mappingRepository.upsertBatch(batches[i].collectEntries())
-    }
+    Mapping.upsertBatched(migration.mappingRepository, mappings, "display rule mappings", log)
     migration.mappingRepository.applyAllDisplayRuleMappings()
 }

migration-examples/src/main/groovy/com/quadient/migration/example/common/mapping/DocumentObjectsImport.groovy

@@ -7,6 +7,7 @@
 package com.quadient.migration.example.common.mapping
 
 import com.quadient.migration.api.Migration
+import com.quadient.migration.api.dto.migrationmodel.BaseTemplateLocation
 import com.quadient.migration.api.dto.migrationmodel.MappingItem
 import com.quadient.migration.example.common.util.Csv
 import com.quadient.migration.example.common.util.Mapping
@@ -59,8 +60,8 @@ static void run(Migration migration, Path documentObjFilePath) {
         def newInternal = Csv.deserialize(values.get("internal"), boolean)
         Mapping.mapProp(existingMapping, existingDocObject, "internal", newInternal)
 
-        def newBaseTemplate = Csv.deserialize(values.get("baseTemplate"), String.class)
-        Mapping.mapProp(existingMapping, existingDocObject, "baseTemplate", newBaseTemplate)
+        def newBaseTemplate = Csv.deserialize(values.get("baseTemplate"), BaseTemplateLocation.class)
+        existingMapping.baseTemplate = newBaseTemplate
 
         def newTargetFolder = Csv.deserialize(values.get("targetFolder"), String.class)
         Mapping.mapProp(existingMapping, existingDocObject, "targetFolder", newTargetFolder)
@@ -93,10 +94,6 @@ static void run(Migration migration, Path documentObjFilePath) {
         }
     }
 
-    def batches = mappings.entrySet().collate(1000)
-    for (int i = 0; i < batches.size(); i++) {
-        log.info "Upserting mappings batch ${i + 1}/${batches.size()} (${batches[i].size()} items)"
-        migration.mappingRepository.upsertBatch(batches[i].collectEntries())
-    }
+    Mapping.upsertBatched(migration.mappingRepository, mappings, "document object mappings", log)
     migration.mappingRepository.applyAllDocumentObjectMappings()
 }

migration-examples/src/main/groovy/com/quadient/migration/example/common/mapping/ImagesImport.groovy

@@ -92,10 +92,6 @@ static void run(Migration migration, Path imagesFilePath) {
         }
     }
 
-    def batches = mappings.entrySet().collate(1000)
-    for (int i = 0; i < batches.size(); i++) {
-        log.info "Upserting mappings batch ${i + 1}/${batches.size()} (${batches[i].size()} items)"
-        migration.mappingRepository.upsertBatch(batches[i].collectEntries())
-    }
+    Mapping.upsertBatched(migration.mappingRepository, mappings, "image mappings", log)
     migration.mappingRepository.applyAllImageMappings()
 }

migration-examples/src/main/groovy/com/quadient/migration/example/common/mapping/AreasExport.groovy → migration-examples/src/main/groovy/com/quadient/migration/example/common/mapping/LayoutExport.groovy

@@ -1,5 +1,5 @@
 //! ---
-//! displayName: Export Areas
+//! displayName: Export Layout
 //! category: Mapping
 //! description: Export areas assigned to the appropriate pages and templates. Allows user to modify interactive flow name
 //! target: gradle
@@ -12,6 +12,8 @@ import com.quadient.migration.api.dto.migrationmodel.builder.DocumentObjectFilte
 import com.quadient.migration.api.repository.DocumentObjectRepository
 import com.quadient.migration.example.common.util.Csv
 import com.quadient.migration.example.common.util.Mapping
+import com.quadient.migration.shared.BaseTemplateArea
+import com.quadient.migration.shared.BaseTemplatePage
 import com.quadient.migration.shared.DocumentObjectType
 import groovy.transform.Field
 
@@ -21,7 +23,7 @@ import static com.quadient.migration.example.common.util.InitMigration.initMigra
 
 @Field Migration migration = initMigration(this.binding)
 
-def areasFile = Mapping.csvPath(binding, migration.projectConfig.name, "areas")
+def areasFile = Mapping.csvPath(binding, migration.projectConfig.name, "layout")
 
 run(migration, areasFile)
 
@@ -50,7 +52,9 @@ static void run(Migration migration, Path path) {
             Mapping.displayHeader("y", true),
             Mapping.displayHeader("width", true),
             Mapping.displayHeader("height", true),
-            Mapping.displayHeader("contentPreview", true)
+            Mapping.displayHeader("type", false),
+            Mapping.displayHeader("targetId", false),
+            Mapping.displayHeader("contentPreview", true),
         ]
         writer.writeLine(headers.join(","))
         templates.each { template ->
@@ -82,6 +86,16 @@ static void run(Migration migration, Path path) {
                 areas.eachWithIndex { area, idx -> writer.writeLine(buildArea(migration, idx, area, page, null)) }
             }
         }
+
+        def baseTemplates = migration.baseTemplateRepository.listAll() ?: []
+        baseTemplates.each { baseTemplate ->
+            baseTemplate.pages.eachWithIndex { page, pageIdx ->
+                def pageId = "page-${pageIdx + 1}"
+                page.areas.each { area ->
+                    writer.writeLine(buildBaseTemplateArea(baseTemplate, pageId, page, area))
+                }
+            }
+        }
     }
 }
 
@@ -102,7 +116,33 @@ static String buildArea(Migration migration, Number idx, Area area, DocumentObje
     builder.append(Csv.serialize(area.position.width) + ",")
     builder.append(Csv.serialize(area.position.height) + ",")
 
+    builder.append("Standard,")
+    builder.append(Csv.serialize(page?.baseTemplate ?: template?.baseTemplate) + ",")
+
     builder.append(Csv.serialize(migration.previewProvider.buildDocumentContentListPreview(area.content)))
 
     return builder.toString()
 }
+
+static String buildBaseTemplateArea(BaseTemplate baseTemplate, String pageId, BaseTemplatePage page, BaseTemplateArea area) {
+    def builder = new StringBuilder()
+    builder.append(Csv.serialize(baseTemplate.id) + ",")
+    builder.append(Csv.serialize(baseTemplate.name) + ",")
+    builder.append(Csv.serialize(pageId) + ",")
+    builder.append(Csv.serialize(page.name) + ",")
+    builder.append(Csv.serialize(page.pageWidth) + ",")
+    builder.append(Csv.serialize(page.pageHeight) + ",")
+    builder.append(Csv.serialize(area.interactiveFlowName) + ",")
+    builder.append(Csv.serialize(area.flowToNextPage) + ",")
+    builder.append(Csv.serialize(area.position?.x) + ",")
+    builder.append(Csv.serialize(area.position?.y) + ",")
+    builder.append(Csv.serialize(area.position?.width) + ",")
+    builder.append(Csv.serialize(area.position?.height) + ",")
+
+    builder.append("Base,")
+    builder.append(Csv.serialize(null) + ",")
+
+    builder.append(Csv.serialize(null))
+
+    return builder.toString()
+}