Skip to content

Commit f5eb16c

Browse files
antwebantweb
committed
Remove dataStore arg from check providers
1 parent bd4a1e1 commit f5eb16c

File tree

3 files changed

+23
-24
lines changed

3 files changed

+23
-24
lines changed

‎libpretixsync/src/main/java/eu/pretix/libpretixsync/check/AsyncCheckProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import java.time.Instant
4141
import java.time.OffsetDateTime
4242
import java.util.*
4343

44-
class AsyncCheckProvider(private val config: ConfigStore, private val dataStore: BlockingEntityStore<Persistable>, private val db: SyncDatabase) : TicketCheckProvider {
44+
class AsyncCheckProvider(private val config: ConfigStore, private val db: SyncDatabase) : TicketCheckProvider {
4545
private var sentry: SentryInterface = DummySentryImplementation()
4646

4747
/*

‎libpretixsync/src/main/java/eu/pretix/libpretixsync/check/OnlineCheckProvider.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import java.util.*
2626
class OnlineCheckProvider(
2727
private val config: ConfigStore,
2828
httpClientFactory: HttpClientFactory?,
29-
private val dataStore: BlockingEntityStore<Persistable>,
3029
private val db: SyncDatabase,
3130
private val fileStore: FileStorage,
3231
private val fallback: TicketCheckProvider? = null,

‎libpretixsync/src/test/java/eu/pretix/libpretixsync/check/AsyncCheckProviderTest.kt

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class AsyncCheckProviderTest : BaseDatabaseTest() {
3232
fun setUpFakes() {
3333
configStore = FakeConfigStore()
3434
fakeApi = FakePretixApi()
35-
p = AsyncCheckProvider(configStore!!, dataStore, db)
35+
p = AsyncCheckProvider(configStore!!, db)
3636

3737
EventSyncAdapter(db, "demo", "demo", fakeApi!!, "", null).standaloneRefreshFromJSON(jsonResource("events/event1.json"))
3838
EventSyncAdapter(db, "demo2", "demo2", fakeApi!!, "", null).standaloneRefreshFromJSON(jsonResource("events/event2.json"))
@@ -151,7 +151,7 @@ class AsyncCheckProviderTest : BaseDatabaseTest() {
151151

152152
@Test
153153
fun testSimpleValidUntil() {
154-
val p2 = AsyncCheckProvider(configStore!!, dataStore, db)
154+
val p2 = AsyncCheckProvider(configStore!!, db)
155155

156156
p2.setNow(ISODateTimeFormat.dateTime().parseDateTime("2023-03-04T00:00:01.000Z"))
157157
var r = p2.check(mapOf("demo" to 1L), "dz4OBvVsTDSJ6T1nY1dD")
@@ -164,7 +164,7 @@ class AsyncCheckProviderTest : BaseDatabaseTest() {
164164

165165
@Test
166166
fun testSimpleValidFrom() {
167-
val p2 = AsyncCheckProvider(configStore!!, dataStore, db)
167+
val p2 = AsyncCheckProvider(configStore!!, db)
168168

169169
p2.setNow(ISODateTimeFormat.dateTime().parseDateTime("2023-03-03T23:59:59.000Z"))
170170
var r = p2.check(mapOf("demo" to 1L), "uG3H4hgRYEIrw4YNclyH")
@@ -457,7 +457,7 @@ class AsyncCheckProviderTest : BaseDatabaseTest() {
457457

458458
@Test
459459
fun testRulesEntriesToday() {
460-
val p2 = AsyncCheckProvider(configStore!!, dataStore, db)
460+
val p2 = AsyncCheckProvider(configStore!!, db)
461461

462462
p2.setNow(ISODateTimeFormat.dateTime().parseDateTime("2020-01-01T10:00:00.000Z"))
463463
setRuleOnList2("{\"<\": [{\"var\": \"entries_today\"}, 3]}")
@@ -491,7 +491,7 @@ class AsyncCheckProviderTest : BaseDatabaseTest() {
491491

492492
@Test
493493
fun testRulesEntriesDays() {
494-
val p2 = AsyncCheckProvider(configStore!!, dataStore, db)
494+
val p2 = AsyncCheckProvider(configStore!!, db)
495495

496496
// Ticket is valid unlimited times, but only on two arbitrary days
497497
setRuleOnList2("{\"or\": [{\">\": [{\"var\": \"entries_today\"}, 0]}, {\"<\": [{\"var\": \"entries_days\"}, 2]}]}")
@@ -527,7 +527,7 @@ class AsyncCheckProviderTest : BaseDatabaseTest() {
527527

528528
@Test
529529
fun testRulesEntriesSince() {
530-
val p2 = AsyncCheckProvider(configStore!!, dataStore, db)
530+
val p2 = AsyncCheckProvider(configStore!!, db)
531531

532532
// Ticket is valid once before X and once after X
533533
setRuleOnList2("{\n" +
@@ -559,7 +559,7 @@ class AsyncCheckProviderTest : BaseDatabaseTest() {
559559

560560
@Test
561561
fun testRulesEntriesSinceTimeOfDay() {
562-
val p2 = AsyncCheckProvider(configStore!!, dataStore, db)
562+
val p2 = AsyncCheckProvider(configStore!!, db)
563563

564564
// Ticket is valid once before X and once after X
565565
setRuleOnList2("{\n" +
@@ -592,7 +592,7 @@ class AsyncCheckProviderTest : BaseDatabaseTest() {
592592

593593
@Test
594594
fun testRulesEntriesBefore() {
595-
val p2 = AsyncCheckProvider(configStore!!, dataStore, db)
595+
val p2 = AsyncCheckProvider(configStore!!, db)
596596

597597
// Ticket is valid after 23:00 only if people already showed up before
598598
setRuleOnList2("{\n" +
@@ -623,7 +623,7 @@ class AsyncCheckProviderTest : BaseDatabaseTest() {
623623

624624
@Test
625625
fun testRulesEntriesDaysSince() {
626-
val p2 = AsyncCheckProvider(configStore!!, dataStore, db)
626+
val p2 = AsyncCheckProvider(configStore!!, db)
627627

628628
// Ticket is valid once before X and on one day after X
629629
setRuleOnList2("{" +
@@ -663,7 +663,7 @@ class AsyncCheckProviderTest : BaseDatabaseTest() {
663663

664664
@Test
665665
fun testRulesEntriesDaysBefore() {
666-
val p2 = AsyncCheckProvider(configStore!!, dataStore, db)
666+
val p2 = AsyncCheckProvider(configStore!!, db)
667667

668668
// Ticket is valid after 23:00 only if people already showed up on two days before
669669
setRuleOnList2("{" +
@@ -699,7 +699,7 @@ class AsyncCheckProviderTest : BaseDatabaseTest() {
699699

700700
@Test
701701
fun testRulesMinutesSinceLastEntry() {
702-
val p2 = AsyncCheckProvider(configStore!!, dataStore, db)
702+
val p2 = AsyncCheckProvider(configStore!!, db)
703703
setRuleOnList2("{\"or\": [{\"<=\": [{\"var\": \"minutes_since_last_entry\"}, -1]}, {\">\": [{\"var\": \"minutes_since_last_entry\"}, 180]}]}")
704704

705705
p2.setNow(ISODateTimeFormat.dateTime().parseDateTime("2020-01-01T10:00:00.000Z"))
@@ -725,7 +725,7 @@ class AsyncCheckProviderTest : BaseDatabaseTest() {
725725

726726
@Test
727727
fun testRulesMinutesSinceFirstEntry() {
728-
val p2 = AsyncCheckProvider(configStore!!, dataStore, db)
728+
val p2 = AsyncCheckProvider(configStore!!, db)
729729
setRuleOnList2("{\"or\": [{\"<=\": [{\"var\": \"minutes_since_first_entry\"}, -1]}, {\"<\": [{\"var\": \"minutes_since_first_entry\"}, 180]}]}")
730730

731731
p2.setNow(ISODateTimeFormat.dateTime().parseDateTime("2020-01-01T10:00:00.000Z"))
@@ -743,7 +743,7 @@ class AsyncCheckProviderTest : BaseDatabaseTest() {
743743

744744
@Test
745745
fun testRulesIsAfterTolerance() {
746-
val p2 = AsyncCheckProvider(configStore!!, dataStore, db)
746+
val p2 = AsyncCheckProvider(configStore!!, db)
747747

748748
// Ticket is valid unlimited times, but only on two arbitrary days
749749
setRuleOnList2("{\"isAfter\": [{\"var\": \"now\"}, {\"buildTime\": [\"date_admission\"]}, 10]}")
@@ -763,7 +763,7 @@ class AsyncCheckProviderTest : BaseDatabaseTest() {
763763

764764
@Test
765765
fun testRulesIsAfterSubevent() {
766-
val p2 = AsyncCheckProvider(configStore!!, dataStore, db)
766+
val p2 = AsyncCheckProvider(configStore!!, db)
767767

768768
// Ticket is valid unlimited times, but only on two arbitrary days
769769
setRuleOnList2("{\"isAfter\": [{\"var\": \"now\"}, {\"buildTime\": [\"date_admission\"]}, 10]}")
@@ -783,7 +783,7 @@ class AsyncCheckProviderTest : BaseDatabaseTest() {
783783

784784
@Test
785785
fun testRulesIsAfterNoTolerance() {
786-
val p2 = AsyncCheckProvider(configStore!!, dataStore, db)
786+
val p2 = AsyncCheckProvider(configStore!!, db)
787787

788788
// Ticket is valid unlimited times, but only on two arbitrary days
789789
setRuleOnList2("{\"isAfter\": [{\"var\": \"now\"}, {\"buildTime\": [\"date_admission\"]}, null]}")
@@ -799,7 +799,7 @@ class AsyncCheckProviderTest : BaseDatabaseTest() {
799799

800800
@Test
801801
fun testRulesIsBeforeTolerance() {
802-
val p2 = AsyncCheckProvider(configStore!!, dataStore, db)
802+
val p2 = AsyncCheckProvider(configStore!!, db)
803803

804804
// Ticket is valid unlimited times, but only on two arbitrary days
805805
setRuleOnList2("{\"isBefore\": [{\"var\": \"now\"}, {\"buildTime\": [\"date_to\"]}, 10]}")
@@ -815,7 +815,7 @@ class AsyncCheckProviderTest : BaseDatabaseTest() {
815815

816816
@Test
817817
fun testRulesIsBeforeNoTolerance() {
818-
val p2 = AsyncCheckProvider(configStore!!, dataStore, db)
818+
val p2 = AsyncCheckProvider(configStore!!, db)
819819

820820
// Ticket is valid unlimited times, but only on two arbitrary days
821821
setRuleOnList2("{\"isBefore\": [{\"var\": \"now\"}, {\"buildTime\": [\"date_to\"]}]}")
@@ -831,7 +831,7 @@ class AsyncCheckProviderTest : BaseDatabaseTest() {
831831

832832
@Test
833833
fun testRulesIsAfterCustomDateTime() {
834-
val p2 = AsyncCheckProvider(configStore!!, dataStore, db)
834+
val p2 = AsyncCheckProvider(configStore!!, db)
835835

836836
// Ticket is valid unlimited times, but only on two arbitrary days
837837
setRuleOnList2("{\"isAfter\": [{\"var\": \"now\"}, {\"buildTime\": [\"custom\", \"2020-01-01T22:00:00.000Z\"]}]}")
@@ -847,7 +847,7 @@ class AsyncCheckProviderTest : BaseDatabaseTest() {
847847

848848
@Test
849849
fun testRulesIsAfterCustomTime() {
850-
val p2 = AsyncCheckProvider(configStore!!, dataStore, db)
850+
val p2 = AsyncCheckProvider(configStore!!, db)
851851

852852
// Ticket is valid unlimited times, but only on two arbitrary days
853853
setRuleOnList2("{\"isAfter\": [{\"var\": \"now\"}, {\"buildTime\": [\"customtime\", \"14:00\"]}]}")
@@ -863,7 +863,7 @@ class AsyncCheckProviderTest : BaseDatabaseTest() {
863863

864864
@Test
865865
fun testRulesCompareIsoweekday() {
866-
val p2 = AsyncCheckProvider(configStore!!, dataStore, db)
866+
val p2 = AsyncCheckProvider(configStore!!, db)
867867

868868
// Ticket is valid unlimited times, but only on two arbitrary days
869869
setRuleOnList2("{\">=\": [{\"var\": \"now_isoweekday\"}, 6]}")
@@ -1033,7 +1033,7 @@ class AsyncCheckProviderTest : BaseDatabaseTest() {
10331033

10341034
@Test
10351035
fun testSignedAndNotYetValid() {
1036-
val p2 = AsyncCheckProvider(configStore!!, dataStore, db)
1036+
val p2 = AsyncCheckProvider(configStore!!, db)
10371037
p2.setNow(ISODateTimeFormat.dateTime().parseDateTime("2023-02-03T22:59:59.000Z"))
10381038

10391039
val r = p2.check(mapOf("demo" to 1L), "Ok4EsqDRCr2cL6yDRtqeP7j5Usr1Vj1Db7J0izOuRGx6Qn0BS1ISW2nxlW8PXkYRk7PJhIBmsK1V1ucq5obBoBAMG4p9jCPKBAheRdFV0REVDZUCKAEAVAQA")
@@ -1048,7 +1048,7 @@ class AsyncCheckProviderTest : BaseDatabaseTest() {
10481048

10491049
@Test
10501050
fun testSignedAndNotLongerValid() {
1051-
val p2 = AsyncCheckProvider(configStore!!, dataStore, db)
1051+
val p2 = AsyncCheckProvider(configStore!!, db)
10521052
p2.setNow(ISODateTimeFormat.dateTime().parseDateTime("2023-02-03T11:01:01.000Z"))
10531053

10541054
val r = p2.check(mapOf("demo" to 1L), "EU9dJn3k5jzwfY4JQAKrTOVFmo+BvZKwH6UAIFOz3XTxABa7tmjU5UoLD8hJr3440uY7IFEHzau1DVk0sP994bgnzLNswAAKBARdUdGMmNVSHVUCKAEAVAQA")

0 commit comments

Comments
 (0)