Skip to content

Commit 58026f1

Browse files
antwebantweb
committed
Tidy up queryKnownIDs
1 parent 0035afa commit 58026f1

18 files changed

+68
-79
lines changed

‎libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/AllEventsSyncAdapter.kt

+4-3
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,15 @@ class AllEventsSyncAdapter(
3535

3636
override fun getJSON(obj: Event): JSONObject = JSONObject(obj.json_data!!)
3737

38-
override fun queryKnownIDs(): MutableSet<String>? {
38+
override fun queryKnownIDs(): MutableSet<String> {
3939
val res = mutableSetOf<String>()
4040
db.eventQueries.selectSlugs().execute { cursor ->
4141
while (cursor.next().value) {
42-
val id = cursor.getString(0) ?: throw RuntimeException("slug column not available")
42+
val id = cursor.getString(0)
43+
?: throw RuntimeException("slug column not available")
44+
4345
res.add(id)
4446
}
45-
4647
QueryResult.Unit
4748
}
4849

‎libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/AllSubEventsSyncAdapter.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ class AllSubEventsSyncAdapter(
4545

4646
override fun getJSON(obj: SubEvent): JSONObject = JSONObject(obj.json_data!!)
4747

48-
override fun queryKnownIDs(): MutableSet<Long>? {
48+
override fun queryKnownIDs(): MutableSet<Long> {
4949
val res = mutableSetOf<Long>()
5050
db.subEventQueries.selectServerIds().execute { cursor ->
5151
while (cursor.next().value) {
52-
val id =
53-
cursor.getLong(0) ?: throw RuntimeException("server_id column not available")
52+
val id = cursor.getLong(0)
53+
?: throw RuntimeException("server_id column not available")
54+
5455
res.add(id)
5556
}
56-
5757
QueryResult.Unit
5858
}
5959

‎libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/BadgeLayoutItemSyncAdapter.kt

+4-5
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,16 @@ class BadgeLayoutItemSyncAdapter(
3636

3737
override fun getJSON(obj: BadgeLayoutItem): JSONObject = JSONObject(obj.json_data!!)
3838

39-
override fun queryKnownIDs(): MutableSet<Long>? {
39+
override fun queryKnownIDs(): MutableSet<Long> {
4040
val res = mutableSetOf<Long>()
4141
db.badgeLayoutItemQueries.selectServerIdsByEventSlug(event_slug = eventSlug)
4242
.execute { cursor ->
4343
while (cursor.next().value) {
44-
val id =
45-
cursor.getLong(0)
46-
?: throw RuntimeException("server_id column not available")
44+
val id = cursor.getLong(0)
45+
?: throw RuntimeException("server_id column not available")
46+
4747
res.add(id)
4848
}
49-
5049
QueryResult.Unit
5150
}
5251

‎libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/BadgeLayoutSyncAdapter.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ class BadgeLayoutSyncAdapter(
3434

3535
override fun getJSON(obj: BadgeLayout): JSONObject = JSONObject(obj.json_data!!)
3636

37-
override fun queryKnownIDs(): MutableSet<Long>? {
37+
override fun queryKnownIDs(): MutableSet<Long> {
3838
val res = mutableSetOf<Long>()
39-
db.badgeLayoutQueries.selectServerIdsByEventSlug(event_slug = eventSlug).execute { cursor ->
39+
db.badgeLayoutQueries.selectServerIdsByEventSlug(eventSlug).execute { cursor ->
4040
while (cursor.next().value) {
41-
val id =
42-
cursor.getLong(0) ?: throw RuntimeException("server_id column not available")
41+
val id = cursor.getLong(0)
42+
?: throw RuntimeException("server_id column not available")
43+
4344
res.add(id)
4445
}
45-
4646
QueryResult.Unit
4747
}
4848

‎libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/BlockedTicketSecretSyncAdapter.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class BlockedTicketSecretSyncAdapter(
4242

4343
override fun getJSON(obj: BlockedTicketSecret): JSONObject = JSONObject(obj.json_data!!)
4444

45-
override fun queryKnownIDs(): MutableSet<Long>? {
45+
override fun queryKnownIDs(): MutableSet<Long> {
4646
val res = mutableSetOf<Long>()
4747
db.blockedTicketSecretQueries.selectServerIdsByEventSlug(eventSlug).execute { cursor ->
4848
while (cursor.next().value) {

‎libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/CashierSyncAdapter.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ class CashierSyncAdapter(
3636
val res = mutableSetOf<Long>()
3737
db.cashierQueries.selectServerIds().execute { cursor ->
3838
while (cursor.next().value) {
39-
val id = cursor.getLong(0) ?: throw RuntimeException("id column not available")
39+
val id = cursor.getLong(0)
40+
?: throw RuntimeException("server_id column not available")
41+
4042
res.add(id)
4143
}
4244
QueryResult.Unit

‎libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/CheckInListSyncAdapter.kt

+5-4
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,15 @@ class CheckInListSyncAdapter(
5252

5353
override fun getJSON(obj: CheckInList): JSONObject = JSONObject(obj.json_data!!)
5454

55-
override fun queryKnownIDs(): MutableSet<Long>? {
55+
override fun queryKnownIDs(): MutableSet<Long> {
5656
val res = mutableSetOf<Long>()
57-
db.checkInListQueries.selectServerIdsByEventSlug(event_slug = eventSlug).execute { cursor ->
57+
db.checkInListQueries.selectServerIdsByEventSlug(eventSlug).execute { cursor ->
5858
while (cursor.next().value) {
59-
val id = cursor.getLong(0) ?: throw RuntimeException("id column not available")
59+
val id = cursor.getLong(0)
60+
?: throw RuntimeException("server_id column not available")
61+
6062
res.add(id)
6163
}
62-
6364
QueryResult.Unit
6465
}
6566

‎libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/ItemCategorySyncAdapter.kt

+5-4
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,16 @@ class ItemCategorySyncAdapter(
3232

3333
override fun getJSON(obj: ItemCategory): JSONObject = JSONObject(obj.json_data)
3434

35-
override fun queryKnownIDs(): MutableSet<Long>? {
35+
override fun queryKnownIDs(): MutableSet<Long> {
3636
val res = mutableSetOf<Long>()
37-
db.itemCategoryQueries.selectServerIdsByEventSlug(event_slug = eventSlug)
37+
db.itemCategoryQueries.selectServerIdsByEventSlug(eventSlug)
3838
.execute { cursor ->
3939
while (cursor.next().value) {
40-
val id = cursor.getLong(0) ?: throw RuntimeException("id column not available")
40+
val id = cursor.getLong(0)
41+
?: throw RuntimeException("server_id column not available")
42+
4143
res.add(id)
4244
}
43-
4445
QueryResult.Unit
4546
}
4647

‎libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/ItemSyncAdapter.kt

+4-3
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,13 @@ class ItemSyncAdapter(
4141

4242
override fun queryKnownIDs(): MutableSet<Long> {
4343
val res = mutableSetOf<Long>()
44-
db.itemQueries.selectServerIdsByEventSlug(event_slug = eventSlug).execute { cursor ->
44+
db.itemQueries.selectServerIdsByEventSlug(eventSlug).execute { cursor ->
4545
while (cursor.next().value) {
46-
val id = cursor.getLong(0) ?: throw RuntimeException("id column not available")
46+
val id = cursor.getLong(0)
47+
?: throw RuntimeException("server_id column not available")
48+
4749
res.add(id)
4850
}
49-
5051
QueryResult.Unit
5152
}
5253

‎libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/MediumKeySetSyncAdapter.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ class MediumKeySetSyncAdapter(
4040

4141
override fun getJSON(obj: MediumKeySet): JSONObject = JSONObject(obj.json_data!!)
4242

43-
override fun queryKnownIDs(): MutableSet<Long>? {
43+
override fun queryKnownIDs(): MutableSet<Long> {
4444
val res = mutableSetOf<Long>()
4545
db.mediumKeySetQueries.selectPublicIds().execute { cursor ->
4646
while (cursor.next().value) {
47-
val id =
48-
cursor.getLong(0) ?: throw RuntimeException("public_id column not available")
47+
val id = cursor.getLong(0)
48+
?: throw RuntimeException("public_id column not available")
49+
4950
res.add(id)
5051
}
51-
5252
QueryResult.Unit
5353
}
5454

‎libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/OrderSyncAdapter.kt

+1-13
Original file line numberDiff line numberDiff line change
@@ -469,19 +469,7 @@ class OrderSyncAdapter(
469469
return itemCache[id]
470470
}
471471

472-
override fun queryKnownIDs(): MutableSet<String> {
473-
val res = mutableSetOf<String>()
474-
db.orderQueries.selectCodesByEventSlug(event_slug = eventSlug).execute { cursor ->
475-
while (cursor.next().value) {
476-
val id = cursor.getString(0) ?: throw RuntimeException("id column not available")
477-
res.add(id)
478-
}
479-
480-
QueryResult.Unit
481-
}
482-
483-
return res
484-
}
472+
override fun queryKnownIDs(): MutableSet<String>? = null
485473

486474
override fun queryKnownObjects(ids: Set<String>): MutableMap<String, Order> {
487475
checkinCache.clear()

‎libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/QuestionSyncAdapter.kt

+5-4
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,15 @@ class QuestionSyncAdapter(
3535

3636
override fun getJSON(obj: Question): JSONObject = JSONObject(obj.json_data!!)
3737

38-
override fun queryKnownIDs(): MutableSet<Long>? {
38+
override fun queryKnownIDs(): MutableSet<Long> {
3939
val res = mutableSetOf<Long>()
40-
db.questionQueries.selectServerIdsByEventSlug(event_slug = eventSlug).execute { cursor ->
40+
db.questionQueries.selectServerIdsByEventSlug(eventSlug).execute { cursor ->
4141
while (cursor.next().value) {
42-
val id = cursor.getLong(0) ?: throw RuntimeException("id column not available")
42+
val id = cursor.getLong(0)
43+
?: throw RuntimeException("server_id column not available")
44+
4345
res.add(id)
4446
}
45-
4647
QueryResult.Unit
4748
}
4849

‎libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/QuotaSyncAdapter.kt

+7-9
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class QuotaSyncAdapter(
4141

4242
override fun getJSON(obj: Quota): JSONObject = JSONObject(obj.json_data!!)
4343

44-
override fun queryKnownIDs(): MutableSet<Long>? {
44+
override fun queryKnownIDs(): MutableSet<Long> {
4545
val res = mutableSetOf<Long>()
4646

4747
if (subeventId != null && subeventId > 0L) {
@@ -50,23 +50,21 @@ class QuotaSyncAdapter(
5050
subevent_id = subeventId,
5151
).execute { cursor ->
5252
while (cursor.next().value) {
53-
val id =
54-
cursor.getLong(0)
55-
?: throw RuntimeException("server_id column not available")
53+
val id = cursor.getLong(0)
54+
?: throw RuntimeException("server_id column not available")
55+
5656
res.add(id)
5757
}
58-
5958
QueryResult.Unit
6059
}
6160
} else {
6261
db.quotaQueries.selectServerIdsByEventSlug(eventSlug).execute { cursor ->
6362
while (cursor.next().value) {
64-
val id =
65-
cursor.getLong(0)
66-
?: throw RuntimeException("server_id column not available")
63+
val id = cursor.getLong(0)
64+
?: throw RuntimeException("server_id column not available")
65+
6766
res.add(id)
6867
}
69-
7068
QueryResult.Unit
7169
}
7270
}

‎libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/ReusableMediaSyncAdapter.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ class ReusableMediaSyncAdapter(
4646

4747
override fun getJSON(obj: ReusableMedium): JSONObject = JSONObject(obj.json_data!!)
4848

49-
override fun queryKnownIDs(): MutableSet<Long>? {
49+
override fun queryKnownIDs(): MutableSet<Long> {
5050
val res = mutableSetOf<Long>()
5151
db.reusableMediumQueries.selectServerIds().execute { cursor ->
5252
while (cursor.next().value) {
53-
val id =
54-
cursor.getLong(0) ?: throw RuntimeException("server_id column not available")
53+
val id = cursor.getLong(0)
54+
?: throw RuntimeException("server_id column not available")
55+
5556
res.add(id)
5657
}
57-
5858
QueryResult.Unit
5959
}
6060

‎libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/RevokedTicketSecretSyncAdapter.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ class RevokedTicketSecretSyncAdapter(
4444

4545
override fun getJSON(obj: RevokedTicketSecret): JSONObject = JSONObject(obj.json_data!!)
4646

47-
override fun queryKnownIDs(): MutableSet<Long>? {
47+
override fun queryKnownIDs(): MutableSet<Long> {
4848
val res = mutableSetOf<Long>()
4949
db.revokedTicketSecretQueries.selectServerIdsByEventSlug(eventSlug).execute { cursor ->
5050
while (cursor.next().value) {
51-
val id =
52-
cursor.getLong(0) ?: throw RuntimeException("server_id column not available")
51+
val id = cursor.getLong(0)
52+
?: throw RuntimeException("server_id column not available")
53+
5354
res.add(id)
5455
}
55-
5656
QueryResult.Unit
5757
}
5858

‎libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/TaxRuleSyncAdapter.kt

+4-2
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,13 @@ class TaxRuleSyncAdapter(
3232

3333
override fun getJSON(obj: TaxRule): JSONObject = JSONObject(obj.json_data!!)
3434

35-
override fun queryKnownIDs(): MutableSet<Long>? {
35+
override fun queryKnownIDs(): MutableSet<Long> {
3636
val res = mutableSetOf<Long>()
3737
db.taxRuleQueries.selectServerIdsByEventSlug(eventSlug).execute { cursor ->
3838
while (cursor.next().value) {
39-
val id = cursor.getLong(0) ?: throw RuntimeException("id column not available")
39+
val id = cursor.getLong(0)
40+
?: throw RuntimeException("server_id column not available")
41+
4042
res.add(id)
4143
}
4244
QueryResult.Unit

‎libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/TicketLayoutSyncAdapter.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ class TicketLayoutSyncAdapter(
3636

3737
override fun getId(obj: TicketLayout): Long = obj.server_id!!
3838

39-
override fun queryKnownIDs(): MutableSet<Long>? {
39+
override fun queryKnownIDs(): MutableSet<Long> {
4040
val res = mutableSetOf<Long>()
4141
db.ticketLayoutQueries.selectServerIdsByEventSlug(eventSlug).execute { cursor ->
4242
while (cursor.next().value) {
43-
val id =
44-
cursor.getLong(0) ?: throw RuntimeException("server_id column not available")
43+
val id = cursor.getLong(0)
44+
?: throw RuntimeException("server_id column not available")
45+
4546
res.add(id)
4647
}
47-
4848
QueryResult.Unit
4949
}
5050

‎libpretixsync/src/main/sqldelight/common/eu/pretix/libpretixsync/sqldelight/Order.sq

-5
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ SELECT *
1313
FROM orders
1414
WHERE code IN ?;
1515

16-
selectCodesByEventSlug:
17-
SELECT code
18-
FROM orders
19-
WHERE event_slug = ?;
20-
2116
countForEventSlug:
2217
SELECT COUNT(*)
2318
FROM orders

0 commit comments

Comments
 (0)