sjs/immich
1
0
Fork 0
mirror of https://github.com/samsonjs/immich.git synced 2026-04-27 15:07:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: null local date time in timeline queries (#26133)

Browse source 
* fix: null local date time in timeline queries

* refactor effectiveCreatedAt

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
This commit is contained in:
shenlong 2026-02-12 19:58:00 +05:30 committed by GitHub
parent 420cd5193b
commit ec4de54ea2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
mobile/lib/infrastructure/repositories/timeline.repository.dart
View file

@ -203,7 +203,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
final album = albums.first; final album = albums.first;
final isAscending = album.order == AlbumAssetOrder.asc; final isAscending = album.order == AlbumAssetOrder.asc;
final assetCountExp = _db.remoteAssetEntity.id.count(); final assetCountExp = _db.remoteAssetEntity.id.count();
final dateExp = _db.remoteAssetEntity.localDateTime.dateFmt(groupBy); final dateExp = _db.remoteAssetEntity.effectiveCreatedAt(groupBy);
final query = _db.remoteAssetEntity.selectOnly() final query = _db.remoteAssetEntity.selectOnly()
..addColumns([assetCountExp, dateExp]) ..addColumns([assetCountExp, dateExp])
@ -361,7 +361,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
} }
final assetCountExp = _db.remoteAssetEntity.id.count(); final assetCountExp = _db.remoteAssetEntity.id.count();
final dateExp = _db.remoteAssetEntity.localDateTime.dateFmt(groupBy); final dateExp = _db.remoteAssetEntity.effectiveCreatedAt(groupBy);
final query = _db.remoteAssetEntity.selectOnly() final query = _db.remoteAssetEntity.selectOnly()
..addColumns([assetCountExp, dateExp]) ..addColumns([assetCountExp, dateExp])
@ -431,7 +431,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
} }
final assetCountExp = _db.remoteAssetEntity.id.count(); final assetCountExp = _db.remoteAssetEntity.id.count();
final dateExp = _db.remoteAssetEntity.localDateTime.dateFmt(groupBy); final dateExp = _db.remoteAssetEntity.effectiveCreatedAt(groupBy);
final query = _db.remoteAssetEntity.selectOnly() final query = _db.remoteAssetEntity.selectOnly()
..addColumns([assetCountExp, dateExp]) ..addColumns([assetCountExp, dateExp])
@ -501,7 +501,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
} }
final assetCountExp = _db.remoteAssetEntity.id.count(); final assetCountExp = _db.remoteAssetEntity.id.count();
final dateExp = _db.remoteAssetEntity.localDateTime.dateFmt(groupBy); final dateExp = _db.remoteAssetEntity.effectiveCreatedAt(groupBy);
final query = _db.remoteAssetEntity.selectOnly() final query = _db.remoteAssetEntity.selectOnly()
..addColumns([assetCountExp, dateExp]) ..addColumns([assetCountExp, dateExp])
@ -603,7 +603,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
} }
final assetCountExp = _db.remoteAssetEntity.id.count(); final assetCountExp = _db.remoteAssetEntity.id.count();
final dateExp = _db.remoteAssetEntity.localDateTime.dateFmt(groupBy); final dateExp = _db.remoteAssetEntity.effectiveCreatedAt(groupBy);
final query = _db.remoteAssetEntity.selectOnly() final query = _db.remoteAssetEntity.selectOnly()
..addColumns([assetCountExp, dateExp]) ..addColumns([assetCountExp, dateExp])
@ -678,6 +678,11 @@ extension on Expression<DateTime> {
} }
} }
extension on $RemoteAssetEntityTable {
Expression<String> effectiveCreatedAt(GroupAssetsBy groupBy) =>
coalesce([localDateTime.dateFmt(groupBy), createdAt.dateFmt(groupBy, toLocal: true)]);
}
extension on String { extension on String {
DateTime truncateDate(GroupAssetsBy groupBy) { DateTime truncateDate(GroupAssetsBy groupBy) {
final format = switch (groupBy) { final format = switch (groupBy) {