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

fix SQLite

Browse Source
This commit is contained in:
stefan
2025-06-05 15:43:31 +02:00
parent 0482ef8479
commit 3b752bd90e
6 changed files with 185 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/meldestelle.db
BIN
View File
Binary file not shown.
docker-compose.yml
+1 -3
View File
@@ -8,7 +8,7 @@ services:
ports:
- "8080:8081"
volumes:
- sqlite_data:/app/data # Volume für SQLite Datenbank
- ./data:/app/data # Direktes Mapping des data Verzeichnisses
environment:
- USE_SQLITE=true
networks:
@@ -17,5 +17,3 @@ services:
networks:
meldestelle-net:
driver: bridge
volumes:
sqlite_data: # Volume für SQLite Datenbank
server/src/main/kotlin/at/mocode/repository/TurnierRepository.kt
+56 -2
View File
@@ -121,6 +121,7 @@ class TurnierRepository {
fun getAllTurniere(): List<Turnier> = transaction {
log.info("Fetching all tournaments from database...")
try {
// Get all tournaments
val turniere = TurniereTable.selectAll().map { row ->
Turnier(
@@ -130,8 +131,11 @@ class TurnierRepository {
)
}
log.info("Found ${turniere.size} tournaments in database")
// For each tournament, get its competitions
turniere.forEach { turnier ->
try {
val bewerbeList = BewerbeTable.selectAll().where { BewerbeTable.turnierNumber eq turnier.number }.map { row ->
Bewerb(
nummer = row[BewerbeTable.nummer],
@@ -141,18 +145,33 @@ class TurnierRepository {
)
}
turnier.bewerbe = bewerbeList
log.info("Found ${bewerbeList.size} competitions for tournament ${turnier.number}")
} catch (e: Exception) {
log.error("Error fetching competitions for tournament ${turnier.number}", e)
turnier.bewerbe = emptyList() // Set empty list to avoid null pointer exceptions
}
}
turniere
} catch (e: Exception) {
log.error("Error fetching tournaments from database", e)
emptyList() // Return empty list instead of throwing exception
}
}
/**
* Inserts dummy tournaments with competitions if the table is empty.
*/
fun insertDummyTurnierIfEmpty() = transaction {
if (TurniereTable.selectAll().count() == 0L) {
try {
// First check if the table is empty
val count = TurniereTable.selectAll().count()
log.info("Current tournament count in database: $count")
if (count == 0L) {
log.info("Turnier table is empty, inserting dummy tournaments...")
try {
// Insert first tournament
val turnierNumber1 = 25319
TurniereTable.insert {
@@ -160,6 +179,7 @@ class TurnierRepository {
it[TurniereTable.name] = "CSN-C Edelhof April 2025"
it[TurniereTable.datum] = "14.04.2025 - 15.04.2025"
}
log.info("Inserted first tournament with number $turnierNumber1")
// Insert competitions for first tournament
BewerbeTable.insert {
@@ -177,6 +197,7 @@ class TurnierRepository {
it[BewerbeTable.task] = "DRA 1"
it[BewerbeTable.turnierNumber] = turnierNumber1
}
log.info("Inserted competitions for first tournament")
// Insert second tournament (as specified in the issue description)
val turnierNumber2 = 25320
@@ -185,6 +206,7 @@ class TurnierRepository {
it[TurniereTable.name] = "CDN-C CDNP-C NEU Neumarkt/M., OÖ"
it[TurniereTable.datum] = "8. JUNI 2025"
}
log.info("Inserted second tournament with number $turnierNumber2")
// Insert competitions for second tournament
BewerbeTable.insert {
@@ -210,8 +232,19 @@ class TurnierRepository {
it[BewerbeTable.task] = "DRL 2"
it[BewerbeTable.turnierNumber] = turnierNumber2
}
log.info("Inserted competitions for second tournament")
log.info("Dummy tournaments and competitions inserted successfully.")
} catch (e: Exception) {
log.error("Error inserting dummy tournaments", e)
// Don't rethrow, allow the application to continue
}
} else {
log.info("Turnier table is not empty, skipping dummy data insertion")
}
} catch (e: Exception) {
log.error("Error checking if tournament table is empty", e)
// Don't rethrow, allow the application to continue
}
}
@@ -221,8 +254,18 @@ class TurnierRepository {
* @return The tournament or null if not found
*/
fun getTurnierByNumber(number: Int): Turnier? = transaction {
log.info("Fetching tournament with number $number")
try {
// Get the tournament
val turnierRow = TurniereTable.selectAll().where { TurniereTable.number eq number }.singleOrNull() ?: return@transaction null
val turnierRow = TurniereTable.selectAll().where { TurniereTable.number eq number }.singleOrNull()
if (turnierRow == null) {
log.warn("Tournament with number $number not found")
return@transaction null
}
log.info("Found tournament with number $number: ${turnierRow[TurniereTable.name]}")
val turnier = Turnier(
name = turnierRow[TurniereTable.name],
@@ -230,6 +273,7 @@ class TurnierRepository {
number = turnierRow[TurniereTable.number]
)
try {
// Get competitions for this tournament
val bewerbeList = BewerbeTable.selectAll().where { BewerbeTable.turnierNumber eq number }.map { row ->
Bewerb(
@@ -240,7 +284,17 @@ class TurnierRepository {
)
}
log.info("Found ${bewerbeList.size} competitions for tournament $number")
turnier.bewerbe = bewerbeList
} catch (e: Exception) {
log.error("Error fetching competitions for tournament $number", e)
turnier.bewerbe = emptyList() // Set empty list to avoid null pointer exceptions
}
turnier
} catch (e: Exception) {
log.error("Error fetching tournament with number $number", e)
null
}
}
}
server/src/main/kotlin/at/mocode/routes/AdminRoutes.kt
+20 -10
View File
@@ -73,19 +73,24 @@ fun Route.adminRoutes() {
val bewerbKlasse = formParameters.getAll("bewerb-klasse[]") ?: emptyList()
val bewerbTask = formParameters.getAll("bewerb-task[]") ?: emptyList()
log.info("Received competitions for creation: ${bewerbNummern.size} numbers, ${bewerbTitel.size} titles, ${bewerbKlasse.size} classes, ${bewerbTask.size} tasks")
// Create list of competitions
val bewerbe = mutableListOf<Bewerb>()
for (i in bewerbNummern.indices) {
if (i < bewerbTitel.size && i < bewerbKlasse.size && i < bewerbTask.size) {
val titel = if (i < bewerbTitel.size) bewerbTitel[i] else "Unbenannter Bewerb"
val klasse = if (i < bewerbKlasse.size) bewerbKlasse[i] else "Keine Klasse"
val task = if (i < bewerbTask.size && bewerbTask[i].isNotBlank()) bewerbTask[i] else null
bewerbe.add(
Bewerb(
nummer = bewerbNummern[i],
titel = bewerbTitel[i],
klasse = bewerbKlasse[i],
task = if (bewerbTask[i].isNotBlank()) bewerbTask[i] else null
titel = titel,
klasse = klasse,
task = task
)
)
}
log.info("Added competition for creation: ${bewerbNummern[i]}, $titel, $klasse, $task")
}
// Create the tournament
@@ -126,19 +131,24 @@ fun Route.adminRoutes() {
val bewerbKlasse = formParameters.getAll("bewerb-klasse[]") ?: emptyList()
val bewerbTask = formParameters.getAll("bewerb-task[]") ?: emptyList()
log.info("Received competitions for update: ${bewerbNummern.size} numbers, ${bewerbTitel.size} titles, ${bewerbKlasse.size} classes, ${bewerbTask.size} tasks")
// Create list of competitions
val bewerbe = mutableListOf<Bewerb>()
for (i in bewerbNummern.indices) {
if (i < bewerbTitel.size && i < bewerbKlasse.size && i < bewerbTask.size) {
val titel = if (i < bewerbTitel.size) bewerbTitel[i] else "Unbenannter Bewerb"
val klasse = if (i < bewerbKlasse.size) bewerbKlasse[i] else "Keine Klasse"
val task = if (i < bewerbTask.size && bewerbTask[i].isNotBlank()) bewerbTask[i] else null
bewerbe.add(
Bewerb(
nummer = bewerbNummern[i],
titel = bewerbTitel[i],
klasse = bewerbKlasse[i],
task = if (bewerbTask[i].isNotBlank()) bewerbTask[i] else null
titel = titel,
klasse = klasse,
task = task
)
)
}
log.info("Added competition for update: ${bewerbNummern[i]}, $titel, $klasse, $task")
}
// Update the tournament
server/src/main/kotlin/at/mocode/routes/HomeRoutes.kt
+1 -4
View File
@@ -16,10 +16,7 @@ fun Route.homeRoutes() {
get("/") {
log.info("Handling request to home page")
// Insert dummy tournament if needed
turnierRepository.insertDummyTurnierIfEmpty()
// Get all tournaments
// Get all tournaments from the database
val turniere = turnierRepository.getAllTurniere()
// Render the home page
server/src/main/kotlin/at/mocode/views/LayoutTemplate.kt
+4 -6
View File
@@ -178,10 +178,10 @@ class LayoutTemplate {
textarea,
select {
width: 100%;
padding: 1.2rem;
border: none;
padding: 0.8rem;
border: 1px solid var(--border-color);
border-radius: 6px;
font-size: 2rem;
font-size: 1rem;
transition: all 0.3s;
margin-bottom: 1.2rem;
box-shadow: 0 1px 3px rgba(0,0,0,0.05);
@@ -220,7 +220,6 @@ class LayoutTemplate {
letter-spacing: 0.5px;
font-weight: 500;
box-shadow: 0 2px 5px rgba(0,0,0,0.2);
width: 100%;
text-align: center;
}
@@ -359,8 +358,7 @@ class LayoutTemplate {
}
.button, button {
width: 100%;
text-align: center;
display: block;
margin-bottom: 0.5rem;
}
}