refactor: user entity (#16655)

* refactor: user entity

* fix: add users to album & user profile url

* chore: rebase fixes

* generate files

* fix(mobile): timeline not reset on login

* fix: test stub

* refactor: rename user model (#16813)

* refactor: rename user model

* simplify import

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
Co-authored-by: Alex <alex.tran1502@gmail.com>

* chore: generate files

* fix: use getAllAccessible instead of getAll

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
Co-authored-by: Alex <alex.tran1502@gmail.com>

mobile/lib/infrastructure/entities/user.entity.dart

@@ -0,0 +1,73 @@
+import 'package:immich_mobile/domain/models/user.model.dart';
+import 'package:immich_mobile/utils/hash.dart';
+import 'package:isar/isar.dart';
+
+part 'user.entity.g.dart';
+
+@Collection(inheritance: false)
+class User {
+  Id get isarId => fastHash(id);
+  @Index(unique: true, replace: false, type: IndexType.hash)
+  final String id;
+  final DateTime updatedAt;
+  final String email;
+  final String name;
+  final bool isPartnerSharedBy;
+  final bool isPartnerSharedWith;
+  final bool isAdmin;
+  final String profileImagePath;
+  @Enumerated(EnumType.ordinal)
+  final AvatarColor avatarColor;
+  final bool memoryEnabled;
+  final bool inTimeline;
+  final int quotaUsageInBytes;
+  final int quotaSizeInBytes;
+
+  const User({
+    required this.id,
+    required this.updatedAt,
+    required this.email,
+    required this.name,
+    required this.isAdmin,
+    this.isPartnerSharedBy = false,
+    this.isPartnerSharedWith = false,
+    this.profileImagePath = '',
+    this.avatarColor = AvatarColor.primary,
+    this.memoryEnabled = true,
+    this.inTimeline = false,
+    this.quotaUsageInBytes = 0,
+    this.quotaSizeInBytes = 0,
+  });
+
+  static User fromDto(UserDto dto) => User(
+        id: dto.uid,
+        updatedAt: dto.updatedAt,
+        email: dto.email,
+        name: dto.name,
+        isAdmin: dto.isAdmin,
+        isPartnerSharedBy: dto.isPartnerSharedBy,
+        isPartnerSharedWith: dto.isPartnerSharedWith,
+        profileImagePath: dto.profileImagePath ?? "",
+        avatarColor: dto.avatarColor,
+        memoryEnabled: dto.memoryEnabled,
+        inTimeline: dto.inTimeline,
+        quotaUsageInBytes: dto.quotaUsageInBytes,
+        quotaSizeInBytes: dto.quotaSizeInBytes,
+      );
+
+  UserDto toDto() => UserDto(
+        uid: id,
+        email: email,
+        name: name,
+        isAdmin: isAdmin,
+        updatedAt: updatedAt,
+        profileImagePath: profileImagePath.isEmpty ? null : profileImagePath,
+        avatarColor: avatarColor,
+        memoryEnabled: memoryEnabled,
+        inTimeline: inTimeline,
+        isPartnerSharedBy: isPartnerSharedBy,
+        isPartnerSharedWith: isPartnerSharedWith,
+        quotaUsageInBytes: quotaUsageInBytes,
+        quotaSizeInBytes: quotaSizeInBytes,
+      );
+}

mobile/lib/infrastructure/repositories/store.repository.dart

@@ -1,9 +1,9 @@
 import 'package:immich_mobile/domain/interfaces/store.interface.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/entities/user.entity.dart';
+import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/infrastructure/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-import 'package:immich_mobile/repositories/user.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
 import 'package:isar/isar.dart';
 
 class IsarStoreRepository extends IsarDatabaseRepository
@@ -78,7 +78,7 @@ class IsarStoreRepository extends IsarDatabaseRepository
         const (DateTime) => entity.intValue == null
             ? null
             : DateTime.fromMillisecondsSinceEpoch(entity.intValue!),
-        const (User) => await UserRepository(_db).getByDbId(entity.intValue!),
+        const (UserDto) => await IsarUserRepository(_db).get(entity.intValue!),
         _ => null,
       } as T?;
 
@@ -88,8 +88,8 @@ class IsarStoreRepository extends IsarDatabaseRepository
       const (String) => (null, value as String),
       const (bool) => ((value as bool) ? 1 : 0, null),
       const (DateTime) => ((value as DateTime).millisecondsSinceEpoch, null),
-      const (User) => (
-          (await UserRepository(_db).update(value as User)).isarId,
+      const (UserDto) => (
+          (await IsarUserRepository(_db).update(value as UserDto)).id,
           null,
         ),
       _ => throw UnsupportedError(

mobile/lib/infrastructure/repositories/user.repository.dart

@@ -0,0 +1,80 @@
+import 'package:immich_mobile/domain/interfaces/user.interface.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/infrastructure/repositories/db.repository.dart';
+import 'package:isar/isar.dart';
+
+class IsarUserRepository extends IsarDatabaseRepository
+    implements IUserRepository {
+  final Isar _db;
+  const IsarUserRepository(super.db) : _db = db;
+
+  @override
+  Future<void> delete(List<int> ids) async {
+    await transaction(() async {
+      await _db.users.deleteAll(ids);
+    });
+  }
+
+  @override
+  Future<void> deleteAll() async {
+    await transaction(() async {
+      await _db.users.clear();
+    });
+  }
+
+  @override
+  Future<UserDto?> get(int id) async {
+    return (await _db.users.get(id))?.toDto();
+  }
+
+  @override
+  Future<List<UserDto>> getAll({SortUserBy? sortBy}) async {
+    return (await _db.users
+            .where()
+            .optional(
+              sortBy != null,
+              (query) => switch (sortBy!) {
+                SortUserBy.id => query.sortById(),
+              },
+            )
+            .findAll())
+        .map((u) => u.toDto())
+        .toList();
+  }
+
+  @override
+  Future<UserDto?> getByUserId(String id) async {
+    return (await _db.users.getById(id))?.toDto();
+  }
+
+  @override
+  Future<List<UserDto?>> getByUserIds(List<String> ids) async {
+    return (await _db.users.getAllById(ids)).map((u) => u?.toDto()).toList();
+  }
+
+  @override
+  Future<bool> insert(UserDto user) async {
+    await transaction(() async {
+      await _db.users.put(entity.User.fromDto(user));
+    });
+    return true;
+  }
+
+  @override
+  Future<UserDto> update(UserDto user) async {
+    await transaction(() async {
+      await _db.users.put(entity.User.fromDto(user));
+    });
+    return user;
+  }
+
+  @override
+  Future<bool> updateAll(List<UserDto> users) async {
+    await transaction(() async {
+      await _db.users.putAll(users.map(entity.User.fromDto).toList());
+    });
+    return true;
+  }
+}

mobile/lib/infrastructure/utils/user.converter.dart

@@ -0,0 +1,66 @@
+import 'package:immich_mobile/domain/models/user.model.dart';
+import 'package:openapi/api.dart';
+
+abstract final class UserConverter {
+  /// Base user dto used where the complete user object is not required
+  static UserDto fromSimpleUserDto(UserResponseDto dto) => UserDto(
+        uid: dto.id,
+        email: dto.email,
+        name: dto.name,
+        isAdmin: false,
+        updatedAt: DateTime.now(),
+        profileImagePath: dto.profileImagePath,
+        avatarColor: dto.avatarColor.toAvatarColor(),
+      );
+
+  static UserDto fromAdminDto(
+    UserAdminResponseDto adminDto, [
+    UserPreferencesResponseDto? preferenceDto,
+  ]) =>
+      UserDto(
+        uid: adminDto.id,
+        email: adminDto.email,
+        name: adminDto.name,
+        isAdmin: adminDto.isAdmin,
+        updatedAt: adminDto.updatedAt,
+        profileImagePath: adminDto.profileImagePath,
+        avatarColor: adminDto.avatarColor.toAvatarColor(),
+        memoryEnabled: preferenceDto?.memories.enabled ?? true,
+        inTimeline: false,
+        isPartnerSharedBy: false,
+        isPartnerSharedWith: false,
+        quotaUsageInBytes: adminDto.quotaUsageInBytes ?? 0,
+        quotaSizeInBytes: adminDto.quotaSizeInBytes ?? 0,
+      );
+
+  static UserDto fromPartnerDto(PartnerResponseDto dto) => UserDto(
+        uid: dto.id,
+        email: dto.email,
+        name: dto.name,
+        isAdmin: false,
+        updatedAt: DateTime.now(),
+        profileImagePath: dto.profileImagePath,
+        avatarColor: dto.avatarColor.toAvatarColor(),
+        memoryEnabled: false,
+        inTimeline: dto.inTimeline ?? false,
+        isPartnerSharedBy: false,
+        isPartnerSharedWith: false,
+        quotaUsageInBytes: 0,
+        quotaSizeInBytes: 0,
+      );
+}
+
+extension on UserAvatarColor {
+  AvatarColor toAvatarColor() => switch (this) {
+        UserAvatarColor.red => AvatarColor.red,
+        UserAvatarColor.green => AvatarColor.green,
+        UserAvatarColor.blue => AvatarColor.blue,
+        UserAvatarColor.purple => AvatarColor.purple,
+        UserAvatarColor.orange => AvatarColor.orange,
+        UserAvatarColor.pink => AvatarColor.pink,
+        UserAvatarColor.amber => AvatarColor.amber,
+        UserAvatarColor.yellow => AvatarColor.yellow,
+        UserAvatarColor.gray => AvatarColor.gray,
+        UserAvatarColor.primary || _ => AvatarColor.primary,
+      };
+}