From e6ec01985285f47bd38fe025f43bd7865306e28f Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Tue, 29 Jul 2025 20:35:04 +0530
Subject: [PATCH] fix: show missing local assets only in timeline with partner
 sharing (#20298)

fix: show missing local assets in timeline with partner sharing

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 .../entities/merged_asset.drift               |   7 ++++---
 .../entities/merged_asset.drift.dart          | Bin 7321 -> 7452 bytes
 .../repositories/timeline.repository.dart     |   4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mobile/lib/infrastructure/entities/merged_asset.drift b/mobile/lib/infrastructure/entities/merged_asset.drift
index 9778ba723..579323d64 100644
--- a/mobile/lib/infrastructure/entities/merged_asset.drift
+++ b/mobile/lib/infrastructure/entities/merged_asset.drift
@@ -29,7 +29,7 @@ LEFT JOIN
 WHERE
 	rae.deleted_at IS NULL
 	AND rae.visibility = 0 -- timeline visibility
-	AND rae.owner_id in ?
+	AND rae.owner_id IN :user_ids
 	AND (
 		rae.stack_id IS NULL
 		OR rae.id = se.primary_asset_id
@@ -57,7 +57,7 @@ SELECT
 FROM
 	local_asset_entity lae
 WHERE NOT EXISTS (
-	SELECT 1 FROM remote_asset_entity rae WHERE rae.checksum = lae.checksum
+	SELECT 1 FROM remote_asset_entity rae WHERE rae.checksum = lae.checksum AND rae.owner_id IN :user_ids
 )
 AND EXISTS (
 	SELECT 1 FROM local_album_asset_entity laa
@@ -85,7 +85,7 @@ FROM
 	WHERE
 		rae.deleted_at IS NULL
 		AND rae.visibility = 0 -- timeline visibility
-		AND rae.owner_id in ?
+		AND rae.owner_id in :user_ids
 		AND (
 			rae.stack_id IS NULL
 			OR rae.id = se.primary_asset_id
@@ -103,6 +103,7 @@ FROM
 		local_album_entity la ON la.id = laa.album_id
 	WHERE
 		rae.id IS NULL
+		AND rae.owner_id IN :user_ids
 		AND la.backup_selection = 0 -- selected
 )
 GROUP BY bucket_date
diff --git a/mobile/lib/infrastructure/entities/merged_asset.drift.dart b/mobile/lib/infrastructure/entities/merged_asset.drift.dart
index 75f8de2de006abdc154416722349b169d5c7506b..9916ec13bb119d984c8846beb1de929d828f4626 100644
GIT binary patch
delta 260
zcmbPfImc>4BC|?0mjVzJr52WE7Nw>r_+%EB*aVjpW#*;ZDU=qc7I~%=>rAd<j$?;%
zCf{LJfUzgBD8ZPU)mT0=!8x+*PZ%fvVw2~9YSP@y$jQwJmloi1W}TePFNecod$`S$
z=QFEJUdb;C(}~M+9)aa>(<jTa`)p<w;$)ospG^wxfXVE_v*D%)a4Bp)CVZI#09vb9
AWdHyG

delta 220
zcmbPZHPdoKBC{ly0ucCQ7MIurmlS2@rQ0c#B^DX#C{#~wWsYM3u_wP`R)8=BS(Lzx
z%~mX*nIJ*}LOz=t*k>?qw&&z#gh&Q*IkOsJHP#4dELfr_wXig^C^bbPGp|G;y(qu5
zz^QWbDrS|*-}psAh8V%@G@1;wlN%(Wmy?>8UXn5SH;d-xNdo0yyNosq2!%3E?h&2_
O(G<v~u-Q}OG6w*hN=4`Z

diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index a2c14a363..dcd10faa6 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -41,7 +41,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     }
 
     return _db.mergedAssetDrift
-        .mergedBucket(userIds, groupBy: groupBy.index)
+        .mergedBucket(userIds: userIds, groupBy: groupBy.index)
         .map((row) {
           final date = row.bucketDate.dateFmt(groupBy);
           return TimeBucket(date: date, assetCount: row.assetCount);
@@ -52,7 +52,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
 
   Future<List<BaseAsset>> _getMainBucketAssets(List<String> userIds, {required int offset, required int count}) {
     return _db.mergedAssetDrift
-        .mergedAsset(userIds, limit: (_) => Limit(count, offset))
+        .mergedAsset(userIds: userIds, limit: (_) => Limit(count, offset))
         .map(
           (row) => row.remoteId != null && row.ownerId != null
               ? RemoteAsset(