micromata · kreinhard · Jan 1, 2025 · Jan 1, 2025 · Jan 1, 2025 · Jan 1, 2025
diff --git a/ToDo.adoc b/ToDo.adoc
@@ -69,6 +69,8 @@ docker system df
 docker volume ls
 docker volume rm <volume-name>
 
+drop table t_fibu_orderbook_storage;
+delete from t_flyway_schema_history where version = '2023.11.01';
 
 Orderbooks importieren:
 docker cp ~/ProjectForgeBackup/ProjectForge-Orderbook_*.gz projectforge-postgres:/tmp/
@@ -77,6 +79,3 @@ docker cp ~/ProjectForgeBackup/ProjectForge-Orderbook_*.gz projectforge-postgres
 INSERT INTO t_fibu_orderbook_storage (date, serialized_orderbook)  VALUES ('2023-11-01', pg_read_binary_file(:'file_path')::bytea);
 \set file_path '/tmp/ProjectForge-Orderbook_2023-12-01.gz'
 INSERT INTO t_fibu_orderbook_storage (date, serialized_orderbook)  VALUES ('2023-12-01', pg_read_binary_file(:'file_path')::bytea);
-
-
-SELECT date, octet_length(serialized_orderbook) AS byte_count FROM t_fibu_orderbook_storage;
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -21,7 +21,7 @@ commons-io = "2.16.1"
 de-micromata-merlin = "1.1.16"
 io-dropwizard-metrics-core = "4.2.26"
 io-spring-dependency-management = "1.1.6" # io.spring.dependency-management.gradle.plugin
-fr-opensagres-xdocreport-poi-xwpf-converter-pdf = "2.0.4"
+fr-opensagres-xdocreport-poi-xwpf-converter-pdf = "2.1.0"
 jakarta-activation-api = "2.1.3"
 jakarta-annotation-api = "3.0.0"
 org-eclipse-angus-jakarta-mail = "2.0.3"

diff --git a/...jectforge.plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccount.kt b/...jectforge.plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccount.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/....plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccountBalanceDO.kt b/....plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccountBalanceDO.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/...plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccountBalanceDao.kt b/...plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccountBalanceDao.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/...ctforge.plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccountDO.kt b/...ctforge.plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccountDO.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/...tforge.plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccountDao.kt b/...tforge.plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccountDao.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/....plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccountPagesRest.kt b/....plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccountPagesRest.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/...rge.plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccountRecord.kt b/...rge.plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccountRecord.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/...e.plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccountRecordDO.kt b/...e.plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccountRecordDO.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/....plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccountRecordDao.kt b/....plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccountRecordDao.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/...nking/src/main/kotlin/org/projectforge/plugins/banking/BankAccountRecordImportPageRest.kt b/...nking/src/main/kotlin/org/projectforge/plugins/banking/BankAccountRecordImportPageRest.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/...ns.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccountRecordPagesRest.kt b/...ns.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccountRecordPagesRest.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/...s.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccountRecordStatistics.kt b/...s.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccountRecordStatistics.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/...orge.plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankingImportJob.kt b/...orge.plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankingImportJob.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/....plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankingImportStorage.kt b/....plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankingImportStorage.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/...ctforge.plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankingPlugin.kt b/...ctforge.plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankingPlugin.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/...e.plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankingServicesRest.kt b/...e.plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankingServicesRest.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/....plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/TransactionsImporter.kt b/....plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/TransactionsImporter.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/...plugins.banking/src/test/kotlin/org/projectforge/plugins/banking/BankAccountRecordTest.kt b/...plugins.banking/src/test/kotlin/org/projectforge/plugins/banking/BankAccountRecordTest.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/...gins.banking/src/test/kotlin/org/projectforge/plugins/banking/BankingImportStorageTest.kt b/...gins.banking/src/test/kotlin/org/projectforge/plugins/banking/BankingImportStorageTest.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/...ansfer/src/main/kotlin/org/projectforge/plugins/datatransfer/DataTransferAccessChecker.kt b/...ansfer/src/main/kotlin/org/projectforge/plugins/datatransfer/DataTransferAccessChecker.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/...ransfer/src/main/kotlin/org/projectforge/plugins/datatransfer/DataTransferAreaCapacity.kt b/...ransfer/src/main/kotlin/org/projectforge/plugins/datatransfer/DataTransferAreaCapacity.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/....datatransfer/src/main/kotlin/org/projectforge/plugins/datatransfer/DataTransferAreaDO.kt b/....datatransfer/src/main/kotlin/org/projectforge/plugins/datatransfer/DataTransferAreaDO.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/...datatransfer/src/main/kotlin/org/projectforge/plugins/datatransfer/DataTransferAreaDao.kt b/...datatransfer/src/main/kotlin/org/projectforge/plugins/datatransfer/DataTransferAreaDao.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/...datatransfer/src/main/kotlin/org/projectforge/plugins/datatransfer/DataTransferAuditDO.kt b/...datatransfer/src/main/kotlin/org/projectforge/plugins/datatransfer/DataTransferAuditDO.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/...atatransfer/src/main/kotlin/org/projectforge/plugins/datatransfer/DataTransferAuditDao.kt b/...atatransfer/src/main/kotlin/org/projectforge/plugins/datatransfer/DataTransferAuditDao.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/...sfer/src/main/kotlin/org/projectforge/plugins/datatransfer/DataTransferFileSizeChecker.kt b/...sfer/src/main/kotlin/org/projectforge/plugins/datatransfer/DataTransferFileSizeChecker.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/.../main/kotlin/org/projectforge/plugins/datatransfer/DataTransferNotificationMailService.kt b/.../main/kotlin/org/projectforge/plugins/datatransfer/DataTransferNotificationMailService.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/....datatransfer/src/main/kotlin/org/projectforge/plugins/datatransfer/DataTransferPlugin.kt b/....datatransfer/src/main/kotlin/org/projectforge/plugins/datatransfer/DataTransferPlugin.kt
@@ -3,7 +3,7 @@
 // Project ProjectForge Community Edition
 //         www.projectforge.org
 //
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
 //
 // ProjectForge is dual-licensed.
 //

diff --git a/...nsfer/src/main/kotlin/org/projectforge/plugins/datatransfer/DataTransferSanityCheckJob.kt b/...nsfer/src/main/kotlin/org/projectforge/plugins/datatransfer/DataTransferSanityCheckJob.kt
@@ -0,0 +1,103 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+// Project ProjectForge Community Edition
+//         www.projectforge.org
+//
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
+//
+// ProjectForge is dual-licensed.
+//
+// This community edition is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as published
+// by the Free Software Foundation; version 3 of the License.
+//
+// This community edition is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+// Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, see http://www.gnu.org/licenses/.
+//
+/////////////////////////////////////////////////////////////////////////////
+
+package org.projectforge.plugins.datatransfer
+
+import jakarta.annotation.PostConstruct
+import org.projectforge.business.jobs.CronSanityCheckJob
+import org.projectforge.framework.jcr.AttachmentsService
+import org.projectforge.jobs.AbstractJob
+import org.projectforge.jobs.JobExecutionContext
+import org.projectforge.plugins.datatransfer.rest.DataTransferAreaPagesRest
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.stereotype.Service
+
+@Service
+class DataTransferSanityCheckJob : AbstractJob("Check data transfer files.") {
+    @Autowired
+    private lateinit var attachmentsService: AttachmentsService
+
+    @Autowired
+    private lateinit var dataTransferAreaDao: DataTransferAreaDao
+
+    @Autowired
+    private lateinit var dataTransferAreaPagesRest: DataTransferAreaPagesRest
+
+    @Autowired
+    private lateinit var cronSanityCheckJob: CronSanityCheckJob
+
+    @PostConstruct
+    private fun postConstruct() {
+        cronSanityCheckJob.registerJob(this)
+    }
+
+    override fun execute(jobContext: JobExecutionContext) {
+        var areaCounter = 0
+        var missingInJcrCounter = 0
+        var orphanedCounter = 0
+        dataTransferAreaDao.selectAll(checkAccess = false).forEach { area ->
+            ++areaCounter
+            val areaName = "'${area.displayName}'"
+            try {
+                val attachments = attachmentsService.getAttachments(
+                    dataTransferAreaPagesRest.jcrPath!!,
+                    area.id!!,
+                    dataTransferAreaPagesRest.attachmentsAccessChecker,
+                    checkAccess = false,
+                )
+                val attachmentsCounter = area.attachmentsCounter ?: 0
+                if (attachmentsCounter == 0 && attachments.isNullOrEmpty()) {
+                    // No attachments given/expected, nothing to check.
+                    return@forEach
+                }
+                jobContext.addMessage("Checking data transfer area $areaName with ${attachmentsCounter} attachments.")
+                attachments?.forEach { attachment ->
+                    if (attachment.size == 0L) {
+                        jobContext.addWarning("Empty attachment ${attachment.name} in area $areaName.")
+                    }
+                }
+                if (attachmentsCounter != attachments?.size) {
+                    jobContext.addWarning("Attachments counter in area $areaName is ${attachmentsCounter}, but found ${attachments?.size} attachments.")
+                }
+                val areaAttachmentIds = area.attachmentsIds?.split(" ")?.filter { it.isNotBlank() } ?: emptyList()
+                val jcrAttachmentIds = attachments?.map { it.fileId.toString() } ?: emptyList()
+                val missingInJcr = areaAttachmentIds - jcrAttachmentIds
+                val unknown = jcrAttachmentIds - areaAttachmentIds
+                if (missingInJcr.isNotEmpty()) {
+                    jobContext.addError("${missingInJcr.size}/$attachmentsCounter attachments missing in JCR for area $areaName: ${missingInJcr.joinToString()}")
+                    missingInJcrCounter += missingInJcr.size
+                }
+                if (unknown.isNotEmpty()) {
+                    jobContext.addWarning("${unknown.size} unknown (orphaned) attachments in JCR for area $areaName: ${unknown.joinToString()}")
+                    orphanedCounter += unknown.size
+                }
+            } catch (ex: Exception) {
+                jobContext.addWarning("Error while checking data transfer area $areaName: ${ex.message}")
+            }
+        }
+        if (missingInJcrCounter > 0 || orphanedCounter > 0) {
+            jobContext.addError("Checked $areaCounter data transfer areas: $missingInJcrCounter missed, $orphanedCounter orphaned attachments.")
+        }
+        jobContext.addMessage("Checked $areaCounter data transfer areas.")
+    }
+}