release-2024.6.1-hotfix: add migration script to fix expirationDay fo…

…r gold cards, set expiration only if card has expirationDay, add null check for startDay for static cards
digitalfabrik · Jul 1, 2024 · 9e1262a · 9e1262a
1 parent 7856fbc
commit 9e1262a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/...end/src/main/kotlin/app/ehrenamtskarte/backend/migration/migrations/MigrationsRegistry.kt b/...end/src/main/kotlin/app/ehrenamtskarte/backend/migration/migrations/MigrationsRegistry.kt
@@ -13,6 +13,7 @@ object MigrationsRegistry {
         V0009_HashPasswordResetKey(),
         V0010_ApplicationNote(),
         V0011_AddRegionCardConfirmationMailActivation(),
-        V0012_AddApplicationCardCreated()
+        V0012_AddApplicationCardCreated(),
+        V0013_FixExpirationDateGoldCard()
     )
 }
diff --git a/...kotlin/app/ehrenamtskarte/backend/migration/migrations/V0013_FixExpirationDateGoldCard.kt b/...kotlin/app/ehrenamtskarte/backend/migration/migrations/V0013_FixExpirationDateGoldCard.kt
@@ -0,0 +1,20 @@
+package app.ehrenamtskarte.backend.migration.migrations
+
+import app.ehrenamtskarte.backend.migration.Migration
+import app.ehrenamtskarte.backend.migration.Statement
+
+/**
+ * Set the expirationDay to null for gold cards where the expirationDay was accidentally set to 0.
+ */
+@Suppress("ClassName")
+internal class V0013_FixExpirationDateGoldCard() : Migration() {
+    override val migrate: Statement = {
+        exec(
+            """
+            UPDATE cards
+            SET "expirationDay" = null
+            WHERE "expirationDay" = 0;
+            """.trimIndent()
+        )
+    }
+}
diff --git a/...n/kotlin/app/ehrenamtskarte/backend/verification/webservice/schema/CardMutationService.kt b/...n/kotlin/app/ehrenamtskarte/backend/verification/webservice/schema/CardMutationService.kt
@@ -70,7 +70,7 @@ class CardMutationService {
             CardRepository.insert(
                 hashedCardInfo,
                 activationSecretHash,
-                cardInfo.expirationDay.toLong(),
+                expirationDay = if (cardInfo.hasExpirationDay()) cardInfo.expirationDay.toLong() else null,
                 cardInfo.extensions.extensionRegion.regionId,
                 userId,
                 CodeType.DYNAMIC,
@@ -101,11 +101,11 @@ class CardMutationService {
             CardRepository.insert(
                 hashedCardInfo,
                 null,
-                cardInfo.expirationDay.toLong(),
+                expirationDay = if (cardInfo.hasExpirationDay()) cardInfo.expirationDay.toLong() else null,
                 cardInfo.extensions.extensionRegion.regionId,
                 userId,
                 CodeType.STATIC,
-                cardInfo.extensions.extensionStartDay.startDay.toLong()
+                cardInfo.extensions.extensionStartDayOrNull?.startDay?.toLong()
             )
 
             StaticVerificationCodeResult(