From 0a414b0dbc0ad62fd957eb3cfdcb43bdd839ec8b Mon Sep 17 00:00:00 2001
From: Matte23 <matteo@underdesk.net>
Date: Tue, 9 Feb 2021 15:02:38 +0100
Subject: [PATCH] Do not send notifications if database was empty

---
 .../net/underdesk/circolapp/backend/ServerUtils.kt     | 10 ++++++++--
 .../circolapp/shared/data/DatabaseDriverFactory.kt     |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/kotlin/net/underdesk/circolapp/backend/ServerUtils.kt b/backend/src/main/kotlin/net/underdesk/circolapp/backend/ServerUtils.kt
index 7cf16ba..7dfc0a6 100644
--- a/backend/src/main/kotlin/net/underdesk/circolapp/backend/ServerUtils.kt
+++ b/backend/src/main/kotlin/net/underdesk/circolapp/backend/ServerUtils.kt
@@ -59,13 +59,19 @@ class ServerUtils(databasePath: String, private val enableNotifications: Boolean
                 errorCode = 1
             }
 
+            circularDao.insertAll(newCirculars)
+
+            // Do not send anything if the database was empty
+            if (oldCirculars.isEmpty()) {
+                print("Database was empty, not sending notifications \n")
+                return Pair(emptyList(), 0)
+            }
+
             val oldCircularsSize =
                 if (newCirculars.size < oldCirculars.size) 0 else oldCirculars.size
 
             val circularCount = newCirculars.size - oldCircularsSize
             onlyNewCirculars = newCirculars.subList(0, circularCount)
-
-            circularDao.insertAll(newCirculars)
         }
         return Pair(onlyNewCirculars, errorCode)
     }
diff --git a/shared/src/jvmMain/kotlin/net/underdesk/circolapp/shared/data/DatabaseDriverFactory.kt b/shared/src/jvmMain/kotlin/net/underdesk/circolapp/shared/data/DatabaseDriverFactory.kt
index 08af893..ec2f79b 100644
--- a/shared/src/jvmMain/kotlin/net/underdesk/circolapp/shared/data/DatabaseDriverFactory.kt
+++ b/shared/src/jvmMain/kotlin/net/underdesk/circolapp/shared/data/DatabaseDriverFactory.kt
@@ -28,7 +28,7 @@ actual class DatabaseDriverFactory(private val path: String) {
                 val currentVer = DatabaseFactory.getVersion(it)
                 if (currentVer == 0) {
                     AppDatabase.Schema.create(it)
-                    DatabaseFactory.setVersion(it, 1)
+                    DatabaseFactory.setVersion(it, AppDatabase.Schema.version)
                 } else {
                     val schemaVer: Int = AppDatabase.Schema.version
                     if (schemaVer > currentVer) {