Refactor domain models and repositories: align imports, improve formatting consistency, remove unused imports, and harmonize implementation for better ZNS import compatibility.

This commit is contained in:
2026-04-06 19:57:39 +02:00
parent abaaeddaaf
commit b7fa2d26a9
12 changed files with 114 additions and 116 deletions
@@ -2,14 +2,7 @@
package at.mocode.zns.importer package at.mocode.zns.importer
import at.mocode.masterdata.domain.repository.VereinRepository import at.mocode.masterdata.domain.repository.*
import at.mocode.masterdata.domain.repository.HorseRepository
import at.mocode.masterdata.domain.repository.AltersklassenRepository
import at.mocode.masterdata.domain.repository.MasterdataLicenseRepository
import at.mocode.masterdata.domain.repository.FunktionaerRepository
import at.mocode.masterdata.domain.repository.ReiterRepository
import at.mocode.masterdata.domain.repository.LandRepository
import at.mocode.masterdata.domain.repository.BundeslandRepository
import at.mocode.zns.parser.ZnsFunktionaerParser import at.mocode.zns.parser.ZnsFunktionaerParser
import at.mocode.zns.parser.ZnsPferdParser import at.mocode.zns.parser.ZnsPferdParser
import at.mocode.zns.parser.ZnsReiterParser import at.mocode.zns.parser.ZnsReiterParser
@@ -2,8 +2,8 @@
package at.mocode.masterdata.domain.model package at.mocode.masterdata.domain.model
import kotlinx.serialization.Serializable
import at.mocode.core.domain.serialization.UuidSerializer import at.mocode.core.domain.serialization.UuidSerializer
import kotlinx.serialization.Serializable
import kotlin.uuid.Uuid import kotlin.uuid.Uuid
/** /**
@@ -2,10 +2,8 @@
package at.mocode.masterdata.domain.model package at.mocode.masterdata.domain.model
import kotlinx.serialization.Serializable
import at.mocode.core.domain.serialization.UuidSerializer import at.mocode.core.domain.serialization.UuidSerializer
import at.mocode.core.domain.serialization.LocalDateSerializer import kotlinx.serialization.Serializable
import kotlinx.datetime.LocalDate
import kotlin.uuid.Uuid import kotlin.uuid.Uuid
@Serializable @Serializable
@@ -2,8 +2,8 @@
package at.mocode.masterdata.domain.model package at.mocode.masterdata.domain.model
import kotlinx.serialization.Serializable
import at.mocode.core.domain.serialization.UuidSerializer import at.mocode.core.domain.serialization.UuidSerializer
import kotlinx.serialization.Serializable
import kotlin.uuid.Uuid import kotlin.uuid.Uuid
/** /**
@@ -2,8 +2,8 @@
package at.mocode.masterdata.domain.model package at.mocode.masterdata.domain.model
import kotlinx.serialization.Serializable
import at.mocode.core.domain.serialization.UuidSerializer import at.mocode.core.domain.serialization.UuidSerializer
import kotlinx.serialization.Serializable
import kotlin.uuid.Uuid import kotlin.uuid.Uuid
/** /**
@@ -2,8 +2,8 @@
package at.mocode.masterdata.domain.model package at.mocode.masterdata.domain.model
import kotlinx.serialization.Serializable
import at.mocode.core.domain.serialization.UuidSerializer import at.mocode.core.domain.serialization.UuidSerializer
import kotlinx.serialization.Serializable
import kotlin.uuid.Uuid import kotlin.uuid.Uuid
/** /**
@@ -10,7 +10,7 @@ import at.mocode.masterdata.domain.model.Startkarte
* Repository für alle Lizenz-Stammdaten (Reit, Fahr, Startkarten). * Repository für alle Lizenz-Stammdaten (Reit, Fahr, Startkarten).
*/ */
interface MasterdataLicenseRepository { interface MasterdataLicenseRepository {
suspend fun findReitLizenzByCode(code: String): at.mocode.masterdata.domain.model.ReitLizenz? suspend fun findReitLizenzByCode(code: String): ReitLizenz?
suspend fun findFahrLizenzByCode(code: String): at.mocode.masterdata.domain.model.FahrLizenz? suspend fun findFahrLizenzByCode(code: String): FahrLizenz?
suspend fun findStartkarteByCode(code: String): at.mocode.masterdata.domain.model.Startkarte? suspend fun findStartkarteByCode(code: String): Startkarte?
} }
@@ -41,8 +41,15 @@ class BundeslandExposedRepository : BundeslandRepository {
override suspend fun findById(id: Uuid): BundeslandDefinition? = null override suspend fun findById(id: Uuid): BundeslandDefinition? = null
override suspend fun findByOepsCode(oepsCode: String, landId: Uuid): BundeslandDefinition? = null override suspend fun findByOepsCode(oepsCode: String, landId: Uuid): BundeslandDefinition? = null
override suspend fun findByIso3166_2_Code(iso3166_2_Code: String): BundeslandDefinition? = null override suspend fun findByIso3166_2_Code(iso3166_2_Code: String): BundeslandDefinition? = null
override suspend fun findByCountry(landId: Uuid, activeOnly: Boolean, orderBySortierung: Boolean): List<BundeslandDefinition> = emptyList() override suspend fun findByCountry(
override suspend fun findByName(searchTerm: String, landId: Uuid?, limit: Int): List<BundeslandDefinition> = emptyList() landId: Uuid,
activeOnly: Boolean,
orderBySortierung: Boolean
): List<BundeslandDefinition> = emptyList()
override suspend fun findByName(searchTerm: String, landId: Uuid?, limit: Int): List<BundeslandDefinition> =
emptyList()
override suspend fun findAllActive(orderBySortierung: Boolean): List<BundeslandDefinition> = emptyList() override suspend fun findAllActive(orderBySortierung: Boolean): List<BundeslandDefinition> = emptyList()
override suspend fun save(bundesland: BundeslandDefinition): BundeslandDefinition = bundesland override suspend fun save(bundesland: BundeslandDefinition): BundeslandDefinition = bundesland
override suspend fun upsertByLandIdAndKuerzel(bundesland: BundeslandDefinition): BundeslandDefinition = bundesland override suspend fun upsertByLandIdAndKuerzel(bundesland: BundeslandDefinition): BundeslandDefinition = bundesland
@@ -68,7 +68,7 @@ class ReiterExposedRepository : ReiterRepository {
private fun loadLizenzen(reiterId: Uuid): List<ReiterLizenz> { private fun loadLizenzen(reiterId: Uuid): List<ReiterLizenz> {
return ReiterLizenzenZuordnungTable.selectAll().where { ReiterLizenzenZuordnungTable.reiterId eq reiterId } return ReiterLizenzenZuordnungTable.selectAll().where { ReiterLizenzenZuordnungTable.reiterId eq reiterId }
.map { .map {
at.mocode.masterdata.domain.model.ReiterLizenz( ReiterLizenz(
lizenzId = it[ReiterLizenzenZuordnungTable.id], lizenzId = it[ReiterLizenzenZuordnungTable.id],
lizenzTyp = it[ReiterLizenzenZuordnungTable.lizenzTyp], lizenzTyp = it[ReiterLizenzenZuordnungTable.lizenzTyp],
kuerzel = it[ReiterLizenzenZuordnungTable.kuerzel], kuerzel = it[ReiterLizenzenZuordnungTable.kuerzel],
@@ -2,7 +2,6 @@
package at.mocode.masterdata.infrastructure.persistence.reiter package at.mocode.masterdata.infrastructure.persistence.reiter
import at.mocode.masterdata.infrastructure.persistence.BundeslaenderTable
import org.jetbrains.exposed.v1.core.Table import org.jetbrains.exposed.v1.core.Table
import org.jetbrains.exposed.v1.datetime.CurrentTimestamp import org.jetbrains.exposed.v1.datetime.CurrentTimestamp
import org.jetbrains.exposed.v1.datetime.date import org.jetbrains.exposed.v1.datetime.date
@@ -1,12 +1,13 @@
@file:OptIn(kotlin.uuid.ExperimentalUuidApi::class) @file:OptIn(kotlin.uuid.ExperimentalUuidApi::class)
package at.mocode.masterdata.service.config package at.mocode.masterdata.service.config
import at.mocode.masterdata.infrastructure.persistence.AltersklasseTable import at.mocode.masterdata.infrastructure.persistence.AltersklasseTable
import jakarta.annotation.PostConstruct import jakarta.annotation.PostConstruct
import org.jetbrains.exposed.v1.jdbc.transactions.transaction import org.jetbrains.exposed.v1.core.eq
import org.jetbrains.exposed.v1.jdbc.insert import org.jetbrains.exposed.v1.jdbc.insert
import org.jetbrains.exposed.v1.jdbc.selectAll import org.jetbrains.exposed.v1.jdbc.selectAll
import org.jetbrains.exposed.v1.core.* import org.jetbrains.exposed.v1.jdbc.transactions.transaction
import org.slf4j.LoggerFactory import org.slf4j.LoggerFactory
import org.springframework.context.annotation.Configuration import org.springframework.context.annotation.Configuration
import org.springframework.context.annotation.DependsOn import org.springframework.context.annotation.DependsOn