diff --git a/backend/infrastructure/zns-importer/src/test/kotlin/at/mocode/zns/importer/ZnsImportServiceTest.kt b/backend/infrastructure/zns-importer/src/test/kotlin/at/mocode/zns/importer/ZnsImportServiceTest.kt index 4c7123a1..ea336d8c 100644 --- a/backend/infrastructure/zns-importer/src/test/kotlin/at/mocode/zns/importer/ZnsImportServiceTest.kt +++ b/backend/infrastructure/zns-importer/src/test/kotlin/at/mocode/zns/importer/ZnsImportServiceTest.kt @@ -1,15 +1,13 @@ package at.mocode.zns.importer -import at.mocode.masterdata.domain.model.DomVerein -import at.mocode.masterdata.domain.repository.VereinRepository -import at.mocode.masterdata.domain.model.DomPferd -import at.mocode.masterdata.domain.repository.HorseRepository import at.mocode.masterdata.domain.model.DomFunktionaer -import at.mocode.masterdata.domain.repository.FunktionaerRepository +import at.mocode.masterdata.domain.model.DomPferd import at.mocode.masterdata.domain.model.DomReiter +import at.mocode.masterdata.domain.model.DomVerein +import at.mocode.masterdata.domain.repository.FunktionaerRepository +import at.mocode.masterdata.domain.repository.HorseRepository import at.mocode.masterdata.domain.repository.ReiterRepository -import at.mocode.core.domain.model.PferdeGeschlechtE -import kotlin.uuid.Uuid +import at.mocode.masterdata.domain.repository.VereinRepository import io.mockk.coEvery import io.mockk.coVerify import io.mockk.mockk diff --git a/backend/services/identity/identity-service/build.gradle.kts b/backend/services/identity/identity-service/build.gradle.kts index 2f2dc665..a3d0bc26 100644 --- a/backend/services/identity/identity-service/build.gradle.kts +++ b/backend/services/identity/identity-service/build.gradle.kts @@ -15,6 +15,8 @@ dependencies { implementation(projects.core.coreUtils) implementation(projects.backend.services.identity.identityDomain) implementation(projects.backend.services.identity.identityInfrastructure) + implementation(projects.backend.infrastructure.security) + implementation(projects.backend.infrastructure.persistence) implementation(libs.spring.boot.starter.web) implementation(libs.spring.boot.starter.validation) diff --git a/backend/services/identity/identity-service/src/main/kotlin/at/mocode/identity/service/IdentityServiceApplication.kt b/backend/services/identity/identity-service/src/main/kotlin/at/mocode/identity/service/IdentityServiceApplication.kt index 6b61988a..3453b8f6 100644 --- a/backend/services/identity/identity-service/src/main/kotlin/at/mocode/identity/service/IdentityServiceApplication.kt +++ b/backend/services/identity/identity-service/src/main/kotlin/at/mocode/identity/service/IdentityServiceApplication.kt @@ -3,7 +3,7 @@ package at.mocode.identity.service import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.runApplication -@SpringBootApplication(scanBasePackages = ["at.mocode.identity", "at.mocode.infrastructure.security"]) +@SpringBootApplication(scanBasePackages = ["at.mocode.identity", "at.mocode.infrastructure.security", "at.mocode.backend.infrastructure.persistence"]) class IdentityServiceApplication fun main(args: Array) { diff --git a/backend/services/ping/ping-service/src/main/kotlin/at/mocode/ping/infrastructure/persistence/PingJpaEntity.kt b/backend/services/ping/ping-service/src/main/kotlin/at/mocode/ping/infrastructure/persistence/PingJpaEntity.kt index 9e17f21b..e22e7d1d 100644 --- a/backend/services/ping/ping-service/src/main/kotlin/at/mocode/ping/infrastructure/persistence/PingJpaEntity.kt +++ b/backend/services/ping/ping-service/src/main/kotlin/at/mocode/ping/infrastructure/persistence/PingJpaEntity.kt @@ -1,10 +1,11 @@ package at.mocode.ping.infrastructure.persistence +import jakarta.persistence.Column import jakarta.persistence.Entity import jakarta.persistence.Id import jakarta.persistence.Table import java.time.Instant -import java.util.UUID +import java.util.* @Entity @Table(name = "ping") @@ -12,6 +13,7 @@ class PingJpaEntity( @Id var id: UUID, var message: String, + @Column(name = "created_at") var createdAt: Instant ) { } diff --git a/core/core-utils/src/jvmMain/kotlin/at/mocode/core/utils/database/DatabaseFactory.kt b/core/core-utils/src/jvmMain/kotlin/at/mocode/core/utils/database/DatabaseFactory.kt index 5029d8a6..cd64617b 100644 --- a/core/core-utils/src/jvmMain/kotlin/at/mocode/core/utils/database/DatabaseFactory.kt +++ b/core/core-utils/src/jvmMain/kotlin/at/mocode/core/utils/database/DatabaseFactory.kt @@ -3,7 +3,6 @@ package at.mocode.core.utils.database import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.jetbrains.exposed.v1.core.Transaction -import org.jetbrains.exposed.v1.jdbc.transactions.transaction import org.jetbrains.exposed.v1.jdbc.transactions.experimental.newSuspendedTransaction /** diff --git a/frontend/features/turnier-feature/src/jvmMain/kotlin/at/mocode/turnier/feature/presentation/TurnierAbrechnungTab.kt b/frontend/features/turnier-feature/src/jvmMain/kotlin/at/mocode/turnier/feature/presentation/TurnierAbrechnungTab.kt index 0c5c8a56..4f5ffa05 100644 --- a/frontend/features/turnier-feature/src/jvmMain/kotlin/at/mocode/turnier/feature/presentation/TurnierAbrechnungTab.kt +++ b/frontend/features/turnier-feature/src/jvmMain/kotlin/at/mocode/turnier/feature/presentation/TurnierAbrechnungTab.kt @@ -4,10 +4,10 @@ import androidx.compose.foundation.background import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items -import androidx.compose.material3.* import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Print import androidx.compose.material.icons.filled.Refresh +import androidx.compose.material3.* import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -16,7 +16,6 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import at.mocode.frontend.core.designsystem.models.PlaceholderContent -import at.mocode.frontend.core.navigation.AppScreen private val PrimaryBlue = Color(0xFF1E3A8A) private val AccentBlue = Color(0xFF3B82F6) diff --git a/frontend/shells/meldestelle-desktop/src/jvmMain/kotlin/at/mocode/desktop/v2/Screens.kt b/frontend/shells/meldestelle-desktop/src/jvmMain/kotlin/at/mocode/desktop/v2/Screens.kt index f23bfd16..a50751dc 100644 --- a/frontend/shells/meldestelle-desktop/src/jvmMain/kotlin/at/mocode/desktop/v2/Screens.kt +++ b/frontend/shells/meldestelle-desktop/src/jvmMain/kotlin/at/mocode/desktop/v2/Screens.kt @@ -1,13 +1,11 @@ package at.mocode.desktop.v2 -import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack -import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material.icons.filled.Delete import androidx.compose.material.icons.filled.Visibility import androidx.compose.material.icons.filled.VisibilityOff diff --git a/frontend/shells/meldestelle-desktop/src/jvmMain/kotlin/at/mocode/desktop/v2/VeranstaltungScreens.kt b/frontend/shells/meldestelle-desktop/src/jvmMain/kotlin/at/mocode/desktop/v2/VeranstaltungScreens.kt index 57608c51..e152a9cb 100644 --- a/frontend/shells/meldestelle-desktop/src/jvmMain/kotlin/at/mocode/desktop/v2/VeranstaltungScreens.kt +++ b/frontend/shells/meldestelle-desktop/src/jvmMain/kotlin/at/mocode/desktop/v2/VeranstaltungScreens.kt @@ -6,7 +6,6 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack -import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material.icons.filled.Delete import androidx.compose.material3.* import androidx.compose.runtime.*