Merge pull request #4356 from Kathrin-Huber/fix_serial_migration

Fix serial migration
kitodo · Apr 23, 2021 · 11a326c · 11a326c
2 parents 2f59437 + f6976ff
commit 11a326c
Show file tree

Hide file tree

Showing 7 changed files with 243 additions and 28 deletions.
diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/CreateProcessForm.java b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/CreateProcessForm.java
@@ -392,7 +392,7 @@ private void createProcessHierarchy()
                 && !this.titleRecordLinkTab.getSelectedInsertionPosition().isEmpty()) {
             this.processes = new LinkedList<>(Collections.singletonList(this.processes.get(0)));
         }
-        ImportService.checkTasks(this.getMainProcess(), processDataTab.getDocType());
+        ProcessService.checkTasks(this.getMainProcess(), processDataTab.getDocType());
         processAncestors();
         processChildren();
         // main process and it's ancestors need to be saved so they have IDs before creating their process directories

diff --git a/Kitodo/src/main/java/org/kitodo/production/helper/tasks/HierarchyMigrationTask.java b/Kitodo/src/main/java/org/kitodo/production/helper/tasks/HierarchyMigrationTask.java
@@ -25,6 +25,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.kitodo.api.Metadata;
 import org.kitodo.api.MetadataEntry;
 import org.kitodo.api.dataformat.IncludedStructuralElement;
 import org.kitodo.api.dataformat.Workpiece;
@@ -165,7 +166,7 @@ public void run() {
      * @param process
      *            process to migrate
      */
-    private void migrate(Process process) throws IOException, ProcessGenerationException, DataException, DAOException, CommandException {
+    void migrate(Process process) throws IOException, ProcessGenerationException, DataException, DAOException, CommandException {
         logger.info("Starting to convert process {} (ID {})...", process.getTitle(), process.getId());
         long begin = System.nanoTime();
         migrateMetadataFiles(process);
@@ -227,13 +228,16 @@ private static Optional<String> getParentRecordId(Process process) throws IOExce
      *         current number of the child process
      */
     private List<Integer> createParentProcess(Process childProcess)
-            throws ProcessGenerationException, IOException, DataException, CommandException {
+            throws ProcessGenerationException, IOException, DataException, CommandException, DAOException {
 
         processGenerator.generateProcess(childProcess.getTemplate().getId(), childProcess.getProject().getId());
         Process parentProcess = processGenerator.getGeneratedProcess();
         processService.save(parentProcess);
         fileService.createProcessLocation(parentProcess);
         createParentMetsFile(childProcess);
+        checkTaskAndId(parentProcess);
+        processService.save(parentProcess);
+        parentProcess = ServiceManager.getProcessService().getById(parentProcess.getId());
         ArrayList<Integer> parentData = new ArrayList<>();
         parentData.add(parentProcess.getId());
         URI metadataFilePath = fileService.getMetadataFilePath(childProcess);
@@ -242,6 +246,33 @@ private List<Integer> createParentProcess(Process childProcess)
         return parentData;
     }
 
+    private void checkTaskAndId(Process parentProcess) throws IOException {
+        URI parentMetadataFilePath = fileService.getMetadataFilePath(parentProcess, true, true);
+        Workpiece workpiece = ServiceManager.getMetsService().loadWorkpiece(parentMetadataFilePath);
+        ProcessService.checkTasks(parentProcess, workpiece.getRootElement().getType());
+        Collection<Metadata> metadata = workpiece.getRootElement().getMetadata();
+        String shortedTitle = "";
+        String catalogIdentifier = "";
+        for (Metadata metadatum : metadata) {
+            if (metadatum.getKey().equals("TSL_ATS")) {
+                shortedTitle = ((MetadataEntry) metadatum).getValue();
+            }
+            if (metadatum.getKey().equals("CatalogIDDigital")) {
+                catalogIdentifier = ((MetadataEntry) metadatum).getValue();
+            }
+        }
+        String title = "";
+        if (!shortedTitle.isEmpty()) {
+            title += shortedTitle + '_';
+        }
+        if (!catalogIdentifier.isEmpty()) {
+            title += catalogIdentifier;
+        }
+        parentProcess.setTitle(title);
+        workpiece.setId(parentProcess.getId().toString());
+        ServiceManager.getMetsService().saveWorkpiece(workpiece,parentMetadataFilePath);
+    }
+
     /**
      * Links parent process and child process in the database. The processes are
      * saved.

diff --git a/Kitodo/src/main/java/org/kitodo/production/migration/NewspaperProcessesMigrator.java b/Kitodo/src/main/java/org/kitodo/production/migration/NewspaperProcessesMigrator.java
@@ -44,16 +44,13 @@
 import org.kitodo.data.exceptions.DataException;
 import org.kitodo.exceptions.CommandException;
 import org.kitodo.exceptions.ProcessGenerationException;
-import org.kitodo.production.dto.BatchDTO;
-import org.kitodo.production.dto.ProcessDTO;
 import org.kitodo.production.helper.tasks.NewspaperMigrationTask;
 import org.kitodo.production.helper.tasks.TaskManager;
 import org.kitodo.production.metadata.MetadataEditor;
 import org.kitodo.production.process.NewspaperProcessesGenerator;
 import org.kitodo.production.process.ProcessGenerator;
 import org.kitodo.production.services.ServiceManager;
 import org.kitodo.production.services.data.BatchService;
-import org.kitodo.production.services.data.ImportService;
 import org.kitodo.production.services.data.ProcessService;
 import org.kitodo.production.services.dataeditor.DataEditorService;
 import org.kitodo.production.services.dataformat.MetsService;
@@ -550,7 +547,7 @@ public void createOverallProcess() throws ProcessGenerationException, IOExceptio
         processGenerator.generateProcess(templateId, projectId);
         overallProcess = processGenerator.getGeneratedProcess();
         overallProcess.setTitle(getTitle());
-        ImportService.checkTasks(overallProcess, overallWorkpiece.getRootElement().getType());
+        ProcessService.checkTasks(overallProcess, overallWorkpiece.getRootElement().getType());
         processService.saveToDatabase(overallProcess);
         ServiceManager.getFileService().createProcessLocation(overallProcess);
         overallWorkpiece.setId(overallProcess.getId().toString());
@@ -586,7 +583,7 @@ public void createNextYearProcess() throws ProcessGenerationException, IOExcepti
         processGenerator.generateProcess(templateId, projectId);
         Process yearProcess = processGenerator.getGeneratedProcess();
         yearProcess.setTitle(yearTitle);
-        ImportService.checkTasks(yearProcess, yearToCreate.getValue().getType());
+        ProcessService.checkTasks(yearProcess, yearToCreate.getValue().getType());
         processService.saveToDatabase(yearProcess);
 
         MetadataEditor.addLink(overallWorkpiece.getRootElement(), yearProcess.getId());

diff --git a/Kitodo/src/main/java/org/kitodo/production/process/NewspaperProcessesGenerator.java b/Kitodo/src/main/java/org/kitodo/production/process/NewspaperProcessesGenerator.java
@@ -61,7 +61,6 @@
 import org.kitodo.production.model.bibliography.course.IndividualIssue;
 import org.kitodo.production.process.field.AdditionalField;
 import org.kitodo.production.services.ServiceManager;
-import org.kitodo.production.services.data.ImportService;
 import org.kitodo.production.services.data.ProcessService;
 import org.kitodo.production.services.data.RulesetService;
 import org.kitodo.production.services.dataformat.MetsService;
@@ -657,7 +656,7 @@ private void saveAndCloseCurrentYearProcess() throws DataException, IOException
         final long begin = System.nanoTime();
 
         metsService.saveWorkpiece(yearWorkpiece, yearMetadataFileUri);
-        ImportService.checkTasks(yearProcess, yearWorkpiece.getRootElement().getType());
+        ProcessService.checkTasks(yearProcess, yearWorkpiece.getRootElement().getType());
         processService.save(yearProcess);
 
         this.yearProcess = null;
@@ -723,7 +722,7 @@ private void createNewYearProcess(String yearMark, Map<String, String> genericFi
 
         String title = makeTitle(yearTitleDefinition.orElse("+'_'+#YEAR"), genericFields);
         getGeneratedProcess().setTitle(title);
-        ImportService.checkTasks(getGeneratedProcess(), yearType);
+        ProcessService.checkTasks(getGeneratedProcess(), yearType);
         processService.save(getGeneratedProcess());
         processService.refresh(getGeneratedProcess());
 
@@ -788,7 +787,7 @@ private void finish() throws DataException, IOException {
                 overallProcess.getTitle());
         }
         metsService.saveWorkpiece(overallWorkpiece, overallMetadataFileUri);
-        ImportService.checkTasks(overallProcess, overallWorkpiece.getRootElement().getType());
+        ProcessService.checkTasks(overallProcess, overallWorkpiece.getRootElement().getType());
         processService.save(overallProcess);
 
         if (logger.isTraceEnabled()) {

diff --git a/Kitodo/src/main/java/org/kitodo/production/services/data/ImportService.java b/Kitodo/src/main/java/org/kitodo/production/services/data/ImportService.java
@@ -1142,25 +1142,10 @@ public static void processTempProcess(TempProcess tempProcess, Template template
         createProcessTitle(tempProcess, managementInterface, acquisitionStage, priorityList, processDetails);
         Process process = tempProcess.getProcess();
         addProperties(tempProcess.getProcess(), template, processDetails, docType, tempProcess.getProcess().getTitle());
-        checkTasks(process, docType);
+        ProcessService.checkTasks(process, docType);
         updateTasks(process);
     }
 
-    /**
-     * Checks if an imported Process should be created with Tasks and removes them if not,
-     * depending on the configuration of the doctype.
-     * @param process the process to check.
-     * @param docType the doctype to check in the ruleset.
-     */
-    public static void checkTasks(Process process, String docType) throws IOException {
-        // remove tasks from process, if doctype is configured not to use a workflow
-        Collection<String> divisionsWithNoWorkflow = ServiceManager.getRulesetService()
-                .openRuleset(process.getRuleset()).getDivisionsWithNoWorkflow();
-        if (divisionsWithNoWorkflow.contains(docType)) {
-            process.getTasks().clear();
-        }
-    }
-
     /**
      * Imports a process and saves it to database.
      * @param ppn the ppn to import

diff --git a/Kitodo/src/main/java/org/kitodo/production/services/data/ProcessService.java b/Kitodo/src/main/java/org/kitodo/production/services/data/ProcessService.java
@@ -219,6 +219,21 @@ public static void emptyCache() {
         RULESET_CACHE_FOR_CREATE_FROM_CALENDAR.clear();
     }
 
+    /**
+     * Checks if an imported Process should be created with Tasks and removes them if not,
+     * depending on the configuration of the doctype.
+     * @param process the process to check.
+     * @param docType the doctype to check in the ruleset.
+     */
+    public static void checkTasks(Process process, String docType) throws IOException {
+        // remove tasks from process, if doctype is configured not to use a workflow
+        Collection<String> divisionsWithNoWorkflow = ServiceManager.getRulesetService()
+                .openRuleset(process.getRuleset()).getDivisionsWithNoWorkflow();
+        if (divisionsWithNoWorkflow.contains(docType)) {
+            process.getTasks().clear();
+        }
+    }
+
     @Override
     public Long countDatabaseRows() throws DAOException {
         return countDatabaseRows("SELECT COUNT(*) FROM Process");