refactor(mobile): (1) user.interface.dart (#19322)

* refactor(mobile): user.interface.dart * generate files * refactor(mobile): (2) user_api.interface.dart (#19323) * refactor(mobile): (2) user_api.interface.dart * generate files * refactor(mobile): (3) sync_stream.interface.dart (#19325)
2025-12-23 01:11:36 +03:00 · 2025-06-19 18:25:18 -05:00
parent a4c0dc5007
commit bce4f93c90
22 changed files with 82 additions and 157 deletions
--- a/mobile/lib/services/asset.service.dart
+++ b/mobile/lib/services/asset.service.dart
@@ -5,11 +5,11 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/interfaces/exif.interface.dart';
-import 'package:immich_mobile/domain/interfaces/user.interface.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/backup_album.entity.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_media.interface.dart';
@@ -53,7 +53,7 @@ class AssetService {
  final IAssetApiRepository _assetApiRepository;
  final IAssetRepository _assetRepository;
  final IExifInfoRepository _exifInfoRepository;
-  final IUserRepository _userRepository;
+  final IsarUserRepository _isarUserRepository;
  final IETagRepository _etagRepository;
  final IBackupAlbumRepository _backupRepository;
  final ApiService _apiService;
@@ -68,7 +68,7 @@ class AssetService {
    this._assetApiRepository,
    this._assetRepository,
    this._exifInfoRepository,
-    this._userRepository,
+    this._isarUserRepository,
    this._etagRepository,
    this._backupRepository,
    this._apiService,
@@ -85,7 +85,9 @@ class AssetService {
    final syncedUserIds = await _etagRepository.getAllIds();
    final List<UserDto> syncedUsers = syncedUserIds.isEmpty
        ? []
-        : (await _userRepository.getByUserIds(syncedUserIds)).nonNulls.toList();
+        : (await _isarUserRepository.getByUserIds(syncedUserIds))
+            .nonNulls
+            .toList();
    final Stopwatch sw = Stopwatch()..start();
    final bool changes = await _syncService.syncRemoteAssetsToDb(
      users: syncedUsers,
--- a/mobile/lib/services/entity.service.dart
+++ b/mobile/lib/services/entity.service.dart
@@ -1,24 +1,24 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/interfaces/user.interface.dart';
 import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.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/repositories/asset.repository.dart';

 class EntityService {
  final IAssetRepository _assetRepository;
-  final IUserRepository _userRepository;
+  final IsarUserRepository _isarUserRepository;
  EntityService(
    this._assetRepository,
-    this._userRepository,
+    this._isarUserRepository,
  );

  Future<Album> fillAlbumWithDatabaseEntities(Album album) async {
    final ownerId = album.ownerId;
    if (ownerId != null) {
      // replace owner with user from database
-      final user = await _userRepository.getByUserId(ownerId);
+      final user = await _isarUserRepository.getByUserId(ownerId);
      album.owner.value = user == null ? null : User.fromDto(user);
    }
    final thumbnailAssetId =
@@ -30,7 +30,7 @@ class EntityService {
    }
    if (album.remoteUsers.isNotEmpty) {
      // replace all users with users from database
-      final users = await _userRepository
+      final users = await _isarUserRepository
          .getByUserIds(album.remoteUsers.map((user) => user.id).toList());
      album.sharedUsers.clear();
      album.sharedUsers.addAll(users.nonNulls.map(User.fromDto));
--- a/mobile/lib/services/partner.service.dart
+++ b/mobile/lib/services/partner.service.dart
@@ -1,6 +1,6 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/interfaces/user.interface.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/interfaces/partner_api.interface.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
@@ -19,12 +19,12 @@ final partnerServiceProvider = Provider(
 class PartnerService {
  final IPartnerApiRepository _partnerApiRepository;
  final IPartnerRepository _partnerRepository;
-  final IUserRepository _userRepository;
+  final IsarUserRepository _isarUserRepository;
  final Logger _log = Logger("PartnerService");

  PartnerService(
    this._partnerApiRepository,
-    this._userRepository,
+    this._isarUserRepository,
    this._partnerRepository,
  );

@@ -47,7 +47,8 @@ class PartnerService {
  Future<bool> removePartner(UserDto partner) async {
    try {
      await _partnerApiRepository.delete(partner.id);
-      await _userRepository.update(partner.copyWith(isPartnerSharedBy: false));
+      await _isarUserRepository
+          .update(partner.copyWith(isPartnerSharedBy: false));
    } catch (e) {
      _log.warning("Failed to remove partner ${partner.id}", e);
      return false;
@@ -58,7 +59,8 @@ class PartnerService {
  Future<bool> addPartner(UserDto partner) async {
    try {
      await _partnerApiRepository.create(partner.id);
-      await _userRepository.update(partner.copyWith(isPartnerSharedBy: true));
+      await _isarUserRepository
+          .update(partner.copyWith(isPartnerSharedBy: true));
      return true;
    } catch (e) {
      _log.warning("Failed to add partner ${partner.id}", e);
@@ -75,7 +77,7 @@ class PartnerService {
        partner.id,
        inTimeline: inTimeline,
      );
-      await _userRepository
+      await _isarUserRepository
          .update(partner.copyWith(inTimeline: dto.inTimeline));
      return true;
    } catch (e) {
--- a/mobile/lib/services/sync.service.dart
+++ b/mobile/lib/services/sync.service.dart
@@ -3,15 +3,16 @@ import 'dart:io';

 import 'package:collection/collection.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/interfaces/exif.interface.dart';
-import 'package:immich_mobile/domain/interfaces/user.interface.dart';
-import 'package:immich_mobile/domain/interfaces/user_api.interface.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/etag.entity.dart';
 import 'package:immich_mobile/extensions/collection_extensions.dart';
+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/album_api.interface.dart';
 import 'package:immich_mobile/interfaces/album_media.interface.dart';
@@ -68,12 +69,12 @@ class SyncService {
  final IAlbumRepository _albumRepository;
  final IAssetRepository _assetRepository;
  final IExifInfoRepository _exifInfoRepository;
-  final IUserRepository _userRepository;
+  final IsarUserRepository _isarUserRepository;
  final UserService _userService;
  final IPartnerRepository _partnerRepository;
  final IETagRepository _eTagRepository;
  final IPartnerApiRepository _partnerApiRepository;
-  final IUserApiRepository _userApiRepository;
+  final UserApiRepository _userApiRepository;
  final AsyncMutex _lock = AsyncMutex();
  final Logger _log = Logger('SyncService');
  final AppSettingsService _appSettingsService;
@@ -88,7 +89,7 @@ class SyncService {
    this._assetRepository,
    this._exifInfoRepository,
    this._partnerRepository,
-    this._userRepository,
+    this._isarUserRepository,
    this._userService,
    this._eTagRepository,
    this._appSettingsService,
@@ -165,7 +166,7 @@ class SyncService {
  /// Returns `true`if there were any changes
  Future<bool> _syncUsersFromServer(List<UserDto> users) async {
    users.sortBy((u) => u.id);
-    final dbUsers = await _userRepository.getAll(sortBy: SortUserBy.id);
+    final dbUsers = await _isarUserRepository.getAll(sortBy: SortUserBy.id);
    final List<String> toDelete = [];
    final List<UserDto> toUpsert = [];
    final changes = diffSortedListsSync(
@@ -186,9 +187,9 @@ class SyncService {
      onlySecond: (UserDto b) => toDelete.add(b.id),
    );
    if (changes) {
-      await _userRepository.transaction(() async {
-        await _userRepository.delete(toDelete);
-        await _userRepository.updateAll(toUpsert);
+      await _isarUserRepository.transaction(() async {
+        await _isarUserRepository.delete(toDelete);
+        await _isarUserRepository.updateAll(toUpsert);
      });
    }
    return changes;
@@ -448,7 +449,7 @@ class SyncService {
    final (existingInDb, updated) = await _linkWithExistingFromDb(toAdd);
    await upsertAssetsWithExif(updated);
    final assetsToLink = existingInDb + updated;
-    final usersToLink = await _userRepository.getByUserIds(userIdsToAdd);
+    final usersToLink = await _isarUserRepository.getByUserIds(userIdsToAdd);

    album.name = dto.name;
    album.description = dto.description;