From 734566db50faa47cf529ed5ff793e21ca9d0a827 Mon Sep 17 00:00:00 2001 From: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> Date: Wed, 12 Mar 2025 12:22:00 +0530 Subject: [PATCH] refactor: rename uid to id --- ..._additional_shared_user_selection.page.dart | 3 +-- .../album_shared_user_selection.page.dart | 3 +-- mobile/lib/pages/common/activities.page.dart | 2 +- .../library/partner/partner_detail.page.dart | 2 +- mobile/lib/pages/photos/photos.page.dart | 2 +- .../album/suggested_shared_users.provider.dart | 2 +- mobile/lib/services/asset.service.dart | 6 +++--- .../services/backup_verification.service.dart | 2 +- mobile/lib/services/sync.service.dart | 18 +++++++++--------- mobile/lib/services/timeline.service.dart | 12 ++++++------ mobile/lib/services/trash.service.dart | 4 ++-- mobile/lib/widgets/common/user_avatar.dart | 2 +- .../test/modules/shared/sync_service_test.dart | 6 +++--- 13 files changed, 31 insertions(+), 33 deletions(-) diff --git a/mobile/lib/pages/album/album_additional_shared_user_selection.page.dart b/mobile/lib/pages/album/album_additional_shared_user_selection.page.dart index 146493382e..194f749a32 100644 --- a/mobile/lib/pages/album/album_additional_shared_user_selection.page.dart +++ b/mobile/lib/pages/album/album_additional_shared_user_selection.page.dart @@ -105,8 +105,7 @@ class AlbumAdditionalSharedUserSelectionPage extends HookConsumerWidget { if (sharedUsersList.value.contains(users[index])) { sharedUsersList.value = sharedUsersList.value .where( - (selectedUser) => - selectedUser.uid != users[index].uid, + (selectedUser) => selectedUser.id != users[index].id, ) .toSet(); } else { diff --git a/mobile/lib/pages/album/album_shared_user_selection.page.dart b/mobile/lib/pages/album/album_shared_user_selection.page.dart index e06ad5d016..1c797aa449 100644 --- a/mobile/lib/pages/album/album_shared_user_selection.page.dart +++ b/mobile/lib/pages/album/album_shared_user_selection.page.dart @@ -118,8 +118,7 @@ class AlbumSharedUserSelectionPage extends HookConsumerWidget { if (sharedUsersList.value.contains(users[index])) { sharedUsersList.value = sharedUsersList.value .where( - (selectedUser) => - selectedUser.uid != users[index].uid, + (selectedUser) => selectedUser.id != users[index].id, ) .toSet(); } else { diff --git a/mobile/lib/pages/common/activities.page.dart b/mobile/lib/pages/common/activities.page.dart index bf59716119..776ee9977b 100644 --- a/mobile/lib/pages/common/activities.page.dart +++ b/mobile/lib/pages/common/activities.page.dart @@ -51,7 +51,7 @@ class ActivitiesPage extends HookConsumerWidget { final liked = data.firstWhereOrNull( (a) => a.type == ActivityType.like && - a.user.uid == user?.uid && + a.user.id == user?.id && a.assetId == asset?.remoteId, ); diff --git a/mobile/lib/pages/library/partner/partner_detail.page.dart b/mobile/lib/pages/library/partner/partner_detail.page.dart index c35311fc44..618d31affa 100644 --- a/mobile/lib/pages/library/partner/partner_detail.page.dart +++ b/mobile/lib/pages/library/partner/partner_detail.page.dart @@ -111,7 +111,7 @@ class PartnerDetailPage extends HookConsumerWidget { ), ), ), - renderListProvider: singleUserTimelineProvider(partner.uid), + renderListProvider: singleUserTimelineProvider(partner.id), onRefresh: () => ref.read(assetProvider.notifier).getAllAsset(), deleteEnabled: false, favoriteEnabled: false, diff --git a/mobile/lib/pages/photos/photos.page.dart b/mobile/lib/pages/photos/photos.page.dart index 6095b4a99e..c9211e984d 100644 --- a/mobile/lib/pages/photos/photos.page.dart +++ b/mobile/lib/pages/photos/photos.page.dart @@ -110,7 +110,7 @@ class PhotosPage extends HookConsumerWidget { : const SizedBox(), renderListProvider: timelineUsers.length > 1 ? multiUsersTimelineProvider(timelineUsers) - : singleUserTimelineProvider(currentUser?.uid), + : singleUserTimelineProvider(currentUser?.id), buildLoadingIndicator: buildLoadingIndicator, onRefresh: refreshAssets, stackEnabled: true, diff --git a/mobile/lib/providers/album/suggested_shared_users.provider.dart b/mobile/lib/providers/album/suggested_shared_users.provider.dart index 120d21e7f1..3c8dcb6733 100644 --- a/mobile/lib/providers/album/suggested_shared_users.provider.dart +++ b/mobile/lib/providers/album/suggested_shared_users.provider.dart @@ -10,6 +10,6 @@ final otherUsersProvider = final currentUser = ref.watch(currentUserProvider); final allUsers = await userService.getAll(); - allUsers.removeWhere((u) => currentUser?.uid == u.uid); + allUsers.removeWhere((u) => currentUser?.id == u.id); return allUsers; }); diff --git a/mobile/lib/services/asset.service.dart b/mobile/lib/services/asset.service.dart index 7bbb7571a9..d187284d07 100644 --- a/mobile/lib/services/asset.service.dart +++ b/mobile/lib/services/asset.service.dart @@ -314,7 +314,7 @@ class AssetService { await refreshRemoteAssets(); final owner = _userService.getMyUser(); final remoteAssets = await _assetRepository.getAll( - ownerId: owner.uid, + ownerId: owner.id, state: AssetState.merged, ); @@ -516,11 +516,11 @@ class AssetService { Future> getRecentlyAddedAssets() { final me = _userService.getMyUser(); - return _assetRepository.getRecentlyAddedAssets(me.uid); + return _assetRepository.getRecentlyAddedAssets(me.id); } Future> getMotionAssets() { final me = _userService.getMyUser(); - return _assetRepository.getMotionAssets(me.uid); + return _assetRepository.getMotionAssets(me.id); } } diff --git a/mobile/lib/services/backup_verification.service.dart b/mobile/lib/services/backup_verification.service.dart index 6c1d1fbe4b..9aa021a324 100644 --- a/mobile/lib/services/backup_verification.service.dart +++ b/mobile/lib/services/backup_verification.service.dart @@ -38,7 +38,7 @@ class BackupVerificationService { /// Returns at most [limit] assets that were backed up without exif Future> findWronglyBackedUpAssets({int limit = 100}) async { - final owner = _userService.getMyUser().uid; + final owner = _userService.getMyUser().id; final List onlyLocal = await _assetRepository.getAll( ownerId: owner, state: AssetState.local, diff --git a/mobile/lib/services/sync.service.dart b/mobile/lib/services/sync.service.dart index 7b692fc062..0574dc283b 100644 --- a/mobile/lib/services/sync.service.dart +++ b/mobile/lib/services/sync.service.dart @@ -183,7 +183,7 @@ class SyncService { return false; }, onlyFirst: (UserDto a) => toUpsert.add(a), - onlySecond: (UserDto b) => toDelete.add(b.uid), + onlySecond: (UserDto b) => toDelete.add(b.id), ); if (changes) { await _userRepository.transaction(() async { @@ -222,7 +222,7 @@ class SyncService { ) async { final currentUser = _userService.getMyUser(); final DateTime? since = - (await _eTagRepository.get(currentUser.uid))?.time?.toUtc(); + (await _eTagRepository.get(currentUser.id))?.time?.toUtc(); if (since == null) return null; final DateTime now = DateTime.now(); final (toUpsert, toDelete) = await getChangedAssets(users, since); @@ -321,7 +321,7 @@ class SyncService { return false; } final List inDb = await _assetRepository.getAll( - ownerId: user.uid, + ownerId: user.id, sortBy: AssetSort.checksum, ); assert(inDb.isSorted(Asset.compareByChecksum), "inDb not sorted!"); @@ -427,15 +427,15 @@ class SyncService { // update shared users final List sharedUsers = album.sharedUsers.map((u) => u.toDto()).toList(growable: false); - sharedUsers.sort((a, b) => a.uid.compareTo(b.uid)); + sharedUsers.sort((a, b) => a.id.compareTo(b.id)); final List users = dto.remoteUsers.map((u) => u.toDto()).toList() - ..sort((a, b) => a.uid.compareTo(b.uid)); + ..sort((a, b) => a.id.compareTo(b.id)); final List userIdsToAdd = []; final List usersToUnlink = []; diffSortedListsSync( users, sharedUsers, - compare: (UserDto a, UserDto b) => a.uid.compareTo(b.uid), + compare: (UserDto a, UserDto b) => a.id.compareTo(b.id), both: (a, b) => false, onlyFirst: (UserDto a) => userIdsToAdd.add(a.id), onlySecond: (UserDto a) => usersToUnlink.add(a), @@ -482,7 +482,7 @@ class SyncService { } if (album.shared || dto.shared) { - final userId = (_userService.getMyUser()).uid; + final userId = (_userService.getMyUser()).id; final foreign = await _assetRepository.getByAlbum(album, notOwnedBy: [userId]); existing.addAll(foreign); @@ -536,7 +536,7 @@ class SyncService { ); } else if (album.shared) { // delete assets in DB unless they belong to this user or are part of some other shared album or belong to a partner - final userIds = (await _getAllAccessibleUsers()).map((user) => user.uid); + final userIds = (await _getAllAccessibleUsers()).map((user) => user.id); final orphanedAssets = await _assetRepository.getByAlbum(album, notOwnedBy: userIds); deleteCandidates.addAll(orphanedAssets); @@ -622,7 +622,7 @@ class SyncService { // general case, e.g. some assets have been deleted or there are excluded albums on iOS final inDb = await _assetRepository.getByAlbum( dbAlbum, - ownerId: (_userService.getMyUser()).uid, + ownerId: (_userService.getMyUser()).id, sortBy: AssetSort.checksum, ); diff --git a/mobile/lib/services/timeline.service.dart b/mobile/lib/services/timeline.service.dart index c3c591c7e4..4e91d27a7c 100644 --- a/mobile/lib/services/timeline.service.dart +++ b/mobile/lib/services/timeline.service.dart @@ -30,12 +30,12 @@ class TimelineService { Future> getTimelineUserIds() async { final me = _userService.getMyUser(); - return _timelineRepository.getTimelineUserIds(me.uid); + return _timelineRepository.getTimelineUserIds(me.id); } Stream> watchTimelineUserIds() async* { final me = _userService.getMyUser(); - yield* _timelineRepository.watchTimelineUsers(me.uid); + yield* _timelineRepository.watchTimelineUsers(me.id); } Stream watchHomeTimeline(String userId) { @@ -52,13 +52,13 @@ class TimelineService { Stream watchArchiveTimeline() async* { final user = _userService.getMyUser(); - yield* _timelineRepository.watchArchiveTimeline(user.uid); + yield* _timelineRepository.watchArchiveTimeline(user.id); } Stream watchFavoriteTimeline() async* { final user = _userService.getMyUser(); - yield* _timelineRepository.watchFavoriteTimeline(user.uid); + yield* _timelineRepository.watchFavoriteTimeline(user.id); } Stream watchAlbumTimeline(Album album) async* { @@ -71,7 +71,7 @@ class TimelineService { Stream watchTrashTimeline() async* { final user = _userService.getMyUser(); - yield* _timelineRepository.watchTrashTimeline(user.uid); + yield* _timelineRepository.watchTrashTimeline(user.id); } Stream watchAllVideosTimeline() { @@ -98,7 +98,7 @@ class TimelineService { Stream watchAssetSelectionTimeline() async* { final user = _userService.getMyUser(); - yield* _timelineRepository.watchAssetSelectionTimeline(user.uid); + yield* _timelineRepository.watchAssetSelectionTimeline(user.id); } GroupAssetsBy _getGroupByOption() { diff --git a/mobile/lib/services/trash.service.dart b/mobile/lib/services/trash.service.dart index eda960c988..478ad65db0 100644 --- a/mobile/lib/services/trash.service.dart +++ b/mobile/lib/services/trash.service.dart @@ -46,7 +46,7 @@ class TrashService { await _apiService.trashApi.emptyTrash(); - final trashedAssets = await _assetRepository.getTrashAssets(user.uid); + final trashedAssets = await _assetRepository.getTrashAssets(user.id); final ids = trashedAssets.map((e) => e.remoteId!).toList(); await _assetRepository.transaction(() async { @@ -77,7 +77,7 @@ class TrashService { await _apiService.trashApi.restoreTrash(); - final trashedAssets = await _assetRepository.getTrashAssets(user.uid); + final trashedAssets = await _assetRepository.getTrashAssets(user.id); final updatedAssets = trashedAssets.map((asset) { asset.isTrashed = false; return asset; diff --git a/mobile/lib/widgets/common/user_avatar.dart b/mobile/lib/widgets/common/user_avatar.dart index 7af2efa07d..a5a6fa2bdd 100644 --- a/mobile/lib/widgets/common/user_avatar.dart +++ b/mobile/lib/widgets/common/user_avatar.dart @@ -16,7 +16,7 @@ Widget userAvatar(BuildContext context, UserDto u, {double? radius}) { foregroundImage: CachedNetworkImageProvider( url, headers: ApiService.getRequestHeaders(), - cacheKey: "user-${u.uid}-profile", + cacheKey: "user-${u.id}-profile", ), // silence errors if user has no profile image, use initials as fallback onForegroundImageError: (exception, stackTrace) {}, diff --git a/mobile/test/modules/shared/sync_service_test.dart b/mobile/test/modules/shared/sync_service_test.dart index caaf669e0a..47bc1b9544 100644 --- a/mobile/test/modules/shared/sync_service_test.dart +++ b/mobile/test/modules/shared/sync_service_test.dart @@ -125,7 +125,7 @@ void main() { when(() => userRepository.getAll()).thenAnswer((_) async => [owner]); when( () => assetRepository.getAll( - ownerId: owner.uid, + ownerId: owner.id, sortBy: AssetSort.checksum, ), ).thenAnswer((_) async => initialAssets); @@ -200,7 +200,7 @@ void main() { expect(c1, isTrue); when( () => assetRepository.getAll( - ownerId: owner.uid, + ownerId: owner.id, sortBy: AssetSort.checksum, ), ).thenAnswer((_) async => remoteAssets); @@ -213,7 +213,7 @@ void main() { final currentState = [...remoteAssets]; when( () => assetRepository.getAll( - ownerId: owner.uid, + ownerId: owner.id, sortBy: AssetSort.checksum, ), ).thenAnswer((_) async => currentState);