fix(server): stack info in asset response for mobile (#7346)

* fix(server): stack info in asset response for mobile

* fix(server): getAllAssets - do not filter by stack ID

* tet(server): GET /assets stack e2e

* chore(server): fix checks

* stack asset height

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>

server/src/domain/repositories/search.repository.ts

@@ -92,12 +92,12 @@ export interface SearchStatusOptions {
 export interface SearchOneToOneRelationOptions {
   withExif?: boolean;
   withSmartInfo?: boolean;
+  withStacked?: boolean;
 }
 
 export interface SearchRelationOptions extends SearchOneToOneRelationOptions {
   withFaces?: boolean;
   withPeople?: boolean;
-  withStacked?: boolean;
 }
 
 export interface SearchDateOptions {

server/src/immich/api-v1/asset/asset.service.ts

@@ -116,9 +116,17 @@ export class AssetService {
     await this.access.requirePermission(auth, Permission.TIMELINE_READ, userId);
     const assets = await this.assetRepository.getAllByFileCreationDate(
       { take: dto.take ?? 1000, skip: dto.skip },
-      { ...dto, userIds: [userId], withDeleted: true, orderDirection: 'DESC', withExif: true, isVisible: true },
+      {
+        ...dto,
+        userIds: [userId],
+        withDeleted: true,
+        orderDirection: 'DESC',
+        withExif: true,
+        isVisible: true,
+        withStacked: true,
+      },
     );
-    return assets.items.map((asset) => mapAsset(asset));
+    return assets.items.map((asset) => mapAsset(asset, { withStack: true }));
   }
 
   async serveThumbnail(auth: AuthDto, assetId: string, dto: GetAssetThumbnailDto): Promise<ImmichFileResponse> {

server/src/infra/infra.utils.ts

@@ -2,7 +2,6 @@ import { AssetSearchBuilderOptions, Paginated, PaginationOptions } from '@app/do
 import _ from 'lodash';
 import {
   Between,
-  Brackets,
   FindManyOptions,
   IsNull,
   LessThanOrEqual,
@@ -229,12 +228,7 @@ export function searchAssetBuilder(
   }
 
   if (withStacked) {
-    builder
-      .leftJoinAndSelect(`${builder.alias}.stack`, 'stack')
-      .leftJoinAndSelect('stack.assets', 'stackedAssets')
-      .andWhere(
-        new Brackets((qb) => qb.where(`stack.primaryAssetId = ${builder.alias}.id`).orWhere('asset.stackId IS NULL')),
-      );
+    builder.leftJoinAndSelect(`${builder.alias}.stack`, 'stack').leftJoinAndSelect('stack.assets', 'stackedAssets');
   }
 
   const withDeleted = options.withDeleted ?? (trashedAfter !== undefined || trashedBefore !== undefined);

server/src/infra/sql/search.repository.sql

@@ -83,10 +83,6 @@ FROM
           "asset"."isFavorite" = $3
           AND "asset"."isArchived" = $4
         )
-        AND (
-          "stack"."primaryAssetId" = "asset"."id"
-          OR "asset"."stackId" IS NULL
-        )
       )
       AND ("asset"."deletedAt" IS NULL)
   ) "distinctAlias"
@@ -184,10 +180,6 @@ WHERE
       "asset"."isFavorite" = $3
       AND "asset"."isArchived" = $4
     )
-    AND (
-      "stack"."primaryAssetId" = "asset"."id"
-      OR "asset"."stackId" IS NULL
-    )
     AND "asset"."ownerId" IN ($5)
   )
   AND ("asset"."deletedAt" IS NULL)