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,8 +2,8 @@
package at.mocode.masterdata.domain.model
import kotlinx.serialization.Serializable
import at.mocode.core.domain.serialization.UuidSerializer
import kotlinx.serialization.Serializable
import kotlin.uuid.Uuid
/**
@@ -11,12 +11,12 @@ import kotlin.uuid.Uuid
*/
@Serializable
data class BewerbsKlasse(
@Serializable(with = UuidSerializer::class)
val bewerbsklasseId: Uuid = Uuid.random(),
val sparte: String,
val code: String,
val bezeichnung: String,
val maxHoehe: Int? = null,
val aufgabenNiveau: String? = null,
val istAktiv: Boolean = true
@Serializable(with = UuidSerializer::class)
val bewerbsklasseId: Uuid = Uuid.random(),
val sparte: String,
val code: String,
val bezeichnung: String,
val maxHoehe: Int? = null,
val aufgabenNiveau: String? = null,
val istAktiv: Boolean = true
)
@@ -2,18 +2,16 @@
package at.mocode.masterdata.domain.model
import kotlinx.serialization.Serializable
import at.mocode.core.domain.serialization.UuidSerializer
import at.mocode.core.domain.serialization.LocalDateSerializer
import kotlinx.datetime.LocalDate
import kotlinx.serialization.Serializable
import kotlin.uuid.Uuid
@Serializable
data class ReitLizenz(
@Serializable(with = UuidSerializer::class)
val lizenzId: Uuid = Uuid.random(),
val code: String,
val bezeichnung: String,
val sparte: String? = null,
val istAktiv: Boolean = true
@Serializable(with = UuidSerializer::class)
val lizenzId: Uuid = Uuid.random(),
val code: String,
val bezeichnung: String,
val sparte: String? = null,
val istAktiv: Boolean = true
)
@@ -221,7 +221,7 @@ data class Reiter(
// Validation against bundeslandNummer if available
// ZNS bundeslandNummer is 01-09, while membership first digit is 1-9
if (bundeslandNummer != null && b != bundeslandNummer) {
return false
return false
}
// Verein part (2nd-4th digit)
@@ -2,8 +2,8 @@
package at.mocode.masterdata.domain.model
import kotlinx.serialization.Serializable
import at.mocode.core.domain.serialization.UuidSerializer
import kotlinx.serialization.Serializable
import kotlin.uuid.Uuid
/**
@@ -11,10 +11,10 @@ import kotlin.uuid.Uuid
*/
@Serializable
data class TurnierKategorie(
@Serializable(with = UuidSerializer::class)
val kategorieId: Uuid = Uuid.random(),
val code: String,
val bezeichnung: String,
val sparte: String? = null,
val istAktiv: Boolean = true
@Serializable(with = UuidSerializer::class)
val kategorieId: Uuid = Uuid.random(),
val code: String,
val bezeichnung: String,
val sparte: String? = null,
val istAktiv: Boolean = true
)
@@ -2,8 +2,8 @@
package at.mocode.masterdata.domain.model
import kotlinx.serialization.Serializable
import at.mocode.core.domain.serialization.UuidSerializer
import kotlinx.serialization.Serializable
import kotlin.uuid.Uuid
/**
@@ -11,12 +11,12 @@ import kotlin.uuid.Uuid
*/
@Serializable
data class TurnierKlasse(
@Serializable(with = UuidSerializer::class)
val turnierklasseId: Uuid = Uuid.random(),
val sparte: String,
val code: String,
val bezeichnung: String,
val maxHoehe: Int? = null,
val aufgabenNiveau: String? = null,
val istAktiv: Boolean = true
@Serializable(with = UuidSerializer::class)
val turnierklasseId: Uuid = Uuid.random(),
val sparte: String,
val code: String,
val bezeichnung: String,
val maxHoehe: Int? = null,
val aufgabenNiveau: String? = null,
val istAktiv: Boolean = true
)
@@ -2,8 +2,8 @@
package at.mocode.masterdata.domain.model
import kotlinx.serialization.Serializable
import at.mocode.core.domain.serialization.UuidSerializer
import kotlinx.serialization.Serializable
import kotlin.uuid.Uuid
/**
@@ -11,9 +11,9 @@ import kotlin.uuid.Uuid
*/
@Serializable
data class TurnierSparte(
@Serializable(with = UuidSerializer::class)
val sparteId: Uuid = Uuid.random(),
val code: String,
val bezeichnung: String,
val istAktiv: Boolean = true
@Serializable(with = UuidSerializer::class)
val sparteId: Uuid = Uuid.random(),
val code: String,
val bezeichnung: String,
val istAktiv: Boolean = true
)
@@ -10,7 +10,7 @@ import at.mocode.masterdata.domain.model.Startkarte
* Repository für alle Lizenz-Stammdaten (Reit, Fahr, Startkarten).
*/
interface MasterdataLicenseRepository {
suspend fun findReitLizenzByCode(code: String): at.mocode.masterdata.domain.model.ReitLizenz?
suspend fun findFahrLizenzByCode(code: String): at.mocode.masterdata.domain.model.FahrLizenz?
suspend fun findStartkarteByCode(code: String): at.mocode.masterdata.domain.model.Startkarte?
suspend fun findReitLizenzByCode(code: String): ReitLizenz?
suspend fun findFahrLizenzByCode(code: String): FahrLizenz?
suspend fun findStartkarteByCode(code: String): Startkarte?
}