Add remaining CachedPdfImage queries

Author: robbi5

libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/OrderCleanup.kt

@@ -2,7 +2,12 @@ package eu.pretix.libpretixsync.sync
 
 import eu.pretix.libpretixsync.api.ApiException
 import eu.pretix.libpretixsync.api.PretixApi
-import eu.pretix.libpretixsync.db.*
+import eu.pretix.libpretixsync.db.Event
+import eu.pretix.libpretixsync.db.Order
+import eu.pretix.libpretixsync.db.OrderPosition
+import eu.pretix.libpretixsync.db.ResourceSyncStatus
+import eu.pretix.libpretixsync.db.SubEvent
+import eu.pretix.libpretixsync.sqldelight.SyncDatabase
 import eu.pretix.libpretixsync.sync.SyncManager.ProgressFeedback
 import io.requery.BlockingEntityStore
 import io.requery.Persistable
@@ -13,7 +18,7 @@ import org.joda.time.Duration
 import org.json.JSONException
 import kotlin.math.max
 
-class OrderCleanup(val store: BlockingEntityStore<Persistable>, val fileStorage: FileStorage, val api: PretixApi, val syncCycleId: String, val feedback: ProgressFeedback?) {
+class OrderCleanup(val db: SyncDatabase, val store: BlockingEntityStore<Persistable>, val fileStorage: FileStorage, val api: PretixApi, val syncCycleId: String, val feedback: ProgressFeedback?) {
     private var subeventsDeletionDate: MutableMap<Long, Long?> = HashMap()
     private fun deletionTimeForSubevent(sid: Long, eventSlug: String): Long? {
         if (subeventsDeletionDate.containsKey(sid)) {
@@ -177,13 +182,11 @@ class OrderCleanup(val store: BlockingEntityStore<Persistable>, val fileStorage:
     }
 
     fun deleteOldPdfImages() {
-        store.delete(CachedPdfImage::class.java).where(
-                CachedPdfImage.ORDERPOSITION_ID.notIn(store.select(OrderPosition.SERVER_ID).from(OrderPosition::class.java))
-        )
+        db.cachedPdfImageQueries.deleteOld()
         for (filename in fileStorage.listFiles { _, s -> s.startsWith("pdfimage_") }) {
             val namebase = filename.split("\\.".toRegex()).toTypedArray()[0]
             val etag = namebase.split("_".toRegex()).toTypedArray()[1]
-            if (store.count(CachedPdfImage::class.java).where(CachedPdfImage.ETAG.eq(etag)).get().value() == 0) {
+            if (db.cachedPdfImageQueries.countEtag(etag).executeAsOne() == 0L) {
                 fileStorage.delete(filename)
             }
         }

libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/SyncManager.java

@@ -467,7 +467,7 @@ protected void downloadData(ProgressFeedback feedback, Boolean skip_orders, Stri
             }
 
             if (profile == Profile.PRETIXSCAN && !skip_orders && overrideEventSlug == null) {
-                OrderCleanup oc = new OrderCleanup(dataStore, fileStorage, api, configStore.getSyncCycleId(), feedback);
+                OrderCleanup oc = new OrderCleanup(db, dataStore, fileStorage, api, configStore.getSyncCycleId(), feedback);
                 if ((System.currentTimeMillis() - configStore.getLastCleanup()) > 3600 * 1000 * 12) {
                     for (String eventSlug : configStore.getSynchronizedEvents()) {
                         oc.deleteOldSubevents(eventSlug, overrideSubeventId > 0L ? overrideSubeventId : configStore.getSelectedSubeventForEvent(eventSlug));
@@ -482,7 +482,7 @@ protected void downloadData(ProgressFeedback feedback, Boolean skip_orders, Stri
                 dataStore.delete(Order.class).get().value();
                 dataStore.delete(ResourceSyncStatus.class).where(ResourceSyncStatus.RESOURCE.like("order%")).get().value();
                 if ((System.currentTimeMillis() - configStore.getLastCleanup()) > 3600 * 1000 * 12) {
-                    OrderCleanup oc = new OrderCleanup(dataStore, fileStorage, api, configStore.getSyncCycleId(), feedback);
+                    OrderCleanup oc = new OrderCleanup(db, dataStore, fileStorage, api, configStore.getSyncCycleId(), feedback);
                     oc.deleteOldPdfImages();
                     configStore.setLastCleanup(System.currentTimeMillis());
                 }

libpretixsync/src/main/sqldelight/common/eu/pretix/libpretixsync/sqldelight/CachedPdfImage.sq

@@ -33,3 +33,13 @@ DELETE FROM CachedPdfImage
 WHERE
     orderposition_id = :orderposition_id
     AND etag NOT IN :seen_etags;
+
+deleteOld:
+DELETE FROM CachedPdfImage
+WHERE
+    orderposition_id NOT IN (SELECT server_id FROM OrderPosition);
+
+countEtag:
+SELECT COUNT()
+FROM CachedPdfImage
+WHERE etag = ?;