Merge pull request #5644 from effective-webwork/sorted-import-configurations

Return import configurations sorted by title

Author: solth

Kitodo/src/main/java/org/kitodo/production/services/data/ImportConfigurationService.java

@@ -139,8 +139,18 @@ public List<ImportConfiguration> getAllFileUploadConfigurations() throws DAOExce
         return getAllImportConfigurations(ImportConfigurationType.FILE_UPLOAD);
     }
 
+    /**
+     * Load and return all ImportConfigurations sorted by title.
+     * @return list of all ImportConfigurations sorted by title
+     * @throws DAOException when ImportConfigurations could not be loaded
+     */
+    public List<ImportConfiguration> getAll() throws DAOException {
+        return super.getAll().stream().sorted(Comparator.comparing(ImportConfiguration::getTitle))
+                .collect(Collectors.toList());
+    }
+
     private List<ImportConfiguration> getAllImportConfigurations(ImportConfigurationType type) throws DAOException {
-        return getAll().stream()
+        return super.getAll().stream()
                 .filter(importConfiguration -> type.name()
                         .equals(importConfiguration.getConfigurationType()))
                 .sorted(Comparator.comparing(ImportConfiguration::getTitle))

Kitodo/src/test/java/org/kitodo/production/services/data/ImportConfigurationIT.java

@@ -0,0 +1,60 @@
+/*
+ * (c) Kitodo. Key to digital objects e. V. <[email protected]>
+ *
+ * This file is part of the Kitodo project.
+ *
+ * It is licensed under GNU General Public License version 3 or later.
+ *
+ * For the full copyright and license information, please read the
+ * GPL3-License.txt file that was distributed with this source code.
+ */
+
+package org.kitodo.production.services.data;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.kitodo.MockDatabase;
+import org.kitodo.data.database.beans.ImportConfiguration;
+import org.kitodo.data.database.exceptions.DAOException;
+import org.kitodo.production.services.ServiceManager;
+
+public class ImportConfigurationIT {
+
+    /**
+     * Insert test mapping files and import configurations into database.
+     */
+    @BeforeClass
+    public static void prepareDatabase() throws Exception {
+        MockDatabase.startNode();
+        MockDatabase.insertMappingFiles();
+        MockDatabase.insertImportConfigurations();
+        MockDatabase.setUpAwaitility();
+    }
+
+    /**
+     * Verifies that ImportConfigurations are returned in alphabetical order by ImportConfigurationService.
+     * @throws DAOException when loading of ImportConfigurations fails
+     */
+    @Test
+    public void shouldGetAllImportConfigurationsSortedAlphabetically() throws DAOException {
+        List<ImportConfiguration> configs = ServiceManager.getImportConfigurationService().getAll();
+        assertEquals("Wrong number of import configurations", Long.valueOf(3), Long.valueOf(configs.size()));
+        assertEquals("Wrong first import configuration", "GBV", configs.get(0).getTitle());
+        assertEquals("Wrong last import configuration", "Kalliope", configs.get(2).getTitle());
+    }
+
+    /**
+     * Clean up test database.
+     */
+    @AfterClass
+    public static void cleanDatabase() throws Exception {
+        MockDatabase.stopNode();
+        MockDatabase.cleanDatabase();
+    }
+
+}