mocode-software/meldestelle
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix and upgrade gradle

Browse Source
This commit is contained in:
stefan
2025-05-08 16:21:43 +02:00
parent 1d18243658
commit bd399fdcd3
20 changed files with 161 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/main/kotlin/at/mocode/server/plugins/Database.kt
+6 -12
View File
@@ -1,13 +1,6 @@
package at.mocode.server.plugins
import at.mocode.server.tables.ArtikelTable
import at.mocode.server.tables.LizenzenTable
import at.mocode.server.tables.PersonenTable
import at.mocode.server.tables.PferdeTable
import at.mocode.server.tables.PlaetzeTable
import at.mocode.server.tables.TurniereTable
import at.mocode.server.tables.VeranstaltungenTable
import at.mocode.server.tables.VereineTable
import at.mocode.server.tables.*
import com.zaxxer.hikari.HikariConfig
import com.zaxxer.hikari.HikariDataSource
import io.ktor.server.application.*
@@ -15,6 +8,7 @@ import io.ktor.server.config.*
import org.jetbrains.exposed.sql.Database
import org.jetbrains.exposed.sql.SchemaUtils
import org.jetbrains.exposed.sql.transactions.transaction
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import java.util.concurrent.TimeUnit
@@ -69,7 +63,7 @@ fun Application.configureDatabase() {
/**
* Configures an in-memory H2 database for testing
*/
private fun configureTestDatabase(log: org.slf4j.Logger): Boolean {
private fun configureTestDatabase(log: Logger): Boolean {
log.info("Test environment detected, using in-memory H2 database (test)...")
return try {
Database.connect(
@@ -89,7 +83,7 @@ private fun configureTestDatabase(log: org.slf4j.Logger): Boolean {
/**
* Configures an in-memory H2 database for development
*/
private fun configureDevelopmentDatabase(log: org.slf4j.Logger): Boolean {
private fun configureDevelopmentDatabase(log: Logger): Boolean {
log.info("Development environment detected, using in-memory H2 database (dev)...")
return try {
Database.connect(
@@ -109,7 +103,7 @@ private fun configureDevelopmentDatabase(log: org.slf4j.Logger): Boolean {
/**
* Configures a PostgreSQL database for production
*/
private fun configureProductionDatabase(log: org.slf4j.Logger, dbConfig: ApplicationConfig?): Boolean {
private fun configureProductionDatabase(log: Logger, dbConfig: ApplicationConfig?): Boolean {
log.info("Production environment detected, connecting to PostgreSQL...")
// Get database configuration from application.yaml or environment variables
@@ -175,7 +169,7 @@ private fun configureProductionDatabase(log: org.slf4j.Logger, dbConfig: Applica
/**
* Initializes the database schema
*/
private fun initializeSchema(log: org.slf4j.Logger, isTestEnvironment: Boolean, isIdeaEnvironment: Boolean) {
private fun initializeSchema(log: Logger, isTestEnvironment: Boolean, isIdeaEnvironment: Boolean) {
transaction {
log.info("Initializing/Verifying database schema...")
try {
server/src/main/kotlin/at/mocode/server/tables/LizenzenTable.kt
-1
View File
@@ -1,6 +1,5 @@
package at.mocode.server.tables
import at.mocode.shared.model.enums.LizenzTyp
import at.mocode.shared.model.enums.Sparte
import org.jetbrains.exposed.sql.Table
server/src/main/resources/application.yaml
+1 -1
View File
@@ -41,7 +41,7 @@ security:
audience: "meldestelle-clients"
realm: "meldestelle"
# Secret should be set via environment variable in production
secret: "${JWT_SECRET:dev-secret-key-change-in-production}"
secret: "${JWT_SECRET:dev-secret-key-change-in-production"
# Token validity duration in milliseconds (24 hours)
validity: 86400000
server/src/test/kotlin/at/mocode/server/ApplicationTest.kt
-48
View File
@@ -1,48 +0,0 @@
package at.mocode.server
import org.junit.jupiter.api.Assertions.*
import org.junit.jupiter.api.Test
import org.slf4j.LoggerFactory
import java.io.File
/**
* Basic tests for the application
*/
class ApplicationTest {
private val logger = LoggerFactory.getLogger(ApplicationTest::class.java)
@Test
fun testEnvironmentSetup() {
// Set test environment flag
System.setProperty("isTestEnvironment", "true")
// Verify the flag is set correctly
assertTrue(System.getProperty("isTestEnvironment").toBoolean())
logger.info("Test environment flag set successfully")
}
@Test
fun testApplicationFilesExist() {
// Verify the Application.kt file exists
val applicationFile = File("src/main/kotlin/at/mocode/server/Application.kt")
assertTrue(applicationFile.exists() || File("server/" + applicationFile.path).exists(),
"Application.kt file should exist")
// Verify the Database.kt file exists
val databaseFile = File("src/main/kotlin/at/mocode/server/plugins/Database.kt")
assertTrue(databaseFile.exists() || File("server/" + databaseFile.path).exists(),
"Database.kt file should exist")
logger.info("Application files exist")
}
@Test
fun testConfigurationFileExists() {
// Verify the application.yaml file exists
val configFile = File("src/main/resources/application.yaml")
assertTrue(configFile.exists() || File("server/" + configFile.path).exists(),
"application.yaml file should exist")
logger.info("Configuration file exists")
}
}
server/src/test/kotlin/at/mocode/server/plugins/DatabaseTest.kt
-223
View File
@@ -1,223 +0,0 @@
package at.mocode.server.plugins
import at.mocode.server.tables.*
import io.ktor.server.config.*
import org.jetbrains.exposed.sql.Database
import org.jetbrains.exposed.sql.SchemaUtils
import org.jetbrains.exposed.sql.transactions.transaction
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.Assertions.*
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.io.TempDir
import org.slf4j.LoggerFactory
import java.io.File
/**
* Tests for the Database.kt file
*/
class DatabaseTest {
private val logger = LoggerFactory.getLogger(DatabaseTest::class.java)
// Create a temporary directory for test resources
@TempDir
lateinit var tempDir: File
@BeforeEach
fun setUp() {
// Clear any system properties that might affect the tests
System.clearProperty("isTestEnvironment")
// Clear environment variables by setting them to null
// Note: This is a workaround since we can't actually clear environment variables in Java
System.getProperties().remove("DB_HOST")
System.getProperties().remove("DB_NAME")
System.getProperties().remove("DB_USER")
System.getProperties().remove("DB_PASSWORD")
}
@AfterEach
fun tearDown() {
// Clear any system properties set during tests
System.clearProperty("isTestEnvironment")
System.getProperties().remove("DB_HOST")
System.getProperties().remove("DB_NAME")
System.getProperties().remove("DB_USER")
System.getProperties().remove("DB_PASSWORD")
}
@Test
fun testTestDatabaseConfiguration() {
// Set test environment flag
System.setProperty("isTestEnvironment", "true")
// Create a direct database connection for testing
val db = Database.connect(
url = "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;MODE=PostgreSQL",
driver = "org.h2.Driver",
user = "sa",
password = ""
)
// Verify that we can execute a simple query
transaction(db) {
// If this doesn't throw an exception, the connection is working
exec("SELECT 1") { rs ->
assertTrue(rs.next())
assertEquals(1, rs.getInt(1))
true
}
logger.info("Test database connection verified")
}
}
@Test
fun testDevelopmentDatabaseConfiguration() {
// Ensure test environment flag is not set
System.clearProperty("isTestEnvironment")
// Create a direct database connection for testing
val db = Database.connect(
url = "jdbc:h2:mem:dev;DB_CLOSE_DELAY=-1;MODE=PostgreSQL",
driver = "org.h2.Driver",
user = "sa",
password = ""
)
// Verify that we can execute a simple query
transaction(db) {
// If this doesn't throw an exception, the connection is working
exec("SELECT 1") { rs ->
assertTrue(rs.next())
assertEquals(1, rs.getInt(1))
true
}
logger.info("Development database connection verified")
}
}
@Test
fun testSchemaInitialization() {
// Set test environment flag
System.setProperty("isTestEnvironment", "true")
// Create a direct database connection for testing
val db = Database.connect(
url = "jdbc:h2:mem:test_schema;DB_CLOSE_DELAY=-1;MODE=PostgreSQL",
driver = "org.h2.Driver",
user = "sa",
password = ""
)
// Initialize schema
transaction(db) {
SchemaUtils.create(
VereineTable,
PersonenTable,
PferdeTable,
VeranstaltungenTable,
TurniereTable,
ArtikelTable,
PlaetzeTable,
LizenzenTable
)
}
// Verify that tables were created
transaction(db) {
// Check if tables exist by querying the H2 metadata
val tables = listOf(
VereineTable,
PersonenTable,
PferdeTable,
VeranstaltungenTable,
TurniereTable,
ArtikelTable,
PlaetzeTable,
LizenzenTable
)
for (table in tables) {
val tableName = table.tableName.uppercase()
val result = exec("SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = '$tableName'") { rs ->
rs.next()
rs.getInt(1)
}
assertEquals(1, result, "Table $tableName should exist")
}
logger.info("Schema initialization verified")
}
}
@Test
fun testErrorHandlingInTestEnvironment() {
// Set test environment flag
System.setProperty("isTestEnvironment", "true")
// Create a test application with a broken database URL
try {
// Use reflection to access the private function
val method = this::class.java.classLoader
.loadClass("at.mocode.server.plugins.DatabaseKt")
.getDeclaredMethod("configureTestDatabase", org.slf4j.Logger::class.java)
method.isAccessible = true
// Create a mock Database object that throws an exception when connect is called
val originalConnect = Database::class.java.getDeclaredMethod("connect",
String::class.java, String::class.java, String::class.java, String::class.java)
// Store the original method
val originalAccessible = originalConnect.canAccess(originalConnect)
originalConnect.isAccessible = true
try {
// Call the method with an invalid URL to trigger an exception
assertThrows(Exception::class.java) {
method.invoke(null, logger)
}
logger.info("Error handling in test environment verified")
} finally {
// Restore the original method
originalConnect.isAccessible = originalAccessible
}
} catch (e: Exception) {
// If we can't use reflection, just log a message
logger.warn("Could not test error handling using reflection: ${e.message}")
}
}
@Test
fun testProductionDatabaseConfigurationValidation() {
// Ensure test environment flag is not set
System.clearProperty("isTestEnvironment")
// Set DB_HOST to trigger production configuration but leave other required variables unset
System.setProperty("DB_HOST", "localhost")
System.getProperties().remove("DB_NAME")
System.getProperties().remove("DB_USER")
System.getProperties().remove("DB_PASSWORD")
// Create a logger to pass to the function
val log = LoggerFactory.getLogger("TestLogger")
// Call the production database configuration function directly
val method = this::class.java.classLoader
.loadClass("at.mocode.server.plugins.DatabaseKt")
.getDeclaredMethod("configureProductionDatabase", org.slf4j.Logger::class.java, ApplicationConfig::class.java)
method.isAccessible = true
// This should throw an exception because we don't have all required environment variables
try {
method.invoke(null, log, null)
fail("Expected an exception to be thrown")
} catch (e: java.lang.reflect.InvocationTargetException) {
// The actual exception is wrapped in an InvocationTargetException
val cause = e.cause
assertTrue(cause is IllegalStateException, "Expected IllegalStateException but got ${cause?.javaClass?.name}")
logger.info("Production database configuration validation verified: ${cause?.message}")
}
}
}