From c707f9cef4cde2504facbcb3216537f126e2d4c6 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 20 Jun 2025 13:37:59 -0500 Subject: [PATCH] refactor(mobile): partner.interface.dart (#19338) --- mobile/lib/interfaces/partner.interface.dart | 8 -------- mobile/lib/repositories/partner.repository.dart | 8 +------- mobile/lib/services/partner.service.dart | 3 +-- mobile/lib/services/sync.service.dart | 3 +-- mobile/test/repository.mocks.dart | 4 ++-- 5 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 mobile/lib/interfaces/partner.interface.dart diff --git a/mobile/lib/interfaces/partner.interface.dart b/mobile/lib/interfaces/partner.interface.dart deleted file mode 100644 index 8e5fcb7a97..0000000000 --- a/mobile/lib/interfaces/partner.interface.dart +++ /dev/null @@ -1,8 +0,0 @@ -import 'package:immich_mobile/domain/models/user.model.dart'; - -abstract class IPartnerRepository { - Future> getSharedWith(); - Future> getSharedBy(); - Stream> watchSharedWith(); - Stream> watchSharedBy(); -} diff --git a/mobile/lib/repositories/partner.repository.dart b/mobile/lib/repositories/partner.repository.dart index 5ea10f98c8..8a53ca7c8d 100644 --- a/mobile/lib/repositories/partner.repository.dart +++ b/mobile/lib/repositories/partner.repository.dart @@ -2,7 +2,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/domain/models/user.model.dart'; import 'package:immich_mobile/infrastructure/entities/user.entity.dart' as entity; -import 'package:immich_mobile/interfaces/partner.interface.dart'; import 'package:immich_mobile/providers/db.provider.dart'; import 'package:immich_mobile/repositories/database.repository.dart'; import 'package:isar/isar.dart'; @@ -11,11 +10,9 @@ final partnerRepositoryProvider = Provider( (ref) => PartnerRepository(ref.watch(dbProvider)), ); -class PartnerRepository extends DatabaseRepository - implements IPartnerRepository { +class PartnerRepository extends DatabaseRepository { PartnerRepository(super.db); - @override Future> getSharedBy() async { return (await db.users .filter() @@ -26,7 +23,6 @@ class PartnerRepository extends DatabaseRepository .toList(); } - @override Future> getSharedWith() async { return (await db.users .filter() @@ -37,13 +33,11 @@ class PartnerRepository extends DatabaseRepository .toList(); } - @override Stream> watchSharedBy() { return (db.users.filter().isPartnerSharedByEqualTo(true).sortById().watch()) .map((users) => users.map((u) => u.toDto()).toList()); } - @override Stream> watchSharedWith() { return (db.users .filter() diff --git a/mobile/lib/services/partner.service.dart b/mobile/lib/services/partner.service.dart index 72c636cd0d..ec210fd587 100644 --- a/mobile/lib/services/partner.service.dart +++ b/mobile/lib/services/partner.service.dart @@ -1,7 +1,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/domain/models/user.model.dart'; import 'package:immich_mobile/infrastructure/repositories/user.repository.dart'; -import 'package:immich_mobile/interfaces/partner.interface.dart'; import 'package:immich_mobile/providers/infrastructure/user.provider.dart'; import 'package:immich_mobile/repositories/partner.repository.dart'; import 'package:immich_mobile/repositories/partner_api.repository.dart'; @@ -17,7 +16,7 @@ final partnerServiceProvider = Provider( class PartnerService { final PartnerApiRepository _partnerApiRepository; - final IPartnerRepository _partnerRepository; + final PartnerRepository _partnerRepository; final IsarUserRepository _isarUserRepository; final Logger _log = Logger("PartnerService"); diff --git a/mobile/lib/services/sync.service.dart b/mobile/lib/services/sync.service.dart index df5cc673f3..5013411599 100644 --- a/mobile/lib/services/sync.service.dart +++ b/mobile/lib/services/sync.service.dart @@ -17,7 +17,6 @@ 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/interfaces/local_files_manager.interface.dart'; -import 'package:immich_mobile/interfaces/partner.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'; @@ -68,7 +67,7 @@ class SyncService { final IExifInfoRepository _exifInfoRepository; final IsarUserRepository _isarUserRepository; final UserService _userService; - final IPartnerRepository _partnerRepository; + final PartnerRepository _partnerRepository; final IETagRepository _eTagRepository; final PartnerApiRepository _partnerApiRepository; final UserApiRepository _userApiRepository; diff --git a/mobile/test/repository.mocks.dart b/mobile/test/repository.mocks.dart index f5efbe5ee1..638b08c1ea 100644 --- a/mobile/test/repository.mocks.dart +++ b/mobile/test/repository.mocks.dart @@ -9,10 +9,10 @@ import 'package:immich_mobile/interfaces/backup_album.interface.dart'; import 'package:immich_mobile/interfaces/etag.interface.dart'; import 'package:immich_mobile/interfaces/file_media.interface.dart'; import 'package:immich_mobile/interfaces/local_files_manager.interface.dart'; -import 'package:immich_mobile/interfaces/partner.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:mocktail/mocktail.dart'; class MockAlbumRepository extends Mock implements IAlbumRepository {} @@ -42,7 +42,7 @@ class MockAuthApiRepository extends Mock implements IAuthApiRepository {} class MockAuthRepository extends Mock implements IAuthRepository {} -class MockPartnerRepository extends Mock implements IPartnerRepository {} +class MockPartnerRepository extends Mock implements PartnerRepository {} class MockPartnerApiRepository extends Mock implements PartnerApiRepository {}