Migrate deliveries.next_delivery from type:string to type:int (SCNTime)

scnserver/db/impl/primary/database.go

@@ -241,6 +241,51 @@ func (db *Database) Migrate(outerctx context.Context) error {
 		} else {
 			log.Debug().Str("schemHash", schemHashDB).Msg("Verified Schema consistency (primary db)")
 		}
+
+		log.Info().Int("currschema", currschema).Msg("Upgrade schema from 5 -> 6")
+
+		_, err = tx.Exec(tctx, schema.PrimaryMigration_5_6, sq.PP{})
+		if err != nil {
+			return err
+		}
+
+		currschema = 6
+
+		err = db.WriteMetaInt(tctx, "schema", int64(currschema))
+		if err != nil {
+			return err
+		}
+
+		err = db.WriteMetaString(tctx, "schema_hash", schema.PrimarySchema[currschema].Hash)
+		if err != nil {
+			return err
+		}
+
+		log.Info().Int("currschema", currschema).Msg("Upgrade schema from 5 -> 6 succesfully")
+
+		ppReInit = true
+	}
+
+	if currschema == 6 {
+
+		schemaHashMeta, err := db.ReadMetaString(tctx, "schema_hash")
+		if err != nil {
+			return err
+		}
+
+		schemHashDB, err := sq.HashSqliteDatabase(tctx, tx)
+		if err != nil {
+			return err
+		}
+
+		if schemHashDB != langext.Coalesce(schemaHashMeta, "") || langext.Coalesce(schemaHashMeta, "") != schema.PrimarySchema[currschema].Hash {
+			log.Debug().Str("schemHashDB", schemHashDB).Msg("Schema (primary db)")
+			log.Debug().Str("schemaHashMeta", langext.Coalesce(schemaHashMeta, "")).Msg("Schema (primary db)")
+			log.Debug().Str("schemaHashAsset", schema.PrimarySchema[currschema].Hash).Msg("Schema (primary db)")
+			return errors.New("database schema does not match (primary db)")
+		} else {
+			log.Debug().Str("schemHash", schemHashDB).Msg("Verified Schema consistency (primary db)")
+		}
 	}
 
 	if currschema != schema.PrimarySchemaVersion {

scnserver/db/impl/primary/deliveries.go

@@ -5,7 +5,6 @@ import (
 	"blackforestbytes.com/simplecloudnotifier/db"
 	"blackforestbytes.com/simplecloudnotifier/models"
 	"gogs.mikescher.com/BlackForestBytes/goext/langext"
-	"gogs.mikescher.com/BlackForestBytes/goext/rfctime"
 	"gogs.mikescher.com/BlackForestBytes/goext/sq"
 	"time"
 )
@@ -28,7 +27,7 @@ func (db *Database) CreateRetryDelivery(ctx db.TxContext, client models.Client,
 		TimestampFinalized: nil,
 		Status:             models.DeliveryStatusRetry,
 		RetryCount:         0,
-		NextDelivery:       rfctime.NewRFC3339NanoPtr(&next),
+		NextDelivery:       models.NewSCNTimePtr(&next),
 		FCMMessageID:       nil,
 	}
 
@@ -76,7 +75,7 @@ func (db *Database) ListRetrieableDeliveries(ctx db.TxContext, pageSize int) ([]
 	}
 
 	return sq.QueryAll[models.Delivery](ctx, tx, "SELECT * FROM deliveries WHERE status = 'RETRY' AND next_delivery < :next ORDER BY next_delivery ASC LIMIT :lim", sq.PP{
-		"next": time.Now().Format(time.RFC3339Nano),
+		"next": time2DB(time.Now()),
 		"lim":  pageSize,
 	}, sq.SModeExtended, sq.Safe)
 }
@@ -126,7 +125,7 @@ func (db *Database) SetDeliveryRetry(ctx db.TxContext, delivery models.Delivery)
 	}
 
 	_, err = tx.Exec(ctx, "UPDATE deliveries SET status = 'RETRY', next_delivery = :next, retry_count = :rc WHERE delivery_id = :did", sq.PP{
-		"next": scn.NextDeliveryTimestamp(time.Now()).Format(time.RFC3339Nano),
+		"next": time2DB(scn.NextDeliveryTimestamp(time.Now())),
 		"rc":   delivery.RetryCount + 1,
 		"did":  delivery.DeliveryID,
 	})