refactor(mobile): use repositories in a number of services (#12891)

* UserService
* PartnerService
* HashService
* MemoryService
* PersonService
* SearchService
* StackService

mobile/lib/services/background.service.dart

@@ -18,7 +18,9 @@ import 'package:immich_mobile/repositories/asset.repository.dart';
 import 'package:immich_mobile/repositories/backup.repository.dart';
 import 'package:immich_mobile/repositories/album_media.repository.dart';
 import 'package:immich_mobile/repositories/file_media.repository.dart';
+import 'package:immich_mobile/repositories/partner_api.repository.dart';
 import 'package:immich_mobile/repositories/user.repository.dart';
+import 'package:immich_mobile/repositories/user_api.repository.dart';
 import 'package:immich_mobile/services/album.service.dart';
 import 'package:immich_mobile/services/entity.service.dart';
 import 'package:immich_mobile/services/hash.service.dart';
@@ -30,7 +32,6 @@ import 'package:immich_mobile/services/backup.service.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/services/api.service.dart';
-import 'package:immich_mobile/services/partner.service.dart';
 import 'package:immich_mobile/services/sync.service.dart';
 import 'package:immich_mobile/services/user.service.dart';
 import 'package:immich_mobile/utils/backup_progress.dart';
@@ -362,16 +363,20 @@ class BackgroundService {
     apiService.setAccessToken(Store.get(StoreKey.accessToken));
     AppSettingsService settingService = AppSettingsService();
     AppSettingsService settingsService = AppSettingsService();
-    PartnerService partnerService = PartnerService(apiService, db);
     AlbumRepository albumRepository = AlbumRepository(db);
     AssetRepository assetRepository = AssetRepository(db);
     BackupRepository backupAlbumRepository = BackupRepository(db);
     AlbumMediaRepository albumMediaRepository = AlbumMediaRepository();
     FileMediaRepository fileMediaRepository = FileMediaRepository();
     UserRepository userRepository = UserRepository(db);
+    UserApiRepository userApiRepository =
+        UserApiRepository(apiService.usersApi);
     AlbumApiRepository albumApiRepository =
         AlbumApiRepository(apiService.albumsApi);
-    HashService hashService = HashService(db, this, albumMediaRepository);
+    PartnerApiRepository partnerApiRepository =
+        PartnerApiRepository(apiService.partnersApi);
+    HashService hashService =
+        HashService(assetRepository, this, albumMediaRepository);
     EntityService entityService =
         EntityService(assetRepository, userRepository);
     SyncService syncSerive = SyncService(
@@ -381,8 +386,12 @@ class BackgroundService {
       albumMediaRepository,
       albumApiRepository,
     );
-    UserService userService =
-        UserService(apiService, db, syncSerive, partnerService);
+    UserService userService = UserService(
+      partnerApiRepository,
+      userApiRepository,
+      userRepository,
+      syncSerive,
+    );
     AlbumService albumService = AlbumService(
       userService,
       syncSerive,

mobile/lib/services/hash.service.dart

@@ -4,20 +4,24 @@ import 'package:flutter/foundation.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/interfaces/album_media.interface.dart';
+import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/repositories/album_media.repository.dart';
+import 'package:immich_mobile/repositories/asset.repository.dart';
 import 'package:immich_mobile/services/background.service.dart';
 import 'package:immich_mobile/entities/android_device_asset.entity.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/device_asset.entity.dart';
 import 'package:immich_mobile/entities/ios_device_asset.entity.dart';
-import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/extensions/string_extensions.dart';
-import 'package:isar/isar.dart';
 import 'package:logging/logging.dart';
 
 class HashService {
-  HashService(this._db, this._backgroundService, this._albumMediaRepository);
-  final Isar _db;
+  HashService(
+    this._assetRepository,
+    this._backgroundService,
+    this._albumMediaRepository,
+  );
+  final IAssetRepository _assetRepository;
   final BackgroundService _backgroundService;
   final IAlbumMediaRepository _albumMediaRepository;
   final _log = Logger('HashService');
@@ -55,7 +59,8 @@ class HashService {
     final ids = assets
         .map(Platform.isAndroid ? (a) => a.localId!.toInt() : (a) => a.localId!)
         .toList();
-    final List<DeviceAsset?> hashes = await _lookupHashes(ids);
+    final List<DeviceAsset?> hashes =
+        await _assetRepository.getDeviceAssetsById(ids);
     final List<DeviceAsset> toAdd = [];
     final List<String> toHash = [];
 
@@ -106,12 +111,6 @@ class HashService {
     return _getHashedAssets(assets, hashes);
   }
 
-  /// Lookup hashes of assets by their local ID
-  Future<List<DeviceAsset?>> _lookupHashes(List<Object> ids) =>
-      Platform.isAndroid
-          ? _db.androidDeviceAssets.getAll(ids.cast())
-          : _db.iOSDeviceAssets.getAllById(ids.cast());
-
   /// Processes a batch of files and saves any successfully hashed
   /// values to the DB table.
   Future<void> _processBatch(
@@ -131,11 +130,7 @@ class HashService {
     final validHashes = anyNull
         ? toAdd.where((e) => e.hash.length == 20).toList(growable: false)
         : toAdd;
-    await _db.writeTxn(
-      () => Platform.isAndroid
-          ? _db.androidDeviceAssets.putAll(validHashes.cast())
-          : _db.iOSDeviceAssets.putAll(validHashes.cast()),
-    );
+    await _assetRepository.upsertDeviceAssets(validHashes);
     _log.fine("Hashed ${validHashes.length}/${toHash.length} assets");
   }
 
@@ -168,7 +163,7 @@ class HashService {
 
 final hashServiceProvider = Provider(
   (ref) => HashService(
-    ref.watch(dbProvider),
+    ref.watch(assetRepositoryProvider),
     ref.watch(backgroundServiceProvider),
     ref.watch(albumMediaRepositoryProvider),
   ),

mobile/lib/services/memory.service.dart

@@ -1,18 +1,17 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
+import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/models/memories/memory.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
-import 'package:immich_mobile/providers/db.provider.dart';
+import 'package:immich_mobile/repositories/asset.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
-import 'package:isar/isar.dart';
 import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
 
 final memoryServiceProvider = StateProvider<MemoryService>((ref) {
   return MemoryService(
     ref.watch(apiServiceProvider),
-    ref.watch(dbProvider),
+    ref.watch(assetRepositoryProvider),
   );
 });
 
@@ -20,9 +19,9 @@ class MemoryService {
   final log = Logger("MemoryService");
 
   final ApiService _apiService;
-  final Isar _db;
+  final IAssetRepository _assetRepository;
 
-  MemoryService(this._apiService, this._db);
+  MemoryService(this._apiService, this._assetRepository);
 
   Future<List<Memory>?> getMemoryLane() async {
     try {
@@ -39,7 +38,7 @@ class MemoryService {
       List<Memory> memories = [];
       for (final MemoryLaneResponseDto(:yearsAgo, :assets) in data) {
         final dbAssets =
-            await _db.assets.getAllByRemoteId(assets.map((e) => e.id));
+            await _assetRepository.getAllByRemoteId(assets.map((e) => e.id));
         if (dbAssets.isNotEmpty) {
           final String title = yearsAgo <= 1
               ? 'memories_year_ago'.tr()

mobile/lib/services/partner.service.dart

@@ -1,43 +1,33 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/entities/user.entity.dart';
-import 'package:immich_mobile/providers/api.provider.dart';
-import 'package:immich_mobile/providers/db.provider.dart';
-import 'package:immich_mobile/services/api.service.dart';
-import 'package:isar/isar.dart';
+import 'package:immich_mobile/interfaces/partner_api.interface.dart';
+import 'package:immich_mobile/interfaces/user.interface.dart';
+import 'package:immich_mobile/repositories/partner_api.repository.dart';
+import 'package:immich_mobile/repositories/user.repository.dart';
 import 'package:logging/logging.dart';
-import 'package:openapi/api.dart';
 
 final partnerServiceProvider = Provider(
   (ref) => PartnerService(
-    ref.watch(apiServiceProvider),
-    ref.watch(dbProvider),
+    ref.watch(partnerApiRepositoryProvider),
+    ref.watch(userRepositoryProvider),
   ),
 );
 
 class PartnerService {
-  final ApiService _apiService;
-  final Isar _db;
+  final IPartnerApiRepository _partnerApiRepository;
+  final IUserRepository _userRepository;
   final Logger _log = Logger("PartnerService");
 
-  PartnerService(this._apiService, this._db);
-
-  Future<List<User>?> getPartners(PartnerDirection direction) async {
-    try {
-      final userDtos = await _apiService.partnersApi.getPartners(direction);
-      if (userDtos != null) {
-        return userDtos.map((u) => User.fromPartnerDto(u)).toList();
-      }
-    } catch (e) {
-      _log.warning("Failed to get partners for direction $direction", e);
-    }
-    return null;
-  }
+  PartnerService(
+    this._partnerApiRepository,
+    this._userRepository,
+  );
 
   Future<bool> removePartner(User partner) async {
     try {
-      await _apiService.partnersApi.removePartner(partner.id);
+      await _partnerApiRepository.delete(partner.id);
       partner.isPartnerSharedBy = false;
-      await _db.writeTxn(() => _db.users.put(partner));
+      await _userRepository.update(partner);
     } catch (e) {
       _log.warning("Failed to remove partner ${partner.id}", e);
       return false;
@@ -47,12 +37,10 @@ class PartnerService {
 
   Future<bool> addPartner(User partner) async {
     try {
-      final dto = await _apiService.partnersApi.createPartner(partner.id);
-      if (dto != null) {
-        partner.isPartnerSharedBy = true;
-        await _db.writeTxn(() => _db.users.put(partner));
-        return true;
-      }
+      await _partnerApiRepository.create(partner.id);
+      partner.isPartnerSharedBy = true;
+      await _userRepository.update(partner);
+      return true;
     } catch (e) {
       _log.warning("Failed to add partner ${partner.id}", e);
     }
@@ -61,13 +49,13 @@ class PartnerService {
 
   Future<bool> updatePartner(User partner, {required bool inTimeline}) async {
     try {
-      final dto = await _apiService.partnersApi
-          .updatePartner(partner.id, UpdatePartnerDto(inTimeline: inTimeline));
-      if (dto != null) {
-        partner.inTimeline = dto.inTimeline ?? partner.inTimeline;
-        await _db.writeTxn(() => _db.users.put(partner));
-        return true;
-      }
+      final dto = await _partnerApiRepository.update(
+        partner.id,
+        inTimeline: inTimeline,
+      );
+      partner.inTimeline = dto.inTimeline;
+      await _userRepository.update(partner);
+      return true;
     } catch (e) {
       _log.warning("Failed to update partner ${partner.id}", e);
     }

mobile/lib/services/person.service.dart

@@ -1,29 +1,37 @@
 import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/providers/api.provider.dart';
-import 'package:immich_mobile/providers/db.provider.dart';
-import 'package:immich_mobile/services/api.service.dart';
-import 'package:isar/isar.dart';
+import 'package:immich_mobile/interfaces/asset.interface.dart';
+import 'package:immich_mobile/interfaces/asset_api.interface.dart';
+import 'package:immich_mobile/interfaces/person_api.interface.dart';
+import 'package:immich_mobile/repositories/asset.repository.dart';
+import 'package:immich_mobile/repositories/asset_api.repository.dart';
+import 'package:immich_mobile/repositories/person_api.repository.dart';
 import 'package:logging/logging.dart';
-import 'package:openapi/api.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'person.service.g.dart';
 
 @riverpod
-PersonService personService(PersonServiceRef ref) =>
-    PersonService(ref.read(apiServiceProvider), ref.read(dbProvider));
+PersonService personService(PersonServiceRef ref) => PersonService(
+      ref.watch(personApiRepositoryProvider),
+      ref.watch(assetApiRepositoryProvider),
+      ref.read(assetRepositoryProvider),
+    );
 
 class PersonService {
   final Logger _log = Logger("PersonService");
-  final ApiService _apiService;
-  final Isar _db;
+  final IPersonApiRepository _personApiRepository;
+  final IAssetApiRepository _assetApiRepository;
+  final IAssetRepository _assetRepository;
 
-  PersonService(this._apiService, this._db);
+  PersonService(
+    this._personApiRepository,
+    this._assetApiRepository,
+    this._assetRepository,
+  );
 
-  Future<List<PersonResponseDto>> getAllPeople() async {
+  Future<List<Person>> getAllPeople() async {
     try {
-      final peopleResponseDto = await _apiService.peopleApi.getAllPeople();
-      return peopleResponseDto?.people ?? [];
+      return await _personApiRepository.getAll();
     } catch (error, stack) {
       _log.severe("Error while fetching curated people", error, stack);
       return [];
@@ -31,50 +39,19 @@ class PersonService {
   }
 
   Future<List<Asset>> getPersonAssets(String id) async {
-    List<Asset> result = [];
-    var hasNext = true;
-    var currentPage = 1;
-
     try {
-      while (hasNext) {
-        final response = await _apiService.searchApi.searchMetadata(
-          MetadataSearchDto(
-            personIds: [id],
-            page: currentPage,
-            size: 1000,
-          ),
-        );
-
-        if (response == null) {
-          break;
-        }
-
-        if (response.assets.nextPage == null) {
-          hasNext = false;
-        }
-
-        final assets = response.assets.items;
-        final mapAssets =
-            await _db.assets.getAllByRemoteId(assets.map((e) => e.id));
-        result.addAll(mapAssets);
-
-        currentPage++;
-      }
+      final assets = await _assetApiRepository.search(personIds: [id]);
+      return await _assetRepository
+          .getAllByRemoteId(assets.map((a) => a.remoteId!));
     } catch (error, stack) {
       _log.severe("Error while fetching person assets", error, stack);
     }
-
-    return result;
+    return [];
   }
 
-  Future<PersonResponseDto?> updateName(String id, String name) async {
+  Future<Person?> updateName(String id, String name) async {
     try {
-      return await _apiService.peopleApi.updatePerson(
-        id,
-        PersonUpdateDto(
-          name: name,
-        ),
-      );
+      return await _personApiRepository.update(id, name: name);
     } catch (error, stack) {
       _log.severe("Error while updating person name", error, stack);
     }

mobile/lib/services/person.service.g.dart

@@ -6,7 +6,7 @@ part of 'person.service.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$personServiceHash() => r'54e6df4b8eea744f6de009f8315c9fe6230f6798';
+String _$personServiceHash() => r'32f28cb5a3de0553c17447e33a0efde7409a43ed';
 
 /// See also [personService].
 @ProviderFor(personService)

mobile/lib/services/search.service.dart

@@ -1,27 +1,27 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/models/search/search_filter.model.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
-import 'package:immich_mobile/providers/db.provider.dart';
+import 'package:immich_mobile/repositories/asset.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
-import 'package:isar/isar.dart';
 import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
 
 final searchServiceProvider = Provider(
   (ref) => SearchService(
     ref.watch(apiServiceProvider),
-    ref.watch(dbProvider),
+    ref.watch(assetRepositoryProvider),
   ),
 );
 
 class SearchService {
   final ApiService _apiService;
-  final Isar _db;
+  final IAssetRepository _assetRepository;
 
   final _log = Logger("SearchService");
-  SearchService(this._apiService, this._db);
+  SearchService(this._apiService, this._assetRepository);
 
   Future<List<String>?> getSearchSuggestions(
     SearchSuggestionType type, {
@@ -103,7 +103,7 @@ class SearchService {
         return null;
       }
 
-      return _db.assets
+      return _assetRepository
           .getAllByRemoteId(response.assets.items.map((e) => e.id));
     } catch (error, stackTrace) {
       _log.severe("Failed to search for assets", error, stackTrace);

mobile/lib/services/stack.service.dart

@@ -1,17 +1,17 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.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/db.provider.dart';
+import 'package:immich_mobile/repositories/asset.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
-import 'package:isar/isar.dart';
 import 'package:openapi/api.dart';
 
 class StackService {
-  StackService(this._api, this._db);
+  StackService(this._api, this._assetRepository);
 
   final ApiService _api;
-  final Isar _db;
+  final IAssetRepository _assetRepository;
 
   Future<StackResponseDto?> getStack(String stackId) async {
     try {
@@ -61,10 +61,7 @@ class StackService {
 
         removeAssets.add(asset);
       }
-
-      _db.writeTxn(() async {
-        await _db.assets.putAll(removeAssets);
-      });
+      await _assetRepository.updateAll(removeAssets);
     } catch (error) {
       debugPrint("Error while deleting stack: $error");
     }
@@ -74,6 +71,6 @@ class StackService {
 final stackServiceProvider = Provider(
   (ref) => StackService(
     ref.watch(apiServiceProvider),
-    ref.watch(dbProvider),
+    ref.watch(assetRepositoryProvider),
   ),
 );

mobile/lib/services/user.service.dart

@@ -1,68 +1,48 @@
 import 'package:collection/collection.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:http/http.dart';
 import 'package:image_picker/image_picker.dart';
-import 'package:immich_mobile/services/partner.service.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/interfaces/partner_api.interface.dart';
+import 'package:immich_mobile/interfaces/user.interface.dart';
+import 'package:immich_mobile/interfaces/user_api.interface.dart';
+import 'package:immich_mobile/repositories/partner_api.repository.dart';
+import 'package:immich_mobile/repositories/user.repository.dart';
+import 'package:immich_mobile/repositories/user_api.repository.dart';
 import 'package:immich_mobile/entities/user.entity.dart';
-import 'package:immich_mobile/providers/api.provider.dart';
-import 'package:immich_mobile/providers/db.provider.dart';
-import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/services/sync.service.dart';
 import 'package:immich_mobile/utils/diff.dart';
-import 'package:isar/isar.dart';
 import 'package:logging/logging.dart';
-import 'package:openapi/api.dart';
 
 final userServiceProvider = Provider(
   (ref) => UserService(
-    ref.watch(apiServiceProvider),
-    ref.watch(dbProvider),
+    ref.watch(partnerApiRepositoryProvider),
+    ref.watch(userApiRepositoryProvider),
+    ref.watch(userRepositoryProvider),
     ref.watch(syncServiceProvider),
-    ref.watch(partnerServiceProvider),
   ),
 );
 
 class UserService {
-  final ApiService _apiService;
-  final Isar _db;
+  final IPartnerApiRepository _partnerApiRepository;
+  final IUserApiRepository _userApiRepository;
+  final IUserRepository _userRepository;
   final SyncService _syncService;
-  final PartnerService _partnerService;
   final Logger _log = Logger("UserService");
 
   UserService(
-    this._apiService,
-    this._db,
+    this._partnerApiRepository,
+    this._userApiRepository,
+    this._userRepository,
     this._syncService,
-    this._partnerService,
   );
 
-  Future<List<User>?> _getAllUsers() async {
-    try {
-      final dto = await _apiService.usersApi.searchUsers();
-      return dto?.map(User.fromSimpleUserDto).toList();
-    } catch (e) {
-      _log.warning("Failed get all users", e);
-      return null;
-    }
-  }
+  Future<List<User>> getUsers({bool self = false}) =>
+      _userRepository.getAll(self: self);
 
-  Future<List<User>> getUsersInDb({bool self = false}) async {
-    if (self) {
-      return _db.users.where().findAll();
-    }
-    final int userId = Store.get(StoreKey.currentUser).isarId;
-    return _db.users.where().isarIdNotEqualTo(userId).findAll();
-  }
-
-  Future<CreateProfileImageResponseDto?> uploadProfileImage(XFile image) async {
+  Future<({String profileImagePath})?> uploadProfileImage(XFile image) async {
     try {
-      return await _apiService.usersApi.createProfileImage(
-        MultipartFile.fromBytes(
-          'file',
-          await image.readAsBytes(),
-          filename: image.name,
-        ),
+      return await _userApiRepository.createProfileImage(
+        name: image.name,
+        data: await image.readAsBytes(),
       );
     } catch (e) {
       _log.warning("Failed to upload profile image", e);
@@ -71,13 +51,19 @@ class UserService {
   }
 
   Future<List<User>?> getUsersFromServer() async {
-    final List<User>? users = await _getAllUsers();
-    final List<User>? sharedBy =
-        await _partnerService.getPartners(PartnerDirection.by);
-    final List<User>? sharedWith =
-        await _partnerService.getPartners(PartnerDirection.with_);
+    List<User>? users;
+    try {
+      users = await _userApiRepository.getAll();
+    } catch (e) {
+      _log.warning("Failed to fetch users", e);
+      users = null;
+    }
+    final List<User> sharedBy =
+        await _partnerApiRepository.getAll(Direction.sharedByMe);
+    final List<User> sharedWith =
+        await _partnerApiRepository.getAll(Direction.sharedWithMe);
 
-    if (users == null || sharedBy == null || sharedWith == null) {
+    if (users == null) {
       _log.warning("Failed to refresh users");
       return null;
     }