feat(horses-service): remove integration tests and obsolete configurations

- Deleted outdated integration test classes (`HorseServiceIntegrationTest`, `TransactionalContextTest`, and others) and test resources (`logback-test.xml`). - Removed obsolete Gradle dependencies related to these tests and revised project module references. - Simplified `DomPferd` domain model with minor refactorings for serialization and validation. Signed-off-by: Stefan Mogeritsch <stefan.mo.co@gmail.com>
2026-03-23 15:20:16 +01:00
parent c53daa926a
commit ceb1ccdab8
30 changed files with 890 additions and 797 deletions
@@ -7,9 +7,9 @@ plugins {
 dependencies {
    // Interne Module
    implementation(projects.platform.platformDependencies)
-    implementation(projects.horses.horsesDomain)
+  implementation(projects.backend.services.horses.horsesDomain)
  // horses-common: ON HOLD
-  // implementation(projects.horses.horsesCommon)
+  // implementation(projects.backend.services.horses.horsesCommon)
    implementation(projects.core.coreDomain)
    implementation(projects.core.coreUtils)

@@ -0,0 +1,336 @@
+@file:OptIn(kotlin.uuid.ExperimentalUuidApi::class)
+package at.mocode.horses.infrastructure.persistence
+
+import at.mocode.core.domain.model.PferdeGeschlechtE
+import at.mocode.horses.domain.model.DomPferd
+import at.mocode.horses.domain.repository.HorseRepository
+import at.mocode.core.utils.database.DatabaseFactory
+import kotlin.uuid.Uuid
+import kotlin.time.Clock
+import org.jetbrains.exposed.sql.*
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
+import org.jetbrains.exposed.sql.statements.UpdateBuilder
+import org.springframework.stereotype.Repository
+
+/**
+ * PostgreSQL implementation of the HorseRepository using Exposed ORM.
+ *
+ * This implementation provides database operations for horse entities,
+ * mapping between the domain model (DomPferd) and the database table (HorseTable).
+ */
+@Repository
+class HorseRepositoryImpl : HorseRepository {
+
+    override suspend fun findById(id: Uuid): DomPferd? = DatabaseFactory.dbQuery {
+        HorseTable.selectAll().where { HorseTable.id eq id }
+            .map { rowToDomPferd(it) }
+            .singleOrNull()
+    }
+
+    override suspend fun findByLebensnummer(lebensnummer: String): DomPferd? = DatabaseFactory.dbQuery {
+        HorseTable.selectAll().where { HorseTable.lebensnummer eq lebensnummer }
+            .map { rowToDomPferd(it) }
+            .singleOrNull()
+    }
+
+    override suspend fun findByChipNummer(chipNummer: String): DomPferd? = DatabaseFactory.dbQuery {
+        HorseTable.selectAll().where { HorseTable.chipNummer eq chipNummer }
+            .map { rowToDomPferd(it) }
+            .singleOrNull()
+    }
+
+    override suspend fun findByPassNummer(passNummer: String): DomPferd? = DatabaseFactory.dbQuery {
+        HorseTable.selectAll().where { HorseTable.passNummer eq passNummer }
+            .map { rowToDomPferd(it) }
+            .singleOrNull()
+    }
+
+    override suspend fun findByOepsNummer(oepsNummer: String): DomPferd? = DatabaseFactory.dbQuery {
+        HorseTable.selectAll().where { HorseTable.oepsNummer eq oepsNummer }
+            .map { rowToDomPferd(it) }
+            .singleOrNull()
+    }
+
+    override suspend fun findByFeiNummer(feiNummer: String): DomPferd? = DatabaseFactory.dbQuery {
+        HorseTable.selectAll().where { HorseTable.feiNummer eq feiNummer }
+            .map { rowToDomPferd(it) }
+            .singleOrNull()
+    }
+
+    override suspend fun findByName(searchTerm: String, limit: Int): List<DomPferd> = DatabaseFactory.dbQuery {
+        HorseTable.selectAll().where { HorseTable.pferdeName like "%$searchTerm%" }
+            .orderBy(HorseTable.pferdeName to SortOrder.ASC)
+            .limit(limit)
+            .map { rowToDomPferd(it) }
+    }
+
+    override suspend fun findByOwnerId(ownerId: Uuid, activeOnly: Boolean): List<DomPferd> = DatabaseFactory.dbQuery {
+        val query = HorseTable.selectAll().where { HorseTable.besitzerId eq ownerId }
+
+        if (activeOnly) {
+            query.andWhere { HorseTable.istAktiv eq true }
+        } else {
+            query
+        }.orderBy(HorseTable.pferdeName to SortOrder.ASC)
+         .map { rowToDomPferd(it) }
+    }
+
+    override suspend fun findByResponsiblePersonId(responsiblePersonId: Uuid, activeOnly: Boolean): List<DomPferd> = DatabaseFactory.dbQuery {
+        val query = HorseTable.selectAll().where { HorseTable.verantwortlichePersonId eq responsiblePersonId }
+
+        if (activeOnly) {
+            query.andWhere { HorseTable.istAktiv eq true }
+        } else {
+            query
+        }.orderBy(HorseTable.pferdeName to SortOrder.ASC)
+         .map { rowToDomPferd(it) }
+    }
+
+    override suspend fun findByGeschlecht(geschlecht: PferdeGeschlechtE, activeOnly: Boolean, limit: Int): List<DomPferd> = DatabaseFactory.dbQuery {
+        val query = HorseTable.selectAll().where { HorseTable.geschlecht eq geschlecht }
+
+        if (activeOnly) {
+            query.andWhere { HorseTable.istAktiv eq true }
+        } else {
+            query
+        }.orderBy(HorseTable.pferdeName to SortOrder.ASC)
+         .limit(limit)
+         .map { rowToDomPferd(it) }
+    }
+
+    override suspend fun findByRasse(rasse: String, activeOnly: Boolean, limit: Int): List<DomPferd> = DatabaseFactory.dbQuery {
+        val query = HorseTable.selectAll().where { HorseTable.rasse eq rasse }
+
+        if (activeOnly) {
+            query.andWhere { HorseTable.istAktiv eq true }
+        } else {
+            query
+        }.orderBy(HorseTable.pferdeName to SortOrder.ASC)
+         .limit(limit)
+         .map { rowToDomPferd(it) }
+    }
+
+    override suspend fun findByBirthYear(birthYear: Int, activeOnly: Boolean): List<DomPferd> = DatabaseFactory.dbQuery {
+        val query = HorseTable.selectAll().where {
+            HorseTable.geburtsdatum.isNotNull() and
+                (CustomFunction(
+                    "EXTRACT",
+                    IntegerColumnType(),
+                    stringLiteral("YEAR FROM "),
+                    HorseTable.geburtsdatum
+                ) eq birthYear)
+        }
+
+        if (activeOnly) {
+            query.andWhere { HorseTable.istAktiv eq true }
+        } else {
+            query
+        }.orderBy(HorseTable.pferdeName to SortOrder.ASC)
+         .map { rowToDomPferd(it) }
+    }
+
+    override suspend fun findByBirthYearRange(fromYear: Int, toYear: Int, activeOnly: Boolean): List<DomPferd> = DatabaseFactory.dbQuery {
+        val query = HorseTable.selectAll().where {
+            HorseTable.geburtsdatum.isNotNull() and
+                (CustomFunction(
+                    "EXTRACT",
+                    IntegerColumnType(),
+                    stringLiteral("YEAR FROM "),
+                    HorseTable.geburtsdatum
+                ) greaterEq fromYear) and
+                (CustomFunction(
+                    "EXTRACT",
+                    IntegerColumnType(),
+                    stringLiteral("YEAR FROM "),
+                    HorseTable.geburtsdatum
+                ) lessEq toYear)
+        }
+
+        if (activeOnly) {
+            query.andWhere { HorseTable.istAktiv eq true }
+        } else {
+            query
+        }.orderBy(HorseTable.geburtsdatum, SortOrder.DESC)
+         .map { rowToDomPferd(it) }
+    }
+
+    override suspend fun findAllActive(limit: Int): List<DomPferd> = DatabaseFactory.dbQuery {
+        HorseTable.selectAll().where { HorseTable.istAktiv eq true }
+            .orderBy(HorseTable.pferdeName to SortOrder.ASC)
+            .limit(limit)
+            .map { rowToDomPferd(it) }
+    }
+
+    override suspend fun findOepsRegistered(activeOnly: Boolean): List<DomPferd> = DatabaseFactory.dbQuery {
+        val query = HorseTable.selectAll().where { HorseTable.oepsNummer.isNotNull() }
+
+        if (activeOnly) {
+            query.andWhere { HorseTable.istAktiv eq true }
+        } else {
+            query
+        }.orderBy(HorseTable.pferdeName to SortOrder.ASC)
+         .map { rowToDomPferd(it) }
+    }
+
+    override suspend fun findFeiRegistered(activeOnly: Boolean): List<DomPferd> = DatabaseFactory.dbQuery {
+        val query = HorseTable.selectAll().where { HorseTable.feiNummer.isNotNull() }
+
+        if (activeOnly) {
+            query.andWhere { HorseTable.istAktiv eq true }
+        } else {
+            query
+        }.orderBy(HorseTable.pferdeName to SortOrder.ASC)
+         .map { rowToDomPferd(it) }
+    }
+
+    override suspend fun save(horse: DomPferd): DomPferd = DatabaseFactory.dbQuery {
+        val now = Clock.System.now()
+        val existingHorse = findById(horse.pferdId)
+
+        if (existingHorse != null) {
+            // Update existing horse
+            val updatedHorse = horse.copy(updatedAt = now)
+            HorseTable.update({ HorseTable.id eq horse.pferdId }) {
+                domPferdToStatement(it, updatedHorse)
+            }
+            updatedHorse
+        } else {
+            // Insert a new horse
+            HorseTable.insert {
+                it[id] = horse.pferdId
+                domPferdToStatement(it, horse.copy(updatedAt = now))
+            }
+            horse.copy(updatedAt = now)
+        }
+    }
+
+    override suspend fun delete(id: Uuid): Boolean = DatabaseFactory.dbQuery {
+        val deletedRows = HorseTable.deleteWhere { HorseTable.id eq id }
+        deletedRows > 0
+    }
+
+    override suspend fun existsByLebensnummer(lebensnummer: String): Boolean = DatabaseFactory.dbQuery {
+        HorseTable.selectAll().where { HorseTable.lebensnummer eq lebensnummer }
+            .count() > 0
+    }
+
+    override suspend fun existsByChipNummer(chipNummer: String): Boolean = DatabaseFactory.dbQuery {
+        HorseTable.selectAll().where { HorseTable.chipNummer eq chipNummer }
+            .count() > 0
+    }
+
+    override suspend fun existsByPassNummer(passNummer: String): Boolean = DatabaseFactory.dbQuery {
+        HorseTable.selectAll().where { HorseTable.passNummer eq passNummer }
+            .count() > 0
+    }
+
+    override suspend fun existsByOepsNummer(oepsNummer: String): Boolean = DatabaseFactory.dbQuery {
+        HorseTable.selectAll().where { HorseTable.oepsNummer eq oepsNummer }
+            .count() > 0
+    }
+
+    override suspend fun existsByFeiNummer(feiNummer: String): Boolean = DatabaseFactory.dbQuery {
+        HorseTable.selectAll().where { HorseTable.feiNummer eq feiNummer }
+            .count() > 0
+    }
+
+    override suspend fun countActive(): Long = DatabaseFactory.dbQuery {
+        HorseTable.selectAll().where { HorseTable.istAktiv eq true }
+            .count()
+    }
+
+    override suspend fun countByOwnerId(ownerId: Uuid, activeOnly: Boolean): Long = DatabaseFactory.dbQuery {
+        val query = HorseTable.selectAll().where { HorseTable.besitzerId eq ownerId }
+
+        if (activeOnly) {
+            query.andWhere { HorseTable.istAktiv eq true }
+        } else {
+            query
+        }.count()
+    }
+
+    override suspend fun countOepsRegistered(activeOnly: Boolean): Long = DatabaseFactory.dbQuery {
+        val query = HorseTable.selectAll().where {
+            HorseTable.oepsNummer.isNotNull() and (HorseTable.oepsNummer neq "")
+        }
+
+        if (activeOnly) {
+            query.andWhere { HorseTable.istAktiv eq true }
+        } else {
+            query
+        }.count()
+    }
+
+    override suspend fun countFeiRegistered(activeOnly: Boolean): Long = DatabaseFactory.dbQuery {
+        val query = HorseTable.selectAll().where {
+            HorseTable.feiNummer.isNotNull() and (HorseTable.feiNummer neq "")
+        }
+
+        if (activeOnly) {
+            query.andWhere { HorseTable.istAktiv eq true }
+        } else {
+            query
+        }.count()
+    }
+
+    /**
+     * Maps a database row to a DomPferd domain object.
+     */
+    private fun rowToDomPferd(row: ResultRow): DomPferd {
+        return DomPferd(
+            pferdId = row[HorseTable.id].value,
+            pferdeName = row[HorseTable.pferdeName],
+            geschlecht = row[HorseTable.geschlecht],
+            geburtsdatum = row[HorseTable.geburtsdatum],
+            rasse = row[HorseTable.rasse],
+            farbe = row[HorseTable.farbe],
+            besitzerId = row[HorseTable.besitzerId],
+            verantwortlichePersonId = row[HorseTable.verantwortlichePersonId],
+            zuechterName = row[HorseTable.zuechterName],
+            zuchtbuchNummer = row[HorseTable.zuchtbuchNummer],
+            lebensnummer = row[HorseTable.lebensnummer],
+            chipNummer = row[HorseTable.chipNummer],
+            passNummer = row[HorseTable.passNummer],
+            oepsNummer = row[HorseTable.oepsNummer],
+            feiNummer = row[HorseTable.feiNummer],
+            vaterName = row[HorseTable.vaterName],
+            mutterName = row[HorseTable.mutterName],
+            mutterVaterName = row[HorseTable.mutterVaterName],
+            stockmass = row[HorseTable.stockmass],
+            istAktiv = row[HorseTable.istAktiv],
+            bemerkungen = row[HorseTable.bemerkungen],
+            datenQuelle = row[HorseTable.datenQuelle],
+            createdAt = row[HorseTable.createdAt],
+            updatedAt = row[HorseTable.updatedAt]
+        )
+    }
+
+    /**
+     * Maps a DomPferd domain object to database statement values.
+     */
+    private fun domPferdToStatement(statement: UpdateBuilder<*>, horse: DomPferd) {
+        statement[HorseTable.pferdeName] = horse.pferdeName
+        statement[HorseTable.geschlecht] = horse.geschlecht
+        statement[HorseTable.geburtsdatum] = horse.geburtsdatum
+        statement[HorseTable.rasse] = horse.rasse
+        statement[HorseTable.farbe] = horse.farbe
+        statement[HorseTable.besitzerId] = horse.besitzerId
+        statement[HorseTable.verantwortlichePersonId] = horse.verantwortlichePersonId
+        statement[HorseTable.zuechterName] = horse.zuechterName
+        statement[HorseTable.zuchtbuchNummer] = horse.zuchtbuchNummer
+        statement[HorseTable.lebensnummer] = horse.lebensnummer
+        statement[HorseTable.chipNummer] = horse.chipNummer
+        statement[HorseTable.passNummer] = horse.passNummer
+        statement[HorseTable.oepsNummer] = horse.oepsNummer
+        statement[HorseTable.feiNummer] = horse.feiNummer
+        statement[HorseTable.vaterName] = horse.vaterName
+        statement[HorseTable.mutterName] = horse.mutterName
+        statement[HorseTable.mutterVaterName] = horse.mutterVaterName
+        statement[HorseTable.stockmass] = horse.stockmass
+        statement[HorseTable.istAktiv] = horse.istAktiv
+        statement[HorseTable.bemerkungen] = horse.bemerkungen
+        statement[HorseTable.datenQuelle] = horse.datenQuelle
+        statement[HorseTable.createdAt] = horse.createdAt
+        statement[HorseTable.updatedAt] = horse.updatedAt
+    }
+}
@@ -0,0 +1,14 @@
+package at.mocode.horses.infrastructure.persistence
+
+import org.jetbrains.exposed.v1.core.dao.id.java.UUIDTable
+import org.jetbrains.exposed.v1.datetime.timestamp
+
+/**
+ * Tabelle für importierte Vereine aus dem ZNS-Datenbestand (VEREIN01.dat).
+ * Wird ausschließlich als Dev-Seed-Daten verwendet.
+ */
+object ZnsClubTable : UUIDTable("zns_clubs") {
+  val vereinsNummer = varchar("vereins_nummer", 4).uniqueIndex()
+  val name = varchar("name", 50)
+  val createdAt = timestamp("created_at")
+}
@@ -0,0 +1,23 @@
+package at.mocode.horses.infrastructure.persistence
+
+import org.jetbrains.exposed.v1.core.dao.id.java.UUIDTable
+import org.jetbrains.exposed.v1.datetime.date
+import org.jetbrains.exposed.v1.datetime.timestamp
+
+/**
+ * Tabelle für importierte Personen/Reiter aus dem ZNS-Datenbestand (LIZENZ01.dat).
+ * Wird ausschließlich als Dev-Seed-Daten verwendet.
+ */
+object ZnsPersonTable : UUIDTable("zns_persons") {
+  val lizenzNummer = varchar("lizenz_nummer", 10).uniqueIndex()
+  val nachname = varchar("nachname", 50)
+  val vorname = varchar("vorname", 25)
+  val vereinsNummer = varchar("vereins_nummer", 4).nullable()
+  val vereinsName = varchar("vereins_name", 50).nullable()
+  val nation = varchar("nation", 3).nullable()
+  val lizenzKlasse = varchar("lizenz_klasse", 6).nullable()
+  val mitgliedsNummer = varchar("mitglieds_nummer", 13).nullable()
+  val geschlecht = varchar("geschlecht", 1).nullable()
+  val geburtsdatum = date("geburtsdatum").nullable()
+  val createdAt = timestamp("created_at")
+}