From c7fd885f9773585a8f0d8e6e91f2f0289f7f66e2 Mon Sep 17 00:00:00 2001
From: Jim Martens <github@2martens.de>
Date: Sun, 30 Jul 2023 18:59:20 +0200
Subject: [PATCH] Fix mapping issues

---
 .../de/twomartens/wahlrecht/model/db/PartyInElection.kt     | 6 +++---
 .../de/twomartens/wahlrecht/model/dto/v1/PartyInElection.kt | 2 +-
 .../kotlin/de/twomartens/wahlrecht/service/PartyService.kt  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/module-server/src/main/kotlin/de/twomartens/wahlrecht/model/db/PartyInElection.kt b/module-server/src/main/kotlin/de/twomartens/wahlrecht/model/db/PartyInElection.kt
index 70a54bf..c6a26ed 100644
--- a/module-server/src/main/kotlin/de/twomartens/wahlrecht/model/db/PartyInElection.kt
+++ b/module-server/src/main/kotlin/de/twomartens/wahlrecht/model/db/PartyInElection.kt
@@ -12,11 +12,11 @@ import java.time.Instant
 @Document
 @CompoundIndex(def = "{'abbreviation': 1, 'electionName': 1}")
 data class PartyInElection(
-    var abbreviation: String,
     var electionName: String,
+    var abbreviation: String,
     var name: String,
-    var overallNomination: Nomination,
-    var constituencyNominations: Map<Int, Nomination?>
+    var overallNomination: Nomination?,
+    var constituencyNominations: Map<Int, Nomination>
 ) {
     @Id
     var id: ObjectId = ObjectId()
diff --git a/module-server/src/main/kotlin/de/twomartens/wahlrecht/model/dto/v1/PartyInElection.kt b/module-server/src/main/kotlin/de/twomartens/wahlrecht/model/dto/v1/PartyInElection.kt
index 0806679..5145fda 100644
--- a/module-server/src/main/kotlin/de/twomartens/wahlrecht/model/dto/v1/PartyInElection.kt
+++ b/module-server/src/main/kotlin/de/twomartens/wahlrecht/model/dto/v1/PartyInElection.kt
@@ -2,4 +2,4 @@ package de.twomartens.wahlrecht.model.dto.v1
 
 data class PartyInElection(var electionName: String?, var abbreviation: String?, var name: String?,
                            var nomination: Nomination?,
-                           var constituencyNominations: Map<Int, Nomination>? = HashMap())
+                           var constituencyNominations: Map<Int, Nomination>? = mapOf())
diff --git a/module-server/src/main/kotlin/de/twomartens/wahlrecht/service/PartyService.kt b/module-server/src/main/kotlin/de/twomartens/wahlrecht/service/PartyService.kt
index d646149..99b0fa0 100644
--- a/module-server/src/main/kotlin/de/twomartens/wahlrecht/service/PartyService.kt
+++ b/module-server/src/main/kotlin/de/twomartens/wahlrecht/service/PartyService.kt
@@ -38,9 +38,9 @@ class PartyService(
         if (!needsUpdate) {
             return false
         }
-        val constituencyNominations: MutableMap<Int, Nomination?> = mutableMapOf()
+        val constituencyNominations: MutableMap<Int, Nomination> = mutableMapOf()
         result.constituencyNominations
-            .forEach { constituencyNominations[it.key] = nominationService.storeNomination(it.value) }
+            .forEach { constituencyNominations[it.key] = nominationService.storeNomination(it.value)!! }
         if (existing != null) {
             existing.name = partyInElection.name
             if (constituencyNominations.isEmpty()) {