Revert "Revert "fix(server): on_asset_update event sends varying data types (#7179)""

This reverts commit 26c3635291.

mobile/.fvm/release

@@ -0,0 +1 @@
+3.13.6

mobile/.fvm/version

@@ -0,0 +1 @@
+3.13.6

mobile/.fvm/versions/3.13.6

@@ -0,0 +1 @@
+C:/Users/alext/fvm/versions/3.13.6

mobile/ios/Podfile.lock

@@ -180,4 +180,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 64c9b5291666c0ca3caabdfe9865c141ac40321d
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.11.3

mobile/lib/shared/services/asset.service.dart

@@ -58,6 +58,18 @@ class AssetService {
     final assetDto = await _apiService.assetApi
         .getAllAssets(userId: user.id, updatedAfter: since);
     if (assetDto == null) return (null, null);
+
+    print("AssetDto length: ${assetDto.length} ");
+    for (final e in assetDto) {
+      print("AssetDto: ${e.stackParentId}");
+      var b = Asset.remote(e);
+      print("e.stackParentId ${e.stackParentId}");
+      print("e.id ${e.id}");
+      print(
+        "e.stackParentId == e.id ? null : e.stackParentId, ${e.stackParentId == e.id ? null : e.stackParentId}",
+      );
+      print("Mapped asset ${b.stackParentId}");
+    }
     return (assetDto.map(Asset.remote).toList(), deleted.ids);
   }
 
@@ -82,6 +94,7 @@ class AssetService {
         if (assets == null) {
           return null;
         }
+
         allAssets.addAll(assets.map(Asset.remote));
         if (assets.length < chunkSize) {
           break;

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

@@ -157,7 +157,9 @@ type BaseAssetSearchOptions = SearchDateOptions &
 
 export type AssetSearchOptions = BaseAssetSearchOptions & SearchRelationOptions;
 
-export type AssetSearchOneToOneRelationOptions = BaseAssetSearchOptions & SearchOneToOneRelationOptions;
+export type AssetSearchOneToOneRelationOptions = BaseAssetSearchOptions &
+  SearchOneToOneRelationOptions &
+  SearchRelationOptions;
 
 export type AssetSearchBuilderOptions = Omit<AssetSearchOptions, 'orderDirection'>;
 

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> {