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 be9d8b521..19fb9e3da 100644 Binary files a/mobile/lib/infrastructure/entities/merged_asset.drift.dart and b/mobile/lib/infrastructure/entities/merged_asset.drift.dart differ