Improve boolean hasSynced. Make tests more stable.

Author: stevensJourney

core/src/commonIntegrationTest/kotlin/com/powersync/AttachmentsTest.kt

@@ -275,14 +275,12 @@ class AttachmentsTest {
                          """,
                 )
 
-                var nextRecord: Attachment? = attachmentQuery.awaitItem().first()
-                if (nextRecord?.state == AttachmentState.ARCHIVED) {
-                    nextRecord = attachmentQuery.awaitItem().getOrNull(0)
+                waitFor {
+                    var nextRecord: Attachment? = attachmentQuery.awaitItem().firstOrNull()
+                    // The record should have been deleted
+                    nextRecord shouldBe null
                 }
 
-                // The record should have been deleted
-                nextRecord shouldBe null
-
                 // The file should have been deleted from storage
                 queue.localStorage.fileExists(localUri) shouldBe false
 
@@ -522,7 +520,6 @@ class AttachmentsTest {
                         remoteStorage = remote,
                         attachmentsDirectory = getAttachmentsDir(),
                         watchAttachments = { watchAttachments(database) },
-                        archivedCacheLimit = 0,
                         errorHandler =
                             object : SyncErrorHandler {
                                 override suspend fun onDownloadError(

core/src/commonMain/kotlin/com/powersync/attachments/Attachment.kt

@@ -72,7 +72,7 @@ public data class Attachment(
     val localUri: String? = null,
     val mediaType: String? = null,
     val size: Long? = null,
-    val hasSynced: Int = 0,
+    val hasSynced: Boolean = false,
     val metaData: String? = null,
 ) {
     public companion object {
@@ -91,7 +91,7 @@ public data class Attachment(
                 mediaType = cursor.getStringOptional(name = "media_type"),
                 size = cursor.getLongOptional("size"),
                 state = AttachmentState.fromLong(cursor.getLong("state")),
-                hasSynced = cursor.getLong("has_synced").toInt(),
+                hasSynced = cursor.getLong("has_synced").toInt() > 0,
                 metaData = cursor.getStringOptional("meta_data"),
             )
     }

core/src/commonMain/kotlin/com/powersync/attachments/AttachmentQueue.kt

@@ -363,7 +363,7 @@ public open class AttachmentQueue(
                         (existingQueueItem.state == AttachmentState.ARCHIVED) {
                         // The attachment is present again. Need to queue it for sync.
                         // We might be able to optimize this in future.
-                        if (existingQueueItem.hasSynced == 1) {
+                        if (existingQueueItem.hasSynced) {
                             // No remote action required, we can restore the record (avoids deletion).
                             attachmentUpdates.add(
                                 existingQueueItem.copy(state = AttachmentState.SYNCED),
@@ -389,13 +389,25 @@ public open class AttachmentQueue(
                 }
 
                 /**
-                 * Archive any items not specified in the watched items except for items pending delete.
+                 * Archive any items not specified in the watched items.
+                 * For QUEUED_DELETE or QUEUED_UPLOAD states, archive only if hasSynced is true.
+                 * For other states, archive if the record is not found in the items.
                  */
                 currentAttachments
-                    .filter {
-                        it.state != AttachmentState.QUEUED_DELETE &&
-                            it.state != AttachmentState.QUEUED_UPLOAD &&
-                            null == items.find { update -> update.id == it.id }
+                    .filter { attachment ->
+                        val notInWatchedItems =
+                            items.find { update -> update.id == attachment.id } == null
+                        if (notInWatchedItems) {
+                            when (attachment.state) {
+                                // Archive these record if they have synced
+                                AttachmentState.QUEUED_DELETE, AttachmentState.QUEUED_UPLOAD -> attachment.hasSynced
+                                // Other states, such as QUEUED_DOWNLOAD can be archived if they are not present in watched items
+                                else -> true
+                            }
+                        } else {
+                            // The record is present in watched items, no need to archive it
+                            false
+                        }
                     }.forEach {
                         attachmentUpdates.add(it.copy(state = AttachmentState.ARCHIVED))
                     }
@@ -484,7 +496,10 @@ public open class AttachmentQueue(
                 db.writeTransaction { tx ->
                     updateHook.invoke(tx, attachment)
                     return@writeTransaction attachmentContext.upsertAttachment(
-                        attachment.copy(state = AttachmentState.QUEUED_DELETE),
+                        attachment.copy(
+                            state = AttachmentState.QUEUED_DELETE,
+                            hasSynced = false,
+                        ),
                         tx,
                     )
                 }

core/src/commonMain/kotlin/com/powersync/attachments/implementation/AttachmentContextImpl.kt

@@ -191,7 +191,7 @@ public open class AttachmentContextImpl(
                 updatedRecord.mediaType,
                 updatedRecord.size,
                 updatedRecord.state.ordinal,
-                updatedRecord.hasSynced,
+                if (updatedRecord.hasSynced) 1 else 0,
                 updatedRecord.metaData,
             ),
         )

core/src/commonMain/kotlin/com/powersync/attachments/sync/SyncingService.kt

@@ -208,7 +208,7 @@ public open class SyncingService(
                 attachment,
             )
             logger.i("Uploaded attachment \"${attachment.id}\" to Cloud Storage")
-            return attachment.copy(state = AttachmentState.SYNCED, hasSynced = 1)
+            return attachment.copy(state = AttachmentState.SYNCED, hasSynced = true)
         } catch (e: Exception) {
             logger.e("Upload attachment error for attachment $attachment: ${e.message}")
             if (errorHandler != null) {
@@ -246,7 +246,7 @@ public open class SyncingService(
             return attachment.copy(
                 localUri = attachmentPath,
                 state = AttachmentState.SYNCED,
-                hasSynced = 1,
+                hasSynced = true,
             )
         } catch (e: Exception) {
             if (errorHandler != null) {