refactor(mobile): use user service methods (#16783)

* refactor: user entity

* chore: rebase fixes

* refactor(mobile): refactor to use user service methods

* fix: late init error

* fix: lint

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
Co-authored-by: Alex <alex.tran1502@gmail.com>

mobile/lib/services/album.service.dart

@@ -6,12 +6,11 @@ import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
+import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/backup_album.entity.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart'
     as entity;
 import 'package:immich_mobile/interfaces/album.interface.dart';
@@ -21,6 +20,7 @@ import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/interfaces/backup_album.interface.dart';
 import 'package:immich_mobile/models/albums/album_add_asset_response.model.dart';
 import 'package:immich_mobile/models/albums/album_search.model.dart';
+import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/repositories/album.repository.dart';
 import 'package:immich_mobile/repositories/album_api.repository.dart';
 import 'package:immich_mobile/repositories/album_media.repository.dart';
@@ -33,6 +33,7 @@ import 'package:logging/logging.dart';
 final albumServiceProvider = Provider(
   (ref) => AlbumService(
     ref.watch(syncServiceProvider),
+    ref.watch(userServiceProvider),
     ref.watch(entityServiceProvider),
     ref.watch(albumRepositoryProvider),
     ref.watch(assetRepositoryProvider),
@@ -44,6 +45,7 @@ final albumServiceProvider = Provider(
 
 class AlbumService {
   final SyncService _syncService;
+  final UserService _userService;
   final EntityService _entityService;
   final IAlbumRepository _albumRepository;
   final IAssetRepository _assetRepository;
@@ -56,6 +58,7 @@ class AlbumService {
 
   AlbumService(
     this._syncService,
+    this._userService,
     this._entityService,
     this._albumRepository,
     this._assetRepository,
@@ -292,7 +295,7 @@ class AlbumService {
 
   Future<bool> deleteAlbum(Album album) async {
     try {
-      final userId = Store.get(StoreKey.currentUser).id;
+      final userId = _userService.getMyUser().id;
       if (album.owner.value?.isarId == userId) {
         await _albumApiRepository.delete(album.remoteId!);
       }

mobile/lib/services/api.service.dart

@@ -35,6 +35,9 @@ class ApiService implements Authentication {
   late MemoriesApi memoriesApi;
 
   ApiService() {
+    // The below line ensures that the api clients are initialized when the service is instantiated
+    // This is required to avoid late initialization errors when the clients are access before the endpoint is resolved
+    setEndpoint('');
     final endpoint = Store.tryGet(StoreKey.serverEndpoint);
     if (endpoint != null && endpoint.isNotEmpty) {
       setEndpoint(endpoint);

mobile/lib/services/asset.service.dart

@@ -6,9 +6,8 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/interfaces/exif.interface.dart';
 import 'package:immich_mobile/domain/interfaces/user.interface.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/domain/services/store.service.dart';
+import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/backup_album.entity.dart';
 import 'package:immich_mobile/interfaces/asset.interface.dart';
@@ -19,9 +18,7 @@ import 'package:immich_mobile/interfaces/etag.interface.dart';
 import 'package:immich_mobile/models/backup/backup_candidate.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/exif.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/store.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/user.provider.dart'
-    hide userServiceProvider;
+import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/repositories/asset.repository.dart';
 import 'package:immich_mobile/repositories/asset_api.repository.dart';
 import 'package:immich_mobile/repositories/asset_media.repository.dart';
@@ -47,7 +44,7 @@ final assetServiceProvider = Provider(
     ref.watch(syncServiceProvider),
     ref.watch(backupServiceProvider),
     ref.watch(albumServiceProvider),
-    ref.watch(storeServiceProvider),
+    ref.watch(userServiceProvider),
     ref.watch(assetMediaRepositoryProvider),
   ),
 );
@@ -63,7 +60,7 @@ class AssetService {
   final SyncService _syncService;
   final BackupService _backupService;
   final AlbumService _albumService;
-  final StoreService _storeService;
+  final UserService _userService;
   final IAssetMediaRepository _assetMediaRepository;
   final log = Logger('AssetService');
 
@@ -78,7 +75,7 @@ class AssetService {
     this._syncService,
     this._backupService,
     this._albumService,
-    this._storeService,
+    this._userService,
     this._assetMediaRepository,
   );
 
@@ -316,7 +313,7 @@ class AssetService {
       );
 
       await refreshRemoteAssets();
-      final owner = _storeService.get(StoreKey.currentUser);
+      final owner = _userService.getMyUser();
       final remoteAssets = await _assetRepository.getAll(
         ownerId: owner.id,
         state: AssetState.merged,
@@ -522,12 +519,12 @@ class AssetService {
   }
 
   Future<List<Asset>> getRecentlyAddedAssets() {
-    final me = _storeService.get(StoreKey.currentUser);
+    final me = _userService.getMyUser();
     return _assetRepository.getRecentlyAddedAssets(me.id);
   }
 
   Future<List<Asset>> getMotionAssets() {
-    final me = _storeService.get(StoreKey.currentUser);
+    final me = _userService.getMyUser();
     return _assetRepository.getMotionAssets(me.id);
   }
 }

mobile/lib/services/backup_verification.service.dart

@@ -8,12 +8,14 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/interfaces/exif.interface.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';
 import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/interfaces/file_media.interface.dart';
 import 'package:immich_mobile/providers/infrastructure/exif.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/repositories/asset.repository.dart';
 import 'package:immich_mobile/repositories/file_media.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
@@ -22,11 +24,13 @@ import 'package:immich_mobile/utils/diff.dart';
 
 /// Finds duplicates originating from missing EXIF information
 class BackupVerificationService {
+  final UserService _userService;
   final IFileMediaRepository _fileMediaRepository;
   final IAssetRepository _assetRepository;
   final IExifInfoRepository _exifInfoRepository;
 
-  BackupVerificationService(
+  const BackupVerificationService(
+    this._userService,
     this._fileMediaRepository,
     this._assetRepository,
     this._exifInfoRepository,
@@ -34,7 +38,7 @@ class BackupVerificationService {
 
   /// Returns at most [limit] assets that were backed up without exif
   Future<List<Asset>> findWronglyBackedUpAssets({int limit = 100}) async {
-    final owner = Store.get(StoreKey.currentUser).id;
+    final owner = _userService.getMyUser().id;
     final List<Asset> onlyLocal = await _assetRepository.getAll(
       ownerId: owner,
       state: AssetState.local,
@@ -214,6 +218,7 @@ class BackupVerificationService {
 
 final backupVerificationServiceProvider = Provider(
   (ref) => BackupVerificationService(
+    ref.watch(userServiceProvider),
     ref.watch(fileMediaRepositoryProvider),
     ref.watch(assetRepositoryProvider),
     ref.watch(exifRepositoryProvider),

mobile/lib/services/sync.service.dart

@@ -5,9 +5,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/interfaces/exif.interface.dart';
 import 'package:immich_mobile/domain/interfaces/user.interface.dart';
 import 'package:immich_mobile/domain/interfaces/user_api.repository.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/domain/services/store.service.dart';
+import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/etag.entity.dart';
@@ -20,7 +19,6 @@ import 'package:immich_mobile/interfaces/etag.interface.dart';
 import 'package:immich_mobile/interfaces/partner.interface.dart';
 import 'package:immich_mobile/interfaces/partner_api.interface.dart';
 import 'package:immich_mobile/providers/infrastructure/exif.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/store.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/repositories/album.repository.dart';
 import 'package:immich_mobile/repositories/album_api.repository.dart';
@@ -47,7 +45,7 @@ final syncServiceProvider = Provider(
     ref.watch(exifRepositoryProvider),
     ref.watch(partnerRepositoryProvider),
     ref.watch(userRepositoryProvider),
-    ref.watch(storeServiceProvider),
+    ref.watch(userServiceProvider),
     ref.watch(etagRepositoryProvider),
     ref.watch(partnerApiRepositoryProvider),
     ref.watch(userApiRepositoryProvider),
@@ -63,8 +61,8 @@ class SyncService {
   final IAssetRepository _assetRepository;
   final IExifInfoRepository _exifInfoRepository;
   final IUserRepository _userRepository;
+  final UserService _userService;
   final IPartnerRepository _partnerRepository;
-  final StoreService _storeService;
   final IETagRepository _eTagRepository;
   final IPartnerApiRepository _partnerApiRepository;
   final IUserApiRepository _userApiRepository;
@@ -81,7 +79,7 @@ class SyncService {
     this._exifInfoRepository,
     this._partnerRepository,
     this._userRepository,
-    this._storeService,
+    this._userService,
     this._eTagRepository,
     this._partnerApiRepository,
     this._userApiRepository,
@@ -210,7 +208,7 @@ class SyncService {
       DateTime since,
     ) getChangedAssets,
   ) async {
-    final currentUser = _storeService.get(StoreKey.currentUser);
+    final currentUser = _userService.getMyUser();
     final DateTime? since =
         (await _eTagRepository.get(currentUser.id))?.time?.toUtc();
     if (since == null) return null;
@@ -261,7 +259,7 @@ class SyncService {
 
   Future<List<UserDto>> _getAllAccessibleUsers() async {
     final sharedWith = (await _partnerRepository.getSharedWith()).toSet();
-    sharedWith.add(_storeService.get(StoreKey.currentUser));
+    sharedWith.add(_userService.getMyUser());
     return sharedWith.toList();
   }
 
@@ -455,7 +453,7 @@ class SyncService {
     }
 
     if (album.shared || dto.shared) {
-      final userId = (_storeService.get(StoreKey.currentUser)).id;
+      final userId = (_userService.getMyUser()).id;
       final foreign =
           await _assetRepository.getByAlbum(album, notOwnedBy: [userId]);
       existing.addAll(foreign);
@@ -591,7 +589,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: (_storeService.get(StoreKey.currentUser)).id,
+      ownerId: (_userService.getMyUser()).id,
       sortBy: AssetSort.checksum,
     );
 

mobile/lib/services/timeline.service.dart

@@ -1,11 +1,10 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/domain/services/store.service.dart';
+import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/interfaces/timeline.interface.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/store.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/repositories/timeline.repository.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/widgets/asset_grid/asset_grid_data_structure.dart';
@@ -14,28 +13,28 @@ final timelineServiceProvider = Provider<TimelineService>((ref) {
   return TimelineService(
     ref.watch(timelineRepositoryProvider),
     ref.watch(appSettingsServiceProvider),
-    ref.watch(storeServiceProvider),
+    ref.watch(userServiceProvider),
   );
 });
 
 class TimelineService {
   final ITimelineRepository _timelineRepository;
   final AppSettingsService _appSettingsService;
-  final StoreService _storeService;
+  final UserService _userService;
 
   const TimelineService(
     this._timelineRepository,
     this._appSettingsService,
-    this._storeService,
+    this._userService,
   );
 
   Future<List<int>> getTimelineUserIds() async {
-    final me = _storeService.get(StoreKey.currentUser);
+    final me = _userService.getMyUser();
     return _timelineRepository.getTimelineUserIds(me.id);
   }
 
   Stream<List<int>> watchTimelineUserIds() async* {
-    final me = _storeService.get(StoreKey.currentUser);
+    final me = _userService.getMyUser();
     yield* _timelineRepository.watchTimelineUsers(me.id);
   }
 
@@ -51,13 +50,13 @@ class TimelineService {
   }
 
   Stream<RenderList> watchArchiveTimeline() async* {
-    final user = _storeService.get(StoreKey.currentUser);
+    final user = _userService.getMyUser();
 
     yield* _timelineRepository.watchArchiveTimeline(user.id);
   }
 
   Stream<RenderList> watchFavoriteTimeline() async* {
-    final user = _storeService.get(StoreKey.currentUser);
+    final user = _userService.getMyUser();
 
     yield* _timelineRepository.watchFavoriteTimeline(user.id);
   }
@@ -70,7 +69,7 @@ class TimelineService {
   }
 
   Stream<RenderList> watchTrashTimeline() async* {
-    final user = _storeService.get(StoreKey.currentUser);
+    final user = _userService.getMyUser();
 
     yield* _timelineRepository.watchTrashTimeline(user.id);
   }
@@ -97,7 +96,7 @@ class TimelineService {
   }
 
   Stream<RenderList> watchAssetSelectionTimeline() async* {
-    final user = _storeService.get(StoreKey.currentUser);
+    final user = _userService.getMyUser();
 
     yield* _timelineRepository.watchAssetSelectionTimeline(user.id);
   }

mobile/lib/services/trash.service.dart

@@ -1,10 +1,9 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/domain/services/store.service.dart';
+import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/store.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/repositories/asset.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:openapi/api.dart';
@@ -13,19 +12,19 @@ final trashServiceProvider = Provider<TrashService>((ref) {
   return TrashService(
     ref.watch(apiServiceProvider),
     ref.watch(assetRepositoryProvider),
-    ref.watch(storeServiceProvider),
+    ref.watch(userServiceProvider),
   );
 });
 
 class TrashService {
   final ApiService _apiService;
   final IAssetRepository _assetRepository;
-  final StoreService _storeService;
+  final UserService _userService;
 
-  TrashService(
+  const TrashService(
     this._apiService,
     this._assetRepository,
-    this._storeService,
+    this._userService,
   );
 
   Future<void> restoreAssets(Iterable<Asset> assetList) async {
@@ -43,7 +42,7 @@ class TrashService {
   }
 
   Future<void> emptyTrash() async {
-    final user = _storeService.get(StoreKey.currentUser);
+    final user = _userService.getMyUser();
 
     await _apiService.trashApi.emptyTrash();
 
@@ -74,7 +73,7 @@ class TrashService {
   }
 
   Future<void> restoreTrash() async {
-    final user = _storeService.get(StoreKey.currentUser);
+    final user = _userService.getMyUser();
 
     await _apiService.trashApi.restoreTrash();