Skip to content

High performance self-hosted photo and video management solution.

fix: parse correct metadata to userDto for SQlite store implmentation (#21154)

Alex13c8a6e61de5
diff --git a/mobile/lib/domain/models/user_metadata.model.dart b/mobile/lib/domain/models/user_metadata.model.dart
index 1c371a9d3e..c477be1a41 100644
--- a/mobile/lib/domain/models/user_metadata.model.dart
+++ b/mobile/lib/domain/models/user_metadata.model.dart
@@ -74,7 +74,6 @@ isOnboarded: $isOnboarded,
int get hashCode => isOnboarded.hashCode;
}
-// TODO: wait to be overwritten
class Preferences {
final bool foldersEnabled;
final bool memoriesEnabled;
@@ -133,17 +132,17 @@ class Preferences {
factory Preferences.fromMap(Map<String, Object?> map) {
return Preferences(
- foldersEnabled: map["folders-Enabled"] as bool? ?? false,
- memoriesEnabled: map["memories-Enabled"] as bool? ?? true,
- peopleEnabled: map["people-Enabled"] as bool? ?? true,
- ratingsEnabled: map["ratings-Enabled"] as bool? ?? false,
- sharedLinksEnabled: map["sharedLinks-Enabled"] as bool? ?? true,
- tagsEnabled: map["tags-Enabled"] as bool? ?? false,
+ foldersEnabled: (map["folders"] as Map<String, Object?>?)?["enabled"] as bool? ?? false,
+ memoriesEnabled: (map["memories"] as Map<String, Object?>?)?["enabled"] as bool? ?? true,
+ peopleEnabled: (map["people"] as Map<String, Object?>?)?["enabled"] as bool? ?? true,
+ ratingsEnabled: (map["ratings"] as Map<String, Object?>?)?["enabled"] as bool? ?? false,
+ sharedLinksEnabled: (map["sharedLinks"] as Map<String, Object?>?)?["enabled"] as bool? ?? true,
+ tagsEnabled: (map["tags"] as Map<String, Object?>?)?["enabled"] as bool? ?? false,
userAvatarColor: AvatarColor.values.firstWhere(
- (e) => e.value == map["avatar-Color"] as String?,
+ (e) => e.value == (map["avatar"] as Map<String, Object?>?)?["color"] as String?,
orElse: () => AvatarColor.primary,
),
- showSupportBadge: map["purchase-ShowSupportBadge"] as bool? ?? true,
+ showSupportBadge: (map["purchase"] as Map<String, Object?>?)?["showSupportBadge"] as bool? ?? true,
);
}
@@ -213,7 +212,7 @@ class License {
factory License.fromMap(Map<String, Object?> map) {
return License(
- activatedAt: map["activatedAt"] as DateTime,
+ activatedAt: DateTime.parse(map["activatedAt"] as String),
activationKey: map["activationKey"] as String,
licenseKey: map["licenseKey"] as String,
);
diff --git a/mobile/lib/infrastructure/repositories/user.repository.dart b/mobile/lib/infrastructure/repositories/user.repository.dart
index 1caab462cd..3081aee1a9 100644
--- a/mobile/lib/infrastructure/repositories/user.repository.dart
+++ b/mobile/lib/infrastructure/repositories/user.repository.dart
@@ -1,9 +1,11 @@
import 'package:drift/drift.dart';
import 'package:immich_mobile/constants/enums.dart';
import 'package:immich_mobile/domain/models/user.model.dart';
+import 'package:immich_mobile/domain/models/user_metadata.model.dart';
import 'package:immich_mobile/infrastructure/entities/user.entity.dart' as entity;
import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart';
import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/user_metadata.repository.dart';
import 'package:isar/isar.dart';
class IsarUserRepository extends IsarDatabaseRepository {
@@ -70,8 +72,16 @@ class DriftUserRepository extends DriftDatabaseRepository {
final Drift _db;
const DriftUserRepository(super.db) : _db = db;
- Future<UserDto?> get(String id) =>
- _db.managers.userEntity.filter((user) => user.id.equals(id)).getSingleOrNull().then((user) => user?.toDto());
+ Future<UserDto?> get(String id) async {
+ final user = await _db.managers.userEntity.filter((user) => user.id.equals(id)).getSingleOrNull();
+
+ if (user == null) return null;
+
+ final query = _db.userMetadataEntity.select()..where((e) => e.userId.equals(id));
+ final metadata = await query.map((row) => row.toDto()).get();
+
+ return user.toDto(metadata);
+ }
Future<UserDto> upsert(UserDto user) async {
await _db.userEntity.insertOnConflictUpdate(
@@ -87,10 +97,35 @@ class DriftUserRepository extends DriftDatabaseRepository {
);
return user;
}
+
+ Future<List<UserDto>> getAll() async {
+ final users = await _db.userEntity.select().get();
+ final List<UserDto> result = [];
+
+ for (final user in users) {
+ final query = _db.userMetadataEntity.select()..where((e) => e.userId.equals(user.id));
+ final metadata = await query.map((row) => row.toDto()).get();
+ result.add(user.toDto(metadata));
+ }
+
+ return result;
+ }
}
extension on UserEntityData {
- UserDto toDto() {
+ UserDto toDto([List<UserMetadata>? metadata]) {
+ AvatarColor avatarColor = AvatarColor.primary;
+ bool memoryEnabled = true;
+
+ if (metadata != null) {
+ for (final meta in metadata) {
+ if (meta.key == UserMetadataKey.preferences && meta.preferences != null) {
+ avatarColor = meta.preferences?.userAvatarColor ?? AvatarColor.primary;
+ memoryEnabled = meta.preferences?.memoriesEnabled ?? true;
+ }
+ }
+ }
+
return UserDto(
id: id,
email: email,
@@ -99,6 +134,8 @@ extension on UserEntityData {
updatedAt: updatedAt,
profileChangedAt: profileChangedAt,
hasProfileImage: hasProfileImage,
+ avatarColor: avatarColor,
+ memoryEnabled: memoryEnabled,
);
}
}
diff --git a/mobile/lib/infrastructure/repositories/user_metadata.repository.dart b/mobile/lib/infrastructure/repositories/user_metadata.repository.dart
index 7205c7f73a..173ec10b97 100644
--- a/mobile/lib/infrastructure/repositories/user_metadata.repository.dart
+++ b/mobile/lib/infrastructure/repositories/user_metadata.repository.dart
@@ -16,7 +16,7 @@ class DriftUserMetadataRepository extends DriftDatabaseRepository {
}
}
-extension on UserMetadataEntityData {
+extension UserMetadataDataExtension on UserMetadataEntityData {
UserMetadata toDto() => switch (key) {
UserMetadataKey.onboarding => UserMetadata(userId: userId, key: key, onboarding: Onboarding.fromMap(value)),
UserMetadataKey.preferences => UserMetadata(userId: userId, key: key, preferences: Preferences.fromMap(value)),
diff --git a/mobile/lib/presentation/pages/dev/main_timeline.page.dart b/mobile/lib/presentation/pages/dev/main_timeline.page.dart
index 3764443566..8ef3ef9757 100644
--- a/mobile/lib/presentation/pages/dev/main_timeline.page.dart
+++ b/mobile/lib/presentation/pages/dev/main_timeline.page.dart
@@ -15,9 +15,6 @@ class MainTimelinePage extends ConsumerWidget {
final memoryLaneProvider = ref.watch(driftMemoryFutureProvider);
final memoriesEnabled = ref.watch(currentUserProvider.select((user) => user?.memoryEnabled ?? true));
- // TODO: the user preferences need to be updated
- // from the server to get live hiding/showing of memory lane
-
return memoryLaneProvider.maybeWhen(
data: (memories) {
return memories.isEmpty || !memoriesEnabled