diff --git a/mobile/lib/interfaces/etag.interface.dart b/mobile/lib/interfaces/etag.interface.dart deleted file mode 100644 index 8b4b5806c9..0000000000 --- a/mobile/lib/interfaces/etag.interface.dart +++ /dev/null @@ -1,16 +0,0 @@ -import 'package:immich_mobile/entities/etag.entity.dart'; -import 'package:immich_mobile/interfaces/database.interface.dart'; - -abstract interface class IETagRepository implements IDatabaseRepository { - Future get(String id); - - Future getById(String id); - - Future> getAllIds(); - - Future upsertAll(List etags); - - Future deleteByIds(List ids); - - Future clearTable(); -} diff --git a/mobile/lib/repositories/etag.repository.dart b/mobile/lib/repositories/etag.repository.dart index e8e0624a89..2bf76218de 100644 --- a/mobile/lib/repositories/etag.repository.dart +++ b/mobile/lib/repositories/etag.repository.dart @@ -1,6 +1,5 @@ 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'; @@ -8,26 +7,20 @@ import 'package:isar/isar.dart'; final etagRepositoryProvider = Provider((ref) => ETagRepository(ref.watch(dbProvider))); -class ETagRepository extends DatabaseRepository implements IETagRepository { +class ETagRepository extends DatabaseRepository { ETagRepository(super.db); - @override Future> getAllIds() => db.eTags.where().idProperty().findAll(); - @override Future get(String id) => db.eTags.getById(id); - @override Future upsertAll(List etags) => txn(() => db.eTags.putAll(etags)); - @override Future deleteByIds(List ids) => txn(() => db.eTags.deleteAllById(ids)); - @override Future getById(String id) => db.eTags.getById(id); - @override Future clearTable() async { await txn(() async { await db.eTags.clear(); diff --git a/mobile/lib/services/asset.service.dart b/mobile/lib/services/asset.service.dart index e57edde55e..782a11912e 100644 --- a/mobile/lib/services/asset.service.dart +++ b/mobile/lib/services/asset.service.dart @@ -14,7 +14,6 @@ import 'package:immich_mobile/interfaces/asset.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/backup_album.interface.dart'; -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'; @@ -54,7 +53,7 @@ class AssetService { final IAssetRepository _assetRepository; final IExifInfoRepository _exifInfoRepository; final IsarUserRepository _isarUserRepository; - final IETagRepository _etagRepository; + final ETagRepository _etagRepository; final IBackupAlbumRepository _backupRepository; final ApiService _apiService; final SyncService _syncService; diff --git a/mobile/lib/services/etag.service.dart b/mobile/lib/services/etag.service.dart index 6dd8a76bb3..1808e32485 100644 --- a/mobile/lib/services/etag.service.dart +++ b/mobile/lib/services/etag.service.dart @@ -1,12 +1,11 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/interfaces/etag.interface.dart'; import 'package:immich_mobile/repositories/etag.repository.dart'; final etagServiceProvider = Provider((ref) => ETagService(ref.watch(etagRepositoryProvider))); class ETagService { - final IETagRepository _eTagRepository; + final ETagRepository _eTagRepository; ETagService(this._eTagRepository); diff --git a/mobile/lib/services/sync.service.dart b/mobile/lib/services/sync.service.dart index 6f47463242..4f8910c609 100644 --- a/mobile/lib/services/sync.service.dart +++ b/mobile/lib/services/sync.service.dart @@ -15,7 +15,6 @@ import 'package:immich_mobile/infrastructure/repositories/user.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/asset.interface.dart'; -import 'package:immich_mobile/interfaces/etag.interface.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/user.provider.dart'; @@ -67,7 +66,7 @@ class SyncService { final IsarUserRepository _isarUserRepository; final UserService _userService; final PartnerRepository _partnerRepository; - final IETagRepository _eTagRepository; + final ETagRepository _eTagRepository; final PartnerApiRepository _partnerApiRepository; final UserApiRepository _userApiRepository; final AsyncMutex _lock = AsyncMutex(); diff --git a/mobile/test/repository.mocks.dart b/mobile/test/repository.mocks.dart index 28c6f3f5b0..cf0909b5dc 100644 --- a/mobile/test/repository.mocks.dart +++ b/mobile/test/repository.mocks.dart @@ -6,11 +6,11 @@ import 'package:immich_mobile/interfaces/asset_media.interface.dart'; import 'package:immich_mobile/interfaces/auth.interface.dart'; import 'package:immich_mobile/interfaces/auth_api.interface.dart'; import 'package:immich_mobile/interfaces/backup_album.interface.dart'; -import 'package:immich_mobile/interfaces/etag.interface.dart'; import 'package:immich_mobile/repositories/partner_api.repository.dart'; import 'package:immich_mobile/repositories/album_media.repository.dart'; import 'package:immich_mobile/repositories/album_api.repository.dart'; import 'package:immich_mobile/repositories/partner.repository.dart'; +import 'package:immich_mobile/repositories/etag.repository.dart'; import 'package:immich_mobile/repositories/local_files_manager.repository.dart'; import 'package:immich_mobile/repositories/file_media.repository.dart'; import 'package:mocktail/mocktail.dart'; @@ -23,7 +23,7 @@ class MockBackupRepository extends Mock implements IBackupAlbumRepository {} class MockExifInfoRepository extends Mock implements IExifInfoRepository {} -class MockETagRepository extends Mock implements IETagRepository {} +class MockETagRepository extends Mock implements ETagRepository {} class MockAlbumMediaRepository extends Mock implements AlbumMediaRepository {}