From 6fd429363829affa9d5e8f1460c1b91b2f553e9d Mon Sep 17 00:00:00 2001
From: Min Idzelis <min123@gmail.com>
Date: Sat, 19 Apr 2025 18:53:32 +0000
Subject: [PATCH] stop being fancy

---
 server/src/repositories/asset.repository.ts | 5 ++---
 server/src/services/timeline.service.ts     | 4 +---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/server/src/repositories/asset.repository.ts b/server/src/repositories/asset.repository.ts
index ee92692856..f32962611d 100644
--- a/server/src/repositories/asset.repository.ts
+++ b/server/src/repositories/asset.repository.ts
@@ -763,6 +763,7 @@ export class AssetRepository {
         'assets.id as id',
         'assets.ownerId',
         'assets.status',
+        'deletedAt',
         'type',
         'duration',
         'isFavorite',
@@ -773,7 +774,6 @@ export class AssetRepository {
       ])
       .leftJoin('exif', 'assets.id', 'exif.assetId')
       .select(['exif.exifImageHeight as height', 'exifImageWidth as width', 'exif.orientation', 'exif.projectionType'])
-      .select(sql<boolean>`('assets.deletedAt' IS NOT NULL)`.as('isTrashed'))
       .$if(!!options.albumId, (qb) =>
         qb
           .innerJoin('albums_assets_assets', 'albums_assets_assets.assetsId', 'assets.id')
@@ -815,7 +815,6 @@ export class AssetRepository {
         qb.where('assets.duplicateId', options.isDuplicate ? 'is not' : 'is', null),
       )
       .$if(!!options.isTrashed, (qb) => qb.where('assets.status', '!=', AssetStatus.DELETED))
-      // .$if(!!options.tagId, (qb) => withTagId(qb, options.tagId!))
       .$if(!!options.tagId, (qb) => qb.where((eb) => withTagId(options.tagId!, eb.ref('assets.id'))))
       .where('assets.deletedAt', options.isTrashed ? 'is not' : 'is', null)
       .where('assets.isVisible', '=', true)
@@ -861,7 +860,7 @@ export class AssetRepository {
       bucketAssets.ratio.push(round(width / height, 2));
       bucketAssets.isArchived.push(item.isArchived ? 1 : 0);
       bucketAssets.isFavorite.push(item.isFavorite ? 1 : 0);
-      bucketAssets.isTrashed.push(item.isTrashed ? 1 : 0);
+      bucketAssets.isTrashed.push(item.deletedAt === null ? 0 : 1);
       bucketAssets.thumbhash.push(item.thumbhash ? hexOrBufferToBase64(item.thumbhash) : 0);
       bucketAssets.localDateTime.push(item.localDateTime);
       bucketAssets.stack.push(this.mapStack(item.stack) || 0);
diff --git a/server/src/services/timeline.service.ts b/server/src/services/timeline.service.ts
index a7112b7259..a028f4e564 100644
--- a/server/src/services/timeline.service.ts
+++ b/server/src/services/timeline.service.ts
@@ -28,9 +28,7 @@ export class TimelineService extends BaseService {
     if (dto.pageSize === 0) {
       throw new BadRequestException('pageSize must not be 0');
     }
-    const a = await this.assetRepository.getTimeBucket(dto.timeBucket, timeBucketOptions, { skip: page, take: size });
-    console.log(a);
-    return a;
+    return await this.assetRepository.getTimeBucket(dto.timeBucket, timeBucketOptions, { skip: page, take: size });
   }
 
   private async buildTimeBucketOptions(auth: AuthDto, dto: TimeBucketDto): Promise<TimeBucketOptions> {