From b8e67d0ef9ac58a10fed36fd53a2106b9e68556b Mon Sep 17 00:00:00 2001 From: Daimolean <92239625+wuzihao051119@users.noreply.github.com> Date: Thu, 3 Jul 2025 01:25:14 +0800 Subject: [PATCH] fix(mobile): filter deleted assets (#19683) --- .../entities/merged_asset.drift | 10 +++++----- .../entities/merged_asset.drift.dart | Bin 5226 -> 5280 bytes 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mobile/lib/infrastructure/entities/merged_asset.drift b/mobile/lib/infrastructure/entities/merged_asset.drift index 51f731f0f..825484503 100644 --- a/mobile/lib/infrastructure/entities/merged_asset.drift +++ b/mobile/lib/infrastructure/entities/merged_asset.drift @@ -1,7 +1,7 @@ import 'remote_asset.entity.dart'; import 'local_asset.entity.dart'; -mergedAsset: SELECT * FROM +mergedAsset: SELECT * FROM ( SELECT rae.id as remote_id, @@ -22,7 +22,7 @@ mergedAsset: SELECT * FROM LEFT JOIN local_asset_entity lae ON rae.checksum = lae.checksum WHERE - rae.visibility = 0 AND rae.owner_id in ? + rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id in ? UNION ALL SELECT NULL as remote_id, @@ -48,8 +48,8 @@ mergedAsset: SELECT * FROM ORDER BY created_at DESC LIMIT $limit; -mergedBucket(:group_by AS INTEGER): -SELECT +mergedBucket(:group_by AS INTEGER): +SELECT COUNT(*) as asset_count, CASE WHEN :group_by = 0 THEN STRFTIME('%Y-%m-%d', created_at) -- day @@ -65,7 +65,7 @@ FROM LEFT JOIN local_asset_entity lae ON rae.checksum = lae.checksum WHERE - rae.visibility = 0 AND rae.owner_id in ? + rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id in ? UNION ALL SELECT lae.name, diff --git a/mobile/lib/infrastructure/entities/merged_asset.drift.dart b/mobile/lib/infrastructure/entities/merged_asset.drift.dart index be9d8b521e3e3344740b63fbca03ad3af1779421..19fb9e3dac21ba973292fc7600766ca0ba4fe22c 100644 GIT binary patch delta 67 zcmaE*u|RXfI~K8&)ST3k)Rg$d5(Up-1;0=q9|cE0m(4F({5f#QO@7H@x;cZFi5&nt C{T8tR delta 21 dcmZ3W`ATEMJC@0Lyat;sS*18O=kXe`0{~xz2Q~lz