V3 S1-S2 : corbeille + versions + extract générique
S1 filet (backend + mobile) : corbeille 30j (deleted_at réutilisé, trash/restore récursifs, purge auto serveur), versions N=3 à chaque overwrite, ops outbox trash/restore/purge (delete legacy mappé), Room v19 (trashed_at), Deleters -> trash, écran Corbeille, walk guards. S2 extract (backend) : package extract (règles FR stdlib, corpus testé), resource_facts 000019 (origin auto/user), hook worker OCR + backfill boot, GET /files/:id/facts (viewer+). Contrat docs/api-v1.md étendu, V3.md (vision + plan).
This commit is contained in:
@@ -0,0 +1,766 @@
|
||||
{
|
||||
"formatVersion": 1,
|
||||
"database": {
|
||||
"version": 19,
|
||||
"identityHash": "db3263dbb69c07a043d41f1c83a892a5",
|
||||
"entities": [
|
||||
{
|
||||
"tableName": "folders",
|
||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `resource_id` TEXT NOT NULL, `uri` TEXT, `name` TEXT NOT NULL, `exists` INTEGER, `parent_resource_id` TEXT, `owner_id` TEXT, `sync_status` TEXT NOT NULL, `created_in_app` INTEGER NOT NULL DEFAULT 0, `trashed_at` INTEGER, `added_at` INTEGER NOT NULL, `updated_at` INTEGER NOT NULL)",
|
||||
"fields": [
|
||||
{
|
||||
"fieldPath": "id",
|
||||
"columnName": "id",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "resourceId",
|
||||
"columnName": "resource_id",
|
||||
"affinity": "TEXT",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "uri",
|
||||
"columnName": "uri",
|
||||
"affinity": "TEXT",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "name",
|
||||
"columnName": "name",
|
||||
"affinity": "TEXT",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "exists",
|
||||
"columnName": "exists",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "parentResourceId",
|
||||
"columnName": "parent_resource_id",
|
||||
"affinity": "TEXT",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "ownerId",
|
||||
"columnName": "owner_id",
|
||||
"affinity": "TEXT",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "syncStatus",
|
||||
"columnName": "sync_status",
|
||||
"affinity": "TEXT",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "createdInApp",
|
||||
"columnName": "created_in_app",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true,
|
||||
"defaultValue": "0"
|
||||
},
|
||||
{
|
||||
"fieldPath": "trashedAt",
|
||||
"columnName": "trashed_at",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "addedAt",
|
||||
"columnName": "added_at",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "updatedAt",
|
||||
"columnName": "updated_at",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
}
|
||||
],
|
||||
"primaryKey": {
|
||||
"autoGenerate": true,
|
||||
"columnNames": [
|
||||
"id"
|
||||
]
|
||||
},
|
||||
"indices": [
|
||||
{
|
||||
"name": "index_folders_resource_id",
|
||||
"unique": true,
|
||||
"columnNames": [
|
||||
"resource_id"
|
||||
],
|
||||
"orders": [],
|
||||
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_folders_resource_id` ON `${TABLE_NAME}` (`resource_id`)"
|
||||
},
|
||||
{
|
||||
"name": "index_folders_uri",
|
||||
"unique": true,
|
||||
"columnNames": [
|
||||
"uri"
|
||||
],
|
||||
"orders": [],
|
||||
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_folders_uri` ON `${TABLE_NAME}` (`uri`)"
|
||||
},
|
||||
{
|
||||
"name": "index_folders_parent_resource_id",
|
||||
"unique": false,
|
||||
"columnNames": [
|
||||
"parent_resource_id"
|
||||
],
|
||||
"orders": [],
|
||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_folders_parent_resource_id` ON `${TABLE_NAME}` (`parent_resource_id`)"
|
||||
}
|
||||
],
|
||||
"foreignKeys": []
|
||||
},
|
||||
{
|
||||
"tableName": "user_preferences",
|
||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, `updated_at` INTEGER NOT NULL, PRIMARY KEY(`key`))",
|
||||
"fields": [
|
||||
{
|
||||
"fieldPath": "key",
|
||||
"columnName": "key",
|
||||
"affinity": "TEXT",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "value",
|
||||
"columnName": "value",
|
||||
"affinity": "TEXT",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "updatedAt",
|
||||
"columnName": "updated_at",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
}
|
||||
],
|
||||
"primaryKey": {
|
||||
"autoGenerate": false,
|
||||
"columnNames": [
|
||||
"key"
|
||||
]
|
||||
},
|
||||
"indices": [],
|
||||
"foreignKeys": []
|
||||
},
|
||||
{
|
||||
"tableName": "files",
|
||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `resource_id` TEXT NOT NULL, `uri` TEXT, `name` TEXT NOT NULL, `folder_resource_id` TEXT NOT NULL, `extension` TEXT, `size` INTEGER NOT NULL, `mime_type` TEXT, `exists` INTEGER, `last_modified` INTEGER, `owner_id` TEXT, `category` TEXT, `sync_status` TEXT NOT NULL, `content` TEXT, `processed` INTEGER NOT NULL, `ocr_text` TEXT, `ocr_attempts` INTEGER NOT NULL, `ocr_queued_at` INTEGER, `bytes_uploaded` INTEGER NOT NULL, `bytes_upload_attempts` INTEGER NOT NULL, `has_content_server` INTEGER NOT NULL, `wanted_offline` INTEGER NOT NULL, `trashed_at` INTEGER, `added_at` INTEGER NOT NULL, `updated_at` INTEGER NOT NULL)",
|
||||
"fields": [
|
||||
{
|
||||
"fieldPath": "id",
|
||||
"columnName": "id",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "resourceId",
|
||||
"columnName": "resource_id",
|
||||
"affinity": "TEXT",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "uri",
|
||||
"columnName": "uri",
|
||||
"affinity": "TEXT",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "name",
|
||||
"columnName": "name",
|
||||
"affinity": "TEXT",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "folderResourceId",
|
||||
"columnName": "folder_resource_id",
|
||||
"affinity": "TEXT",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "extension",
|
||||
"columnName": "extension",
|
||||
"affinity": "TEXT",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "size",
|
||||
"columnName": "size",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "mimeType",
|
||||
"columnName": "mime_type",
|
||||
"affinity": "TEXT",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "exists",
|
||||
"columnName": "exists",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "lastModified",
|
||||
"columnName": "last_modified",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "ownerId",
|
||||
"columnName": "owner_id",
|
||||
"affinity": "TEXT",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "category",
|
||||
"columnName": "category",
|
||||
"affinity": "TEXT",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "syncStatus",
|
||||
"columnName": "sync_status",
|
||||
"affinity": "TEXT",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "content",
|
||||
"columnName": "content",
|
||||
"affinity": "TEXT",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "processed",
|
||||
"columnName": "processed",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "ocrText",
|
||||
"columnName": "ocr_text",
|
||||
"affinity": "TEXT",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "ocrAttempts",
|
||||
"columnName": "ocr_attempts",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "ocrQueuedAt",
|
||||
"columnName": "ocr_queued_at",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "bytesUploaded",
|
||||
"columnName": "bytes_uploaded",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "bytesUploadAttempts",
|
||||
"columnName": "bytes_upload_attempts",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "hasContentServer",
|
||||
"columnName": "has_content_server",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "wantedOffline",
|
||||
"columnName": "wanted_offline",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "trashedAt",
|
||||
"columnName": "trashed_at",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "addedAt",
|
||||
"columnName": "added_at",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "updatedAt",
|
||||
"columnName": "updated_at",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
}
|
||||
],
|
||||
"primaryKey": {
|
||||
"autoGenerate": true,
|
||||
"columnNames": [
|
||||
"id"
|
||||
]
|
||||
},
|
||||
"indices": [
|
||||
{
|
||||
"name": "index_files_resource_id",
|
||||
"unique": true,
|
||||
"columnNames": [
|
||||
"resource_id"
|
||||
],
|
||||
"orders": [],
|
||||
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_files_resource_id` ON `${TABLE_NAME}` (`resource_id`)"
|
||||
},
|
||||
{
|
||||
"name": "index_files_uri",
|
||||
"unique": true,
|
||||
"columnNames": [
|
||||
"uri"
|
||||
],
|
||||
"orders": [],
|
||||
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_files_uri` ON `${TABLE_NAME}` (`uri`)"
|
||||
},
|
||||
{
|
||||
"name": "index_files_folder_resource_id",
|
||||
"unique": false,
|
||||
"columnNames": [
|
||||
"folder_resource_id"
|
||||
],
|
||||
"orders": [],
|
||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_files_folder_resource_id` ON `${TABLE_NAME}` (`folder_resource_id`)"
|
||||
},
|
||||
{
|
||||
"name": "index_files_category",
|
||||
"unique": false,
|
||||
"columnNames": [
|
||||
"category"
|
||||
],
|
||||
"orders": [],
|
||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_files_category` ON `${TABLE_NAME}` (`category`)"
|
||||
},
|
||||
{
|
||||
"name": "index_files_exists_processed_sync_status",
|
||||
"unique": false,
|
||||
"columnNames": [
|
||||
"exists",
|
||||
"processed",
|
||||
"sync_status"
|
||||
],
|
||||
"orders": [],
|
||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_files_exists_processed_sync_status` ON `${TABLE_NAME}` (`exists`, `processed`, `sync_status`)"
|
||||
}
|
||||
],
|
||||
"foreignKeys": []
|
||||
},
|
||||
{
|
||||
"tableName": "pending_operations",
|
||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `device_id` TEXT, `operation_id` TEXT NOT NULL, `ref_type` TEXT, `ref_id` INTEGER, `resource_id` TEXT, `resource_type` TEXT, `operation` TEXT NOT NULL, `payload` TEXT NOT NULL, `parent_resource_id` TEXT, `status` TEXT NOT NULL, `attempts` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `updated_at` INTEGER NOT NULL)",
|
||||
"fields": [
|
||||
{
|
||||
"fieldPath": "id",
|
||||
"columnName": "id",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "deviceId",
|
||||
"columnName": "device_id",
|
||||
"affinity": "TEXT",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "operationId",
|
||||
"columnName": "operation_id",
|
||||
"affinity": "TEXT",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "refType",
|
||||
"columnName": "ref_type",
|
||||
"affinity": "TEXT",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "refId",
|
||||
"columnName": "ref_id",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "resourceId",
|
||||
"columnName": "resource_id",
|
||||
"affinity": "TEXT",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "resourceType",
|
||||
"columnName": "resource_type",
|
||||
"affinity": "TEXT",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "operation",
|
||||
"columnName": "operation",
|
||||
"affinity": "TEXT",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "payload",
|
||||
"columnName": "payload",
|
||||
"affinity": "TEXT",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "parentResourceId",
|
||||
"columnName": "parent_resource_id",
|
||||
"affinity": "TEXT",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "status",
|
||||
"columnName": "status",
|
||||
"affinity": "TEXT",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "attempts",
|
||||
"columnName": "attempts",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "createdAt",
|
||||
"columnName": "created_at",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "updatedAt",
|
||||
"columnName": "updated_at",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
}
|
||||
],
|
||||
"primaryKey": {
|
||||
"autoGenerate": true,
|
||||
"columnNames": [
|
||||
"id"
|
||||
]
|
||||
},
|
||||
"indices": [
|
||||
{
|
||||
"name": "index_pending_operations_device_id_operation_id",
|
||||
"unique": true,
|
||||
"columnNames": [
|
||||
"device_id",
|
||||
"operation_id"
|
||||
],
|
||||
"orders": [],
|
||||
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_pending_operations_device_id_operation_id` ON `${TABLE_NAME}` (`device_id`, `operation_id`)"
|
||||
},
|
||||
{
|
||||
"name": "index_pending_operations_status",
|
||||
"unique": false,
|
||||
"columnNames": [
|
||||
"status"
|
||||
],
|
||||
"orders": [],
|
||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_pending_operations_status` ON `${TABLE_NAME}` (`status`)"
|
||||
},
|
||||
{
|
||||
"name": "index_pending_operations_resource_id",
|
||||
"unique": false,
|
||||
"columnNames": [
|
||||
"resource_id"
|
||||
],
|
||||
"orders": [],
|
||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_pending_operations_resource_id` ON `${TABLE_NAME}` (`resource_id`)"
|
||||
},
|
||||
{
|
||||
"name": "index_pending_operations_resource_id_operation_status",
|
||||
"unique": false,
|
||||
"columnNames": [
|
||||
"resource_id",
|
||||
"operation",
|
||||
"status"
|
||||
],
|
||||
"orders": [],
|
||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_pending_operations_resource_id_operation_status` ON `${TABLE_NAME}` (`resource_id`, `operation`, `status`)"
|
||||
},
|
||||
{
|
||||
"name": "index_pending_operations_parent_resource_id",
|
||||
"unique": false,
|
||||
"columnNames": [
|
||||
"parent_resource_id"
|
||||
],
|
||||
"orders": [],
|
||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_pending_operations_parent_resource_id` ON `${TABLE_NAME}` (`parent_resource_id`)"
|
||||
}
|
||||
],
|
||||
"foreignKeys": []
|
||||
},
|
||||
{
|
||||
"tableName": "scan_sessions",
|
||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `resource_id` TEXT NOT NULL, `root_folder_id` TEXT, `status` TEXT NOT NULL, `created_at` INTEGER NOT NULL, `updated_at` INTEGER NOT NULL)",
|
||||
"fields": [
|
||||
{
|
||||
"fieldPath": "id",
|
||||
"columnName": "id",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "resourceId",
|
||||
"columnName": "resource_id",
|
||||
"affinity": "TEXT",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "rootFolderId",
|
||||
"columnName": "root_folder_id",
|
||||
"affinity": "TEXT",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "status",
|
||||
"columnName": "status",
|
||||
"affinity": "TEXT",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "createdAt",
|
||||
"columnName": "created_at",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "updatedAt",
|
||||
"columnName": "updated_at",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
}
|
||||
],
|
||||
"primaryKey": {
|
||||
"autoGenerate": true,
|
||||
"columnNames": [
|
||||
"id"
|
||||
]
|
||||
},
|
||||
"indices": [
|
||||
{
|
||||
"name": "index_scan_sessions_resource_id",
|
||||
"unique": true,
|
||||
"columnNames": [
|
||||
"resource_id"
|
||||
],
|
||||
"orders": [],
|
||||
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_scan_sessions_resource_id` ON `${TABLE_NAME}` (`resource_id`)"
|
||||
}
|
||||
],
|
||||
"foreignKeys": []
|
||||
},
|
||||
{
|
||||
"tableName": "scan_pages",
|
||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `resource_id` TEXT NOT NULL, `session_id` INTEGER NOT NULL, `temp_uri` TEXT NOT NULL, `corners_json` TEXT NOT NULL, `width` INTEGER NOT NULL, `height` INTEGER NOT NULL, `sort_order` INTEGER NOT NULL, `status` TEXT NOT NULL, `created_at` INTEGER NOT NULL, FOREIGN KEY(`session_id`) REFERENCES `scan_sessions`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
|
||||
"fields": [
|
||||
{
|
||||
"fieldPath": "id",
|
||||
"columnName": "id",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "resourceId",
|
||||
"columnName": "resource_id",
|
||||
"affinity": "TEXT",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "sessionId",
|
||||
"columnName": "session_id",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "tempUri",
|
||||
"columnName": "temp_uri",
|
||||
"affinity": "TEXT",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "cornersJson",
|
||||
"columnName": "corners_json",
|
||||
"affinity": "TEXT",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "width",
|
||||
"columnName": "width",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "height",
|
||||
"columnName": "height",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "sortOrder",
|
||||
"columnName": "sort_order",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "status",
|
||||
"columnName": "status",
|
||||
"affinity": "TEXT",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "createdAt",
|
||||
"columnName": "created_at",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
}
|
||||
],
|
||||
"primaryKey": {
|
||||
"autoGenerate": true,
|
||||
"columnNames": [
|
||||
"id"
|
||||
]
|
||||
},
|
||||
"indices": [
|
||||
{
|
||||
"name": "index_scan_pages_resource_id",
|
||||
"unique": true,
|
||||
"columnNames": [
|
||||
"resource_id"
|
||||
],
|
||||
"orders": [],
|
||||
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_scan_pages_resource_id` ON `${TABLE_NAME}` (`resource_id`)"
|
||||
},
|
||||
{
|
||||
"name": "index_scan_pages_session_id",
|
||||
"unique": false,
|
||||
"columnNames": [
|
||||
"session_id"
|
||||
],
|
||||
"orders": [],
|
||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_scan_pages_session_id` ON `${TABLE_NAME}` (`session_id`)"
|
||||
},
|
||||
{
|
||||
"name": "index_scan_pages_sort_order",
|
||||
"unique": false,
|
||||
"columnNames": [
|
||||
"sort_order"
|
||||
],
|
||||
"orders": [],
|
||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_scan_pages_sort_order` ON `${TABLE_NAME}` (`sort_order`)"
|
||||
}
|
||||
],
|
||||
"foreignKeys": [
|
||||
{
|
||||
"table": "scan_sessions",
|
||||
"onDelete": "CASCADE",
|
||||
"onUpdate": "NO ACTION",
|
||||
"columns": [
|
||||
"session_id"
|
||||
],
|
||||
"referencedColumns": [
|
||||
"id"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"tableName": "resource_permissions",
|
||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`resource_id` TEXT NOT NULL, `resource_type` TEXT NOT NULL, `effective_access` TEXT NOT NULL, `owner_id` TEXT, `shared_by_id` TEXT, `expires_at` INTEGER, `cached_at` INTEGER NOT NULL, `updated_at` INTEGER NOT NULL, PRIMARY KEY(`resource_id`))",
|
||||
"fields": [
|
||||
{
|
||||
"fieldPath": "resourceId",
|
||||
"columnName": "resource_id",
|
||||
"affinity": "TEXT",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "resourceType",
|
||||
"columnName": "resource_type",
|
||||
"affinity": "TEXT",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "effectiveAccess",
|
||||
"columnName": "effective_access",
|
||||
"affinity": "TEXT",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "ownerId",
|
||||
"columnName": "owner_id",
|
||||
"affinity": "TEXT",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "sharedById",
|
||||
"columnName": "shared_by_id",
|
||||
"affinity": "TEXT",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "expiresAt",
|
||||
"columnName": "expires_at",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "cachedAt",
|
||||
"columnName": "cached_at",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "updatedAt",
|
||||
"columnName": "updated_at",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
}
|
||||
],
|
||||
"primaryKey": {
|
||||
"autoGenerate": false,
|
||||
"columnNames": [
|
||||
"resource_id"
|
||||
]
|
||||
},
|
||||
"indices": [
|
||||
{
|
||||
"name": "index_resource_permissions_expires_at",
|
||||
"unique": false,
|
||||
"columnNames": [
|
||||
"expires_at"
|
||||
],
|
||||
"orders": [],
|
||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_resource_permissions_expires_at` ON `${TABLE_NAME}` (`expires_at`)"
|
||||
}
|
||||
],
|
||||
"foreignKeys": []
|
||||
}
|
||||
],
|
||||
"views": [],
|
||||
"setupQueries": [
|
||||
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
|
||||
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'db3263dbb69c07a043d41f1c83a892a5')"
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -34,6 +34,8 @@ import com.kazier.mobile.data.local.entity.UserPreferenceEntity
|
||||
* v16: table resource_permissions (cache snapshot, M27).
|
||||
* v17: bytes_uploaded + bytes_upload_attempts sur files (upload V2).
|
||||
* v18: has_content_server + wanted_offline sur files (download V2).
|
||||
* v19: trashed_at sur files + folders (corbeille V3 — tombstone exists=0,
|
||||
* restore exists=1, purge locale après 30j+).
|
||||
*/
|
||||
@Database(
|
||||
entities = [
|
||||
@@ -41,7 +43,7 @@ import com.kazier.mobile.data.local.entity.UserPreferenceEntity
|
||||
PendingOperationEntity::class, ScanSessionEntity::class, ScanPageEntity::class,
|
||||
ResourcePermissionEntity::class,
|
||||
],
|
||||
version = 18,
|
||||
version = 19,
|
||||
// m19 : schéma exporté (`app/schemas/`) — toute dérive non migrée casse
|
||||
// la compilation au lieu de briqueter les utilisateurs au démarrage.
|
||||
exportSchema = true,
|
||||
|
||||
@@ -97,6 +97,43 @@ interface FileDao {
|
||||
@Query("UPDATE files SET \"exists\" = 0, updated_at = :updatedAt WHERE resource_id = :resourceId")
|
||||
suspend fun markMissing(resourceId: String, updatedAt: Long)
|
||||
|
||||
/**
|
||||
* V3 corbeille : lignes trashées, les plus récentes d'abord (écran
|
||||
* Corbeille). Le masquage de l'UI passe par `exists = 0` (requêtes
|
||||
* `exists = 1` inchangées) ; `trashed_at` date la purge locale.
|
||||
*/
|
||||
@Query("SELECT * FROM files WHERE trashed_at IS NOT NULL ORDER BY trashed_at DESC")
|
||||
fun observeTrashed(): Flow<List<FileEntity>>
|
||||
|
||||
@Query("SELECT * FROM files WHERE trashed_at IS NOT NULL ORDER BY trashed_at DESC")
|
||||
suspend fun getTrashedOnce(): List<FileEntity>
|
||||
|
||||
@Query("SELECT COUNT(*) FROM files WHERE trashed_at IS NOT NULL")
|
||||
fun observeTrashedCount(): Flow<Int>
|
||||
|
||||
/** Descendants sans filtre `exists` — collecte trash/restore (Deleters). */
|
||||
@Query("SELECT * FROM files WHERE folder_resource_id = :folderResourceId ORDER BY name ASC")
|
||||
suspend fun getByFolderAll(folderResourceId: String): List<FileEntity>
|
||||
|
||||
/** Trash : tombstone `exists = 0` + timestamp (jamais de DELETE Room). */
|
||||
@Query("UPDATE files SET trashed_at = :now, \"exists\" = 0, updated_at = :now WHERE resource_id = :resourceId")
|
||||
suspend fun markTrashed(resourceId: String, now: Long)
|
||||
|
||||
/**
|
||||
* Restore : lève le flag, re-visible (`exists = 1` — cloud-only si `uri`
|
||||
* NULL, le walk re-marque si le physique a vraiment disparu).
|
||||
*/
|
||||
@Query("UPDATE files SET trashed_at = NULL, \"exists\" = 1, updated_at = :now WHERE resource_id = :resourceId")
|
||||
suspend fun clearTrashed(resourceId: String, now: Long)
|
||||
|
||||
/**
|
||||
* Purge locale miroir de la rétention serveur (corbeille 30j + marge) :
|
||||
* destruction Room des lignes trashées depuis plus de `cutoff`. Le
|
||||
* serveur purge de son côté ; sans ça les tombstones s'accumuleraient.
|
||||
*/
|
||||
@Query("DELETE FROM files WHERE trashed_at IS NOT NULL AND trashed_at < :cutoff")
|
||||
suspend fun deleteTrashedOlderThan(cutoff: Long): Int
|
||||
|
||||
/**
|
||||
* Promote le placement après confirmation serveur (`POST /sync/ops` appliqué) :
|
||||
* `local-cloud` si une copie physique existe, sinon `cloud`. Idempotent.
|
||||
|
||||
@@ -86,6 +86,29 @@ interface FolderDao {
|
||||
@Query("UPDATE folders SET \"exists\" = 0, updated_at = :updatedAt WHERE resource_id = :resourceId")
|
||||
suspend fun markMissing(resourceId: String, updatedAt: Long)
|
||||
|
||||
/** V3 corbeille : voir `FileDao.observeTrashed` — même sémantique. */
|
||||
@Query("SELECT * FROM folders WHERE trashed_at IS NOT NULL ORDER BY trashed_at DESC")
|
||||
fun observeTrashed(): Flow<List<FolderEntity>>
|
||||
|
||||
@Query("SELECT * FROM folders WHERE trashed_at IS NOT NULL ORDER BY trashed_at DESC")
|
||||
suspend fun getTrashedOnce(): List<FolderEntity>
|
||||
|
||||
/** Enfants sans filtre `exists` — collecte trash/restore (FolderDeleter). */
|
||||
@Query("SELECT * FROM folders WHERE parent_resource_id = :parentResourceId ORDER BY name ASC")
|
||||
suspend fun getChildrenAll(parentResourceId: String): List<FolderEntity>
|
||||
|
||||
/** V3 corbeille : voir `FileDao.markTrashed`. */
|
||||
@Query("UPDATE folders SET trashed_at = :now, \"exists\" = 0, updated_at = :now WHERE resource_id = :resourceId")
|
||||
suspend fun markTrashed(resourceId: String, now: Long)
|
||||
|
||||
/** V3 corbeille : voir `FileDao.clearTrashed`. */
|
||||
@Query("UPDATE folders SET trashed_at = NULL, \"exists\" = 1, updated_at = :now WHERE resource_id = :resourceId")
|
||||
suspend fun clearTrashed(resourceId: String, now: Long)
|
||||
|
||||
/** V3 corbeille : voir `FileDao.deleteTrashedOlderThan`. */
|
||||
@Query("DELETE FROM folders WHERE trashed_at IS NOT NULL AND trashed_at < :cutoff")
|
||||
suspend fun deleteTrashedOlderThan(cutoff: Long): Int
|
||||
|
||||
/** Re-parente des sous-dossiers vers un nouveau parent (fusion). */
|
||||
@Query("UPDATE folders SET parent_resource_id = :newParentId, updated_at = :updatedAt WHERE resource_id IN (:resourceIds)")
|
||||
suspend fun reparent(resourceIds: List<String>, newParentId: String, updatedAt: Long)
|
||||
|
||||
+20
-6
@@ -158,20 +158,34 @@ interface PendingOperationDao {
|
||||
suspend fun deleteUnpushed(): Int
|
||||
|
||||
/**
|
||||
* Un `delete_resource` est-il encore en attente de push pour cette
|
||||
* ressource ? Le walk SAF ne doit alors jamais la ressusciter (`exists =
|
||||
* 1`) : l'intention de suppression est déjà journalisée (ordre
|
||||
* journal-first, C4) et la repasse physique va suivre. Sans ce garde, le
|
||||
* walk réimporterait une ressource que le serveur s'apprête à supprimer.
|
||||
* Un `delete_resource` (legacy) ou `trash_resource` (V3) est-il encore en
|
||||
* attente de push pour cette ressource ? Le walk SAF ne doit alors jamais
|
||||
* la ressusciter (`exists = 1`) : l'intention de suppression est déjà
|
||||
* journalisée (ordre journal-first, C4) et la repasse physique va suivre.
|
||||
* Sans ce garde, le walk réimporterait une ressource que le serveur
|
||||
* s'apprête à trasher.
|
||||
*/
|
||||
@Query("""
|
||||
SELECT COUNT(*) FROM pending_operations
|
||||
WHERE resource_id = :resourceId
|
||||
AND operation = 'delete_resource'
|
||||
AND operation IN ('delete_resource', 'trash_resource')
|
||||
AND status = 'pending'
|
||||
""")
|
||||
suspend fun countPendingDeleteOperations(resourceId: String): Int
|
||||
|
||||
/**
|
||||
* Un `purge_resource` est-il encore en attente de push ? Le refresh
|
||||
* serveur (qui liste encore la ressource tant que l'op n'est pas synced)
|
||||
* ne doit pas la réimporter — destruction définitive en cours.
|
||||
*/
|
||||
@Query("""
|
||||
SELECT COUNT(*) FROM pending_operations
|
||||
WHERE resource_id = :resourceId
|
||||
AND operation = 'purge_resource'
|
||||
AND status = 'pending'
|
||||
""")
|
||||
suspend fun countPendingPurgeOperations(resourceId: String): Int
|
||||
|
||||
/**
|
||||
* Un `move_resource` est-il encore en attente de push ? Tant que l'op est
|
||||
* pendante, le `folder_resource_id` local reflète la cible future : ni le
|
||||
|
||||
@@ -87,6 +87,16 @@ data class FileEntity(
|
||||
*/
|
||||
@ColumnInfo(name = "wanted_offline")
|
||||
val wantedOffline: Boolean = false,
|
||||
/**
|
||||
* V3 corbeille : timestamp de trash (ms epoch), NULL = vivant. Posé avec
|
||||
* `exists = 0` (tombstone M5 : invisible des requêtes `exists = 1` sans
|
||||
* toucher à chaque requête, exclu de la rétention via `isReleasable`,
|
||||
* couvert par le sweep `getMissingWithUri` en cas de kill entre journal
|
||||
* et suppression SAF). `restore` remet `exists = 1` (cloud-only si `uri`
|
||||
* NULL — le walk re-marque si le physique a vraiment disparu).
|
||||
*/
|
||||
@ColumnInfo(name = "trashed_at")
|
||||
val trashedAt: Long? = null,
|
||||
@ColumnInfo(name = "added_at")
|
||||
val addedAt: Long,
|
||||
@ColumnInfo(name = "updated_at")
|
||||
|
||||
@@ -45,6 +45,12 @@ data class FolderEntity(
|
||||
val syncStatus: String = "local",
|
||||
@ColumnInfo(name = "created_in_app", defaultValue = "0")
|
||||
val createdInApp: Boolean = false,
|
||||
/**
|
||||
* V3 corbeille : voir `FileEntity.trashedAt` — même sémantique (tombstone
|
||||
* `exists = 0`, trash/restore récursifs côté Deleters, jamais de delete).
|
||||
*/
|
||||
@ColumnInfo(name = "trashed_at")
|
||||
val trashedAt: Long? = null,
|
||||
@ColumnInfo(name = "added_at")
|
||||
val addedAt: Long,
|
||||
@ColumnInfo(name = "updated_at")
|
||||
|
||||
+9
@@ -90,4 +90,13 @@ object PendingOperationType {
|
||||
* `operation_id` (garde anti-rejeu serveur A9).
|
||||
*/
|
||||
const val REPORT_BYTES = "report_bytes"
|
||||
/**
|
||||
* V3 corbeille : `trash_resource` (soft, subtree), `restore_resource`
|
||||
* (lève le flag), `purge_resource` (destruction définitive). `payload`
|
||||
* vide — `delete_resource` (legacy, mappé serveur vers trash) conservé
|
||||
* pour compatibilité des lignes pré-V3 mais plus jamais émis.
|
||||
*/
|
||||
const val TRASH_RESOURCE = "trash_resource"
|
||||
const val RESTORE_RESOURCE = "restore_resource"
|
||||
const val PURGE_RESOURCE = "purge_resource"
|
||||
}
|
||||
+14
-1
@@ -316,7 +316,20 @@ object Migrations {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* V3 corbeille : `trashed_at` (ms epoch, NULL = vivant) sur `files` +
|
||||
* `folders`. Zéro backfill (NULL = vivant = état courant). Le masquage
|
||||
* passe par `exists = 0` posé par l'action de trash (pas par cette
|
||||
* colonne seule) — les requêtes `exists = 1` restent inchangées.
|
||||
*/
|
||||
private val MIGRATION_18_19 = object : Migration(18, 19) {
|
||||
override fun migrate(db: SupportSQLiteDatabase) {
|
||||
db.execSQL("ALTER TABLE `files` ADD COLUMN `trashed_at` INTEGER")
|
||||
db.execSQL("ALTER TABLE `folders` ADD COLUMN `trashed_at` INTEGER")
|
||||
}
|
||||
}
|
||||
|
||||
val ALL: Array<Migration> = arrayOf(
|
||||
MIGRATION_1_2, MIGRATION_2_3, MIGRATION_3_4, MIGRATION_4_5, MIGRATION_5_6, MIGRATION_6_7, MIGRATION_7_8, MIGRATION_8_9, MIGRATION_9_10, MIGRATION_10_11, MIGRATION_11_12, MIGRATION_12_13, MIGRATION_13_14, MIGRATION_14_15, MIGRATION_15_16, MIGRATION_16_17, MIGRATION_17_18,
|
||||
MIGRATION_1_2, MIGRATION_2_3, MIGRATION_3_4, MIGRATION_4_5, MIGRATION_5_6, MIGRATION_6_7, MIGRATION_7_8, MIGRATION_8_9, MIGRATION_9_10, MIGRATION_10_11, MIGRATION_11_12, MIGRATION_12_13, MIGRATION_13_14, MIGRATION_14_15, MIGRATION_15_16, MIGRATION_16_17, MIGRATION_17_18, MIGRATION_18_19,
|
||||
)
|
||||
}
|
||||
@@ -29,6 +29,8 @@ import com.kazier.mobile.data.remote.dto.ShareLinkDto
|
||||
import com.kazier.mobile.data.remote.dto.SyncOpDto
|
||||
import com.kazier.mobile.data.remote.dto.SyncOpsRequest
|
||||
import com.kazier.mobile.data.remote.dto.SyncOpsResult
|
||||
import com.kazier.mobile.data.remote.dto.TrashDto
|
||||
import com.kazier.mobile.data.remote.dto.VersionDto
|
||||
import kotlin.coroutines.cancellation.CancellationException
|
||||
import okhttp3.MultipartBody
|
||||
import okhttp3.MediaType.Companion.toMediaType
|
||||
@@ -148,6 +150,21 @@ class ApiClient @Inject constructor(
|
||||
suspend fun deleteFile(fileId: String): String =
|
||||
unwrap({ apiService.deleteFile(fileId) }).id
|
||||
|
||||
/** Corbeille serveur V3 — `GET /trash` (+ `meta`). */
|
||||
suspend fun listTrashPaged(
|
||||
page: Int? = null,
|
||||
pageSize: Int? = null,
|
||||
): Pair<List<TrashDto>, ApiMeta?> =
|
||||
unwrapWithMeta({ apiService.listTrash(page, pageSize) })
|
||||
|
||||
/** Restaure une ressource trashée — `POST /files/:id/restore`. */
|
||||
suspend fun restoreFile(fileId: String): String =
|
||||
unwrap({ apiService.restoreFile(fileId) }).id
|
||||
|
||||
/** Historique des octets — `GET /files/:id/versions`. */
|
||||
suspend fun listVersions(fileId: String): List<VersionDto> =
|
||||
unwrap({ apiService.listVersions(fileId) })
|
||||
|
||||
/** Recherche serveur paginée — `GET /files/search?q=…` (+ `meta`). */
|
||||
suspend fun searchFilesPaged(
|
||||
query: String,
|
||||
|
||||
@@ -22,6 +22,8 @@ import com.kazier.mobile.data.remote.dto.ShareGrantDto
|
||||
import com.kazier.mobile.data.remote.dto.ShareLinkDto
|
||||
import com.kazier.mobile.data.remote.dto.SyncOpsRequest
|
||||
import com.kazier.mobile.data.remote.dto.SyncOpsResult
|
||||
import com.kazier.mobile.data.remote.dto.TrashDto
|
||||
import com.kazier.mobile.data.remote.dto.VersionDto
|
||||
import okhttp3.MultipartBody
|
||||
import okhttp3.RequestBody
|
||||
import okhttp3.ResponseBody
|
||||
@@ -145,6 +147,35 @@ interface ApiService {
|
||||
@Path("id") fileId: String,
|
||||
): Response<ApiEnvelope<IdResultDto>>
|
||||
|
||||
/**
|
||||
* Corbeille serveur V3 (`GET /trash`, paginé `meta`) — ressources
|
||||
* trashées du user, les plus récentes d'abord.
|
||||
*/
|
||||
@GET("trash")
|
||||
suspend fun listTrash(
|
||||
@Query("page") page: Int?,
|
||||
@Query("pageSize") pageSize: Int?,
|
||||
): Response<ApiEnvelope<List<TrashDto>>>
|
||||
|
||||
/** Restaure une ressource trashée — `POST /files/:id/restore`. */
|
||||
@POST("files/{id}/restore")
|
||||
suspend fun restoreFile(
|
||||
@Path("id") fileId: String,
|
||||
): Response<ApiEnvelope<IdResultDto>>
|
||||
|
||||
/** Historique des octets — `GET /files/:id/versions` (parent live). */
|
||||
@GET("files/{id}/versions")
|
||||
suspend fun listVersions(
|
||||
@Path("id") fileId: String,
|
||||
): Response<ApiEnvelope<List<VersionDto>>>
|
||||
|
||||
/** Recopie la génération `n` vers le live (V3 versions). */
|
||||
@POST("files/{id}/versions/{n}/restore")
|
||||
suspend fun restoreVersion(
|
||||
@Path("id") fileId: String,
|
||||
@Path("n") versionNo: Int,
|
||||
): Response<ApiEnvelope<FileDto>>
|
||||
|
||||
/**
|
||||
* Recherche serveur (`GET /files/search?q=…`, paginé `meta`). Non consommée
|
||||
* en V1 (recherche 100 % locale via Room) — exposée pour parité contrat.
|
||||
|
||||
@@ -250,4 +250,29 @@ data class OcrSubmitDto(
|
||||
data class FileOcrDto(
|
||||
@Json(name = "text") val text: String,
|
||||
@Json(name = "updatedAt") val updatedAt: String? = null,
|
||||
)
|
||||
|
||||
/**
|
||||
* Entrée `GET /trash` (V3 corbeille) — miroir de `TrashDTO` Go. `type` =
|
||||
* "file" | "folder", `trashedAt` en RFC3339 (affichage), tri serveur
|
||||
* (plus récent d'abord).
|
||||
*/
|
||||
data class TrashDto(
|
||||
@Json(name = "id") val id: String,
|
||||
@Json(name = "type") val type: String,
|
||||
@Json(name = "name") val name: String,
|
||||
@Json(name = "size") val size: Long = 0L,
|
||||
@Json(name = "trashedAt") val trashedAt: String? = null,
|
||||
@Json(name = "updatedAt") val updatedAt: String? = null,
|
||||
)
|
||||
|
||||
/**
|
||||
* Génération figée `GET /files/{id}/versions` (V3) — miroir de `VersionDTO`
|
||||
* Go. Le restore recopie vers le live (l'actuel est à son tour versionné).
|
||||
*/
|
||||
data class VersionDto(
|
||||
@Json(name = "versionNo") val versionNo: Int,
|
||||
@Json(name = "size") val size: Long = 0L,
|
||||
@Json(name = "mimeType") val mimeType: String? = null,
|
||||
@Json(name = "createdAt") val createdAt: String? = null,
|
||||
)
|
||||
@@ -208,6 +208,13 @@ class FileRepository @Inject constructor(
|
||||
return existing.copy(exists = 0, updatedAt = now)
|
||||
}
|
||||
|
||||
// Garde corbeille V3 : une ligne trashée n'est JAMAIS ressuscitée par
|
||||
// le walk — ni par réimport SAF (IN_CLOUD garde le physique), ni par
|
||||
// réactivation. Seul `restore` (TrashRepository) lève le flag.
|
||||
if (existing != null && existing.trashedAt != null) {
|
||||
return existing
|
||||
}
|
||||
|
||||
// Un `move_resource` encore en attente fait de la cible outbox la
|
||||
// source de vérité du placement : un snapshot SAF périmé (walk lancé
|
||||
// avant le move) ne doit pas ré-attribuer le dossier à l'ancien parent.
|
||||
@@ -271,6 +278,23 @@ class FileRepository @Inject constructor(
|
||||
suspend fun markMissing(resourceId: String, updatedAt: Long) =
|
||||
fileDao.markMissing(resourceId, updatedAt)
|
||||
|
||||
/** Lignes trashées (écran Corbeille) — les plus récentes d'abord. */
|
||||
fun observeTrashed(): Flow<List<FileEntity>> = fileDao.observeTrashed()
|
||||
|
||||
fun observeTrashedCount(): Flow<Int> = fileDao.observeTrashedCount()
|
||||
|
||||
/** Fichiers d'un dossier sans filtre `exists` — collecte trash/restore. */
|
||||
suspend fun getFilesInFolderAll(folderResourceId: String): List<FileEntity> =
|
||||
fileDao.getByFolderAll(folderResourceId)
|
||||
|
||||
/** Trash local (tombstone, jamais de DELETE) — dans la transaction de l'op outbox. */
|
||||
suspend fun markTrashed(resourceId: String, trashedAt: Long) =
|
||||
fileDao.markTrashed(resourceId, trashedAt)
|
||||
|
||||
/** Restore local — dans la transaction de l'op outbox `restore_resource`. */
|
||||
suspend fun clearTrashed(resourceId: String, now: Long) =
|
||||
fileDao.clearTrashed(resourceId, now)
|
||||
|
||||
/** Met à jour la cible dossier d'un fichier (déplacement local / cloud-only).
|
||||
*
|
||||
* Le `move_resource` n'est journalisé que si le serveur connaît déjà la
|
||||
@@ -320,6 +344,16 @@ class FileRepository @Inject constructor(
|
||||
// L'antichambre outbox fait foi tant que le move n'est pas synced.
|
||||
return@forEach
|
||||
}
|
||||
if (outboxRepository.hasPendingPurgeOperation(dto.id)) {
|
||||
// Destruction définitive en cours : le serveur renvoie
|
||||
// encore la ressource, ne jamais la réimporter (V3).
|
||||
return@forEach
|
||||
}
|
||||
// Ligne trashée localement : le serveur la renvoie encore
|
||||
// tant que l'op trash n'est pas synced — ne pas la ressusciter.
|
||||
if (fileDao.getByResourceId(dto.id)?.trashedAt != null) {
|
||||
return@forEach
|
||||
}
|
||||
upsertTolerant(toEntity(dto, folderResourceId, now))
|
||||
}
|
||||
if (files.isEmpty()) break
|
||||
|
||||
@@ -56,6 +56,21 @@ class FolderRepository @Inject constructor(
|
||||
suspend fun getChildren(parentResourceId: String): List<FolderEntity> =
|
||||
folderDao.getByParentOnce(parentResourceId)
|
||||
|
||||
/** Enfants sans filtre `exists` — collecte trash/restore (FolderDeleter). */
|
||||
suspend fun getChildrenAll(parentResourceId: String): List<FolderEntity> =
|
||||
folderDao.getChildrenAll(parentResourceId)
|
||||
|
||||
/** Lignes trashées (écran Corbeille). */
|
||||
fun observeTrashed(): Flow<List<FolderEntity>> = folderDao.observeTrashed()
|
||||
|
||||
/** Trash local (tombstone) — dans la transaction de l'op outbox. */
|
||||
suspend fun markTrashed(resourceId: String, trashedAt: Long) =
|
||||
folderDao.markTrashed(resourceId, trashedAt)
|
||||
|
||||
/** Restore local — dans la transaction de l'op outbox `restore_resource`. */
|
||||
suspend fun clearTrashed(resourceId: String, now: Long) =
|
||||
folderDao.clearTrashed(resourceId, now)
|
||||
|
||||
/** Dossiers créés dans l'app uniquement (cibles du picker de déplacement). */
|
||||
suspend fun getCreatedInApp(): List<FolderEntity> = folderDao.getCreatedInApp()
|
||||
|
||||
@@ -80,6 +95,15 @@ class FolderRepository @Inject constructor(
|
||||
// synced : le serveur renvoie encore l'ancien parent.
|
||||
outboxRepository.hasPendingMoveOperation(dto.id)
|
||||
}
|
||||
.filterNot { dto ->
|
||||
// Destruction définitive en cours (V3) : ne pas réimporter.
|
||||
outboxRepository.hasPendingPurgeOperation(dto.id)
|
||||
}
|
||||
.filterNot { dto ->
|
||||
// Ligne trashée localement : le serveur la renvoie encore
|
||||
// tant que l'op trash n'est pas synced — ne pas ressusciter.
|
||||
folderDao.getByResourceId(dto.id)?.trashedAt != null
|
||||
}
|
||||
.map { toEntity(it, now) }
|
||||
if (rows.isNotEmpty()) folderDao.upsertAll(rows)
|
||||
}
|
||||
@@ -129,6 +153,11 @@ class FolderRepository @Inject constructor(
|
||||
return existing.copy(exists = 0, updatedAt = now)
|
||||
}
|
||||
|
||||
// Garde corbeille V3 : voir `FileRepository.saveLocalFile`.
|
||||
if (existing != null && existing.trashedAt != null) {
|
||||
return existing
|
||||
}
|
||||
|
||||
// Garde pending-move (M1) : un snapshot SAF périmé ne revert jamais un
|
||||
// reparent/merge en cours de push.
|
||||
val movePending = existing != null && outboxRepository.hasPendingMoveOperation(existing.resourceId)
|
||||
|
||||
+26
-4
@@ -101,7 +101,7 @@ class OutboxRepository @Inject constructor(
|
||||
payload = mapOf("toFolderResourceId" to toFolderResourceId),
|
||||
)
|
||||
|
||||
/** Raccourci `delete_resource` — idempotent côté serveur. */
|
||||
/** Raccourci `delete_resource` — legacy V3 (serveur : mappé vers trash). */
|
||||
suspend fun enqueueDeleteResource(
|
||||
resourceId: String,
|
||||
resourceType: String,
|
||||
@@ -111,6 +111,20 @@ class OutboxRepository @Inject constructor(
|
||||
resourceType = resourceType,
|
||||
)
|
||||
|
||||
/**
|
||||
* Raccourcis corbeille V3 — payload vide, `resource_id` + `resource_type`
|
||||
* portent tout (docs/api-v1.md §6.1). MÊME transaction que le
|
||||
* `markTrashed`/`clearTrashed` Room correspondant (Deleters).
|
||||
*/
|
||||
suspend fun enqueueTrashResource(resourceId: String, resourceType: String): String =
|
||||
enqueue(PendingOperationType.TRASH_RESOURCE, resourceId, resourceType)
|
||||
|
||||
suspend fun enqueueRestoreResource(resourceId: String, resourceType: String): String =
|
||||
enqueue(PendingOperationType.RESTORE_RESOURCE, resourceId, resourceType)
|
||||
|
||||
suspend fun enqueuePurgeResource(resourceId: String, resourceType: String): String =
|
||||
enqueue(PendingOperationType.PURGE_RESOURCE, resourceId, resourceType)
|
||||
|
||||
/**
|
||||
* Raccourci `share` — payload `{ granteeUserId|granteeGroupId, access }`
|
||||
* (voir docs/api-v1.md §6.1). `access`: viewer | commenter | editor.
|
||||
@@ -299,13 +313,21 @@ class OutboxRepository @Inject constructor(
|
||||
pendingOperationDao.countPendingMoveOperations(resourceId) > 0
|
||||
|
||||
/**
|
||||
* Un `delete_resource` est-il encore en attente de push ? Garde
|
||||
* anti-résurrection du walk (C4, voir DAO) : une ressource dont la
|
||||
* suppression est journalisée ne doit plus être réimportée.
|
||||
* Un `delete_resource` (legacy) ou `trash_resource` (V3) est-il encore en
|
||||
* attente de push ? Garde anti-résurrection du walk (C4, voir DAO).
|
||||
*/
|
||||
suspend fun hasPendingDeleteOperation(resourceId: String): Boolean =
|
||||
pendingOperationDao.countPendingDeleteOperations(resourceId) > 0
|
||||
|
||||
/**
|
||||
* Un `purge_resource` est-il encore en attente de push ? Garde du refresh
|
||||
* serveur : une destruction définitive en cours ne doit pas être
|
||||
* réimportée par la liste serveur (qui la renvoie tant que l'op n'est
|
||||
* pas synced).
|
||||
*/
|
||||
suspend fun hasPendingPurgeOperation(resourceId: String): Boolean =
|
||||
pendingOperationDao.countPendingPurgeOperations(resourceId) > 0
|
||||
|
||||
companion object {
|
||||
/**
|
||||
* Clé du lien parent→enfant, à la fois dans le payload JSON
|
||||
|
||||
@@ -0,0 +1,213 @@
|
||||
package com.kazier.mobile.data.repository
|
||||
|
||||
import androidx.room.withTransaction
|
||||
import com.kazier.mobile.data.local.AppDatabase
|
||||
import com.kazier.mobile.data.local.dao.FileDao
|
||||
import com.kazier.mobile.data.local.dao.FolderDao
|
||||
import com.kazier.mobile.data.local.entity.FileEntity
|
||||
import com.kazier.mobile.data.local.entity.FolderEntity
|
||||
import com.kazier.mobile.data.remote.ApiClient
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Singleton
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
import kotlinx.coroutines.flow.combine
|
||||
|
||||
/**
|
||||
* Corbeille V3 — पढ़ें local-first du trash serveur.
|
||||
*
|
||||
* - L'action de trash est portée par les Deleters (journal-first + outbox
|
||||
* `trash_resource`) ; ce repository porte le **restore**, la **purge
|
||||
* définitive** et la **convergence** (`GET /trash` → tombstones locales).
|
||||
* - Ordre outbox préservé : un restore après un trash encore pending
|
||||
* s'enqueue APRÈS (jamais d'annulation du trash pending) — le serveur
|
||||
* applique trash puis restore, l'intention finale gagne.
|
||||
* - Purge = destruction locale immédiate + op `purge_resource` si le serveur
|
||||
* connaît la ressource ; si l'op dead-letter, le refresh reconverge (la
|
||||
* ressource réapparaît — l'utilisateur peut re-purger).
|
||||
*/
|
||||
@Singleton
|
||||
class TrashRepository @Inject constructor(
|
||||
private val appDatabase: AppDatabase,
|
||||
private val fileDao: FileDao,
|
||||
private val folderDao: FolderDao,
|
||||
private val fileRepository: FileRepository,
|
||||
private val folderRepository: FolderRepository,
|
||||
private val outboxRepository: OutboxRepository,
|
||||
private val apiClient: ApiClient,
|
||||
) {
|
||||
|
||||
/** Lignes trashées pour l'écran Corbeille (fichiers + dossiers). */
|
||||
fun observeTrashedFiles(): Flow<List<FileEntity>> = fileRepository.observeTrashed()
|
||||
|
||||
fun observeTrashedFolders(): Flow<List<FolderEntity>> = folderRepository.observeTrashed()
|
||||
|
||||
fun observeTrashedCount(): Flow<Int> = combine(
|
||||
fileRepository.observeTrashedCount(),
|
||||
folderRepository.observeTrashed(),
|
||||
) { files, folders -> files + folders.size }
|
||||
|
||||
/**
|
||||
* Restore d'un fichier : lève le flag + `restore_resource` si le serveur
|
||||
* connaît la ressource (create synced — sinon rien à restaurer côté
|
||||
* serveur, réactivation purement locale).
|
||||
*/
|
||||
suspend fun restoreFile(resourceId: String) {
|
||||
val now = System.currentTimeMillis()
|
||||
appDatabase.withTransaction {
|
||||
fileRepository.clearTrashed(resourceId, now)
|
||||
if (outboxRepository.hasSyncedCreateOperation(resourceId)) {
|
||||
outboxRepository.enqueueRestoreResource(resourceId, "file")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** Restore d'un dossier et de tout son arbre (miroir du trash). */
|
||||
suspend fun restoreFolder(resourceId: String) {
|
||||
val now = System.currentTimeMillis()
|
||||
appDatabase.withTransaction {
|
||||
folderRepository.clearTrashed(resourceId, now)
|
||||
if (outboxRepository.hasCreateOperationAnyType(resourceId)) {
|
||||
outboxRepository.enqueueRestoreResource(resourceId, "folder")
|
||||
}
|
||||
for (file in fileRepository.getFilesInFolderAll(resourceId)) {
|
||||
if (file.trashedAt != null) {
|
||||
fileRepository.clearTrashed(file.resourceId, now)
|
||||
if (outboxRepository.hasCreateOperation(file.resourceId)) {
|
||||
outboxRepository.enqueueRestoreResource(file.resourceId, "file")
|
||||
}
|
||||
}
|
||||
}
|
||||
restoreFolderChildren(resourceId, now)
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun restoreFolderChildren(parentId: String, now: Long) {
|
||||
for (child in folderRepository.getChildrenAll(parentId)) {
|
||||
if (child.trashedAt != null) {
|
||||
folderRepository.clearTrashed(child.resourceId, now)
|
||||
if (outboxRepository.hasCreateOperationAnyType(child.resourceId)) {
|
||||
outboxRepository.enqueueRestoreResource(child.resourceId, "folder")
|
||||
}
|
||||
for (file in fileRepository.getFilesInFolderAll(child.resourceId)) {
|
||||
if (file.trashedAt != null) {
|
||||
fileRepository.clearTrashed(file.resourceId, now)
|
||||
if (outboxRepository.hasCreateOperation(file.resourceId)) {
|
||||
outboxRepository.enqueueRestoreResource(file.resourceId, "file")
|
||||
}
|
||||
}
|
||||
}
|
||||
restoreFolderChildren(child.resourceId, now)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Purge définitive d'un fichier : op `purge_resource` (si connue serveur)
|
||||
* + destruction locale immédiate (ligne Room). Le SAF a déjà été supprimé
|
||||
* par l'action de trash (FULL) ou n'a jamais existé (IN_CLOUD).
|
||||
*/
|
||||
suspend fun purgeFile(resourceId: String) {
|
||||
appDatabase.withTransaction {
|
||||
outboxRepository.cancelPendingCreates(resourceId)
|
||||
if (outboxRepository.hasSyncedCreateOperation(resourceId)) {
|
||||
outboxRepository.enqueuePurgeResource(resourceId, "file")
|
||||
}
|
||||
fileDao.remove(resourceId)
|
||||
}
|
||||
}
|
||||
|
||||
/** Purge définitive d'un dossier et de son arbre. */
|
||||
suspend fun purgeFolder(resourceId: String) {
|
||||
appDatabase.withTransaction {
|
||||
val files = mutableListOf<String>()
|
||||
val folders = mutableListOf(resourceId)
|
||||
collectTrashedTree(resourceId, files, folders)
|
||||
for (id in files) {
|
||||
outboxRepository.cancelPendingCreates(id)
|
||||
if (outboxRepository.hasSyncedCreateOperation(id)) {
|
||||
outboxRepository.enqueuePurgeResource(id, "file")
|
||||
}
|
||||
fileDao.remove(id)
|
||||
}
|
||||
for (id in folders) {
|
||||
outboxRepository.cancelPendingCreates(id)
|
||||
if (outboxRepository.hasCreateOperationAnyType(id)) {
|
||||
outboxRepository.enqueuePurgeResource(id, "folder")
|
||||
}
|
||||
folderDao.remove(id)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun collectTrashedTree(rootId: String, files: MutableList<String>, folders: MutableList<String>) {
|
||||
for (file in fileRepository.getFilesInFolderAll(rootId)) {
|
||||
files += file.resourceId
|
||||
}
|
||||
for (child in folderRepository.getChildrenAll(rootId)) {
|
||||
folders += child.resourceId
|
||||
collectTrashedTree(child.resourceId, files, folders)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Convergence cross-device : rapatrie `GET /trash` (paginé) et pose les
|
||||
* tombstones locales manquantes (trash fait ailleurs, jamais poussé
|
||||
* d'ici — aucune op outbox). Best-effort (réseau toléré, voir
|
||||
* `SyncViewModel`).
|
||||
*/
|
||||
suspend fun syncTrashFromServer() {
|
||||
var page = 1
|
||||
val now = System.currentTimeMillis()
|
||||
while (page <= MAX_PAGES) {
|
||||
val (items, meta) = apiClient.listTrashPaged(page = page, pageSize = PAGE_SIZE)
|
||||
if (items.isEmpty()) break
|
||||
appDatabase.withTransaction {
|
||||
for (dto in items) {
|
||||
when (dto.type) {
|
||||
"file" -> {
|
||||
val local = fileDao.getByResourceId(dto.id)
|
||||
if (local != null && local.trashedAt == null) {
|
||||
fileDao.markTrashed(dto.id, now)
|
||||
}
|
||||
}
|
||||
"folder" -> {
|
||||
val local = folderDao.getByResourceId(dto.id)
|
||||
if (local != null && local.trashedAt == null) {
|
||||
folderDao.markTrashed(dto.id, now)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
val total = meta?.total
|
||||
if (total != null) {
|
||||
if (page * PAGE_SIZE >= total) break
|
||||
} else if (items.size < PAGE_SIZE) {
|
||||
break
|
||||
}
|
||||
page++
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Expiration locale miroir (corbeille 30j serveur + marge) : destruction
|
||||
* Room des tombstones anciennes. Appelée par la passe de rétention
|
||||
* (quotidienne, sans réseau).
|
||||
*/
|
||||
suspend fun purgeExpiredLocally(cutoff: Long): Int {
|
||||
val files = fileDao.deleteTrashedOlderThan(cutoff)
|
||||
val folders = folderDao.deleteTrashedOlderThan(cutoff)
|
||||
return files + folders
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val PAGE_SIZE = 50
|
||||
private const val MAX_PAGES = 200
|
||||
/**
|
||||
* Rétention locale des tombstones : 31j (serveur 30j + 1j de marge —
|
||||
* une ligne purgée serveur ne doit jamais réapparaître via un vieux
|
||||
* restore local).
|
||||
*/
|
||||
const val LOCAL_RETENTION_MS = 31L * 24 * 60 * 60 * 1000
|
||||
}
|
||||
}
|
||||
@@ -20,14 +20,16 @@ import javax.inject.Inject
|
||||
import javax.inject.Singleton
|
||||
|
||||
/**
|
||||
* Suppression de fichiers en mode multi-sélection.
|
||||
* Suppression de fichiers en mode multi-sélection (V3 : corbeille).
|
||||
*
|
||||
* Trois modes :
|
||||
* - **LOCALLY** : supprime le fichier physique SAF + marque `exists = 0` en Room,
|
||||
* sans journaliser dans l\'outbox (le serveur n\'est pas affecté).
|
||||
* - **IN_CLOUD** : enqueue `delete_resource` dans l\'outbox uniquement, sans
|
||||
* toucher au fichier local.
|
||||
* - **FULL** : les deux — suppression physique + outbox `delete_resource`.
|
||||
* - **IN_CLOUD** : enqueue `trash_resource` dans l\'outbox + tombstone locale
|
||||
* (`trashed_at`, `exists = 0`, M5) dans la MÊME transaction, sans toucher
|
||||
* au fichier physique local.
|
||||
* - **FULL** : les deux — journal trash + suppression physique SAF, puis
|
||||
* détachement `uri` (la ligne devient trashée cloud-only, restaurable).
|
||||
*/
|
||||
@Singleton
|
||||
class FileDeleter @Inject constructor(
|
||||
@@ -84,12 +86,12 @@ class FileDeleter @Inject constructor(
|
||||
}
|
||||
|
||||
/**
|
||||
* Suppression cloud uniquement (outbox `delete_resource` + tombstone locale).
|
||||
* Trash serveur uniquement (outbox `trash_resource` + tombstone locale).
|
||||
* Le fichier physique local n'est pas touché, mais la ligne Room passe
|
||||
* `exists = 0` dans la MÊME transaction (M5) : sans ça la ressource restait
|
||||
* affichée, le walk la revoyait et `refreshFromServer` ne supprime jamais
|
||||
* de lignes → fantôme local vs serveur supprimé. N'a de sens que si la
|
||||
* ressource a déjà été poussée (gate « processed »).
|
||||
* `trashed_at` + `exists = 0` dans la MÊME transaction (M5) : sans ça la
|
||||
* ressource restait affichée, le walk la revoyait et `refreshFromServer`
|
||||
* ne supprime jamais de lignes → fantôme local vs serveur trashé.
|
||||
* N'a de sens que si la ressource a déjà été poussée (gate « processed »).
|
||||
*/
|
||||
private suspend fun deleteInCloud(file: FileEntity): Boolean {
|
||||
var ok = false
|
||||
@@ -97,43 +99,43 @@ class FileDeleter @Inject constructor(
|
||||
val now = System.currentTimeMillis()
|
||||
appDatabase.withTransaction {
|
||||
// Jamais poussé (create encore pending) : annulation (M19), pas
|
||||
// de delete — le serveur n'a rien à oublier. Poussé (synced) :
|
||||
// `delete_resource`, le serveur connaît la ressource.
|
||||
// d'op — le serveur n'a rien à oublier. Poussé (synced) :
|
||||
// `trash_resource`, le serveur connaît la ressource.
|
||||
outboxRepository.cancelPendingCreates(file.resourceId)
|
||||
if (outboxRepository.hasSyncedCreateOperation(file.resourceId)) {
|
||||
outboxRepository.enqueueDeleteResource(file.resourceId, "file")
|
||||
outboxRepository.enqueueTrashResource(file.resourceId, "file")
|
||||
}
|
||||
fileRepository.markMissing(file.resourceId, now)
|
||||
fileRepository.markTrashed(file.resourceId, now)
|
||||
}
|
||||
ok = true
|
||||
Timber.d("enqueued cloud delete for %s", file.resourceId)
|
||||
Timber.d("enqueued trash for %s", file.resourceId)
|
||||
}.onFailure { e ->
|
||||
Timber.w(e, "enqueueDeleteResource failed for %s", file.resourceId)
|
||||
Timber.w(e, "enqueueTrashResource failed for %s", file.resourceId)
|
||||
}
|
||||
return ok
|
||||
}
|
||||
|
||||
/**
|
||||
* Suppression complète : journal d'abord, physique ensuite (C4).
|
||||
* Trash complète : journal d'abord, physique ensuite (C4).
|
||||
*
|
||||
* Ordre crash-safe : la transaction Room (`exists = 0` + annulation du
|
||||
* create pending + éventuel `delete_resource`) est committée AVANT la
|
||||
* Ordre crash-safe : la transaction Room (`trashed_at` + annulation du
|
||||
* create pending + éventuel `trash_resource`) est committée AVANT la
|
||||
* suppression SAF — un kill entre les deux ne perd plus le journal, le
|
||||
* serveur est toujours notifié. Si la suppression physique échoue (ou si
|
||||
* le kill survient juste après), la ligne reste `exists = 0` avec son
|
||||
* `uri` : la repasse [sweepPendingPhysicalDeletes] retentera le
|
||||
* `deleteDocument` au prochain tick (le walk peut la ressusciter
|
||||
* entre-temps, elle sera re-marquée sans nouveau journal — convergence).
|
||||
* le kill survient juste après), la ligne reste trashée avec son `uri` :
|
||||
* la repasse [sweepPendingPhysicalDeletes] retentera le `deleteDocument`
|
||||
* au prochain tick (le walk ne ressuscite plus les lignes trashées —
|
||||
* garde `trashedAt`).
|
||||
*/
|
||||
private suspend fun deleteFull(file: FileEntity): Boolean {
|
||||
val uri = file.uri
|
||||
return if (uri != null) {
|
||||
val now = System.currentTimeMillis()
|
||||
appDatabase.withTransaction {
|
||||
fileRepository.markMissing(file.resourceId, now)
|
||||
fileRepository.markTrashed(file.resourceId, now)
|
||||
outboxRepository.cancelPendingCreates(file.resourceId)
|
||||
if (outboxRepository.hasSyncedCreateOperation(file.resourceId)) {
|
||||
outboxRepository.enqueueDeleteResource(file.resourceId, "file")
|
||||
outboxRepository.enqueueTrashResource(file.resourceId, "file")
|
||||
}
|
||||
}
|
||||
val deleted = runCatching {
|
||||
@@ -144,6 +146,10 @@ class FileDeleter @Inject constructor(
|
||||
if (deleted) {
|
||||
Timber.d("deleted full %s", uri)
|
||||
thumbnailStore.delete(file.resourceId)
|
||||
// Ligne trashée cloud-only (restaurable, `uri` NULL) + le
|
||||
// serveur apprend que les octets sont partis (V2 placements).
|
||||
fileRepository.detachLocalCopy(file.resourceId)
|
||||
outboxRepository.enqueueReportBytes(file.resourceId, "file", false)
|
||||
} else {
|
||||
Timber.w("deleteDocument returned false for %s (sweep will retry)", uri)
|
||||
}
|
||||
@@ -176,8 +182,14 @@ class FileDeleter @Inject constructor(
|
||||
}.getOrDefault(false)
|
||||
if (deleted) {
|
||||
thumbnailStore.delete(file.resourceId)
|
||||
// Rattrapage : ces octets n'avaient jamais été signalés partis.
|
||||
outboxRepository.enqueueReportBytes(file.resourceId, "file", false)
|
||||
// Ligne trashée (V3) : le serveur l'a déjà oubliée — inutile
|
||||
// de lui signaler des octets partis (op vouée au NOT_FOUND
|
||||
// dead-letter). Lignes non trashées : rattrapage V2.
|
||||
if (file.trashedAt == null) {
|
||||
outboxRepository.enqueueReportBytes(file.resourceId, "file", false)
|
||||
} else {
|
||||
fileRepository.detachLocalCopy(file.resourceId)
|
||||
}
|
||||
swept++
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,8 +30,10 @@ import javax.inject.Singleton
|
||||
* Trois modes (partagés avec `FileDeleter`) :
|
||||
* - **LOCALLY** : suppression physique SAF de l'arbre + marquage `exists = 0`
|
||||
* Room, sans outbox (le serveur n'est pas affecté).
|
||||
* - **IN_CLOUD** : enqueue `delete_resource` pour les dossiers uniquement.
|
||||
* - **FULL** : les deux — suppression physique + outbox, transaction atomique.
|
||||
* - **IN_CLOUD** : enqueue `trash_resource` pour l'arbre + tombstones locales
|
||||
* (`trashed_at`, M5) dans la MÊME transaction — le physique reste intact
|
||||
* mais l'arbre disparaît de l'UI et le walk ne le ressuscite plus.
|
||||
* - **FULL** : les deux — journal trash + suppression physique, transaction atomique.
|
||||
*/
|
||||
@Singleton
|
||||
class FolderDeleter @Inject constructor(
|
||||
@@ -88,10 +90,11 @@ class FolderDeleter @Inject constructor(
|
||||
}
|
||||
|
||||
/**
|
||||
* Suppression cloud uniquement (outbox `delete_resource` + tombstone locale,
|
||||
* M5) : le dossier et toute sa descendance Room passent `exists = 0` dans
|
||||
* Trash serveur uniquement (outbox `trash_resource` + tombstones locales,
|
||||
* M5) : le dossier et toute sa descendance Room passent `trashed_at` dans
|
||||
* la MÊME transaction — le physique reste intact mais l'arbre disparaît de
|
||||
* l'UI et le walk ne le ressuscite plus (garde `hasPendingDeleteOperation`).
|
||||
* l'UI et le walk ne le ressuscite plus (gardes `hasPendingDeleteOperation`
|
||||
* élargi + `trashedAt`).
|
||||
*/
|
||||
private suspend fun deleteInCloud(folder: FolderEntity): Boolean {
|
||||
var ok = false
|
||||
@@ -99,26 +102,26 @@ class FolderDeleter @Inject constructor(
|
||||
val tree = collectDescendants(folder.resourceId)
|
||||
val now = System.currentTimeMillis()
|
||||
appDatabase.withTransaction {
|
||||
treeMarkMissing(folder, tree, now)
|
||||
treeMarkTrashed(folder, tree, now)
|
||||
}
|
||||
ok = true
|
||||
Timber.d("enqueued cloud delete for folder %s", folder.resourceId)
|
||||
Timber.d("enqueued trash for folder %s", folder.resourceId)
|
||||
}.onFailure { e ->
|
||||
Timber.w(e, "enqueueDeleteResource failed for folder %s", folder.resourceId)
|
||||
Timber.w(e, "enqueueTrashResource failed for folder %s", folder.resourceId)
|
||||
}
|
||||
return ok
|
||||
}
|
||||
|
||||
/**
|
||||
* Suppression complète : journal d'abord, physique ensuite (C4).
|
||||
* Trash complète : journal d'abord, physique ensuite (C4).
|
||||
*
|
||||
* Même contrat crash-safe que `FileDeleter.deleteFull` : la transaction
|
||||
* Room (`exists = 0` sur tout l'arbre + annulation des creates pending +
|
||||
* `delete_resource` là où le serveur connaît déjà la ressource) est
|
||||
* Room (`trashed_at` sur tout l'arbre + annulation des creates pending +
|
||||
* `trash_resource` là où le serveur connaît déjà la ressource) est
|
||||
* committée AVANT la suppression SAF. Un kill entre les deux ne perd plus
|
||||
* le journal ; si le physique échoue, [sweepPendingPhysicalDeletes]
|
||||
* retentera au prochain tick (le walk ne ressuscite plus les lignes sous
|
||||
* `delete_resource` pending — garde anti-résurrection).
|
||||
* retentera au prochain tick (le walk ne ressuscite plus les lignes
|
||||
* trashées — garde `trashedAt`).
|
||||
*/
|
||||
private suspend fun deleteFull(folder: FolderEntity): Boolean {
|
||||
val uri = folder.uri
|
||||
@@ -126,7 +129,7 @@ class FolderDeleter @Inject constructor(
|
||||
val tree = collectDescendants(folder.resourceId)
|
||||
val now = System.currentTimeMillis()
|
||||
appDatabase.withTransaction {
|
||||
treeMarkMissing(folder, tree, now)
|
||||
treeMarkTrashed(folder, tree, now)
|
||||
}
|
||||
return if (deleteTreePhysically(folder, tree)) {
|
||||
tree.files.forEach { thumbnailStore.delete(it.resourceId) }
|
||||
@@ -172,36 +175,76 @@ class FolderDeleter @Inject constructor(
|
||||
private const val SWEEP_LIMIT = 50
|
||||
}
|
||||
|
||||
/** Marque missing + outbox `delete_resource` pour toute la descendance, atomique. */
|
||||
private suspend fun treeMarkMissing(folder: FolderEntity, tree: FolderTree, now: Long) {
|
||||
/** Marque trash + outbox `trash_resource` pour toute la descendance, atomique. */
|
||||
private suspend fun treeMarkTrashed(folder: FolderEntity, tree: FolderTree, now: Long) {
|
||||
for (file in tree.files) {
|
||||
fileRepository.markMissing(file.resourceId, now)
|
||||
fileRepository.markTrashed(file.resourceId, now)
|
||||
outboxRepository.cancelPendingCreates(file.resourceId)
|
||||
if (outboxRepository.hasSyncedCreateOperation(file.resourceId)) {
|
||||
outboxRepository.enqueueDeleteResource(file.resourceId, "file")
|
||||
outboxRepository.enqueueTrashResource(file.resourceId, "file")
|
||||
}
|
||||
}
|
||||
for (desc in tree.folders) {
|
||||
folderRepository.markMissing(desc.resourceId, now)
|
||||
folderRepository.markTrashed(desc.resourceId, now)
|
||||
outboxRepository.cancelPendingCreates(desc.resourceId)
|
||||
if (outboxRepository.hasSyncedCreateOperationAnyType(desc.resourceId)) {
|
||||
outboxRepository.enqueueDeleteResource(desc.resourceId, "folder")
|
||||
outboxRepository.enqueueTrashResource(desc.resourceId, "folder")
|
||||
}
|
||||
}
|
||||
folderRepository.markMissing(folder.resourceId, now)
|
||||
folderRepository.markTrashed(folder.resourceId, now)
|
||||
outboxRepository.cancelPendingCreates(folder.resourceId)
|
||||
if (outboxRepository.hasSyncedCreateOperationAnyType(folder.resourceId)) {
|
||||
outboxRepository.enqueueDeleteResource(folder.resourceId, "folder")
|
||||
outboxRepository.enqueueTrashResource(folder.resourceId, "folder")
|
||||
}
|
||||
}
|
||||
|
||||
/** Énumère le contenu d'un dossier (fichiers + sous-dossiers, tout niveau) via Room. */
|
||||
private suspend fun collectDescendants(folderResourceId: String): FolderTree {
|
||||
val files = fileRepository.getFilesInFolder(folderResourceId).toMutableList()
|
||||
/**
|
||||
* Lève le flag trash sur tout l'arbre + enqueue `restore_resource` par
|
||||
* nœud connu du serveur (miroir de [treeMarkTrashed]). Les nœuds jamais
|
||||
* poussés sont juste réactivés localement (le serveur ne les connaît pas).
|
||||
*/
|
||||
suspend fun treeRestore(folderResourceId: String) {
|
||||
val tree = collectDescendants(folderResourceId, includeTrashed = true)
|
||||
val now = System.currentTimeMillis()
|
||||
appDatabase.withTransaction {
|
||||
for (file in tree.files) {
|
||||
fileRepository.clearTrashed(file.resourceId, now)
|
||||
if (outboxRepository.hasCreateOperation(file.resourceId)) {
|
||||
outboxRepository.enqueueRestoreResource(file.resourceId, "file")
|
||||
}
|
||||
}
|
||||
for (desc in tree.folders) {
|
||||
folderRepository.clearTrashed(desc.resourceId, now)
|
||||
if (outboxRepository.hasCreateOperationAnyType(desc.resourceId)) {
|
||||
outboxRepository.enqueueRestoreResource(desc.resourceId, "folder")
|
||||
}
|
||||
}
|
||||
folderRepository.clearTrashed(folderResourceId, now)
|
||||
if (outboxRepository.hasCreateOperationAnyType(folderResourceId)) {
|
||||
outboxRepository.enqueueRestoreResource(folderResourceId, "folder")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Énumère le contenu d'un dossier (fichiers + sous-dossiers, tout niveau)
|
||||
* via Room. `includeTrashed = true` pour le restore (les enfants trashés
|
||||
* sont invisibles des requêtes `exists = 1`).
|
||||
*/
|
||||
private suspend fun collectDescendants(folderResourceId: String, includeTrashed: Boolean = false): FolderTree {
|
||||
val files = if (includeTrashed) {
|
||||
fileRepository.getFilesInFolderAll(folderResourceId)
|
||||
} else {
|
||||
fileRepository.getFilesInFolder(folderResourceId)
|
||||
}.toMutableList()
|
||||
val folders = mutableListOf<FolderEntity>()
|
||||
val children = folderRepository.getChildren(folderResourceId)
|
||||
val children = if (includeTrashed) {
|
||||
folderRepository.getChildrenAll(folderResourceId)
|
||||
} else {
|
||||
folderRepository.getChildren(folderResourceId)
|
||||
}
|
||||
for (child in children) {
|
||||
val sub = collectDescendants(child.resourceId)
|
||||
val sub = collectDescendants(child.resourceId, includeTrashed)
|
||||
files += sub.files
|
||||
folders += child
|
||||
folders += sub.folders
|
||||
|
||||
@@ -18,14 +18,14 @@ import javax.inject.Inject
|
||||
import javax.inject.Singleton
|
||||
|
||||
/**
|
||||
* Suppression physique d'un fichier sur le device (mode review « supprimer »).
|
||||
* Trash d'un fichier depuis le mode review « supprimer » (V3 : corbeille).
|
||||
*
|
||||
* Appelle `DocumentsContract.deleteDocument` sur l'uri SAF — le fichier
|
||||
* disparaît aussi de l'arborescence (et donc du prochain sync). En cas de
|
||||
* succès, la ligne Room est masquée (`exists = 0`) : cohérent avec la
|
||||
* réconciliation (jamais de DELETE SQL), idempotent face à la marche 30s.
|
||||
* La suppression est aussi journalisée dans l'outbox (`delete_resource`),
|
||||
* dans la même transaction que le masquage Room.
|
||||
* Journal d'abord (`trashed_at` + `trash_resource` si le serveur connaît la
|
||||
* ressource), physique ensuite — même contrat crash-safe que
|
||||
* `FileDeleter.deleteFull` (C4). En cas de succès SAF la ligne reste trashée
|
||||
* (restaurable, cloud-only si plus d'`uri`) ; en cas de refus, la repasse
|
||||
* `FileDeleter.sweepPendingPhysicalDeletes` retente (jamais de DELETE SQL,
|
||||
* idempotent face à la marche 30s).
|
||||
*
|
||||
* Retourne `false` si le provider refuse la suppression (permission ou pas de
|
||||
* geste delete) : dans ce cas le fichier reste dans la file de review.
|
||||
@@ -42,7 +42,7 @@ class SafFileDeleter @Inject constructor(
|
||||
private val resolver: ContentResolver get() = context.contentResolver
|
||||
|
||||
/**
|
||||
* Suppression review (swipe ✗) : journal d'abord, physique ensuite (C4 —
|
||||
* Trash review (swipe ✗) : journal d'abord, physique ensuite (C4 —
|
||||
* même contrat que `FileDeleter.deleteFull`, la repasse
|
||||
* `FileDeleter.sweepPendingPhysicalDeletes` couvrant aussi ces lignes).
|
||||
*/
|
||||
@@ -51,15 +51,15 @@ class SafFileDeleter @Inject constructor(
|
||||
return withContext(Dispatchers.IO) {
|
||||
val now = System.currentTimeMillis()
|
||||
appDatabase.withTransaction {
|
||||
fileRepository.markMissing(file.resourceId, now)
|
||||
fileRepository.markTrashed(file.resourceId, now)
|
||||
// Gate « processed » + annulation (M19) : si le fichier
|
||||
// n'a jamais été poussé (create encore pending), on
|
||||
// annule le create au lieu d'un delete bruit ; le
|
||||
// delete n'est journalisé que si le serveur connaît
|
||||
// annule le create au lieu d'une op bruit ; le
|
||||
// trash n'est journalisé que si le serveur connaît
|
||||
// déjà la ressource (create synced).
|
||||
outboxRepository.cancelPendingCreates(file.resourceId)
|
||||
if (outboxRepository.hasSyncedCreateOperation(file.resourceId)) {
|
||||
outboxRepository.enqueueDeleteResource(file.resourceId, "file")
|
||||
outboxRepository.enqueueTrashResource(file.resourceId, "file")
|
||||
}
|
||||
}
|
||||
val deleted = runCatching {
|
||||
|
||||
@@ -144,7 +144,11 @@ class DeviceSync @Inject constructor(
|
||||
// O(racines×DB) — le SQL filtre par préfixe d'uri (échappé).
|
||||
for (folder in folderRepository.getUnderRoot(rootUri)) {
|
||||
val folderUri = folder.uri
|
||||
// Lignes trashées (V3) : cycle de vie piloté par la corbeille, pas
|
||||
// par le walk — jamais de markMissing ni d'annulation de creates
|
||||
// (l'op trash porte déjà l'intention).
|
||||
if (folder.exists != 0 && folderUri != null && folderUri !in seen &&
|
||||
folder.trashedAt == null &&
|
||||
!outboxRepository.hasPendingMoveOperation(folder.resourceId)
|
||||
) {
|
||||
folderRepository.markMissing(folder.resourceId, now)
|
||||
@@ -164,6 +168,7 @@ class DeviceSync @Inject constructor(
|
||||
// ensuite disparu du disque, c'est une vraie suppression
|
||||
// (sinon fantôme `exists = 1` éternel, M4).
|
||||
if (file.exists != 0 && fileUri != null && fileUri !in seen &&
|
||||
file.trashedAt == null &&
|
||||
!outboxRepository.hasPendingMoveOperation(file.resourceId)
|
||||
) {
|
||||
fileRepository.markMissing(file.resourceId, now)
|
||||
|
||||
@@ -11,6 +11,7 @@ import androidx.work.PeriodicWorkRequestBuilder
|
||||
import androidx.work.WorkManager
|
||||
import androidx.work.WorkerParameters
|
||||
import com.kazier.mobile.data.local.dao.FileDao
|
||||
import com.kazier.mobile.data.repository.TrashRepository
|
||||
import com.kazier.mobile.domain.RetentionRule
|
||||
import com.kazier.mobile.domain.RetentionStore
|
||||
import com.kazier.mobile.features.saf.FileDeleter
|
||||
@@ -25,6 +26,9 @@ import timber.log.Timber
|
||||
* (gate `isReleasable` : seuls les fichiers dont le serveur a les octets
|
||||
* partent — jamais de perte). Opération purement locale : aucune contrainte
|
||||
* réseau, batterie faible exclue.
|
||||
*
|
||||
* V3 corbeille : la même passe expire les tombstones locales
|
||||
* (`TrashRepository.purgeExpiredLocally`, 31j = serveur 30j + marge).
|
||||
*/
|
||||
@HiltWorker
|
||||
class RetentionWorker @AssistedInject constructor(
|
||||
@@ -33,9 +37,14 @@ class RetentionWorker @AssistedInject constructor(
|
||||
private val retentionStore: RetentionStore,
|
||||
private val fileDeleter: FileDeleter,
|
||||
private val fileDao: FileDao,
|
||||
private val trashRepository: TrashRepository,
|
||||
) : CoroutineWorker(appContext, workerParams) {
|
||||
|
||||
override suspend fun doWork(): Result {
|
||||
val purged = trashRepository.purgeExpiredLocally(
|
||||
System.currentTimeMillis() - TrashRepository.LOCAL_RETENTION_MS,
|
||||
)
|
||||
if (purged > 0) Timber.d("retention: tombstones purgées=%d", purged)
|
||||
val rule = retentionStore.current()
|
||||
if (rule is RetentionRule.KeepAll) return Result.success()
|
||||
val months = (rule as RetentionRule.LastMonths).months
|
||||
|
||||
@@ -11,6 +11,7 @@ import com.kazier.mobile.data.local.entity.PendingOperationEntity
|
||||
import com.kazier.mobile.data.repository.FolderRepository
|
||||
import com.kazier.mobile.data.repository.SaveFolderInput
|
||||
import com.kazier.mobile.data.repository.ShareRepository
|
||||
import com.kazier.mobile.data.repository.TrashRepository
|
||||
import com.kazier.mobile.features.ocr.OcrAutoWorker
|
||||
import com.kazier.mobile.features.saf.FileDeleter
|
||||
import com.kazier.mobile.features.saf.FolderDeleter
|
||||
@@ -51,6 +52,7 @@ class SyncViewModel @Inject constructor(
|
||||
private val folderRepository: FolderRepository,
|
||||
private val pendingOperationDao: PendingOperationDao,
|
||||
private val shareRepository: ShareRepository,
|
||||
private val trashRepository: TrashRepository,
|
||||
private val fileDeleter: FileDeleter,
|
||||
private val folderDeleter: FolderDeleter,
|
||||
@ApplicationContext private val appContext: Context,
|
||||
@@ -139,6 +141,13 @@ class SyncViewModel @Inject constructor(
|
||||
if (e is CancellationException) throw e
|
||||
Timber.d("syncSnapshot failed, retrying later: %s", e.message)
|
||||
}
|
||||
// Convergence corbeille V3 : trash fait ailleurs (2e
|
||||
// device, autre client) → tombstones locales, sans outbox.
|
||||
runCatching { trashRepository.syncTrashFromServer() }
|
||||
.onFailure { e ->
|
||||
if (e is CancellationException) throw e
|
||||
Timber.d("syncTrash failed, retrying later: %s", e.message)
|
||||
}
|
||||
// m2 : ne réveiller WorkManager que si le tick a produit
|
||||
// quelque chose (walk/sweep) ou si l'outbox attend un drain
|
||||
// (op partagée depuis l'UI, drain précédent interrompu…).
|
||||
|
||||
@@ -29,6 +29,7 @@ import com.kazier.mobile.ui.scan.ScanFlowScreen
|
||||
import com.kazier.mobile.ui.search.SearchScreen
|
||||
import com.kazier.mobile.ui.settings.SettingsScreen
|
||||
import com.kazier.mobile.ui.share.OpenLinkScreen
|
||||
import com.kazier.mobile.ui.trash.TrashScreen
|
||||
import com.kazier.mobile.ui.watchedfolders.WatchedFoldersScreen
|
||||
|
||||
object Routes {
|
||||
@@ -38,6 +39,7 @@ object Routes {
|
||||
const val DASHBOARD = "dashboard"
|
||||
const val REVIEW = "review"
|
||||
const val WATCHED_FOLDERS = "watched"
|
||||
const val TRASH = "trash"
|
||||
const val FOLDER_DETAIL = "folder/{folderResourceId}"
|
||||
const val ARG_FOLDER = "folderResourceId"
|
||||
const val DOCUMENT = "document/{documentResourceId}"
|
||||
@@ -146,6 +148,7 @@ fun NavGraph(
|
||||
selectedTab = selectedTab,
|
||||
onTabSelected = onTabSelected,
|
||||
onOpenWatchedFolders = onOpenWatchedFolders,
|
||||
onOpenTrash = { navController.navigate(Routes.TRASH) },
|
||||
authViewModel = authViewModel,
|
||||
connectionStatusViewModel = connectionStatusViewModel,
|
||||
syncViewModel = syncViewModel,
|
||||
@@ -179,6 +182,11 @@ fun NavGraph(
|
||||
syncViewModel = syncViewModel,
|
||||
)
|
||||
}
|
||||
composable(Routes.TRASH) {
|
||||
TrashScreen(
|
||||
onBack = { navController.popBackStack() },
|
||||
)
|
||||
}
|
||||
composable(
|
||||
route = Routes.FOLDER_DETAIL,
|
||||
arguments = listOf(
|
||||
|
||||
@@ -17,6 +17,7 @@ import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.CloudOff
|
||||
import androidx.compose.material.icons.filled.DarkMode
|
||||
import androidx.compose.material.icons.filled.Delete
|
||||
import androidx.compose.material.icons.filled.Dns
|
||||
import androidx.compose.material.icons.filled.Folder
|
||||
import androidx.compose.material.icons.filled.Person
|
||||
@@ -69,6 +70,7 @@ fun SettingsScreen(
|
||||
selectedTab: NavTab,
|
||||
onTabSelected: (NavTab) -> Unit,
|
||||
onOpenWatchedFolders: () -> Unit,
|
||||
onOpenTrash: () -> Unit,
|
||||
authViewModel: AuthViewModel,
|
||||
connectionStatusViewModel: ConnectionStatusViewModel,
|
||||
syncViewModel: SyncViewModel,
|
||||
@@ -153,6 +155,14 @@ fun SettingsScreen(
|
||||
onClick = onOpenWatchedFolders,
|
||||
)
|
||||
|
||||
HorizontalDivider()
|
||||
SettingsRow(
|
||||
icon = { Icon(Icons.Filled.Delete, contentDescription = null) },
|
||||
title = stringResource(R.string.trash_title),
|
||||
subtitle = stringResource(R.string.trash_hint),
|
||||
onClick = onOpenTrash,
|
||||
)
|
||||
|
||||
HorizontalDivider()
|
||||
SettingsRow(
|
||||
icon = { Icon(Icons.Filled.Dns, contentDescription = null) },
|
||||
|
||||
@@ -0,0 +1,222 @@
|
||||
package com.kazier.mobile.ui.trash
|
||||
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
import androidx.compose.foundation.lazy.items
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.automirrored.filled.ArrowBack
|
||||
import androidx.compose.material.icons.filled.DeleteForever
|
||||
import androidx.compose.material.icons.filled.Description
|
||||
import androidx.compose.material.icons.filled.Folder
|
||||
import androidx.compose.material.icons.filled.RestoreFromTrash
|
||||
import androidx.compose.material3.AlertDialog
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Scaffold
|
||||
import androidx.compose.material3.SnackbarHost
|
||||
import androidx.compose.material3.SnackbarHostState
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextButton
|
||||
import androidx.compose.material3.TopAppBar
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.saveable.rememberSaveable
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.text.style.TextOverflow
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.hilt.navigation.compose.hiltViewModel
|
||||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||
import com.kazier.mobile.R
|
||||
import java.text.DateFormat
|
||||
import java.util.Date
|
||||
|
||||
/**
|
||||
* Corbeille V3 : ressources trashées (plus récentes d'abord), restore en un
|
||||
* tap, purge définitive après confirmation. Destruction auto serveur après
|
||||
* 30j (rappelée en sous-titre vide) — la purge locale suit (31j).
|
||||
*/
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun TrashScreen(
|
||||
onBack: () -> Unit,
|
||||
viewModel: TrashViewModel = hiltViewModel(),
|
||||
) {
|
||||
val files by viewModel.trashedFiles.collectAsStateWithLifecycle(initialValue = emptyList())
|
||||
val folders by viewModel.trashedFolders.collectAsStateWithLifecycle(initialValue = emptyList())
|
||||
val busy by viewModel.busy.collectAsStateWithLifecycle()
|
||||
val error by viewModel.error.collectAsStateWithLifecycle()
|
||||
|
||||
val snackbarHostState = remember { SnackbarHostState() }
|
||||
LaunchedEffect(error) {
|
||||
error?.let {
|
||||
snackbarHostState.showSnackbar(it)
|
||||
viewModel.clearError()
|
||||
}
|
||||
}
|
||||
|
||||
var pendingPurge by rememberSaveable { mutableStateOf<Pair<String, Boolean>?>(null) }
|
||||
|
||||
pendingPurge?.let { (resourceId, isFolder) ->
|
||||
AlertDialog(
|
||||
onDismissRequest = { pendingPurge = null },
|
||||
title = { Text(stringResource(R.string.trash_purge_confirm_title)) },
|
||||
text = { Text(stringResource(R.string.trash_purge_confirm_message)) },
|
||||
confirmButton = {
|
||||
TextButton(
|
||||
onClick = {
|
||||
pendingPurge = null
|
||||
if (isFolder) viewModel.purgeFolder(resourceId) else viewModel.purgeFile(resourceId)
|
||||
},
|
||||
) { Text(stringResource(R.string.trash_purge_confirm)) }
|
||||
},
|
||||
dismissButton = {
|
||||
TextButton(onClick = { pendingPurge = null }) {
|
||||
Text(stringResource(R.string.delete_cancel))
|
||||
}
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
Scaffold(
|
||||
topBar = {
|
||||
TopAppBar(
|
||||
title = { Text(stringResource(R.string.trash_title)) },
|
||||
navigationIcon = {
|
||||
IconButton(onClick = onBack) {
|
||||
Icon(
|
||||
Icons.AutoMirrored.Filled.ArrowBack,
|
||||
contentDescription = stringResource(R.string.back),
|
||||
)
|
||||
}
|
||||
},
|
||||
)
|
||||
},
|
||||
snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
|
||||
) { padding ->
|
||||
val rows = remember(folders, files) {
|
||||
val folderRows = folders.map { TrashRow(it.resourceId, it.name, it.trashedAt, true) }
|
||||
val fileRows = files.map { TrashRow(it.resourceId, it.name, it.trashedAt, false) }
|
||||
// Les deux listes sont déjà triées (plus récent d'abord) ; fusion
|
||||
// par date décroissante (NULL = le plus vieux, jamais en pratique).
|
||||
(folderRows + fileRows).sortedByDescending { it.trashedAt ?: 0L }
|
||||
}
|
||||
if (rows.isEmpty()) {
|
||||
Column(
|
||||
modifier = Modifier.fillMaxSize().padding(padding).padding(32.dp),
|
||||
verticalArrangement = Arrangement.Center,
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
) {
|
||||
Text(
|
||||
text = stringResource(R.string.trash_empty),
|
||||
style = MaterialTheme.typography.bodyLarge,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
textAlign = TextAlign.Center,
|
||||
)
|
||||
Text(
|
||||
text = stringResource(R.string.trash_retention_hint),
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
textAlign = TextAlign.Center,
|
||||
modifier = Modifier.padding(top = 8.dp),
|
||||
)
|
||||
}
|
||||
} else {
|
||||
LazyColumn(
|
||||
modifier = Modifier.fillMaxSize().padding(padding),
|
||||
contentPadding = PaddingValues(horizontal = 16.dp),
|
||||
) {
|
||||
items(rows, key = { it.resourceId }) { row ->
|
||||
TrashItemRow(
|
||||
row = row,
|
||||
actionsEnabled = !busy,
|
||||
onRestore = {
|
||||
if (row.isFolder) viewModel.restoreFolder(row.resourceId)
|
||||
else viewModel.restoreFile(row.resourceId)
|
||||
},
|
||||
onPurge = { pendingPurge = row.resourceId to row.isFolder },
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private data class TrashRow(
|
||||
val resourceId: String,
|
||||
val name: String,
|
||||
val trashedAt: Long?,
|
||||
val isFolder: Boolean,
|
||||
)
|
||||
|
||||
@Composable
|
||||
private fun TrashItemRow(
|
||||
row: TrashRow,
|
||||
actionsEnabled: Boolean,
|
||||
onRestore: () -> Unit,
|
||||
onPurge: () -> Unit,
|
||||
) {
|
||||
val dateLabel = remember(row.trashedAt) {
|
||||
row.trashedAt?.let {
|
||||
DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT).format(Date(it))
|
||||
}
|
||||
}
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth().padding(vertical = 12.dp),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.spacedBy(12.dp),
|
||||
) {
|
||||
Icon(
|
||||
imageVector = if (row.isFolder) Icons.Filled.Folder else Icons.Filled.Description,
|
||||
contentDescription = null,
|
||||
tint = MaterialTheme.colorScheme.primary,
|
||||
modifier = Modifier.size(28.dp),
|
||||
)
|
||||
Column(modifier = Modifier.weight(1f)) {
|
||||
Text(
|
||||
text = row.name,
|
||||
style = MaterialTheme.typography.bodyLarge,
|
||||
fontWeight = FontWeight.Medium,
|
||||
maxLines = 1,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
)
|
||||
dateLabel?.let {
|
||||
Text(
|
||||
text = it,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
maxLines = 1,
|
||||
)
|
||||
}
|
||||
}
|
||||
IconButton(onClick = onRestore, enabled = actionsEnabled) {
|
||||
Icon(
|
||||
imageVector = Icons.Filled.RestoreFromTrash,
|
||||
contentDescription = stringResource(R.string.trash_restore),
|
||||
)
|
||||
}
|
||||
IconButton(onClick = onPurge, enabled = actionsEnabled) {
|
||||
Icon(
|
||||
imageVector = Icons.Filled.DeleteForever,
|
||||
contentDescription = stringResource(R.string.trash_purge),
|
||||
tint = MaterialTheme.colorScheme.error,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,63 @@
|
||||
package com.kazier.mobile.ui.trash
|
||||
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import com.kazier.mobile.data.local.entity.FileEntity
|
||||
import com.kazier.mobile.data.local.entity.FolderEntity
|
||||
import com.kazier.mobile.data.repository.TrashRepository
|
||||
import dagger.hilt.android.lifecycle.HiltViewModel
|
||||
import javax.inject.Inject
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
import kotlinx.coroutines.flow.asStateFlow
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
/**
|
||||
* Écran Corbeille V3 : lignes trashées (fichiers + dossiers), restore et
|
||||
* purge définitive. Les actions passent par [TrashRepository] (transaction
|
||||
* Room + outbox) ; toute erreur remonte en snackbar via [error].
|
||||
*/
|
||||
@HiltViewModel
|
||||
class TrashViewModel @Inject constructor(
|
||||
private val trashRepository: TrashRepository,
|
||||
) : ViewModel() {
|
||||
|
||||
val trashedFiles: Flow<List<FileEntity>> = trashRepository.observeTrashedFiles()
|
||||
|
||||
val trashedFolders: Flow<List<FolderEntity>> = trashRepository.observeTrashedFolders()
|
||||
|
||||
val trashedCount: Flow<Int> = trashRepository.observeTrashedCount()
|
||||
|
||||
private val _busy = MutableStateFlow(false)
|
||||
val busy: StateFlow<Boolean> = _busy.asStateFlow()
|
||||
|
||||
private val _error = MutableStateFlow<String?>(null)
|
||||
val error: StateFlow<String?> = _error.asStateFlow()
|
||||
|
||||
fun clearError() {
|
||||
_error.value = null
|
||||
}
|
||||
|
||||
fun restoreFile(resourceId: String) = runGuarded { trashRepository.restoreFile(resourceId) }
|
||||
|
||||
fun restoreFolder(resourceId: String) = runGuarded { trashRepository.restoreFolder(resourceId) }
|
||||
|
||||
fun purgeFile(resourceId: String) = runGuarded { trashRepository.purgeFile(resourceId) }
|
||||
|
||||
fun purgeFolder(resourceId: String) = runGuarded { trashRepository.purgeFolder(resourceId) }
|
||||
|
||||
private fun runGuarded(block: suspend () -> Unit) {
|
||||
if (_busy.value) return
|
||||
viewModelScope.launch {
|
||||
_busy.value = true
|
||||
try {
|
||||
block()
|
||||
} catch (e: Exception) {
|
||||
_error.value = e.message ?: e.javaClass.simpleName
|
||||
} finally {
|
||||
_busy.value = false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -303,7 +303,7 @@
|
||||
<string name="delete_in_cloud">Delete from cloud</string>
|
||||
<string name="delete_full">Delete everywhere</string>
|
||||
<string name="delete_confirm_title">Delete %1$d document(s)?</string>
|
||||
<string name="delete_confirm_message">This action cannot be undone.</string>
|
||||
<string name="delete_confirm_message">Items go to trash (restorable for 30 days).</string>
|
||||
<string name="delete_warning_title">Documents not synced</string>
|
||||
<string name="delete_warning_local_only_msg">%1$d out of %2$d document(s) are not synced to the cloud and will not be deleted from the server.</string>
|
||||
<string name="delete_warning_cloud_only_msg">%1$d out of %2$d document(s) have no local copy and will not be deleted from this device.</string>
|
||||
@@ -382,4 +382,14 @@
|
||||
<string name="share_content_description">Share this folder</string>
|
||||
<string name="share_action">Share</string>
|
||||
<string name="more_actions">More actions</string>
|
||||
<!-- Trash V3 -->
|
||||
<string name="trash_title">Trash</string>
|
||||
<string name="trash_hint">Deleted items, restorable for 30 days</string>
|
||||
<string name="trash_empty">Trash is empty</string>
|
||||
<string name="trash_retention_hint">Deleted items are destroyed automatically after 30 days.</string>
|
||||
<string name="trash_restore">Restore</string>
|
||||
<string name="trash_purge">Delete forever</string>
|
||||
<string name="trash_purge_confirm_title">Delete forever?</string>
|
||||
<string name="trash_purge_confirm_message">This action cannot be undone. The item will be destroyed everywhere.</string>
|
||||
<string name="trash_purge_confirm">Delete</string>
|
||||
</resources>
|
||||
@@ -304,7 +304,7 @@
|
||||
<string name="delete_in_cloud">Supprimer dans le cloud</string>
|
||||
<string name="delete_full">Supprimer partout</string>
|
||||
<string name="delete_confirm_title">Supprimer %1$d document(s) ?</string>
|
||||
<string name="delete_confirm_message">Cette action est irréversible.</string>
|
||||
<string name="delete_confirm_message">Les éléments partent en corbeille (restaurables 30 jours).</string>
|
||||
<string name="delete_warning_title">Documents non synchronisés</string>
|
||||
<string name="delete_warning_local_only_msg">%1$d document(s) sur %2$d n\'est/sont pas synchronisés avec le cloud et ne seront pas supprimés du serveur.</string>
|
||||
<string name="delete_warning_cloud_only_msg">%1$d document(s) sur %2$d n\'ont pas de copie locale et ne seront pas supprimés de cet appareil.</string>
|
||||
@@ -383,4 +383,14 @@
|
||||
<string name="share_content_description">Partager ce dossier</string>
|
||||
<string name="share_action">Partager</string>
|
||||
<string name="more_actions">Plus d\'actions</string>
|
||||
<!-- Corbeille V3 -->
|
||||
<string name="trash_title">Corbeille</string>
|
||||
<string name="trash_hint">Éléments supprimés, restaurables 30 jours</string>
|
||||
<string name="trash_empty">Corbeille vide</string>
|
||||
<string name="trash_retention_hint">Les éléments supprimés sont détruits automatiquement après 30 jours.</string>
|
||||
<string name="trash_restore">Restaurer</string>
|
||||
<string name="trash_purge">Supprimer définitivement</string>
|
||||
<string name="trash_purge_confirm_title">Supprimer définitivement ?</string>
|
||||
<string name="trash_purge_confirm_message">Cette action est irréversible. L\'élément sera détruit partout.</string>
|
||||
<string name="trash_purge_confirm">Supprimer</string>
|
||||
</resources>
|
||||
+187
@@ -0,0 +1,187 @@
|
||||
package com.kazier.mobile.data.local.dao
|
||||
|
||||
import android.content.Context
|
||||
import androidx.room.Room
|
||||
import androidx.test.core.app.ApplicationProvider
|
||||
import com.squareup.moshi.Moshi
|
||||
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
|
||||
import com.kazier.mobile.data.local.AppDatabase
|
||||
import com.kazier.mobile.data.local.entity.FileEntity
|
||||
import com.kazier.mobile.data.local.entity.FolderEntity
|
||||
import com.kazier.mobile.data.local.entity.PendingOperationType
|
||||
import com.kazier.mobile.data.remote.ApiClient
|
||||
import com.kazier.mobile.data.remote.ApiService
|
||||
import com.kazier.mobile.data.repository.FileRepository
|
||||
import com.kazier.mobile.data.repository.OutboxRepository
|
||||
import com.kazier.mobile.data.repository.SaveFileInput
|
||||
import com.kazier.mobile.domain.DeviceIdentity
|
||||
import com.kazier.mobile.domain.GenerateId
|
||||
import kotlinx.coroutines.flow.first
|
||||
import kotlinx.coroutines.test.runTest
|
||||
import org.junit.After
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Assert.assertNull
|
||||
import org.junit.Assert.assertTrue
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.annotation.Config
|
||||
import retrofit2.Retrofit
|
||||
import retrofit2.converter.moshi.MoshiConverterFactory
|
||||
|
||||
/**
|
||||
* Corbeille V3 côté Room : tombstone (`trashed_at` + `exists = 0`), jamais
|
||||
* de DELETE — visibilité, anti-résurrection du walk, purge locale, outbox.
|
||||
*/
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
@Config(sdk = [34])
|
||||
class TrashCorbeilleTest {
|
||||
|
||||
private lateinit var db: AppDatabase
|
||||
private lateinit var fileDao: FileDao
|
||||
private lateinit var folderDao: FolderDao
|
||||
private lateinit var opsDao: PendingOperationDao
|
||||
private lateinit var fileRepository: FileRepository
|
||||
private lateinit var outboxRepository: OutboxRepository
|
||||
|
||||
@Before
|
||||
fun setUp() {
|
||||
val context = ApplicationProvider.getApplicationContext<Context>()
|
||||
db = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
|
||||
.allowMainThreadQueries()
|
||||
.build()
|
||||
fileDao = db.fileDao()
|
||||
folderDao = db.folderDao()
|
||||
opsDao = db.pendingOperationDao()
|
||||
|
||||
val moshi = Moshi.Builder().add(KotlinJsonAdapterFactory()).build()
|
||||
val apiService = Retrofit.Builder()
|
||||
.baseUrl("http://localhost:1/")
|
||||
.addConverterFactory(MoshiConverterFactory.create(moshi))
|
||||
.build()
|
||||
.create(ApiService::class.java)
|
||||
val generateId = GenerateId()
|
||||
outboxRepository = OutboxRepository(opsDao, generateId, DeviceIdentity(db.userPreferenceDao(), generateId), moshi)
|
||||
fileRepository = FileRepository(fileDao, folderDao, ApiClient(apiService, moshi), generateId, db, outboxRepository)
|
||||
|
||||
runTest {
|
||||
folderDao.upsert(
|
||||
FolderEntity(
|
||||
resourceId = FOLDER, uri = null, name = FOLDER, exists = 1,
|
||||
parentResourceId = null, syncStatus = "local",
|
||||
addedAt = NOW, updatedAt = NOW,
|
||||
),
|
||||
)
|
||||
folderDao.upsert(
|
||||
FolderEntity(
|
||||
resourceId = FOLDER_CHILD, uri = null, name = "Enfant", exists = 1,
|
||||
parentResourceId = FOLDER, syncStatus = "local",
|
||||
addedAt = NOW, updatedAt = NOW,
|
||||
),
|
||||
)
|
||||
fileDao.upsert(
|
||||
FileEntity(
|
||||
resourceId = RESOURCE_ID, uri = FILE_URI, name = "doc.txt",
|
||||
folderResourceId = FOLDER, size = 10, exists = 1,
|
||||
processed = true, addedAt = NOW, updatedAt = NOW,
|
||||
),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@After
|
||||
fun tearDown() {
|
||||
db.close()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun trash_masque_et_restorable() = runTest {
|
||||
fileDao.markTrashed(RESOURCE_ID, NOW)
|
||||
|
||||
assertTrue(fileDao.observeByFolder(FOLDER).first().isEmpty())
|
||||
assertTrue(fileDao.getByFolderOnce(FOLDER).isEmpty())
|
||||
val trashed = fileDao.observeTrashed().first()
|
||||
assertEquals(1, trashed.size)
|
||||
assertEquals(RESOURCE_ID, trashed[0].resourceId)
|
||||
|
||||
fileDao.clearTrashed(RESOURCE_ID, NOW + 1)
|
||||
assertEquals(1, fileDao.getByFolderOnce(FOLDER).size)
|
||||
assertTrue(fileDao.observeTrashed().first().isEmpty())
|
||||
}
|
||||
|
||||
@Test
|
||||
fun walk_ne_ressuscite_jamais_une_ligne_trashee() = runTest {
|
||||
fileDao.markTrashed(RESOURCE_ID, NOW)
|
||||
|
||||
// Le walk revoit le fichier SAF (IN_CLOUD garde le physique) : refusé.
|
||||
val kept = fileRepository.saveLocalFile(
|
||||
SaveFileInput(uri = FILE_URI, name = "doc.txt", size = 10),
|
||||
folderResourceId = FOLDER,
|
||||
)
|
||||
assertEquals(0, kept.exists)
|
||||
assertEquals(NOW, kept.trashedAt)
|
||||
assertTrue(fileDao.getByFolderOnce(FOLDER).isEmpty())
|
||||
}
|
||||
|
||||
@Test
|
||||
fun op_trash_pending_bloque_la_reimport() = runTest {
|
||||
// Ordre journal-first : trash pending AVANT disparition SAF.
|
||||
outboxRepository.enqueueTrashResource(RESOURCE_ID, "file")
|
||||
assertTrue(outboxRepository.hasPendingDeleteOperation(RESOURCE_ID))
|
||||
assertEquals(1, opsDao.countPendingDeleteOperations(RESOURCE_ID))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun ops_trash_restore_purge_enqueued_avec_bons_noms() = runTest {
|
||||
outboxRepository.enqueueTrashResource("r1", "file")
|
||||
outboxRepository.enqueueRestoreResource("r1", "file")
|
||||
outboxRepository.enqueuePurgeResource("r1", "file")
|
||||
val ops = opsDao.selectPending(10).map { it.operation }
|
||||
assertEquals(
|
||||
listOf(
|
||||
PendingOperationType.TRASH_RESOURCE,
|
||||
PendingOperationType.RESTORE_RESOURCE,
|
||||
PendingOperationType.PURGE_RESOURCE,
|
||||
),
|
||||
ops,
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun purge_locale_expire_les_vieilles_tombstones() = runTest {
|
||||
val old = NOW - 32L * 24 * 60 * 60 * 1000
|
||||
fileDao.markTrashed(RESOURCE_ID, old)
|
||||
|
||||
val deleted = fileDao.deleteTrashedOlderThan(NOW - 31L * 24 * 60 * 60 * 1000)
|
||||
assertEquals(1, deleted)
|
||||
assertNull(fileDao.getByResourceId(RESOURCE_ID))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun purge_locale_garde_les_tombstones_recentes() = runTest {
|
||||
fileDao.markTrashed(RESOURCE_ID, NOW)
|
||||
|
||||
val deleted = fileDao.deleteTrashedOlderThan(NOW - 31L * 24 * 60 * 60 * 1000)
|
||||
assertEquals(0, deleted)
|
||||
assertEquals(1, fileDao.getTrashedOnce().size)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun dossier_trash_masque_des_requetes_parent() = runTest {
|
||||
folderDao.markTrashed(FOLDER_CHILD, NOW)
|
||||
assertTrue(folderDao.observeByParent(FOLDER).first().none { it.resourceId == FOLDER_CHILD })
|
||||
assertEquals(1, folderDao.observeTrashed().first().size)
|
||||
|
||||
folderDao.clearTrashed(FOLDER_CHILD, NOW + 1)
|
||||
assertTrue(folderDao.observeByParent(FOLDER).first().any { it.resourceId == FOLDER_CHILD })
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val FOLDER = "folder-trash"
|
||||
private const val FOLDER_CHILD = "folder-trash-child"
|
||||
private const val RESOURCE_ID = "file-trash-1"
|
||||
private const val FILE_URI = "content://trash/doc.txt"
|
||||
private const val NOW = 1_700_000_000_000L
|
||||
}
|
||||
}
|
||||
+95
@@ -0,0 +1,95 @@
|
||||
package com.kazier.mobile.data.local.migration
|
||||
|
||||
import android.content.Context
|
||||
import androidx.sqlite.db.SupportSQLiteDatabase
|
||||
import androidx.sqlite.db.SupportSQLiteOpenHelper
|
||||
import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
|
||||
import androidx.test.core.app.ApplicationProvider
|
||||
import org.junit.Assert.assertTrue
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.annotation.Config
|
||||
|
||||
/**
|
||||
* V3 corbeille : la migration 18→19 ajoute `trashed_at` (ms epoch, NULL =
|
||||
* vivant) sur `files` et `folders`. Zéro backfill : NULL = état courant, le
|
||||
* masquage passe par `exists = 0` posé par l'action de trash.
|
||||
*/
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
@Config(sdk = [34])
|
||||
class Migration18To19Test {
|
||||
|
||||
@Test
|
||||
fun migration_ajoute_trashed_at_null_par_defaut() {
|
||||
val context = ApplicationProvider.getApplicationContext<Context>()
|
||||
val helper = FrameworkSQLiteOpenHelperFactory().create(
|
||||
SupportSQLiteOpenHelper.Configuration.builder(context)
|
||||
.name(null)
|
||||
.callback(V18Callback())
|
||||
.build(),
|
||||
)
|
||||
val db = helper.writableDatabase
|
||||
db.execSQL(
|
||||
"INSERT INTO `files` (`resource_id`, `name`, `folder_resource_id`, `size`, `added_at`, `updated_at`) " +
|
||||
"VALUES ('d-old', 'vieux.txt', 'f-one', 10, 1, 1)",
|
||||
)
|
||||
db.execSQL(
|
||||
"INSERT INTO `folders` (`resource_id`, `name`, `added_at`, `updated_at`) " +
|
||||
"VALUES ('f-one', 'Docs', 1, 1)",
|
||||
)
|
||||
|
||||
val migration = Migrations.ALL.first { it.startVersion == 18 && it.endVersion == 19 }
|
||||
migration.migrate(db)
|
||||
|
||||
for (table in listOf("files", "folders")) {
|
||||
val columns = mutableListOf<String>()
|
||||
db.query("PRAGMA table_info(`$table`)").use { cursor ->
|
||||
val nameIdx = cursor.getColumnIndexOrThrow("name")
|
||||
while (cursor.moveToNext()) columns += cursor.getString(nameIdx)
|
||||
}
|
||||
assertTrue("colonne trashed_at manquante sur $table", columns.contains("trashed_at"))
|
||||
}
|
||||
|
||||
db.query("SELECT `trashed_at` FROM `files` WHERE `resource_id` = 'd-old'").use { cursor ->
|
||||
assertTrue(cursor.moveToFirst())
|
||||
assertTrue(cursor.isNull(0))
|
||||
}
|
||||
db.query("SELECT `trashed_at` FROM `folders` WHERE `resource_id` = 'f-one'").use { cursor ->
|
||||
assertTrue(cursor.moveToFirst())
|
||||
assertTrue(cursor.isNull(0))
|
||||
}
|
||||
helper.close()
|
||||
}
|
||||
|
||||
/** Schéma v18 minimal (sans `trashed_at`). */
|
||||
private class V18Callback : SupportSQLiteOpenHelper.Callback(18) {
|
||||
override fun onCreate(db: SupportSQLiteDatabase) {
|
||||
db.execSQL(
|
||||
"CREATE TABLE `files` (" +
|
||||
"`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, " +
|
||||
"`resource_id` TEXT NOT NULL, " +
|
||||
"`uri` TEXT, " +
|
||||
"`name` TEXT NOT NULL, " +
|
||||
"`folder_resource_id` TEXT NOT NULL, " +
|
||||
"`size` INTEGER NOT NULL, " +
|
||||
"`added_at` INTEGER NOT NULL, " +
|
||||
"`updated_at` INTEGER NOT NULL)",
|
||||
)
|
||||
db.execSQL(
|
||||
"CREATE TABLE `folders` (" +
|
||||
"`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, " +
|
||||
"`resource_id` TEXT NOT NULL, " +
|
||||
"`name` TEXT NOT NULL, " +
|
||||
"`added_at` INTEGER NOT NULL, " +
|
||||
"`updated_at` INTEGER NOT NULL)",
|
||||
)
|
||||
}
|
||||
|
||||
override fun onUpgrade(
|
||||
db: SupportSQLiteDatabase,
|
||||
oldVersion: Int,
|
||||
newVersion: Int,
|
||||
) = Unit
|
||||
}
|
||||
}
|
||||
@@ -312,6 +312,26 @@ class Auth401Test {
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun listTrash(
|
||||
page: Int?,
|
||||
pageSize: Int?,
|
||||
): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.TrashDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun restoreFile(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun listVersions(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.VersionDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun restoreVersion(
|
||||
fileId: String,
|
||||
versionNo: Int,
|
||||
): Response<ApiEnvelope<FileDto>> = Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun searchFiles(
|
||||
query: String,
|
||||
page: Int?,
|
||||
|
||||
@@ -186,6 +186,26 @@ class PaginationTest {
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun listTrash(
|
||||
page: Int?,
|
||||
pageSize: Int?,
|
||||
): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.TrashDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun restoreFile(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun listVersions(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.VersionDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun restoreVersion(
|
||||
fileId: String,
|
||||
versionNo: Int,
|
||||
): Response<ApiEnvelope<FileDto>> = Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun searchFiles(
|
||||
query: String,
|
||||
page: Int?,
|
||||
|
||||
@@ -132,6 +132,18 @@ class RemoteContentTest {
|
||||
override suspend fun deleteFile(fileId: String): Response<ApiEnvelope<IdResultDto>> =
|
||||
Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun listTrash(page: Int?, pageSize: Int?): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.TrashDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun restoreFile(fileId: String): Response<ApiEnvelope<IdResultDto>> =
|
||||
Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun listVersions(fileId: String): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.VersionDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun restoreVersion(fileId: String, versionNo: Int): Response<ApiEnvelope<FileDto>> =
|
||||
Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun searchFiles(query: String, page: Int?, pageSize: Int?): Response<ApiEnvelope<List<FileDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
|
||||
@@ -338,6 +338,18 @@ class SessionReloginTest {
|
||||
override suspend fun deleteFile(fileId: String): Response<ApiEnvelope<IdResultDto>> =
|
||||
Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun listTrash(page: Int?, pageSize: Int?): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.TrashDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun restoreFile(fileId: String): Response<ApiEnvelope<IdResultDto>> =
|
||||
Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun listVersions(fileId: String): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.VersionDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun restoreVersion(fileId: String, versionNo: Int): Response<ApiEnvelope<FileDto>> =
|
||||
Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun searchFiles(query: String, page: Int?, pageSize: Int?): Response<ApiEnvelope<List<FileDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
|
||||
@@ -171,6 +171,18 @@ class ShareManagementTest {
|
||||
override suspend fun deleteFile(fileId: String): Response<ApiEnvelope<IdResultDto>> =
|
||||
Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun listTrash(page: Int?, pageSize: Int?): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.TrashDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun restoreFile(fileId: String): Response<ApiEnvelope<IdResultDto>> =
|
||||
Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun listVersions(fileId: String): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.VersionDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun restoreVersion(fileId: String, versionNo: Int): Response<ApiEnvelope<FileDto>> =
|
||||
Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun searchFiles(query: String, page: Int?, pageSize: Int?): Response<ApiEnvelope<List<FileDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
|
||||
@@ -265,6 +265,18 @@ class BytesUploadTest {
|
||||
override suspend fun deleteFile(fileId: String): Response<ApiEnvelope<IdResultDto>> =
|
||||
Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun listTrash(page: Int?, pageSize: Int?): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.TrashDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun restoreFile(fileId: String): Response<ApiEnvelope<IdResultDto>> =
|
||||
Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun listVersions(fileId: String): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.VersionDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun restoreVersion(fileId: String, versionNo: Int): Response<ApiEnvelope<FileDto>> =
|
||||
Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun searchFiles(query: String, page: Int?, pageSize: Int?): Response<ApiEnvelope<List<FileDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
|
||||
+20
@@ -372,6 +372,26 @@ private class FolderMergeApiService : ApiService {
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun listTrash(
|
||||
page: Int?,
|
||||
pageSize: Int?,
|
||||
): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.TrashDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun restoreFile(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun listVersions(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.VersionDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun restoreVersion(
|
||||
fileId: String,
|
||||
versionNo: Int,
|
||||
): Response<ApiEnvelope<FileDto>> = Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun searchFiles(
|
||||
query: String,
|
||||
page: Int?,
|
||||
|
||||
+20
@@ -461,6 +461,26 @@ private class MoveProtectionApiService : ApiService {
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun listTrash(
|
||||
page: Int?,
|
||||
pageSize: Int?,
|
||||
): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.TrashDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun restoreFile(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun listVersions(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.VersionDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun restoreVersion(
|
||||
fileId: String,
|
||||
versionNo: Int,
|
||||
): Response<ApiEnvelope<FileDto>> = Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun searchFiles(
|
||||
query: String,
|
||||
page: Int?,
|
||||
|
||||
+20
@@ -373,6 +373,26 @@ private class OcrApiServiceFake : ApiService {
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun listTrash(
|
||||
page: Int?,
|
||||
pageSize: Int?,
|
||||
): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.TrashDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun restoreFile(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun listVersions(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.VersionDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun restoreVersion(
|
||||
fileId: String,
|
||||
versionNo: Int,
|
||||
): Response<ApiEnvelope<FileDto>> = Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun searchFiles(
|
||||
query: String,
|
||||
page: Int?,
|
||||
|
||||
+12
@@ -273,6 +273,18 @@ class OfflineDownloadTest {
|
||||
override suspend fun deleteFile(fileId: String): Response<ApiEnvelope<IdResultDto>> =
|
||||
Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun listTrash(page: Int?, pageSize: Int?): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.TrashDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun restoreFile(fileId: String): Response<ApiEnvelope<IdResultDto>> =
|
||||
Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun listVersions(fileId: String): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.VersionDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun restoreVersion(fileId: String, versionNo: Int): Response<ApiEnvelope<FileDto>> =
|
||||
Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun searchFiles(query: String, page: Int?, pageSize: Int?): Response<ApiEnvelope<List<FileDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
|
||||
+20
@@ -228,6 +228,26 @@ private class RefreshVsMoveApiService : ApiService {
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun listTrash(
|
||||
page: Int?,
|
||||
pageSize: Int?,
|
||||
): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.TrashDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun restoreFile(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun listVersions(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.VersionDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun restoreVersion(
|
||||
fileId: String,
|
||||
versionNo: Int,
|
||||
): Response<ApiEnvelope<FileDto>> = Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun searchFiles(
|
||||
query: String,
|
||||
page: Int?,
|
||||
|
||||
+20
@@ -482,6 +482,26 @@ private class FakeApiService : ApiService {
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun listTrash(
|
||||
page: Int?,
|
||||
pageSize: Int?,
|
||||
): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.TrashDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun restoreFile(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun listVersions(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.VersionDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun restoreVersion(
|
||||
fileId: String,
|
||||
versionNo: Int,
|
||||
): Response<ApiEnvelope<FileDto>> = Response.success(ApiEnvelope())
|
||||
|
||||
override suspend fun searchFiles(
|
||||
query: String,
|
||||
page: Int?,
|
||||
|
||||
+14
-11
@@ -32,12 +32,13 @@ import retrofit2.Retrofit
|
||||
import retrofit2.converter.moshi.MoshiConverterFactory
|
||||
|
||||
/**
|
||||
* M5 : `deleteInCloud` journalise `delete_resource` ET pose la tombstone
|
||||
* locale (`exists = 0`) dans la même transaction — sans ça la ressource
|
||||
* restait affichée et le walk la revoyait (fantôme local vs serveur supprimé).
|
||||
* - fichier déjà poussé (create synced) → `delete_resource` + `exists = 0` ;
|
||||
* - fichier jamais poussé → pas de `delete_resource`, mais `exists = 0` ;
|
||||
* - dossier poussé → dossier + descendance en `exists = 0`, deletes journalisés.
|
||||
* M5 (V3 corbeille) : `deleteInCloud` journalise `trash_resource` ET pose la
|
||||
* tombstone locale (`trashed_at` + `exists = 0`) dans la même transaction —
|
||||
* sans ça la ressource restait affichée et le walk la revoyait (fantôme
|
||||
* local vs serveur trashé).
|
||||
* - fichier déjà poussé (create synced) → `trash_resource` + tombstone ;
|
||||
* - fichier jamais poussé → pas de `trash_resource`, mais tombstone ;
|
||||
* - dossier poussé → dossier + descendance trashés, trashes journalisés.
|
||||
*/
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
@Config(sdk = [34])
|
||||
@@ -99,9 +100,11 @@ class DeleteInCloudTest {
|
||||
)
|
||||
|
||||
assertEquals(1, report.succeeded)
|
||||
assertEquals(0, db.fileDao().getByResourceId(FILE_ID)!!.exists)
|
||||
val row = db.fileDao().getByResourceId(FILE_ID)!!
|
||||
assertEquals(0, row.exists)
|
||||
assertTrue("tombstone trashée", row.trashedAt != null)
|
||||
val deletes = opsDao.selectPending(100).filter {
|
||||
it.resourceId == FILE_ID && it.operation == PendingOperationType.DELETE_RESOURCE
|
||||
it.resourceId == FILE_ID && it.operation == PendingOperationType.TRASH_RESOURCE
|
||||
}
|
||||
assertEquals(1, deletes.size)
|
||||
}
|
||||
@@ -122,9 +125,9 @@ class DeleteInCloudTest {
|
||||
assertEquals(1, report.succeeded)
|
||||
assertEquals(0, db.fileDao().getByResourceId(FILE_ID)!!.exists)
|
||||
val deletes = opsDao.selectPending(100).filter {
|
||||
it.resourceId == FILE_ID && it.operation == PendingOperationType.DELETE_RESOURCE
|
||||
it.resourceId == FILE_ID && it.operation == PendingOperationType.TRASH_RESOURCE
|
||||
}
|
||||
assertTrue("jamais poussé : aucun delete_resource", deletes.isEmpty())
|
||||
assertTrue("jamais poussé : aucun trash_resource", deletes.isEmpty())
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -146,7 +149,7 @@ class DeleteInCloudTest {
|
||||
assertEquals(0, db.folderDao().getByResourceId(folder.resourceId)!!.exists)
|
||||
assertEquals(0, db.fileDao().getByResourceId(FILE_ID)!!.exists)
|
||||
val deletes = opsDao.selectPending(100).filter {
|
||||
it.operation == PendingOperationType.DELETE_RESOURCE
|
||||
it.operation == PendingOperationType.TRASH_RESOURCE
|
||||
}.map { it.resourceId }.toSet()
|
||||
assertTrue(deletes.contains(folder.resourceId))
|
||||
assertTrue(deletes.contains(FILE_ID))
|
||||
|
||||
@@ -155,6 +155,10 @@ class ReleaseLocalCopyTest {
|
||||
override suspend fun getFileOcr(fileId: String): retrofit2.Response<com.kazier.mobile.data.remote.dto.ApiEnvelope<com.kazier.mobile.data.remote.dto.FileOcrDto>> = TODO()
|
||||
override suspend fun getFile(fileId: String): retrofit2.Response<com.kazier.mobile.data.remote.dto.ApiEnvelope<com.kazier.mobile.data.remote.dto.FileDto>> = TODO()
|
||||
override suspend fun deleteFile(fileId: String): retrofit2.Response<com.kazier.mobile.data.remote.dto.ApiEnvelope<com.kazier.mobile.data.remote.dto.IdResultDto>> = TODO()
|
||||
override suspend fun listTrash(page: Int?, pageSize: Int?): retrofit2.Response<com.kazier.mobile.data.remote.dto.ApiEnvelope<List<com.kazier.mobile.data.remote.dto.TrashDto>>> = TODO()
|
||||
override suspend fun restoreFile(fileId: String): retrofit2.Response<com.kazier.mobile.data.remote.dto.ApiEnvelope<com.kazier.mobile.data.remote.dto.IdResultDto>> = TODO()
|
||||
override suspend fun listVersions(fileId: String): retrofit2.Response<com.kazier.mobile.data.remote.dto.ApiEnvelope<List<com.kazier.mobile.data.remote.dto.VersionDto>>> = TODO()
|
||||
override suspend fun restoreVersion(fileId: String, versionNo: Int): retrofit2.Response<com.kazier.mobile.data.remote.dto.ApiEnvelope<com.kazier.mobile.data.remote.dto.FileDto>> = TODO()
|
||||
override suspend fun searchFiles(query: String, page: Int?, pageSize: Int?): retrofit2.Response<com.kazier.mobile.data.remote.dto.ApiEnvelope<List<com.kazier.mobile.data.remote.dto.FileDto>>> = TODO()
|
||||
override suspend fun changePassword(body: com.kazier.mobile.data.remote.dto.ChangePasswordDto): retrofit2.Response<com.kazier.mobile.data.remote.dto.ApiEnvelope<com.kazier.mobile.data.remote.dto.IdResultDto>> = TODO()
|
||||
override suspend fun getShareLink(token: String): retrofit2.Response<com.kazier.mobile.data.remote.dto.ApiEnvelope<com.kazier.mobile.data.remote.dto.ShareLinkDto>> = TODO()
|
||||
|
||||
+12
@@ -495,6 +495,18 @@ class OutboxSyncWorkerTest {
|
||||
override suspend fun deleteFile(fileId: String): Response<ApiEnvelope<IdResultDto>> =
|
||||
throw UnsupportedOperationException()
|
||||
|
||||
override suspend fun listTrash(page: Int?, pageSize: Int?): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.TrashDto>>> =
|
||||
throw UnsupportedOperationException()
|
||||
|
||||
override suspend fun restoreFile(fileId: String): Response<ApiEnvelope<IdResultDto>> =
|
||||
throw UnsupportedOperationException()
|
||||
|
||||
override suspend fun listVersions(fileId: String): Response<ApiEnvelope<List<com.kazier.mobile.data.remote.dto.VersionDto>>> =
|
||||
throw UnsupportedOperationException()
|
||||
|
||||
override suspend fun restoreVersion(fileId: String, versionNo: Int): Response<ApiEnvelope<FileDto>> =
|
||||
throw UnsupportedOperationException()
|
||||
|
||||
override suspend fun searchFiles(
|
||||
query: String,
|
||||
page: Int?,
|
||||
|
||||
Reference in New Issue
Block a user