feat: people page/sheet/detail (#20309)

Author: alextran1502

i18n/en.json

@@ -14,6 +14,7 @@
   "add_a_location": "Add a location",
   "add_a_name": "Add a name",
   "add_a_title": "Add a title",
+  "add_birthday": "Add a birthday",
   "add_endpoint": "Add endpoint",
   "add_exclusion_pattern": "Add exclusion pattern",
   "add_import_path": "Add import path",
@@ -828,6 +829,7 @@
   "edit": "Edit",
   "edit_album": "Edit album",
   "edit_avatar": "Edit avatar",
+  "edit_birthday": "Edit Birthday",
   "edit_date": "Edit date",
   "edit_date_and_time": "Edit date and time",
   "edit_description": "Edit description",

mobile/lib/domain/models/person.model.dart

@@ -91,7 +91,7 @@ class PersonDto {
 }
 
 // Model for a person stored in the server
-class Person {
+class DriftPerson {
   final String id;
   final DateTime createdAt;
   final DateTime updatedAt;
@@ -103,7 +103,7 @@ class Person {
   final String? color;
   final DateTime? birthDate;
 
-  const Person({
+  const DriftPerson({
     required this.id,
     required this.createdAt,
     required this.updatedAt,
@@ -116,7 +116,7 @@ class Person {
     this.birthDate,
   });
 
-  Person copyWith({
+  DriftPerson copyWith({
     String? id,
     DateTime? createdAt,
     DateTime? updatedAt,
@@ -128,7 +128,7 @@ class Person {
     String? color,
     DateTime? birthDate,
   }) {
-    return Person(
+    return DriftPerson(
       id: id ?? this.id,
       createdAt: createdAt ?? this.createdAt,
       updatedAt: updatedAt ?? this.updatedAt,
@@ -159,7 +159,7 @@ class Person {
   }
 
   @override
-  bool operator ==(covariant Person other) {
+  bool operator ==(covariant DriftPerson other) {
     if (identical(this, other)) return true;
 
     return other.id == id &&

mobile/lib/domain/services/people.service.dart

@@ -0,0 +1,30 @@
+import 'dart:async';
+
+import 'package:immich_mobile/domain/models/person.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/people.repository.dart';
+import 'package:immich_mobile/repositories/person_api.repository.dart';
+
+class DriftPeopleService {
+  final DriftPeopleRepository _repository;
+  final PersonApiRepository _personApiRepository;
+
+  const DriftPeopleService(this._repository, this._personApiRepository);
+
+  Future<List<DriftPerson>> getAssetPeople(String assetId) {
+    return _repository.getAssetPeople(assetId);
+  }
+
+  Future<List<DriftPerson>> getAllPeople() {
+    return _repository.getAllPeople();
+  }
+
+  Future<int> updateName(String personId, String name) async {
+    await _personApiRepository.update(personId, name: name);
+    return _repository.updateName(personId, name);
+  }
+
+  Future<int> updateBrithday(String personId, DateTime birthday) async {
+    await _personApiRepository.update(personId, birthday: birthday);
+    return _repository.updateBirthday(personId, birthday);
+  }
+}

mobile/lib/domain/services/timeline.service.dart

@@ -53,6 +53,9 @@ class TimelineFactory {
 
   TimelineService place(String place) => TimelineService(_timelineRepository.place(place, groupBy));
 
+  TimelineService person(String userId, String personId) =>
+      TimelineService(_timelineRepository.person(userId, personId, groupBy));
+
   TimelineService fromAssets(List<BaseAsset> assets) => TimelineService(_timelineRepository.fromAssets(assets));
 }
 

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

@@ -0,0 +1,67 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/person.model.dart';
+import 'package:immich_mobile/infrastructure/entities/person.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+
+class DriftPeopleRepository extends DriftDatabaseRepository {
+  final Drift _db;
+  const DriftPeopleRepository(this._db) : super(_db);
+
+  Future<List<DriftPerson>> getAssetPeople(String assetId) async {
+    final query = _db.select(_db.assetFaceEntity).join([
+      innerJoin(_db.personEntity, _db.personEntity.id.equalsExp(_db.assetFaceEntity.personId)),
+    ])..where(_db.assetFaceEntity.assetId.equals(assetId) & _db.personEntity.isHidden.equals(false));
+
+    return query.map((row) {
+      final person = row.readTable(_db.personEntity);
+      return person.toDto();
+    }).get();
+  }
+
+  Future<List<DriftPerson>> getAllPeople() async {
+    final query =
+        _db.select(_db.personEntity).join([
+            leftOuterJoin(_db.assetFaceEntity, _db.assetFaceEntity.personId.equalsExp(_db.personEntity.id)),
+          ])
+          ..where(_db.personEntity.isHidden.equals(false))
+          ..groupBy([_db.personEntity.id])
+          ..orderBy([
+            OrderingTerm(expression: _db.personEntity.name.equals('').not(), mode: OrderingMode.desc),
+            OrderingTerm(expression: _db.assetFaceEntity.id.count(), mode: OrderingMode.desc),
+          ]);
+
+    return query.map((row) {
+      final person = row.readTable(_db.personEntity);
+      return person.toDto();
+    }).get();
+  }
+
+  Future<int> updateName(String personId, String name) {
+    final query = _db.update(_db.personEntity)..where((row) => row.id.equals(personId));
+
+    return query.write(PersonEntityCompanion(name: Value(name), updatedAt: Value(DateTime.now())));
+  }
+
+  Future<int> updateBirthday(String personId, DateTime birthday) {
+    final query = _db.update(_db.personEntity)..where((row) => row.id.equals(personId));
+
+    return query.write(PersonEntityCompanion(birthDate: Value(birthday), updatedAt: Value(DateTime.now())));
+  }
+}
+
+extension on PersonEntityData {
+  DriftPerson toDto() {
+    return DriftPerson(
+      id: id,
+      createdAt: createdAt,
+      updatedAt: updatedAt,
+      ownerId: ownerId,
+      name: name,
+      faceAssetId: faceAssetId,
+      isFavorite: isFavorite,
+      isHidden: isHidden,
+      color: color,
+      birthDate: birthDate,
+    );
+  }
+}

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

@@ -292,6 +292,11 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     assetSource: (offset, count) => _getPlaceBucketAssets(place, offset: offset, count: count),
   );
 
+  TimelineQuery person(String userId, String personId, GroupAssetsBy groupBy) => (
+    bucketSource: () => _watchPersonBucket(userId, personId, groupBy: groupBy),
+    assetSource: (offset, count) => _getPersonBucketAssets(userId, personId, offset: offset, count: count),
+  );
+
   Stream<List<Bucket>> _watchPlaceBucket(String place, {GroupAssetsBy groupBy = GroupAssetsBy.day}) {
     if (groupBy == GroupAssetsBy.none) {
       // TODO: implement GroupAssetBy for place
@@ -344,6 +349,84 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     return query.map((row) => row.readTable(_db.remoteAssetEntity).toDto()).get();
   }
 
+  Stream<List<Bucket>> _watchPersonBucket(String userId, String personId, {GroupAssetsBy groupBy = GroupAssetsBy.day}) {
+    if (groupBy == GroupAssetsBy.none) {
+      final query = _db.remoteAssetEntity.selectOnly()
+        ..addColumns([_db.remoteAssetEntity.id.count()])
+        ..join([
+          innerJoin(
+            _db.assetFaceEntity,
+            _db.assetFaceEntity.assetId.equalsExp(_db.remoteAssetEntity.id),
+            useColumns: false,
+          ),
+        ])
+        ..where(
+          _db.remoteAssetEntity.deletedAt.isNull() &
+              _db.remoteAssetEntity.ownerId.equals(userId) &
+              _db.remoteAssetEntity.visibility.equalsValue(AssetVisibility.timeline) &
+              _db.assetFaceEntity.personId.equals(personId),
+        );
+
+      return query.map((row) {
+        final count = row.read(_db.remoteAssetEntity.id.count())!;
+        return _generateBuckets(count);
+      }).watchSingle();
+    }
+
+    final assetCountExp = _db.remoteAssetEntity.id.count();
+    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
+
+    final query = _db.remoteAssetEntity.selectOnly()
+      ..addColumns([assetCountExp, dateExp])
+      ..join([
+        innerJoin(
+          _db.assetFaceEntity,
+          _db.assetFaceEntity.assetId.equalsExp(_db.remoteAssetEntity.id),
+          useColumns: false,
+        ),
+      ])
+      ..where(
+        _db.remoteAssetEntity.deletedAt.isNull() &
+            _db.remoteAssetEntity.ownerId.equals(userId) &
+            _db.remoteAssetEntity.visibility.equalsValue(AssetVisibility.timeline) &
+            _db.assetFaceEntity.personId.equals(personId),
+      )
+      ..groupBy([dateExp])
+      ..orderBy([OrderingTerm.desc(dateExp)]);
+
+    return query.map((row) {
+      final timeline = row.read(dateExp)!.dateFmt(groupBy);
+      final assetCount = row.read(assetCountExp)!;
+      return TimeBucket(date: timeline, assetCount: assetCount);
+    }).watch();
+  }
+
+  Future<List<BaseAsset>> _getPersonBucketAssets(
+    String userId,
+    String personId, {
+    required int offset,
+    required int count,
+  }) {
+    final query =
+        _db.remoteAssetEntity.select().join([
+            innerJoin(
+              _db.assetFaceEntity,
+              _db.assetFaceEntity.assetId.equalsExp(_db.remoteAssetEntity.id),
+              useColumns: false,
+            ),
+          ])
+          ..where(
+            _db.remoteAssetEntity.deletedAt.isNull() &
+                _db.remoteAssetEntity.ownerId.equals(userId) &
+                _db.remoteAssetEntity.visibility.equalsValue(AssetVisibility.timeline) &
+                _db.assetFaceEntity.personId.equals(personId),
+          )
+          ..orderBy([OrderingTerm.desc(_db.remoteAssetEntity.createdAt)])
+          ..limit(count, offset: offset);
+
+    return query.map((row) => row.readTable(_db.remoteAssetEntity).toDto()).get();
+  }
+
   TimelineQuery _remoteQueryBuilder({
     required Expression<bool> Function($RemoteAssetEntityTable row) filter,
     GroupAssetsBy groupBy = GroupAssetsBy.day,

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

@@ -5,7 +5,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/partner_user_avatar.widget.dart';
+import 'package:immich_mobile/presentation/widgets/people/partner_user_avatar.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/partner.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/widgets/common/confirm_dialog.dart';

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

@@ -6,10 +6,10 @@ import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/images/local_album_thumbnail.widget.dart';
-import 'package:immich_mobile/presentation/widgets/partner_user_avatar.widget.dart';
+import 'package:immich_mobile/presentation/widgets/people/partner_user_avatar.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/partner.provider.dart';
-import 'package:immich_mobile/providers/search/people.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/people.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/services/api.service.dart';
@@ -144,7 +144,7 @@ class _PeopleCollectionCard extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final people = ref.watch(getAllPeopleProvider);
+    final people = ref.watch(driftGetAllPeopleProvider);
 
     return LayoutBuilder(
       builder: (context, constraints) {
@@ -153,7 +153,7 @@ class _PeopleCollectionCard extends ConsumerWidget {
         final size = context.width * widthFactor - 20.0;
 
         return GestureDetector(
-          onTap: () => context.pushRoute(const PeopleCollectionRoute()),
+          onTap: () => context.pushRoute(const DriftPeopleCollectionRoute()),
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [