From 824409351e327a747739dc38c125e6395bf6d181 Mon Sep 17 00:00:00 2001 From: Zack Pollard Date: Mon, 20 Feb 2023 01:50:48 +0000 Subject: [PATCH] fix: use fileCreatedAt for asset sorting after recent refactor (#1799) --- .../immich/src/api-v1/asset/asset-repository.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/server/apps/immich/src/api-v1/asset/asset-repository.ts b/server/apps/immich/src/api-v1/asset/asset-repository.ts index 9670ee86c3..815264afb8 100644 --- a/server/apps/immich/src/api-v1/asset/asset-repository.ts +++ b/server/apps/immich/src/api-v1/asset/asset-repository.ts @@ -152,12 +152,12 @@ export class AssetRepository implements IAssetRepository { return await this.assetRepository .createQueryBuilder('asset') .where('asset.ownerId = :userId', { userId: userId }) - .andWhere(`date_trunc('month', "createdAt") IN (:...buckets)`, { + .andWhere(`date_trunc('month', "fileCreatedAt") IN (:...buckets)`, { buckets: [...getAssetByTimeBucketDto.timeBucket], }) .andWhere('asset.resizePath is not NULL') .andWhere('asset.isVisible = true') - .orderBy('asset.createdAt', 'DESC') + .orderBy('asset.fileCreatedAt', 'DESC') .getMany(); } @@ -168,23 +168,23 @@ export class AssetRepository implements IAssetRepository { result = await this.assetRepository .createQueryBuilder('asset') .select(`COUNT(asset.id)::int`, 'count') - .addSelect(`date_trunc('month', "createdAt")`, 'timeBucket') + .addSelect(`date_trunc('month', "fileCreatedAt")`, 'timeBucket') .where('"ownerId" = :userId', { userId: userId }) .andWhere('asset.resizePath is not NULL') .andWhere('asset.isVisible = true') - .groupBy(`date_trunc('month', "createdAt")`) - .orderBy(`date_trunc('month', "createdAt")`, 'DESC') + .groupBy(`date_trunc('month', "fileCreatedAt")`) + .orderBy(`date_trunc('month', "fileCreatedAt")`, 'DESC') .getRawMany(); } else if (timeBucket === TimeGroupEnum.Day) { result = await this.assetRepository .createQueryBuilder('asset') .select(`COUNT(asset.id)::int`, 'count') - .addSelect(`date_trunc('day', "createdAt")`, 'timeBucket') + .addSelect(`date_trunc('day', "fileCreatedAt")`, 'timeBucket') .where('"ownerId" = :userId', { userId: userId }) .andWhere('asset.resizePath is not NULL') .andWhere('asset.isVisible = true') - .groupBy(`date_trunc('day', "createdAt")`) - .orderBy(`date_trunc('day', "createdAt")`, 'DESC') + .groupBy(`date_trunc('day', "fileCreatedAt")`) + .orderBy(`date_trunc('day', "fileCreatedAt")`, 'DESC') .getRawMany(); }