refactor(mobile): DB repository for asset, backup, sync service (#12953)

* refactor(mobile): DB repository for asset, backup, sync service

* review feedback

* fix bug found by Alex

---------

Co-authored-by: Alex <alex.tran1502@gmail.com>

mobile/lib/repositories/activity_api.repository.dart

@@ -3,14 +3,14 @@ import 'package:immich_mobile/entities/user.entity.dart';
 import 'package:immich_mobile/interfaces/activity_api.interface.dart';
 import 'package:immich_mobile/models/activities/activity.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
-import 'package:immich_mobile/repositories/base_api.repository.dart';
+import 'package:immich_mobile/repositories/api.repository.dart';
 import 'package:openapi/api.dart';
 
 final activityApiRepositoryProvider = Provider(
   (ref) => ActivityApiRepository(ref.watch(apiServiceProvider).activitiesApi),
 );
 
-class ActivityApiRepository extends BaseApiRepository
+class ActivityApiRepository extends ApiRepository
     implements IActivityApiRepository {
   final ActivitiesApi _api;
 

mobile/lib/repositories/album.repository.dart

@@ -4,32 +4,36 @@ import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/user.entity.dart';
 import 'package:immich_mobile/interfaces/album.interface.dart';
 import 'package:immich_mobile/providers/db.provider.dart';
+import 'package:immich_mobile/repositories/database.repository.dart';
 import 'package:isar/isar.dart';
 
 final albumRepositoryProvider =
     Provider((ref) => AlbumRepository(ref.watch(dbProvider)));
 
-class AlbumRepository implements IAlbumRepository {
-  final Isar _db;
-
-  AlbumRepository(
-    this._db,
-  );
+class AlbumRepository extends DatabaseRepository implements IAlbumRepository {
+  AlbumRepository(super.db);
 
   @override
   Future<int> count({bool? local}) {
-    if (local == true) return _db.albums.where().localIdIsNotNull().count();
-    if (local == false) return _db.albums.where().remoteIdIsNotNull().count();
-    return _db.albums.count();
+    final baseQuery = db.albums.where();
+    final QueryBuilder<Album, Album, QAfterWhereClause> query;
+    switch (local) {
+      case null:
+        query = baseQuery.noOp();
+      case true:
+        query = baseQuery.localIdIsNotNull();
+      case false:
+        query = baseQuery.remoteIdIsNotNull();
+    }
+    return query.count();
   }
 
   @override
-  Future<Album> create(Album album) =>
-      _db.writeTxn(() => _db.albums.store(album));
+  Future<Album> create(Album album) => txn(() => db.albums.store(album));
 
   @override
   Future<Album?> getByName(String name, {bool? shared, bool? remote}) {
-    var query = _db.albums.filter().nameEqualTo(name);
+    var query = db.albums.filter().nameEqualTo(name);
     if (shared != null) {
       query = query.sharedEqualTo(shared);
     }
@@ -42,37 +46,61 @@ class AlbumRepository implements IAlbumRepository {
   }
 
   @override
-  Future<Album> update(Album album) =>
-      _db.writeTxn(() => _db.albums.store(album));
+  Future<Album> update(Album album) => txn(() => db.albums.store(album));
 
   @override
-  Future<void> delete(int albumId) =>
-      _db.writeTxn(() => _db.albums.delete(albumId));
+  Future<void> delete(int albumId) => txn(() => db.albums.delete(albumId));
 
   @override
-  Future<List<Album>> getAll({bool? shared}) {
-    final baseQuery = _db.albums.filter();
-    QueryBuilder<Album, Album, QAfterFilterCondition>? query;
-    if (shared != null) {
-      query = baseQuery.sharedEqualTo(true);
+  Future<List<Album>> getAll({
+    bool? shared,
+    bool? remote,
+    int? ownerId,
+    AlbumSort? sortBy,
+  }) {
+    final baseQuery = db.albums.where();
+    final QueryBuilder<Album, Album, QAfterWhereClause> afterWhere;
+    if (remote == null) {
+      afterWhere = baseQuery.noOp();
+    } else if (remote) {
+      afterWhere = baseQuery.remoteIdIsNotNull();
+    } else {
+      afterWhere = baseQuery.localIdIsNotNull();
     }
-    return query?.findAll() ?? _db.albums.where().findAll();
+    QueryBuilder<Album, Album, QAfterFilterCondition> filterQuery =
+        afterWhere.filter().noOp();
+    if (shared != null) {
+      filterQuery = filterQuery.sharedEqualTo(true);
+    }
+    if (ownerId != null) {
+      filterQuery = filterQuery.owner((q) => q.isarIdEqualTo(ownerId));
+    }
+    final QueryBuilder<Album, Album, QAfterSortBy> query;
+    switch (sortBy) {
+      case null:
+        query = filterQuery.noOp();
+      case AlbumSort.remoteId:
+        query = filterQuery.sortByRemoteId();
+      case AlbumSort.localId:
+        query = filterQuery.sortByLocalId();
+    }
+    return query.findAll();
   }
 
   @override
-  Future<Album?> getById(int id) => _db.albums.get(id);
+  Future<Album?> get(int id) => db.albums.get(id);
 
   @override
   Future<void> removeUsers(Album album, List<User> users) =>
-      _db.writeTxn(() => album.sharedUsers.update(unlink: users));
+      txn(() => album.sharedUsers.update(unlink: users));
 
   @override
   Future<void> addAssets(Album album, List<Asset> assets) =>
-      _db.writeTxn(() => album.assets.update(link: assets));
+      txn(() => album.assets.update(link: assets));
 
   @override
   Future<void> removeAssets(Album album, List<Asset> assets) =>
-      _db.writeTxn(() => album.assets.update(unlink: assets));
+      txn(() => album.assets.update(unlink: assets));
 
   @override
   Future<Album> recalculateMetadata(Album album) async {
@@ -82,4 +110,12 @@ class AlbumRepository implements IAlbumRepository {
         await album.assets.filter().updatedAtProperty().max();
     return album;
   }
+
+  @override
+  Future<void> addUsers(Album album, List<User> users) =>
+      txn(() => album.sharedUsers.update(link: users));
+
+  @override
+  Future<void> deleteAllLocal() =>
+      txn(() => db.albums.where().localIdIsNotNull().deleteAll());
 }

mobile/lib/repositories/album_api.repository.dart

@@ -4,15 +4,14 @@ import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/user.entity.dart';
 import 'package:immich_mobile/interfaces/album_api.interface.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
-import 'package:immich_mobile/repositories/base_api.repository.dart';
+import 'package:immich_mobile/repositories/api.repository.dart';
 import 'package:openapi/api.dart';
 
 final albumApiRepositoryProvider = Provider(
   (ref) => AlbumApiRepository(ref.watch(apiServiceProvider).albumsApi),
 );
 
-class AlbumApiRepository extends BaseApiRepository
-    implements IAlbumApiRepository {
+class AlbumApiRepository extends ApiRepository implements IAlbumApiRepository {
   final AlbumsApi _api;
 
   AlbumApiRepository(this._api);
@@ -26,7 +25,7 @@ class AlbumApiRepository extends BaseApiRepository
   @override
   Future<List<Album>> getAll({bool? shared}) async {
     final dtos = await checkNull(_api.getAllAlbums(shared: shared));
-    return dtos.map(_toAlbum).toList().cast();
+    return dtos.map(_toAlbum).toList();
   }
 
   @override

mobile/lib/repositories/api.repository.dart

@@ -1,8 +1,6 @@
-import 'package:flutter/foundation.dart';
 import 'package:immich_mobile/constants/errors.dart';
 
-abstract class BaseApiRepository {
-  @protected
+abstract class ApiRepository {
   Future<T> checkNull<T>(Future<T?> future) async {
     final response = await future;
     if (response == null) throw NoResponseDtoError();

mobile/lib/repositories/asset.repository.dart

@@ -5,78 +5,145 @@ import 'package:immich_mobile/entities/album.entity.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/duplicated_asset.entity.dart';
+import 'package:immich_mobile/entities/exif_info.entity.dart';
 import 'package:immich_mobile/entities/ios_device_asset.entity.dart';
-import 'package:immich_mobile/entities/user.entity.dart';
 import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/providers/db.provider.dart';
+import 'package:immich_mobile/repositories/database.repository.dart';
 import 'package:isar/isar.dart';
 
 final assetRepositoryProvider =
     Provider((ref) => AssetRepository(ref.watch(dbProvider)));
 
-class AssetRepository implements IAssetRepository {
-  final Isar _db;
-
-  AssetRepository(
-    this._db,
-  );
+class AssetRepository extends DatabaseRepository implements IAssetRepository {
+  AssetRepository(super.db);
 
   @override
-  Future<List<Asset>> getByAlbum(Album album, {User? notOwnedBy}) {
+  Future<List<Asset>> getByAlbum(
+    Album album, {
+    Iterable<int> notOwnedBy = const [],
+    int? ownerId,
+    AssetState? state,
+    AssetSort? sortBy,
+  }) {
     var query = album.assets.filter();
-    if (notOwnedBy != null) {
-      query = query.not().ownerIdEqualTo(notOwnedBy.isarId);
+    if (notOwnedBy.length == 1) {
+      query = query.not().ownerIdEqualTo(notOwnedBy.first);
+    } else if (notOwnedBy.isNotEmpty) {
+      query =
+          query.not().anyOf(notOwnedBy, (q, int id) => q.ownerIdEqualTo(id));
     }
-    return query.findAll();
+    if (ownerId != null) {
+      query = query.ownerIdEqualTo(ownerId);
+    }
+
+    switch (state) {
+      case null:
+        break;
+      case AssetState.local:
+        query = query.remoteIdIsNull();
+      case AssetState.remote:
+        query = query.localIdIsNull();
+      case AssetState.merged:
+        query = query.localIdIsNotNull().remoteIdIsNotNull();
+    }
+
+    final QueryBuilder<Asset, Asset, QAfterSortBy> sortedQuery;
+
+    switch (sortBy) {
+      case null:
+        sortedQuery = query.noOp();
+      case AssetSort.checksum:
+        sortedQuery = query.sortByChecksum();
+      case AssetSort.ownerIdChecksum:
+        sortedQuery = query.sortByOwnerId().thenByChecksum();
+    }
+
+    return sortedQuery.findAll();
   }
 
   @override
-  Future<void> deleteById(List<int> ids) =>
-      _db.writeTxn(() => _db.assets.deleteAll(ids));
+  Future<void> deleteById(List<int> ids) => txn(() async {
+        await db.assets.deleteAll(ids);
+        await db.exifInfos.deleteAll(ids);
+      });
 
   @override
-  Future<Asset?> getByRemoteId(String id) => _db.assets.getByRemoteId(id);
+  Future<Asset?> getByRemoteId(String id) => db.assets.getByRemoteId(id);
 
   @override
-  Future<List<Asset>> getAllByRemoteId(Iterable<String> ids) =>
-      _db.assets.getAllByRemoteId(ids);
+  Future<List<Asset>> getAllByRemoteId(
+    Iterable<String> ids, {
+    AssetState? state,
+  }) =>
+      _getAllByRemoteIdImpl(ids, state).findAll();
+
+  QueryBuilder<Asset, Asset, QAfterFilterCondition> _getAllByRemoteIdImpl(
+    Iterable<String> ids,
+    AssetState? state,
+  ) {
+    final query = db.assets.remote(ids).filter();
+    switch (state) {
+      case null:
+        return query.noOp();
+      case AssetState.local:
+        return query.remoteIdIsNull();
+      case AssetState.remote:
+        return query.localIdIsNull();
+      case AssetState.merged:
+        return query.localIdIsNotEmpty().remoteIdIsNotNull();
+    }
+  }
 
   @override
   Future<List<Asset>> getAll({
     required int ownerId,
-    bool? remote,
-    int limit = 100,
+    AssetState? state,
+    AssetSort? sortBy,
+    int? limit,
   }) {
-    if (remote == null) {
-      return _db.assets
-          .where()
-          .ownerIdEqualToAnyChecksum(ownerId)
-          .limit(limit)
-          .findAll();
-    }
-    final QueryBuilder<Asset, Asset, QAfterFilterCondition> query;
-    if (remote) {
-      query = _db.assets
-          .where()
-          .localIdIsNull()
-          .filter()
-          .remoteIdIsNotNull()
-          .ownerIdEqualTo(ownerId);
-    } else {
-      query = _db.assets
-          .where()
-          .remoteIdIsNull()
-          .filter()
-          .localIdIsNotNull()
-          .ownerIdEqualTo(ownerId);
+    final baseQuery = db.assets.where();
+    final QueryBuilder<Asset, Asset, QAfterFilterCondition> filteredQuery;
+    switch (state) {
+      case null:
+        filteredQuery = baseQuery.ownerIdEqualToAnyChecksum(ownerId).noOp();
+      case AssetState.local:
+        filteredQuery = baseQuery
+            .remoteIdIsNull()
+            .filter()
+            .localIdIsNotNull()
+            .ownerIdEqualTo(ownerId);
+      case AssetState.remote:
+        filteredQuery = baseQuery
+            .localIdIsNull()
+            .filter()
+            .remoteIdIsNotNull()
+            .ownerIdEqualTo(ownerId);
+      case AssetState.merged:
+        filteredQuery = baseQuery
+            .ownerIdEqualToAnyChecksum(ownerId)
+            .filter()
+            .remoteIdIsNotNull()
+            .localIdIsNotNull();
     }
 
-    return query.limit(limit).findAll();
+    final QueryBuilder<Asset, Asset, QAfterSortBy> query;
+    switch (sortBy) {
+      case null:
+        query = filteredQuery.noOp();
+      case AssetSort.checksum:
+        query = filteredQuery.sortByChecksum();
+      case AssetSort.ownerIdChecksum:
+        query = filteredQuery.sortByOwnerId().thenByChecksum();
+    }
+
+    return limit == null ? query.findAll() : query.limit(limit).findAll();
   }
 
   @override
   Future<List<Asset>> updateAll(List<Asset> assets) async {
-    await _db.writeTxn(() => _db.assets.putAll(assets));
+    await txn(() => db.assets.putAll(assets));
     return assets;
   }
 
@@ -84,16 +151,20 @@ class AssetRepository implements IAssetRepository {
   Future<List<Asset>> getMatches({
     required List<Asset> assets,
     required int ownerId,
-    bool? remote,
+    AssetState? state,
     int limit = 100,
   }) {
+    final baseQuery = db.assets.where();
     final QueryBuilder<Asset, Asset, QAfterFilterCondition> query;
-    if (remote == null) {
-      query = _db.assets.filter().remoteIdIsNotNull().or().localIdIsNotNull();
-    } else if (remote) {
-      query = _db.assets.where().localIdIsNull().filter().remoteIdIsNotNull();
-    } else {
-      query = _db.assets.where().remoteIdIsNull().filter().localIdIsNotNull();
+    switch (state) {
+      case null:
+        query = baseQuery.noOp();
+      case AssetState.local:
+        query = baseQuery.remoteIdIsNull().filter().localIdIsNotNull();
+      case AssetState.remote:
+        query = baseQuery.localIdIsNull().filter().remoteIdIsNotNull();
+      case AssetState.merged:
+        query = baseQuery.localIdIsNotNull().filter().remoteIdIsNotNull();
     }
     return _getMatchesImpl(query, ownerId, assets, limit);
   }
@@ -101,16 +172,50 @@ class AssetRepository implements IAssetRepository {
   @override
   Future<List<DeviceAsset?>> getDeviceAssetsById(List<Object> ids) =>
       Platform.isAndroid
-          ? _db.androidDeviceAssets.getAll(ids.cast())
-          : _db.iOSDeviceAssets.getAllById(ids.cast());
+          ? db.androidDeviceAssets.getAll(ids.cast())
+          : db.iOSDeviceAssets.getAllById(ids.cast());
 
   @override
-  Future<void> upsertDeviceAssets(List<DeviceAsset> deviceAssets) =>
-      _db.writeTxn(
+  Future<void> upsertDeviceAssets(List<DeviceAsset> deviceAssets) => txn(
         () => Platform.isAndroid
-            ? _db.androidDeviceAssets.putAll(deviceAssets.cast())
-            : _db.iOSDeviceAssets.putAll(deviceAssets.cast()),
+            ? db.androidDeviceAssets.putAll(deviceAssets.cast())
+            : db.iOSDeviceAssets.putAll(deviceAssets.cast()),
       );
+
+  @override
+  Future<Asset> update(Asset asset) async {
+    await txn(() => asset.put(db));
+    return asset;
+  }
+
+  @override
+  Future<void> upsertDuplicatedAssets(Iterable<String> duplicatedAssets) => txn(
+        () => db.duplicatedAssets
+            .putAll(duplicatedAssets.map(DuplicatedAsset.new).toList()),
+      );
+
+  @override
+  Future<List<String>> getAllDuplicatedAssetIds() =>
+      db.duplicatedAssets.where().idProperty().findAll();
+
+  @override
+  Future<Asset?> getByOwnerIdChecksum(int ownerId, String checksum) =>
+      db.assets.getByOwnerIdChecksum(ownerId, checksum);
+
+  @override
+  Future<List<Asset?>> getAllByOwnerIdChecksum(
+    List<int> ids,
+    List<String> checksums,
+  ) =>
+      db.assets.getAllByOwnerIdChecksum(ids, checksums);
+
+  @override
+  Future<List<Asset>> getAllLocal() =>
+      db.assets.where().localIdIsNotNull().findAll();
+
+  @override
+  Future<void> deleteAllByRemoteId(List<String> ids, {AssetState? state}) =>
+      txn(() => _getAllByRemoteIdImpl(ids, state).deleteAll());
 }
 
 Future<List<Asset>> _getMatchesImpl(

mobile/lib/repositories/asset_api.repository.dart

@@ -2,7 +2,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/interfaces/asset_api.interface.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
-import 'package:immich_mobile/repositories/base_api.repository.dart';
+import 'package:immich_mobile/repositories/api.repository.dart';
 import 'package:openapi/api.dart';
 
 final assetApiRepositoryProvider = Provider(
@@ -12,8 +12,7 @@ final assetApiRepositoryProvider = Provider(
   ),
 );
 
-class AssetApiRepository extends BaseApiRepository
-    implements IAssetApiRepository {
+class AssetApiRepository extends ApiRepository implements IAssetApiRepository {
   final AssetsApi _api;
   final SearchApi _searchApi;
 

mobile/lib/repositories/backup.repository.dart

@@ -2,19 +2,41 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/entities/backup_album.entity.dart';
 import 'package:immich_mobile/interfaces/backup.interface.dart';
 import 'package:immich_mobile/providers/db.provider.dart';
+import 'package:immich_mobile/repositories/database.repository.dart';
 import 'package:isar/isar.dart';
 
 final backupRepositoryProvider =
     Provider((ref) => BackupRepository(ref.watch(dbProvider)));
 
-class BackupRepository implements IBackupRepository {
-  final Isar _db;
+class BackupRepository extends DatabaseRepository implements IBackupRepository {
+  BackupRepository(super.db);
 
-  BackupRepository(
-    this._db,
-  );
+  @override
+  Future<List<BackupAlbum>> getAll({BackupAlbumSort? sort}) {
+    final baseQuery = db.backupAlbums.where();
+    final QueryBuilder<BackupAlbum, BackupAlbum, QAfterSortBy> query;
+    switch (sort) {
+      case null:
+        query = baseQuery.noOp();
+      case BackupAlbumSort.id:
+        query = baseQuery.sortById();
+    }
+    return query.findAll();
+  }
 
   @override
   Future<List<String>> getIdsBySelection(BackupSelection backup) =>
-      _db.backupAlbums.filter().selectionEqualTo(backup).idProperty().findAll();
+      db.backupAlbums.filter().selectionEqualTo(backup).idProperty().findAll();
+
+  @override
+  Future<List<BackupAlbum>> getAllBySelection(BackupSelection backup) =>
+      db.backupAlbums.filter().selectionEqualTo(backup).findAll();
+
+  @override
+  Future<void> deleteAll(List<int> ids) =>
+      txn(() => db.backupAlbums.deleteAll(ids));
+
+  @override
+  Future<void> updateAll(List<BackupAlbum> backupAlbums) =>
+      txn(() => db.backupAlbums.putAll(backupAlbums));
 }

mobile/lib/repositories/database.repository.dart

@@ -0,0 +1,28 @@
+import 'dart:async';
+
+import 'package:immich_mobile/interfaces/database.interface.dart';
+import 'package:isar/isar.dart';
+
+/// copied from Isar; needed to check if an async transaction is already active
+const Symbol _zoneTxn = #zoneTxn;
+
+abstract class DatabaseRepository implements IDatabaseRepository {
+  final Isar db;
+  DatabaseRepository(this.db);
+
+  bool get inTxn => Zone.current[_zoneTxn] != null;
+
+  Future<T> txn<T>(Future<T> Function() callback) =>
+      inTxn ? callback() : transaction(callback);
+
+  @override
+  Future<T> transaction<T>(Future<T> Function() callback) =>
+      db.writeTxn(callback);
+}
+
+extension Asd<T> on QueryBuilder<T, dynamic, dynamic> {
+  QueryBuilder<T, T, O> noOp<O>() {
+    // ignore: invalid_use_of_protected_member
+    return QueryBuilder.apply(this, (query) => query);
+  }
+}

mobile/lib/repositories/etag.repository.dart

@@ -0,0 +1,29 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/entities/etag.entity.dart';
+import 'package:immich_mobile/interfaces/etag.interface.dart';
+import 'package:immich_mobile/providers/db.provider.dart';
+import 'package:immich_mobile/repositories/database.repository.dart';
+import 'package:isar/isar.dart';
+
+final etagRepositoryProvider =
+    Provider((ref) => ETagRepository(ref.watch(dbProvider)));
+
+class ETagRepository extends DatabaseRepository implements IETagRepository {
+  ETagRepository(super.db);
+
+  @override
+  Future<List<String>> getAllIds() => db.eTags.where().idProperty().findAll();
+
+  @override
+  Future<ETag?> get(int id) => db.eTags.get(id);
+
+  @override
+  Future<void> upsertAll(List<ETag> etags) => txn(() => db.eTags.putAll(etags));
+
+  @override
+  Future<void> deleteByIds(List<String> ids) =>
+      txn(() => db.eTags.deleteAllById(ids));
+
+  @override
+  Future<ETag?> getById(String id) => db.eTags.getById(id);
+}

mobile/lib/repositories/exif_info.repository.dart

@@ -2,27 +2,30 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/entities/exif_info.entity.dart';
 import 'package:immich_mobile/interfaces/exif_info.interface.dart';
 import 'package:immich_mobile/providers/db.provider.dart';
-import 'package:isar/isar.dart';
+import 'package:immich_mobile/repositories/database.repository.dart';
 
 final exifInfoRepositoryProvider =
     Provider((ref) => ExifInfoRepository(ref.watch(dbProvider)));
 
-class ExifInfoRepository implements IExifInfoRepository {
-  final Isar _db;
-
-  ExifInfoRepository(
-    this._db,
-  );
+class ExifInfoRepository extends DatabaseRepository
+    implements IExifInfoRepository {
+  ExifInfoRepository(super.db);
 
   @override
-  Future<void> delete(int id) => _db.exifInfos.delete(id);
+  Future<void> delete(int id) => txn(() => db.exifInfos.delete(id));
 
   @override
-  Future<ExifInfo?> get(int id) => _db.exifInfos.get(id);
+  Future<ExifInfo?> get(int id) => db.exifInfos.get(id);
 
   @override
   Future<ExifInfo> update(ExifInfo exifInfo) async {
-    await _db.writeTxn(() => _db.exifInfos.put(exifInfo));
+    await txn(() => db.exifInfos.put(exifInfo));
     return exifInfo;
   }
+
+  @override
+  Future<List<ExifInfo>> updateAll(List<ExifInfo> exifInfos) async {
+    await txn(() => db.exifInfos.putAll(exifInfos));
+    return exifInfos;
+  }
 }

mobile/lib/repositories/partner_api.repository.dart

@@ -2,7 +2,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/entities/user.entity.dart';
 import 'package:immich_mobile/interfaces/partner_api.interface.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
-import 'package:immich_mobile/repositories/base_api.repository.dart';
+import 'package:immich_mobile/repositories/api.repository.dart';
 import 'package:openapi/api.dart';
 
 final partnerApiRepositoryProvider = Provider(
@@ -11,7 +11,7 @@ final partnerApiRepositoryProvider = Provider(
   ),
 );
 
-class PartnerApiRepository extends BaseApiRepository
+class PartnerApiRepository extends ApiRepository
     implements IPartnerApiRepository {
   final PartnersApi _api;
 

mobile/lib/repositories/person_api.repository.dart

@@ -1,14 +1,14 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/interfaces/person_api.interface.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
-import 'package:immich_mobile/repositories/base_api.repository.dart';
+import 'package:immich_mobile/repositories/api.repository.dart';
 import 'package:openapi/api.dart';
 
 final personApiRepositoryProvider = Provider(
   (ref) => PersonApiRepository(ref.watch(apiServiceProvider).peopleApi),
 );
 
-class PersonApiRepository extends BaseApiRepository
+class PersonApiRepository extends ApiRepository
     implements IPersonApiRepository {
   final PeopleApi _api;
 

mobile/lib/repositories/user.repository.dart

@@ -3,37 +3,61 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/entities/user.entity.dart';
 import 'package:immich_mobile/interfaces/user.interface.dart';
 import 'package:immich_mobile/providers/db.provider.dart';
+import 'package:immich_mobile/repositories/database.repository.dart';
 import 'package:isar/isar.dart';
 
 final userRepositoryProvider =
     Provider((ref) => UserRepository(ref.watch(dbProvider)));
 
-class UserRepository implements IUserRepository {
-  final Isar _db;
-
-  UserRepository(
-    this._db,
-  );
+class UserRepository extends DatabaseRepository implements IUserRepository {
+  UserRepository(super.db);
 
   @override
   Future<List<User>> getByIds(List<String> ids) async =>
-      (await _db.users.getAllById(ids)).cast();
+      (await db.users.getAllById(ids)).nonNulls.toList();
 
   @override
-  Future<User?> get(String id) => _db.users.getById(id);
+  Future<User?> get(String id) => db.users.getById(id);
 
   @override
-  Future<List<User>> getAll({bool self = true}) {
-    if (self) {
-      return _db.users.where().findAll();
-    }
+  Future<List<User>> getAll({bool self = true, UserSort? sortBy}) {
+    final baseQuery = db.users.where();
     final int userId = Store.get(StoreKey.currentUser).isarId;
-    return _db.users.where().isarIdNotEqualTo(userId).findAll();
+    final QueryBuilder<User, User, QAfterWhereClause> afterWhere =
+        self ? baseQuery.noOp() : baseQuery.isarIdNotEqualTo(userId);
+    final QueryBuilder<User, User, QAfterSortBy> query;
+    switch (sortBy) {
+      case null:
+        query = afterWhere.noOp();
+      case UserSort.id:
+        query = afterWhere.sortById();
+    }
+    return query.findAll();
   }
 
   @override
   Future<User> update(User user) async {
-    await _db.writeTxn(() => _db.users.put(user));
+    await txn(() => db.users.put(user));
     return user;
   }
+
+  @override
+  Future<User> me() => Future.value(Store.get(StoreKey.currentUser));
+
+  @override
+  Future<void> deleteById(List<int> ids) => txn(() => db.users.deleteAll(ids));
+
+  @override
+  Future<List<User>> upsertAll(List<User> users) async {
+    await txn(() => db.users.putAll(users));
+    return users;
+  }
+
+  @override
+  Future<List<User>> getAllAccessible() => db.users
+      .filter()
+      .isPartnerSharedWithEqualTo(true)
+      .or()
+      .isarIdEqualTo(Store.get(StoreKey.currentUser).isarId)
+      .findAll();
 }

mobile/lib/repositories/user_api.repository.dart

@@ -5,7 +5,7 @@ import 'package:http/http.dart';
 import 'package:immich_mobile/entities/user.entity.dart';
 import 'package:immich_mobile/interfaces/user_api.interface.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
-import 'package:immich_mobile/repositories/base_api.repository.dart';
+import 'package:immich_mobile/repositories/api.repository.dart';
 import 'package:openapi/api.dart';
 
 final userApiRepositoryProvider = Provider(
@@ -14,8 +14,7 @@ final userApiRepositoryProvider = Provider(
   ),
 );
 
-class UserApiRepository extends BaseApiRepository
-    implements IUserApiRepository {
+class UserApiRepository extends ApiRepository implements IUserApiRepository {
   final UsersApi _api;
 
   UserApiRepository(this._api);