Skip to content

High performance self-hosted photo and video management solution.

fix(web): bucket by `localDateTime` (#12612)

Jason Rasmussen15f9ff1fcb48
diff --git a/web/src/lib/components/asset-viewer/detail-panel.svelte b/web/src/lib/components/asset-viewer/detail-panel.svelte
index 205eb26699..5dc4fc0812 100644
--- a/web/src/lib/components/asset-viewer/detail-panel.svelte
+++ b/web/src/lib/components/asset-viewer/detail-panel.svelte
@@ -219,9 +219,9 @@
<p class="mt-1 truncate font-medium" title={person.name}>{person.name}</p>
{#if person.birthDate}
{@const personBirthDate = DateTime.fromISO(person.birthDate)}
- {@const age = Math.floor(DateTime.fromISO(asset.fileCreatedAt).diff(personBirthDate, 'years').years)}
+ {@const age = Math.floor(DateTime.fromISO(asset.localDateTime).diff(personBirthDate, 'years').years)}
{@const ageInMonths = Math.floor(
- DateTime.fromISO(asset.fileCreatedAt).diff(personBirthDate, 'months').months,
+ DateTime.fromISO(asset.localDateTime).diff(personBirthDate, 'months').months,
)}
{#if age >= 0}
<p
diff --git a/web/src/lib/stores/asset.store.spec.ts b/web/src/lib/stores/asset.store.spec.ts
index 7787bf794d..918a29e97d 100644
--- a/web/src/lib/stores/asset.store.spec.ts
+++ b/web/src/lib/stores/asset.store.spec.ts
@@ -141,7 +141,10 @@ describe('AssetStore', () => {
});
it('adds assets to new bucket', () => {
- const asset = assetFactory.build({ fileCreatedAt: '2024-01-20T12:00:00.000Z' });
+ const asset = assetFactory.build({
+ localDateTime: '2024-01-20T12:00:00.000Z',
+ fileCreatedAt: '2024-01-20T12:00:00.000Z',
+ });
assetStore.addAssets([asset]);
expect(assetStore.buckets.length).toEqual(1);
@@ -152,7 +155,10 @@ describe('AssetStore', () => {
});
it('adds assets to existing bucket', () => {
- const [assetOne, assetTwo] = assetFactory.buildList(2, { fileCreatedAt: '2024-01-20T12:00:00.000Z' });
+ const [assetOne, assetTwo] = assetFactory.buildList(2, {
+ localDateTime: '2024-01-20T12:00:00.000Z',
+ fileCreatedAt: '2024-01-20T12:00:00.000Z',
+ });
assetStore.addAssets([assetOne]);
assetStore.addAssets([assetTwo]);
@@ -163,9 +169,18 @@ describe('AssetStore', () => {
});
it('orders assets in buckets by descending date', () => {
- const assetOne = assetFactory.build({ fileCreatedAt: '2024-01-20T12:00:00.000Z' });
- const assetTwo = assetFactory.build({ fileCreatedAt: '2024-01-15T12:00:00.000Z' });
- const assetThree = assetFactory.build({ fileCreatedAt: '2024-01-16T12:00:00.000Z' });
+ const assetOne = assetFactory.build({
+ fileCreatedAt: '2024-01-20T12:00:00.000Z',
+ localDateTime: '2024-01-20T12:00:00.000Z',
+ });
+ const assetTwo = assetFactory.build({
+ fileCreatedAt: '2024-01-15T12:00:00.000Z',
+ localDateTime: '2024-01-15T12:00:00.000Z',
+ });
+ const assetThree = assetFactory.build({
+ fileCreatedAt: '2024-01-16T12:00:00.000Z',
+ localDateTime: '2024-01-16T12:00:00.000Z',
+ });
assetStore.addAssets([assetOne, assetTwo, assetThree]);
const bucket = assetStore.getBucketByDate('2024-01-01T00:00:00.000Z');
@@ -177,9 +192,9 @@ describe('AssetStore', () => {
});
it('orders buckets by descending date', () => {
- const assetOne = assetFactory.build({ fileCreatedAt: '2024-01-20T12:00:00.000Z' });
- const assetTwo = assetFactory.build({ fileCreatedAt: '2024-04-20T12:00:00.000Z' });
- const assetThree = assetFactory.build({ fileCreatedAt: '2023-01-20T12:00:00.000Z' });
+ const assetOne = assetFactory.build({ localDateTime: '2024-01-20T12:00:00.000Z' });
+ const assetTwo = assetFactory.build({ localDateTime: '2024-04-20T12:00:00.000Z' });
+ const assetThree = assetFactory.build({ localDateTime: '2023-01-20T12:00:00.000Z' });
assetStore.addAssets([assetOne, assetTwo, assetThree]);
expect(assetStore.buckets.length).toEqual(3);
@@ -239,8 +254,8 @@ describe('AssetStore', () => {
});
it('replaces bucket date when asset date changes', () => {
- const asset = assetFactory.build({ fileCreatedAt: '2024-01-20T12:00:00.000Z' });
- const updatedAsset = { ...asset, fileCreatedAt: '2024-03-20T12:00:00.000Z' };
+ const asset = assetFactory.build({ localDateTime: '2024-01-20T12:00:00.000Z' });
+ const updatedAsset = { ...asset, localDateTime: '2024-03-20T12:00:00.000Z' };
assetStore.addAssets([asset]);
expect(assetStore.buckets.length).toEqual(1);
@@ -264,7 +279,7 @@ describe('AssetStore', () => {
});
it('ignores invalid IDs', () => {
- assetStore.addAssets(assetFactory.buildList(2, { fileCreatedAt: '2024-01-20T12:00:00.000Z' }));
+ assetStore.addAssets(assetFactory.buildList(2, { localDateTime: '2024-01-20T12:00:00.000Z' }));
assetStore.removeAssets(['', 'invalid', '4c7d9acc']);
expect(assetStore.assets.length).toEqual(2);
@@ -273,7 +288,7 @@ describe('AssetStore', () => {
});
it('removes asset from bucket', () => {
- const [assetOne, assetTwo] = assetFactory.buildList(2, { fileCreatedAt: '2024-01-20T12:00:00.000Z' });
+ const [assetOne, assetTwo] = assetFactory.buildList(2, { localDateTime: '2024-01-20T12:00:00.000Z' });
assetStore.addAssets([assetOne, assetTwo]);
assetStore.removeAssets([assetOne.id]);
@@ -283,7 +298,7 @@ describe('AssetStore', () => {
});
it('removes bucket when empty', () => {
- const assets = assetFactory.buildList(2, { fileCreatedAt: '2024-01-20T12:00:00.000Z' });
+ const assets = assetFactory.buildList(2, { localDateTime: '2024-01-20T12:00:00.000Z' });
assetStore.addAssets(assets);
assetStore.removeAssets(assets.map((asset) => asset.id));
@@ -376,8 +391,8 @@ describe('AssetStore', () => {
});
it('returns the bucket index', () => {
- const assetOne = assetFactory.build({ fileCreatedAt: '2024-01-20T12:00:00.000Z' });
- const assetTwo = assetFactory.build({ fileCreatedAt: '2024-02-15T12:00:00.000Z' });
+ const assetOne = assetFactory.build({ localDateTime: '2024-01-20T12:00:00.000Z' });
+ const assetTwo = assetFactory.build({ localDateTime: '2024-02-15T12:00:00.000Z' });
assetStore.addAssets([assetOne, assetTwo]);
expect(assetStore.getBucketIndexByAssetId(assetTwo.id)).toEqual(0);
@@ -385,8 +400,8 @@ describe('AssetStore', () => {
});
it('ignores removed buckets', () => {
- const assetOne = assetFactory.build({ fileCreatedAt: '2024-01-20T12:00:00.000Z' });
- const assetTwo = assetFactory.build({ fileCreatedAt: '2024-02-15T12:00:00.000Z' });
+ const assetOne = assetFactory.build({ localDateTime: '2024-01-20T12:00:00.000Z' });
+ const assetTwo = assetFactory.build({ localDateTime: '2024-02-15T12:00:00.000Z' });
assetStore.addAssets([assetOne, assetTwo]);
assetStore.removeAssets([assetTwo.id]);
diff --git a/web/src/lib/stores/assets.store.ts b/web/src/lib/stores/assets.store.ts
index ed6f9fdf04..3892fc09cc 100644
--- a/web/src/lib/stores/assets.store.ts
+++ b/web/src/lib/stores/assets.store.ts
@@ -661,7 +661,7 @@ export class AssetStore {
const updatedBuckets = new Set<AssetBucket>();
for (const asset of assets) {
- const timeBucket = DateTime.fromISO(asset.fileCreatedAt).toUTC().startOf('month').toString();
+ const timeBucket = DateTime.fromISO(asset.localDateTime).toUTC().startOf('month').toString();
let bucket = this.getBucketByDate(timeBucket);
if (!bucket) {
@@ -791,7 +791,7 @@ export class AssetStore {
if (assets.length === 0) {
return;
}
- const assetsToReculculate: AssetResponseDto[] = [];
+ const assetsToRecalculate: AssetResponseDto[] = [];
for (const _asset of assets) {
const asset = this.assets.find((asset) => asset.id === _asset.id);
@@ -799,17 +799,17 @@ export class AssetStore {
continue;
}
- const recalculate = asset.fileCreatedAt !== _asset.fileCreatedAt;
+ const recalculate = asset.localDateTime !== _asset.localDateTime;
Object.assign(asset, _asset);
if (recalculate) {
- assetsToReculculate.push(asset);
+ assetsToRecalculate.push(asset);
}
}
- this.removeAssets(assetsToReculculate.map((asset) => asset.id));
- this.addAssetsToBuckets(assetsToReculculate);
- this.emit(assetsToReculculate.length > 0);
+ this.removeAssets(assetsToRecalculate.map((asset) => asset.id));
+ this.addAssetsToBuckets(assetsToRecalculate);
+ this.emit(assetsToRecalculate.length > 0);
}
removeAssets(ids: string[]) {