sascha
/
immich
mirror of https://github.com/immich-app/immich.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor(mobile): asset.interface.dart (#19351) 

* refactor(mobile): asset.interface.dart

* refactor(mobile): asset.interface.dart
pull/19352/head^2
Alex 2025-06-21 17:41:02 +07:00 committed by GitHub
parent 69b1331026
commit 366539bc4c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 20 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
mobile/lib/interfaces/asset.interface.dart
Unescape Escape View File

@ -1,68 +0,0 @@
import 'package:immich_mobile/entities/album.entity.dart';
import 'package:immich_mobile/entities/asset.entity.dart';
import 'package:immich_mobile/interfaces/database.interface.dart';
abstract interface class IAssetRepository implements IDatabaseRepository {
Future<Asset?> getByRemoteId(String id);
Future<Asset?> getByOwnerIdChecksum(int ownerId, String checksum);
Future<List<Asset>> getAllByRemoteId(
Iterable<String> ids, {
AssetState? state,
});
Future<List<Asset?>> getAllByOwnerIdChecksum(
List<int> ids,
List<String> checksums,
);
Future<List<Asset>> getAll({
required String ownerId,
AssetState? state,
AssetSort? sortBy,
int? limit,
});
Future<List<Asset>> getAllLocal();
Future<List<Asset>> getByAlbum(
Album album, {
Iterable<String> notOwnedBy = const [],
String? ownerId,
AssetState? state,
AssetSort? sortBy,
});
Future<Asset> update(Asset asset);
Future<List<Asset>> updateAll(List<Asset> assets);
Future<void> deleteAllByRemoteId(List<String> ids, {AssetState? state});
Future<void> deleteByIds(List<int> ids);
Future<List<Asset>> getMatches({
required List<Asset> assets,
required String ownerId,
AssetState? state,
int limit = 100,
});
Future<void> upsertDuplicatedAssets(Iterable<String> duplicatedAssets);
Future<List<String>> getAllDuplicatedAssetIds();
Future<List<Asset>> getStackAssets(String stackId);
Future<void> clearTable();
Stream<Asset?> watchAsset(int id, {bool fireImmediately = false});
Future<List<Asset>> getTrashAssets(String userId);
Future<List<Asset>> getRecentlyTakenAssets(String userId);
Future<List<Asset>> getMotionAssets(String userId);
}
enum AssetSort { checksum, ownerIdChecksum }

25
mobile/lib/repositories/asset.repository.dart
Unescape Escape View File

@ -4,19 +4,19 @@ import 'package:immich_mobile/entities/album.entity.dart';
import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/entities/asset.entity.dart';
import 'package:immich_mobile/entities/duplicated_asset.entity.dart'; import 'package:immich_mobile/entities/duplicated_asset.entity.dart';
import 'package:immich_mobile/infrastructure/entities/exif.entity.dart'; import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
import 'package:immich_mobile/interfaces/asset.interface.dart';
import 'package:immich_mobile/providers/db.provider.dart'; import 'package:immich_mobile/providers/db.provider.dart';
import 'package:immich_mobile/repositories/database.repository.dart'; import 'package:immich_mobile/repositories/database.repository.dart';
import 'package:immich_mobile/utils/hash.dart'; import 'package:immich_mobile/utils/hash.dart';
import 'package:isar/isar.dart'; import 'package:isar/isar.dart';
enum AssetSort { checksum, ownerIdChecksum }
final assetRepositoryProvider = final assetRepositoryProvider =
Provider((ref) => AssetRepository(ref.watch(dbProvider))); Provider((ref) => AssetRepository(ref.watch(dbProvider)));
class AssetRepository extends DatabaseRepository implements IAssetRepository { class AssetRepository extends DatabaseRepository {
AssetRepository(super.db); AssetRepository(super.db);
@override
Future<List<Asset>> getByAlbum( Future<List<Asset>> getByAlbum(
Album album, { Album album, {
Iterable<String> notOwnedBy = const [], Iterable<String> notOwnedBy = const [],
@ -54,16 +54,13 @@ class AssetRepository extends DatabaseRepository implements IAssetRepository {
return sortedQuery.findAll(); return sortedQuery.findAll();
} }
@override
Future<void> deleteByIds(List<int> ids) => txn(() async { Future<void> deleteByIds(List<int> ids) => txn(() async {
await db.assets.deleteAll(ids); await db.assets.deleteAll(ids);
await db.exifInfos.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( Future<List<Asset>> getAllByRemoteId(
Iterable<String> ids, { Iterable<String> ids, {
AssetState? state, AssetState? state,
@ -88,7 +85,6 @@ class AssetRepository extends DatabaseRepository implements IAssetRepository {
}; };
} }
@override
Future<List<Asset>> getAll({ Future<List<Asset>> getAll({
required String ownerId, required String ownerId,
AssetState? state, AssetState? state,
@ -127,13 +123,11 @@ class AssetRepository extends DatabaseRepository implements IAssetRepository {
return limit == null ? query.findAll() : query.limit(limit).findAll(); return limit == null ? query.findAll() : query.limit(limit).findAll();
} }
@override
Future<List<Asset>> updateAll(List<Asset> assets) async { Future<List<Asset>> updateAll(List<Asset> assets) async {
await txn(() => db.assets.putAll(assets)); await txn(() => db.assets.putAll(assets));
return assets; return assets;
} }
@override
Future<List<Asset>> getMatches({ Future<List<Asset>> getMatches({
required List<Asset> assets, required List<Asset> assets,
required String ownerId, required String ownerId,
@ -154,42 +148,34 @@ class AssetRepository extends DatabaseRepository implements IAssetRepository {
return _getMatchesImpl(query, fastHash(ownerId), assets, limit); return _getMatchesImpl(query, fastHash(ownerId), assets, limit);
} }
@override
Future<Asset> update(Asset asset) async { Future<Asset> update(Asset asset) async {
await txn(() => asset.put(db)); await txn(() => asset.put(db));
return asset; return asset;
} }
@override
Future<void> upsertDuplicatedAssets(Iterable<String> duplicatedAssets) => txn( Future<void> upsertDuplicatedAssets(Iterable<String> duplicatedAssets) => txn(
() => db.duplicatedAssets () => db.duplicatedAssets
.putAll(duplicatedAssets.map(DuplicatedAsset.new).toList()), .putAll(duplicatedAssets.map(DuplicatedAsset.new).toList()),
); );
@override
Future<List<String>> getAllDuplicatedAssetIds() => Future<List<String>> getAllDuplicatedAssetIds() =>
db.duplicatedAssets.where().idProperty().findAll(); db.duplicatedAssets.where().idProperty().findAll();
@override
Future<Asset?> getByOwnerIdChecksum(int ownerId, String checksum) => Future<Asset?> getByOwnerIdChecksum(int ownerId, String checksum) =>
db.assets.getByOwnerIdChecksum(ownerId, checksum); db.assets.getByOwnerIdChecksum(ownerId, checksum);
@override
Future<List<Asset?>> getAllByOwnerIdChecksum( Future<List<Asset?>> getAllByOwnerIdChecksum(
List<int> ownerIds, List<int> ownerIds,
List<String> checksums, List<String> checksums,
) => ) =>
db.assets.getAllByOwnerIdChecksum(ownerIds, checksums); db.assets.getAllByOwnerIdChecksum(ownerIds, checksums);
@override
Future<List<Asset>> getAllLocal() => Future<List<Asset>> getAllLocal() =>
db.assets.where().localIdIsNotNull().findAll(); db.assets.where().localIdIsNotNull().findAll();
@override
Future<void> deleteAllByRemoteId(List<String> ids, {AssetState? state}) => Future<void> deleteAllByRemoteId(List<String> ids, {AssetState? state}) =>
txn(() => _getAllByRemoteIdImpl(ids, state).deleteAll()); txn(() => _getAllByRemoteIdImpl(ids, state).deleteAll());
@override
Future<List<Asset>> getStackAssets(String stackId) { Future<List<Asset>> getStackAssets(String stackId) {
return db.assets return db.assets
.filter() .filter()
@ -202,19 +188,16 @@ class AssetRepository extends DatabaseRepository implements IAssetRepository {
.findAll(); .findAll();
} }
@override
Future<void> clearTable() async { Future<void> clearTable() async {
await txn(() async { await txn(() async {
await db.assets.clear(); await db.assets.clear();
}); });
} }
@override
Stream<Asset?> watchAsset(int id, {bool fireImmediately = false}) { Stream<Asset?> watchAsset(int id, {bool fireImmediately = false}) {
return db.assets.watchObject(id, fireImmediately: fireImmediately); return db.assets.watchObject(id, fireImmediately: fireImmediately);
} }
@override
Future<List<Asset>> getTrashAssets(String userId) { Future<List<Asset>> getTrashAssets(String userId) {
return db.assets return db.assets
.where() .where()
@ -225,7 +208,6 @@ class AssetRepository extends DatabaseRepository implements IAssetRepository {
.findAll(); .findAll();
} }
@override
Future<List<Asset>> getRecentlyTakenAssets(String userId) { Future<List<Asset>> getRecentlyTakenAssets(String userId) {
return db.assets return db.assets
.where() .where()
@ -236,7 +218,6 @@ class AssetRepository extends DatabaseRepository implements IAssetRepository {
.findAll(); .findAll();
} }
@override
Future<List<Asset>> getMotionAssets(String userId) { Future<List<Asset>> getMotionAssets(String userId) {
return db.assets return db.assets
.where() .where()

3
mobile/lib/services/album.service.dart
Unescape Escape View File

@ -14,7 +14,6 @@ import 'package:immich_mobile/entities/backup_album.entity.dart';
import 'package:immich_mobile/infrastructure/entities/user.entity.dart' import 'package:immich_mobile/infrastructure/entities/user.entity.dart'
as entity; as entity;
import 'package:immich_mobile/interfaces/album.interface.dart'; import 'package:immich_mobile/interfaces/album.interface.dart';
import 'package:immich_mobile/interfaces/asset.interface.dart';
import 'package:immich_mobile/models/albums/album_add_asset_response.model.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/models/albums/album_search.model.dart';
import 'package:immich_mobile/providers/infrastructure/user.provider.dart'; import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
@ -46,7 +45,7 @@ class AlbumService {
final UserService _userService; final UserService _userService;
final EntityService _entityService; final EntityService _entityService;
final IAlbumRepository _albumRepository; final IAlbumRepository _albumRepository;
final IAssetRepository _assetRepository; final AssetRepository _assetRepository;
final BackupAlbumRepository _backupAlbumRepository; final BackupAlbumRepository _backupAlbumRepository;
final AlbumMediaRepository _albumMediaRepository; final AlbumMediaRepository _albumMediaRepository;
final AlbumApiRepository _albumApiRepository; final AlbumApiRepository _albumApiRepository;

3
mobile/lib/services/asset.service.dart
Unescape Escape View File

@ -10,7 +10,6 @@ import 'package:immich_mobile/domain/services/user.service.dart';
import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/entities/asset.entity.dart';
import 'package:immich_mobile/entities/backup_album.entity.dart'; import 'package:immich_mobile/entities/backup_album.entity.dart';
import 'package:immich_mobile/infrastructure/repositories/user.repository.dart'; import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
import 'package:immich_mobile/interfaces/asset.interface.dart';
import 'package:immich_mobile/interfaces/asset_api.interface.dart'; import 'package:immich_mobile/interfaces/asset_api.interface.dart';
import 'package:immich_mobile/interfaces/asset_media.interface.dart'; import 'package:immich_mobile/interfaces/asset_media.interface.dart';
import 'package:immich_mobile/models/backup/backup_candidate.model.dart'; import 'package:immich_mobile/models/backup/backup_candidate.model.dart';
@ -49,7 +48,7 @@ final assetServiceProvider = Provider(
class AssetService { class AssetService {
final IAssetApiRepository _assetApiRepository; final IAssetApiRepository _assetApiRepository;
final IAssetRepository _assetRepository; final AssetRepository _assetRepository;
final IExifInfoRepository _exifInfoRepository; final IExifInfoRepository _exifInfoRepository;
final IsarUserRepository _isarUserRepository; final IsarUserRepository _isarUserRepository;
final ETagRepository _etagRepository; final ETagRepository _etagRepository;

3
mobile/lib/services/backup.service.dart
Unescape Escape View File

@ -11,7 +11,6 @@ import 'package:immich_mobile/entities/album.entity.dart';
import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/entities/asset.entity.dart';
import 'package:immich_mobile/entities/backup_album.entity.dart'; import 'package:immich_mobile/entities/backup_album.entity.dart';
import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/entities/store.entity.dart';
import 'package:immich_mobile/interfaces/asset.interface.dart';
import 'package:immich_mobile/interfaces/asset_media.interface.dart'; import 'package:immich_mobile/interfaces/asset_media.interface.dart';
import 'package:immich_mobile/models/backup/backup_candidate.model.dart'; import 'package:immich_mobile/models/backup/backup_candidate.model.dart';
import 'package:immich_mobile/models/backup/current_upload_asset.model.dart'; import 'package:immich_mobile/models/backup/current_upload_asset.model.dart';
@ -52,7 +51,7 @@ class BackupService {
final AlbumService _albumService; final AlbumService _albumService;
final AlbumMediaRepository _albumMediaRepository; final AlbumMediaRepository _albumMediaRepository;
final FileMediaRepository _fileMediaRepository; final FileMediaRepository _fileMediaRepository;
final IAssetRepository _assetRepository; final AssetRepository _assetRepository;
final IAssetMediaRepository _assetMediaRepository; final IAssetMediaRepository _assetMediaRepository;
BackupService( BackupService(

3
mobile/lib/services/backup_verification.service.dart
Unescape Escape View File

@ -12,7 +12,6 @@ import 'package:immich_mobile/domain/services/user.service.dart';
import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/entities/asset.entity.dart';
import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/entities/store.entity.dart';
import 'package:immich_mobile/infrastructure/utils/exif.converter.dart'; import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';
import 'package:immich_mobile/interfaces/asset.interface.dart';
import 'package:immich_mobile/providers/infrastructure/exif.provider.dart'; import 'package:immich_mobile/providers/infrastructure/exif.provider.dart';
import 'package:immich_mobile/providers/infrastructure/user.provider.dart'; import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
import 'package:immich_mobile/repositories/asset.repository.dart'; import 'package:immich_mobile/repositories/asset.repository.dart';
@ -25,7 +24,7 @@ import 'package:immich_mobile/utils/diff.dart';
class BackupVerificationService { class BackupVerificationService {
final UserService _userService; final UserService _userService;
final FileMediaRepository _fileMediaRepository; final FileMediaRepository _fileMediaRepository;
final IAssetRepository _assetRepository; final AssetRepository _assetRepository;
final IExifInfoRepository _exifInfoRepository; final IExifInfoRepository _exifInfoRepository;
const BackupVerificationService( const BackupVerificationService(

3
mobile/lib/services/entity.service.dart
Unescape Escape View File

@ -2,12 +2,11 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/entities/album.entity.dart'; import 'package:immich_mobile/entities/album.entity.dart';
import 'package:immich_mobile/infrastructure/entities/user.entity.dart'; import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
import 'package:immich_mobile/infrastructure/repositories/user.repository.dart'; import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
import 'package:immich_mobile/interfaces/asset.interface.dart';
import 'package:immich_mobile/providers/infrastructure/user.provider.dart'; import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
import 'package:immich_mobile/repositories/asset.repository.dart'; import 'package:immich_mobile/repositories/asset.repository.dart';
class EntityService { class EntityService {
final IAssetRepository _assetRepository; final AssetRepository _assetRepository;
final IsarUserRepository _isarUserRepository; final IsarUserRepository _isarUserRepository;
EntityService( EntityService(
this._assetRepository, this._assetRepository,

3
mobile/lib/services/memory.service.dart
Unescape Escape View File

@ -1,6 +1,5 @@
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/extensions/translate_extensions.dart'; import 'package:immich_mobile/extensions/translate_extensions.dart';
import 'package:immich_mobile/interfaces/asset.interface.dart';
import 'package:immich_mobile/models/memories/memory.model.dart'; import 'package:immich_mobile/models/memories/memory.model.dart';
import 'package:immich_mobile/providers/api.provider.dart'; import 'package:immich_mobile/providers/api.provider.dart';
import 'package:immich_mobile/repositories/asset.repository.dart'; import 'package:immich_mobile/repositories/asset.repository.dart';
@ -18,7 +17,7 @@ class MemoryService {
final log = Logger("MemoryService"); final log = Logger("MemoryService");
final ApiService _apiService; final ApiService _apiService;
final IAssetRepository _assetRepository; final AssetRepository _assetRepository;
MemoryService(this._apiService, this._assetRepository); MemoryService(this._apiService, this._assetRepository);

3
mobile/lib/services/person.service.dart
Unescape Escape View File

@ -1,7 +1,6 @@
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/domain/models/person.model.dart'; import 'package:immich_mobile/domain/models/person.model.dart';
import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/entities/asset.entity.dart';
import 'package:immich_mobile/interfaces/asset.interface.dart';
import 'package:immich_mobile/interfaces/asset_api.interface.dart'; import 'package:immich_mobile/interfaces/asset_api.interface.dart';
import 'package:immich_mobile/repositories/asset.repository.dart'; import 'package:immich_mobile/repositories/asset.repository.dart';
import 'package:immich_mobile/repositories/asset_api.repository.dart'; import 'package:immich_mobile/repositories/asset_api.repository.dart';
@ -22,7 +21,7 @@ class PersonService {
final Logger _log = Logger("PersonService"); final Logger _log = Logger("PersonService");
final PersonApiRepository _personApiRepository; final PersonApiRepository _personApiRepository;
final IAssetApiRepository _assetApiRepository; final IAssetApiRepository _assetApiRepository;
final IAssetRepository _assetRepository; final AssetRepository _assetRepository;
PersonService( PersonService(
this._personApiRepository, this._personApiRepository,

3
mobile/lib/services/search.service.dart
Unescape Escape View File

@ -1,7 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/extensions/string_extensions.dart'; import 'package:immich_mobile/extensions/string_extensions.dart';
import 'package:immich_mobile/interfaces/asset.interface.dart';
import 'package:immich_mobile/models/search/search_filter.model.dart'; import 'package:immich_mobile/models/search/search_filter.model.dart';
import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/entities/asset.entity.dart';
import 'package:immich_mobile/models/search/search_result.model.dart'; import 'package:immich_mobile/models/search/search_result.model.dart';
@ -20,7 +19,7 @@ final searchServiceProvider = Provider(
class SearchService { class SearchService {
final ApiService _apiService; final ApiService _apiService;
final IAssetRepository _assetRepository; final AssetRepository _assetRepository;
final _log = Logger("SearchService"); final _log = Logger("SearchService");
SearchService(this._apiService, this._assetRepository); SearchService(this._apiService, this._assetRepository);

3
mobile/lib/services/stack.service.dart
Unescape Escape View File

@ -1,7 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/entities/asset.entity.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/api.provider.dart';
import 'package:immich_mobile/repositories/asset.repository.dart'; import 'package:immich_mobile/repositories/asset.repository.dart';
import 'package:immich_mobile/services/api.service.dart'; import 'package:immich_mobile/services/api.service.dart';
@ -11,7 +10,7 @@ class StackService {
StackService(this._api, this._assetRepository); StackService(this._api, this._assetRepository);
final ApiService _api; final ApiService _api;
final IAssetRepository _assetRepository; final AssetRepository _assetRepository;
Future<StackResponseDto?> getStack(String stackId) async { Future<StackResponseDto?> getStack(String stackId) async {
try { try {

3
mobile/lib/services/sync.service.dart
Unescape Escape View File

@ -14,7 +14,6 @@ import 'package:immich_mobile/extensions/collection_extensions.dart';
import 'package:immich_mobile/infrastructure/repositories/user.repository.dart'; import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
import 'package:immich_mobile/infrastructure/repositories/user_api.repository.dart'; import 'package:immich_mobile/infrastructure/repositories/user_api.repository.dart';
import 'package:immich_mobile/interfaces/album.interface.dart'; import 'package:immich_mobile/interfaces/album.interface.dart';
import 'package:immich_mobile/interfaces/asset.interface.dart';
import 'package:immich_mobile/providers/app_settings.provider.dart'; import 'package:immich_mobile/providers/app_settings.provider.dart';
import 'package:immich_mobile/providers/infrastructure/exif.provider.dart'; import 'package:immich_mobile/providers/infrastructure/exif.provider.dart';
import 'package:immich_mobile/providers/infrastructure/user.provider.dart'; import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
@ -61,7 +60,7 @@ class SyncService {
final AlbumMediaRepository _albumMediaRepository; final AlbumMediaRepository _albumMediaRepository;
final AlbumApiRepository _albumApiRepository; final AlbumApiRepository _albumApiRepository;
final IAlbumRepository _albumRepository; final IAlbumRepository _albumRepository;
final IAssetRepository _assetRepository; final AssetRepository _assetRepository;
final IExifInfoRepository _exifInfoRepository; final IExifInfoRepository _exifInfoRepository;
final IsarUserRepository _isarUserRepository; final IsarUserRepository _isarUserRepository;
final UserService _userService; final UserService _userService;

3
mobile/lib/services/trash.service.dart
Unescape Escape View File

@ -1,7 +1,6 @@
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/domain/services/user.service.dart'; import 'package:immich_mobile/domain/services/user.service.dart';
import 'package:immich_mobile/entities/asset.entity.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/api.provider.dart';
import 'package:immich_mobile/providers/infrastructure/user.provider.dart'; import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
import 'package:immich_mobile/repositories/asset.repository.dart'; import 'package:immich_mobile/repositories/asset.repository.dart';
@ -18,7 +17,7 @@ final trashServiceProvider = Provider<TrashService>((ref) {
class TrashService { class TrashService {
final ApiService _apiService; final ApiService _apiService;
final IAssetRepository _assetRepository; final AssetRepository _assetRepository;
final UserService _userService; final UserService _userService;
const TrashService( const TrashService(

6
mobile/test/modules/shared/sync_service_test.dart
Unescape Escape View File

@ -10,8 +10,8 @@ import 'package:immich_mobile/entities/etag.entity.dart';
import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/entities/store.entity.dart';
import 'package:immich_mobile/infrastructure/repositories/log.repository.dart'; import 'package:immich_mobile/infrastructure/repositories/log.repository.dart';
import 'package:immich_mobile/infrastructure/repositories/store.repository.dart'; import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
import 'package:immich_mobile/interfaces/asset.interface.dart';
import 'package:immich_mobile/repositories/partner_api.repository.dart'; import 'package:immich_mobile/repositories/partner_api.repository.dart';
import 'package:immich_mobile/repositories/asset.repository.dart';
import 'package:immich_mobile/services/sync.service.dart'; import 'package:immich_mobile/services/sync.service.dart';
import 'package:mocktail/mocktail.dart'; import 'package:mocktail/mocktail.dart';
@ -240,7 +240,9 @@ void main() {
[initialAssets[1].remoteId!, initialAssets[2].remoteId!], [initialAssets[1].remoteId!, initialAssets[2].remoteId!],
state: AssetState.remote, state: AssetState.remote,
), ),
).thenAnswer((_) async {}); ).thenAnswer((_) async {
return;
});
when( when(
() => assetRepository () => assetRepository
.getAllByRemoteId(["2-1", "1-1"], state: AssetState.merged), .getAllByRemoteId(["2-1", "1-1"], state: AssetState.merged),

4
mobile/test/repository.mocks.dart
Unescape Escape View File

@ -1,6 +1,5 @@
import 'package:immich_mobile/domain/interfaces/exif.interface.dart'; import 'package:immich_mobile/domain/interfaces/exif.interface.dart';
import 'package:immich_mobile/interfaces/album.interface.dart'; import 'package:immich_mobile/interfaces/album.interface.dart';
import 'package:immich_mobile/interfaces/asset.interface.dart';
import 'package:immich_mobile/interfaces/asset_api.interface.dart'; import 'package:immich_mobile/interfaces/asset_api.interface.dart';
import 'package:immich_mobile/interfaces/asset_media.interface.dart'; import 'package:immich_mobile/interfaces/asset_media.interface.dart';
import 'package:immich_mobile/repositories/partner_api.repository.dart'; import 'package:immich_mobile/repositories/partner_api.repository.dart';
@ -13,11 +12,12 @@ import 'package:immich_mobile/repositories/file_media.repository.dart';
import 'package:immich_mobile/repositories/backup.repository.dart'; import 'package:immich_mobile/repositories/backup.repository.dart';
import 'package:immich_mobile/repositories/auth.repository.dart'; import 'package:immich_mobile/repositories/auth.repository.dart';
import 'package:immich_mobile/repositories/auth_api.repository.dart'; import 'package:immich_mobile/repositories/auth_api.repository.dart';
import 'package:immich_mobile/repositories/asset.repository.dart';
import 'package:mocktail/mocktail.dart'; import 'package:mocktail/mocktail.dart';
class MockAlbumRepository extends Mock implements IAlbumRepository {} class MockAlbumRepository extends Mock implements IAlbumRepository {}
class MockAssetRepository extends Mock implements IAssetRepository {} class MockAssetRepository extends Mock implements AssetRepository {}
class MockBackupRepository extends Mock implements BackupAlbumRepository {} class MockBackupRepository extends Mock implements BackupAlbumRepository {}