Mgc remove

Migration-ToDo.adoc

@@ -0,0 +1,100 @@
+Aktuell:
+- Fehlerhinweis, wenn halber Tag für Urlaubsanfang/ende gewählt wird, es aber kein Arbeitstag ist.
+- Scripts
+
+- remove all BaseDO.xxxId (lazy fetch) and replace callee by baseDO?.id
+- Entitygraphen nutzen: ConflictVacationCache, AuftragCache etc.
+  - Auftrag editieren: massenhaft SQLs
+  - employeeSalaryList: lädt wie blöde nach dem Editieren. (Excel-Exports auch zuviele SQLs)
+  - AddressKampagnen: ebd. (massenhaft SQLs)
+- Suche nach Kontonummer in KontoDO
+
+- Lazy-Breakpoint: AbstractLazyInitializer.initialize (#170)
+org.hibernate.persister.entity.AbstractEntityPersister#generateSelectLazy:
+
+postrgesql.conf:
+ log_lock_waits = on
+ deadlock_timeout = '500ms'
+ log_min_duration_statement = 1000  # Optional: loggt Abfragen, die länger als 1 Sekunde dauern
+
+History
+- Positionen etc. vernünftig anzeigen.
+
+- Suche:
+  - Suche in History
+  - Suche nach K+S (aktuell noch Provisorium)
+- HistoryConvertContext: Am Ende alle displayProperties übernehmen.
+
+- ProjektEdit: History enthält keine neuen Kost2DOs/Arten (Einträge sind aber da).
+- CronReindexingHourlyJob ohne Effekt.
+- Protokoll einsehen: http://localhost:8080/react/logViewer/dynamic/1
+- Reindizierung der letzten n einträge nicht migriert (sinnvoll?).
+- history-entries bei EmployeeValidityAttrDO nichtssagend.
+- HistoryEntry: EmployeeValidityAttrDO.insert muss sinnvoll für Anzeige formatiert werden.
+- Cascade aller Entitäten prüfen (z. B. war GroupTaskAccessDO.task auf Merged!!!!) Abgleich mit autoUpdateCollectionEntries (evtl. kann auf autoUpdateCollectionEntries verzichtet werden, zumindest aber Sanity-Check in CandH.)
+- PFHistoryMasterDO: Indexe setzen, wenn Einträge wieder gehen.
+- XML-Import für Testsystem
+- TypeBinding: ProjektDO, Kost1DO, Kost2DO, ...: Add path to list of searchable items
+- @WithHistory: AuftragDO, TeamEventDO
+- UserRights zu Benutzer hinzufügen testen (Reihenfolge update/save wichtig)
+- ICalGeneratorParserTest
+- UserRightId: ClassBridge müsste eigentlich in die Felder der benutzenden DOs
+- Script-Parameter: intValue ist nun long!?
+- StringHelper: splitToLongs/LongObjects OK?
+- SetupPage testen
+- reindexing settings implementieren. Aktuell wird nur komplett gemass-indexed.
+- History of AddressCampaignValueDO's (AddressCampaignValueDao.convertToDisplayHistoryEntries removed)
+
+Später
+- Hibernate-Search: K+S etc.
+- Milton
+- Besuchsbuch und EmployeeValidSinceAttr: DisplayEntries von Besuchtagen mit Datum des Besuchs versehen.
+- Suche-Seite hat veraltete Bereiche, AddressListPage läuft auf Fehler.
+- OrderExport: paymentSchedules werden gefetcht.
+- Update caches after single load or modification.
+
+Ganz später
+- Kalenderlist ruft x-fach DB: FIND GroupDO resultClass=GroupDO auf.
+
+- pom.xml:
+Some problems were encountered while building the effective model for org.projectforge:projectforge-business:jar:7.5.1-SNAPSHOT
+[WARNING] 'dependencies.dependency.(groupId:artifactId:type:classifier)' must be unique: org.springframework.boot:spring-boot-starter-cache:jar -> version (?) vs ${spring.boot.version} @ line 188, column 21
+[WARNING]
+[WARNING] It is highly recommended to fix these problems because they threaten the stability of your build.
+[WARNING]
+[WARNING] For this reason, future Maven versions might no longer support building such malformed projects.
+
+Migration employee timed attrs:
+select a.createdat, a.createdby, a.modifiedat, a.modifiedby, a.start_time, a.end_time, a.employee_id, a.group_name, b.value, b.propertyname, b.createdby, b.createdat, b.modifiedby, b.modifiedat from t_fibu_employee_timed a JOIN t_fibu_employee_timedattr b ON a.pk=b.parent;
+
+employeestatus
+employeeannualleave
+
+- Produktion:
+  # In postgresql.conf (Neustart der Datenbank erforderlich)
+  lock_timeout = '300s'   # 5 minutes timeout for locks.
+  statement_timeout = '300s'   # 5 minutes timeout for SQL-commands.
+
+
+Rollback:
+update t_configuration set configurationtype='INTEGER' where configurationtype='LONG';
+ALTER TABLE t_configuration RENAME COLUMN longvalue TO intvalue;
+
+Folgendes muss nur gemacht werden, bevor die Version 8.0 erneut installiert wird (die alte Version 7.5.1 läuft auch ohne diese Änderungen):
+DELETE FROM t_flyway_schema_version WHERE installed_rank >= 43;
+ALTER TABLE t_pf_history_attr DROP COLUMN old_value;
+ALTER TABLE t_pf_history_attr DROP COLUMN optype;
+DROP TABLE t_orga_visitorbook_entry;
+DROP TABLE t_fibu_employee_valid_since_attr;
+
+
+
+
+Scripts:
+Faktura-Quote nach KJ/GJ
+ - import java.util.Objects
+ - 114: EmployeeCache.instance.getEmployeeByUserId
+ - 37: data class User(val id: Long?, val username: String, val name: String, val firstName: String) : Comparable<User> {
+ - 266: var useYear = jahr?.toInt() ?: LocalDate.now().year
+ -
+

doc/deployment.adoc

@@ -3,7 +3,7 @@ Micromata GmbH, Version {version}
 :toc:
 :toclevels: 4
 
-:last-update-label: Copyright (C) 2021, Last updated
+:last-update-label: Copyright (C) 2024, Last updated
 
 ifdef::env-github,env-browser[:outfilesuffix: .adoc]
 link:index{outfilesuffix}[Top]

plugins/org.projectforge.plugins.banking/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.projectforge</groupId>
     <artifactId>org.projectforge.plugins</artifactId>
-    <version>7.5.1-SNAPSHOT</version><!-- projectforge.version -->
+    <version>8.0.0-SNAPSHOT</version><!-- projectforge.version -->
   </parent>
   <artifactId>org.projectforge.plugins.banking</artifactId>
   <packaging>jar</packaging>

plugins/org.projectforge.plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccount.kt

@@ -26,7 +26,7 @@ package org.projectforge.rest.dto
 import org.projectforge.plugins.banking.BankAccountDO
 
 class BankAccount(
-  id: Int? = null,
+  id: Long? = null,
   var name: String? = null,
   var description: String? = null,
   var iban: String? = null,
@@ -55,11 +55,11 @@ class BankAccount(
   // The user and group ids are stored as csv list of integers in the data base.
   override fun copyTo(dest: BankAccountDO) {
     super.copyTo(dest)
-    dest.fullAccessGroupIds = Group.toIntList(fullAccessGroups)
-    dest.fullAccessUserIds = User.toIntList(fullAccessUsers)
-    dest.readonlyAccessGroupIds = Group.toIntList(readonlyAccessGroups)
-    dest.readonlyAccessUserIds = User.toIntList(readonlyAccessUsers)
-    dest.minimalAccessGroupIds = Group.toIntList(minimalAccessGroups)
-    dest.minimalAccessUserIds = User.toIntList(minimalAccessUsers)
+    dest.fullAccessGroupIds = Group.toLongList(fullAccessGroups)
+    dest.fullAccessUserIds = User.toLongList(fullAccessUsers)
+    dest.readonlyAccessGroupIds = Group.toLongList(readonlyAccessGroups)
+    dest.readonlyAccessUserIds = User.toLongList(readonlyAccessUsers)
+    dest.minimalAccessGroupIds = Group.toLongList(minimalAccessGroups)
+    dest.minimalAccessUserIds = User.toLongList(minimalAccessUsers)
   }
 }

plugins/org.projectforge.plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccountBalanceDO.kt

@@ -23,58 +23,54 @@
 
 package org.projectforge.plugins.banking
 
-import org.apache.commons.codec.digest.DigestUtils
-import org.hibernate.search.annotations.Analyze
-import org.hibernate.search.annotations.Field
-import org.hibernate.search.annotations.Indexed
-import org.hibernate.search.annotations.IndexedEmbedded
+import jakarta.persistence.*
+import org.hibernate.search.mapper.pojo.automaticindexing.ReindexOnUpdate
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.*
 import org.projectforge.Constants
-import org.projectforge.common.StringHelper
 import org.projectforge.common.anots.PropertyInfo
 import org.projectforge.common.props.PropertyType
 import org.projectforge.framework.persistence.entities.DefaultBaseDO
-import org.projectforge.framework.time.PFDay
 import java.math.BigDecimal
 import java.time.LocalDate
-import javax.persistence.*
 
 /**
  * @author Kai Reinhard ([email protected])
  */
 @Entity
 @Indexed
 @Table(
-  name = "T_PLUGIN_BANKING_ACCOUNT_BALANCE",
+    name = "T_PLUGIN_BANKING_ACCOUNT_BALANCE",
 )
 @NamedQueries(
-  NamedQuery(
-    name = BankAccountBalanceDO.FIND_BY_BANK_ACCOUNT,
-    query = "from BankAccountBalanceDO where bankAccount.id=:bankAccountId"
-  ),
+    NamedQuery(
+        name = BankAccountBalanceDO.FIND_BY_BANK_ACCOUNT,
+        query = "from BankAccountBalanceDO where bankAccount.id=:bankAccountId"
+    ),
 )
 open class BankAccountBalanceDO : DefaultBaseDO() {
-  @PropertyInfo(i18nKey = "plugins.banking.account")
-  @IndexedEmbedded(depth = 1)
-  @get:ManyToOne(fetch = FetchType.LAZY)
-  @get:JoinColumn(name = "banking_account_fk", nullable = false)
-  open var bankAccount: BankAccountDO? = null
+    @PropertyInfo(i18nKey = "plugins.banking.account")
+    @IndexedEmbedded(includeDepth = 1)
+    @IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
+    @get:ManyToOne(fetch = FetchType.LAZY)
+    @get:JoinColumn(name = "banking_account_fk", nullable = false)
+    open var bankAccount: BankAccountDO? = null
 
-  @PropertyInfo(i18nKey = "plugins.banking.account.record.amount", type = PropertyType.CURRENCY)
-  @get:Column(name = "amount", scale = 2, precision = 12)
-  open var amount: BigDecimal? = null
+    @PropertyInfo(i18nKey = "plugins.banking.account.record.amount", type = PropertyType.CURRENCY)
+    @get:Column(name = "amount", scale = 2, precision = 12)
+    open var amount: BigDecimal? = null
 
-  @PropertyInfo(i18nKey = "plugins.banking.account.record.date")
-  @Field(analyze = Analyze.NO)
-  @get:Column(name = "date_col")
-  open var date: LocalDate? = null
+    @PropertyInfo(i18nKey = "plugins.banking.account.record.date")
+    @GenericField
+    @get:Column(name = "date_col")
+    open var date: LocalDate? = null
 
-  @PropertyInfo(i18nKey = "comment")
-  @Field
-  @get:Column(length = Constants.LENGTH_TEXT)
-  open var comment: String? = null
+    @PropertyInfo(i18nKey = "comment")
+    @FullTextField
+    @get:Column(length = Constants.LENGTH_TEXT)
+    open var comment: String? = null
 
-  companion object {
-    const val FIND_BY_BANK_ACCOUNT = "BankAccountBalanceDO_FindByBankAccount"
+    companion object {
+        const val FIND_BY_BANK_ACCOUNT = "BankAccountBalanceDO_FindByBankAccount"
 
-  }
+    }
 }

plugins/org.projectforge.plugins.banking/src/main/kotlin/org/projectforge/plugins/banking/BankAccountBalanceDao.kt

@@ -27,59 +27,58 @@ import mu.KotlinLogging
 import org.projectforge.business.user.ProjectForgeGroup
 import org.projectforge.framework.access.OperationType
 import org.projectforge.framework.persistence.api.BaseDao
-import org.projectforge.framework.persistence.api.BaseDaoSupport
+import org.projectforge.framework.persistence.api.BaseDOPersistenceService
 import org.projectforge.framework.persistence.user.entities.PFUserDO
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Repository
-import org.springframework.transaction.annotation.Propagation
-import org.springframework.transaction.annotation.Transactional
+import org.springframework.stereotype.Service
 
 private val log = KotlinLogging.logger {}
 
-@Repository
-open class BankAccountBalanceDao : BaseDao<BankAccountBalanceDO>(BankAccountBalanceDO::class.java) {
-  @Autowired
-  private lateinit var bankAccountDao: BankAccountDao
+@Service
+class BankAccountBalanceDao : BaseDao<BankAccountBalanceDO>(BankAccountBalanceDO::class.java) {
+    @Autowired
+    private lateinit var bankAccountDao: BankAccountDao
 
-  override fun hasAccess(
-    user: PFUserDO,
-    obj: BankAccountBalanceDO?,
-    oldObj: BankAccountBalanceDO?,
-    operationType: OperationType,
-    throwException: Boolean
-  ): Boolean {
-    val bankAccount = obj?.bankAccount
-    if (obj != null && bankAccount == null) {
-      return BaseDaoSupport.returnFalseOrThrowException(
-        throwException,
-        user,
-        operationType,
-        msg = "Bank account not given.",
-      )
+    override fun hasAccess(
+        user: PFUserDO,
+        obj: BankAccountBalanceDO?,
+        oldObj: BankAccountBalanceDO?,
+        operationType: OperationType,
+        throwException: Boolean
+    ): Boolean {
+        val bankAccount = obj?.bankAccount
+        if (obj != null && bankAccount == null) {
+            return BaseDOPersistenceService.returnFalseOrThrowException(
+                throwException,
+                user,
+                operationType,
+                msg = "Bank account not given.",
+            )
+        }
+        if (!accessChecker.isLoggedInUserMemberOfGroup(ProjectForgeGroup.FINANCE_GROUP)) {
+            // Double check, user isn't member of financial staff.
+            return BaseDOPersistenceService.returnFalseOrThrowException(
+                throwException,
+                user,
+                operationType,
+                msg = "User not member of financial staff.",
+            )
+        }
+        val oldBankAccount = oldObj?.bankAccount
+        return bankAccountDao.hasAccess(user, bankAccount, oldBankAccount, operationType, throwException)
     }
-    if (!accessChecker.isLoggedInUserMemberOfGroup(ProjectForgeGroup.FINANCE_GROUP)) {
-      // Double check, user isn't member of financial staff.
-      return BaseDaoSupport.returnFalseOrThrowException(
-        throwException,
-        user,
-        operationType,
-        msg = "User not member of financial staff.",
-      )
-    }
-    val oldBankAccount = oldObj?.bankAccount
-    return bankAccountDao.hasAccess(user, bankAccount, oldBankAccount, operationType, throwException)
-  }
 
-  override fun newInstance(): BankAccountBalanceDO {
-    return BankAccountBalanceDO()
-  }
+    override fun newInstance(): BankAccountBalanceDO {
+        return BankAccountBalanceDO()
+    }
 
-  @Transactional(propagation = Propagation.NOT_SUPPORTED)
-  open fun getByTimePeriod(accountId: Int): List<BankAccountBalanceDO> {
-    val account = bankAccountDao.getById(accountId) // For access checking
-    log.info("Getting Balances of account '${account.name}', IBAN=${account.iban}")
-    return em.createNamedQuery(BankAccountBalanceDO.FIND_BY_BANK_ACCOUNT, BankAccountBalanceDO::class.java)
-      .setParameter("bankAccountId", accountId)
-      .resultList
-  }
+    fun getByTimePeriod(accountId: Int): List<BankAccountBalanceDO> {
+        val account = bankAccountDao.find(accountId)!! // For access checking
+        log.info("Getting Balances of account '${account.name}', IBAN=${account.iban}")
+        return persistenceService.executeNamedQuery(
+            BankAccountBalanceDO.FIND_BY_BANK_ACCOUNT,
+            BankAccountBalanceDO::class.java,
+            Pair("bankAccountId", accountId),
+        )
+    }
 }