Tidy up queryKnownIDs

antweb · antweb · commit 58026f1c6683 · 2024-07-31T17:26:00.000+02:00
diff --git a/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/AllEventsSyncAdapter.kt b/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/AllEventsSyncAdapter.kt
@@ -35,14 +35,15 @@ class AllEventsSyncAdapter(
 
     override fun getJSON(obj: Event): JSONObject = JSONObject(obj.json_data!!)
 
-    override fun queryKnownIDs(): MutableSet<String>? {
+    override fun queryKnownIDs(): MutableSet<String> {
         val res = mutableSetOf<String>()
         db.eventQueries.selectSlugs().execute { cursor ->
             while (cursor.next().value) {
-                val id = cursor.getString(0) ?: throw RuntimeException("slug column not available")
+                val id = cursor.getString(0)
+                    ?: throw RuntimeException("slug column not available")
+
                 res.add(id)
             }
-
             QueryResult.Unit
         }
 
diff --git a/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/AllSubEventsSyncAdapter.kt b/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/AllSubEventsSyncAdapter.kt
@@ -45,15 +45,15 @@ class AllSubEventsSyncAdapter(
 
     override fun getJSON(obj: SubEvent): JSONObject = JSONObject(obj.json_data!!)
 
-    override fun queryKnownIDs(): MutableSet<Long>? {
+    override fun queryKnownIDs(): MutableSet<Long> {
         val res = mutableSetOf<Long>()
         db.subEventQueries.selectServerIds().execute { cursor ->
             while (cursor.next().value) {
-                val id =
-                    cursor.getLong(0) ?: throw RuntimeException("server_id column not available")
+                val id = cursor.getLong(0)
+                    ?: throw RuntimeException("server_id column not available")
+
                 res.add(id)
             }
-
             QueryResult.Unit
         }
 
diff --git a/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/BadgeLayoutItemSyncAdapter.kt b/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/BadgeLayoutItemSyncAdapter.kt
@@ -36,17 +36,16 @@ class BadgeLayoutItemSyncAdapter(
 
     override fun getJSON(obj: BadgeLayoutItem): JSONObject = JSONObject(obj.json_data!!)
 
-    override fun queryKnownIDs(): MutableSet<Long>? {
+    override fun queryKnownIDs(): MutableSet<Long> {
         val res = mutableSetOf<Long>()
         db.badgeLayoutItemQueries.selectServerIdsByEventSlug(event_slug = eventSlug)
             .execute { cursor ->
                 while (cursor.next().value) {
-                    val id =
-                        cursor.getLong(0)
-                            ?: throw RuntimeException("server_id column not available")
+                    val id = cursor.getLong(0)
+                        ?: throw RuntimeException("server_id column not available")
+
                     res.add(id)
                 }
-
                 QueryResult.Unit
             }
 
diff --git a/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/BadgeLayoutSyncAdapter.kt b/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/BadgeLayoutSyncAdapter.kt
@@ -34,15 +34,15 @@ class BadgeLayoutSyncAdapter(
 
     override fun getJSON(obj: BadgeLayout): JSONObject = JSONObject(obj.json_data!!)
 
-    override fun queryKnownIDs(): MutableSet<Long>? {
+    override fun queryKnownIDs(): MutableSet<Long> {
         val res = mutableSetOf<Long>()
-        db.badgeLayoutQueries.selectServerIdsByEventSlug(event_slug = eventSlug).execute { cursor ->
+        db.badgeLayoutQueries.selectServerIdsByEventSlug(eventSlug).execute { cursor ->
             while (cursor.next().value) {
-                val id =
-                    cursor.getLong(0) ?: throw RuntimeException("server_id column not available")
+                val id = cursor.getLong(0)
+                    ?: throw RuntimeException("server_id column not available")
+
                 res.add(id)
             }
-
             QueryResult.Unit
         }
 
diff --git a/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/BlockedTicketSecretSyncAdapter.kt b/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/BlockedTicketSecretSyncAdapter.kt
@@ -42,7 +42,7 @@ class BlockedTicketSecretSyncAdapter(
 
     override fun getJSON(obj: BlockedTicketSecret): JSONObject = JSONObject(obj.json_data!!)
 
-    override fun queryKnownIDs(): MutableSet<Long>? {
+    override fun queryKnownIDs(): MutableSet<Long> {
         val res = mutableSetOf<Long>()
         db.blockedTicketSecretQueries.selectServerIdsByEventSlug(eventSlug).execute { cursor ->
             while (cursor.next().value) {
diff --git a/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/CashierSyncAdapter.kt b/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/CashierSyncAdapter.kt
@@ -36,7 +36,9 @@ class CashierSyncAdapter(
         val res = mutableSetOf<Long>()
         db.cashierQueries.selectServerIds().execute { cursor ->
             while (cursor.next().value) {
-                val id = cursor.getLong(0) ?: throw RuntimeException("id column not available")
+                val id = cursor.getLong(0)
+                    ?: throw RuntimeException("server_id column not available")
+
                 res.add(id)
             }
             QueryResult.Unit
diff --git a/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/CheckInListSyncAdapter.kt b/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/CheckInListSyncAdapter.kt
@@ -52,14 +52,15 @@ class CheckInListSyncAdapter(
 
     override fun getJSON(obj: CheckInList): JSONObject = JSONObject(obj.json_data!!)
 
-    override fun queryKnownIDs(): MutableSet<Long>? {
+    override fun queryKnownIDs(): MutableSet<Long> {
         val res = mutableSetOf<Long>()
-        db.checkInListQueries.selectServerIdsByEventSlug(event_slug = eventSlug).execute { cursor ->
+        db.checkInListQueries.selectServerIdsByEventSlug(eventSlug).execute { cursor ->
             while (cursor.next().value) {
-                val id = cursor.getLong(0) ?: throw RuntimeException("id column not available")
+                val id = cursor.getLong(0)
+                    ?: throw RuntimeException("server_id column not available")
+
                 res.add(id)
             }
-
             QueryResult.Unit
         }
 
diff --git a/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/ItemCategorySyncAdapter.kt b/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/ItemCategorySyncAdapter.kt
@@ -32,15 +32,16 @@ class ItemCategorySyncAdapter(
 
     override fun getJSON(obj: ItemCategory): JSONObject = JSONObject(obj.json_data)
 
-    override fun queryKnownIDs(): MutableSet<Long>? {
+    override fun queryKnownIDs(): MutableSet<Long> {
         val res = mutableSetOf<Long>()
-        db.itemCategoryQueries.selectServerIdsByEventSlug(event_slug = eventSlug)
+        db.itemCategoryQueries.selectServerIdsByEventSlug(eventSlug)
             .execute { cursor ->
                 while (cursor.next().value) {
-                    val id = cursor.getLong(0) ?: throw RuntimeException("id column not available")
+                    val id = cursor.getLong(0)
+                        ?: throw RuntimeException("server_id column not available")
+
                     res.add(id)
                 }
-
                 QueryResult.Unit
             }
 
diff --git a/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/ItemSyncAdapter.kt b/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/ItemSyncAdapter.kt
@@ -41,12 +41,13 @@ class ItemSyncAdapter(
 
     override fun queryKnownIDs(): MutableSet<Long> {
         val res = mutableSetOf<Long>()
-        db.itemQueries.selectServerIdsByEventSlug(event_slug = eventSlug).execute { cursor ->
+        db.itemQueries.selectServerIdsByEventSlug(eventSlug).execute { cursor ->
             while (cursor.next().value) {
-                val id = cursor.getLong(0) ?: throw RuntimeException("id column not available")
+                val id = cursor.getLong(0)
+                    ?: throw RuntimeException("server_id column not available")
+
                 res.add(id)
             }
-
             QueryResult.Unit
         }
 
diff --git a/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/MediumKeySetSyncAdapter.kt b/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/MediumKeySetSyncAdapter.kt
@@ -40,15 +40,15 @@ class MediumKeySetSyncAdapter(
 
     override fun getJSON(obj: MediumKeySet): JSONObject = JSONObject(obj.json_data!!)
 
-    override fun queryKnownIDs(): MutableSet<Long>? {
+    override fun queryKnownIDs(): MutableSet<Long> {
         val res = mutableSetOf<Long>()
         db.mediumKeySetQueries.selectPublicIds().execute { cursor ->
             while (cursor.next().value) {
-                val id =
-                    cursor.getLong(0) ?: throw RuntimeException("public_id column not available")
+                val id = cursor.getLong(0)
+                    ?: throw RuntimeException("public_id column not available")
+
                 res.add(id)
             }
-
             QueryResult.Unit
         }
 
diff --git a/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/OrderSyncAdapter.kt b/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/OrderSyncAdapter.kt
@@ -469,19 +469,7 @@ class OrderSyncAdapter(
         return itemCache[id]
     }
 
-    override fun queryKnownIDs(): MutableSet<String> {
-        val res = mutableSetOf<String>()
-        db.orderQueries.selectCodesByEventSlug(event_slug = eventSlug).execute { cursor ->
-            while (cursor.next().value) {
-                val id = cursor.getString(0) ?: throw RuntimeException("id column not available")
-                res.add(id)
-            }
-
-            QueryResult.Unit
-        }
-
-        return res
-    }
+    override fun queryKnownIDs(): MutableSet<String>? = null
 
     override fun queryKnownObjects(ids: Set<String>): MutableMap<String, Order> {
         checkinCache.clear()
diff --git a/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/QuestionSyncAdapter.kt b/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/QuestionSyncAdapter.kt
@@ -35,14 +35,15 @@ class QuestionSyncAdapter(
 
     override fun getJSON(obj: Question): JSONObject = JSONObject(obj.json_data!!)
 
-    override fun queryKnownIDs(): MutableSet<Long>? {
+    override fun queryKnownIDs(): MutableSet<Long> {
         val res = mutableSetOf<Long>()
-        db.questionQueries.selectServerIdsByEventSlug(event_slug = eventSlug).execute { cursor ->
+        db.questionQueries.selectServerIdsByEventSlug(eventSlug).execute { cursor ->
             while (cursor.next().value) {
-                val id = cursor.getLong(0) ?: throw RuntimeException("id column not available")
+                val id = cursor.getLong(0)
+                    ?: throw RuntimeException("server_id column not available")
+
                 res.add(id)
             }
-
             QueryResult.Unit
         }
 
diff --git a/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/QuotaSyncAdapter.kt b/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/QuotaSyncAdapter.kt
@@ -41,7 +41,7 @@ class QuotaSyncAdapter(
 
     override fun getJSON(obj: Quota): JSONObject = JSONObject(obj.json_data!!)
 
-    override fun queryKnownIDs(): MutableSet<Long>? {
+    override fun queryKnownIDs(): MutableSet<Long> {
         val res = mutableSetOf<Long>()
 
         if (subeventId != null && subeventId > 0L) {
@@ -50,23 +50,21 @@ class QuotaSyncAdapter(
                 subevent_id = subeventId,
             ).execute { cursor ->
                 while (cursor.next().value) {
-                    val id =
-                        cursor.getLong(0)
-                            ?: throw RuntimeException("server_id column not available")
+                    val id = cursor.getLong(0)
+                        ?: throw RuntimeException("server_id column not available")
+
                     res.add(id)
                 }
-
                 QueryResult.Unit
             }
         } else {
             db.quotaQueries.selectServerIdsByEventSlug(eventSlug).execute { cursor ->
                 while (cursor.next().value) {
-                    val id =
-                        cursor.getLong(0)
-                            ?: throw RuntimeException("server_id column not available")
+                    val id = cursor.getLong(0)
+                        ?: throw RuntimeException("server_id column not available")
+
                     res.add(id)
                 }
-
                 QueryResult.Unit
             }
         }
diff --git a/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/ReusableMediaSyncAdapter.kt b/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/ReusableMediaSyncAdapter.kt
@@ -46,15 +46,15 @@ class ReusableMediaSyncAdapter(
 
     override fun getJSON(obj: ReusableMedium): JSONObject = JSONObject(obj.json_data!!)
 
-    override fun queryKnownIDs(): MutableSet<Long>? {
+    override fun queryKnownIDs(): MutableSet<Long> {
         val res = mutableSetOf<Long>()
         db.reusableMediumQueries.selectServerIds().execute { cursor ->
             while (cursor.next().value) {
-                val id =
-                    cursor.getLong(0) ?: throw RuntimeException("server_id column not available")
+                val id = cursor.getLong(0)
+                    ?: throw RuntimeException("server_id column not available")
+
                 res.add(id)
             }
-
             QueryResult.Unit
         }
 
diff --git a/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/RevokedTicketSecretSyncAdapter.kt b/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/RevokedTicketSecretSyncAdapter.kt
@@ -44,15 +44,15 @@ class RevokedTicketSecretSyncAdapter(
 
     override fun getJSON(obj: RevokedTicketSecret): JSONObject = JSONObject(obj.json_data!!)
 
-    override fun queryKnownIDs(): MutableSet<Long>? {
+    override fun queryKnownIDs(): MutableSet<Long> {
         val res = mutableSetOf<Long>()
         db.revokedTicketSecretQueries.selectServerIdsByEventSlug(eventSlug).execute { cursor ->
             while (cursor.next().value) {
-                val id =
-                    cursor.getLong(0) ?: throw RuntimeException("server_id column not available")
+                val id = cursor.getLong(0)
+                    ?: throw RuntimeException("server_id column not available")
+
                 res.add(id)
             }
-
             QueryResult.Unit
         }
 
diff --git a/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/TaxRuleSyncAdapter.kt b/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/TaxRuleSyncAdapter.kt
@@ -32,11 +32,13 @@ class TaxRuleSyncAdapter(
 
     override fun getJSON(obj: TaxRule): JSONObject = JSONObject(obj.json_data!!)
 
-    override fun queryKnownIDs(): MutableSet<Long>? {
+    override fun queryKnownIDs(): MutableSet<Long> {
         val res = mutableSetOf<Long>()
         db.taxRuleQueries.selectServerIdsByEventSlug(eventSlug).execute { cursor ->
             while (cursor.next().value) {
-                val id = cursor.getLong(0) ?: throw RuntimeException("id column not available")
+                val id = cursor.getLong(0)
+                    ?: throw RuntimeException("server_id column not available")
+
                 res.add(id)
             }
             QueryResult.Unit
diff --git a/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/TicketLayoutSyncAdapter.kt b/libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/TicketLayoutSyncAdapter.kt
@@ -36,15 +36,15 @@ class TicketLayoutSyncAdapter(
 
     override fun getId(obj: TicketLayout): Long = obj.server_id!!
 
-    override fun queryKnownIDs(): MutableSet<Long>? {
+    override fun queryKnownIDs(): MutableSet<Long> {
         val res = mutableSetOf<Long>()
         db.ticketLayoutQueries.selectServerIdsByEventSlug(eventSlug).execute { cursor ->
             while (cursor.next().value) {
-                val id =
-                    cursor.getLong(0) ?: throw RuntimeException("server_id column not available")
+                val id = cursor.getLong(0)
+                    ?: throw RuntimeException("server_id column not available")
+
                 res.add(id)
             }
-
             QueryResult.Unit
         }
 
diff --git a/libpretixsync/src/main/sqldelight/common/eu/pretix/libpretixsync/sqldelight/Order.sq b/libpretixsync/src/main/sqldelight/common/eu/pretix/libpretixsync/sqldelight/Order.sq
@@ -13,11 +13,6 @@ SELECT *
 FROM orders
 WHERE code IN ?;
 
-selectCodesByEventSlug:
-SELECT code
-FROM orders
-WHERE event_slug = ?;
-
 countForEventSlug:
 SELECT COUNT(*)
 FROM orders
