feat(server): add album filter to search tab

e2e/src/api/specs/search.e2e-spec.ts

@@ -187,6 +187,21 @@ describe('/search', () => {
         dto: { [value]: 'immich' },
         expected: [`${value} must be a boolean value`],
       })),
+      {
+        should: 'should reject albumIds null',
+        dto: { size: 1, albumIds: null },
+        expected: [
+          "each value in albumIds must be a UUID",
+          "albumIds must be an array"
+        ],
+      },
+      {
+        should: 'should reject albumIds invalid format',
+        dto: { size: 1, albumIds: ['invalid_uuid'] },
+        expected: [
+          "each value in albumIds must be a UUID"
+        ],
+      },
     ];
 
     for (const { should, dto, expected } of badTests) {
@@ -434,6 +449,14 @@ describe('/search', () => {
           assets: [assetLast],
         }),
       },
+      {
+        should: 'should get my assets with empty albumIds',
+        deferred: () => ({ dto: { size: 1 }, assets: [assetLast], albumIds: [] }),
+      },
+      {
+        should: 'should get my assets with a valued albumIds',
+        deferred: () => ({ dto: { size: 1 }, assets: [assetLast], albumIds: ['84010428-5106-42e1-be4d-e66d88fb59c2'] }),
+      },
     ];
 
     for (const { should, deferred } of searchTests) {

open-api/immich-openapi-specs.json

@@ -10166,6 +10166,13 @@
       },
       "MetadataSearchDto": {
         "properties": {
+          "albumIds": {
+            "items": {
+              "format": "uuid",
+              "type": "string"
+            },
+            "type": "array"
+          },
           "checksum": {
             "type": "string"
           },
@@ -10865,6 +10872,13 @@
       },
       "RandomSearchDto": {
         "properties": {
+          "albumIds": {
+            "items": {
+              "format": "uuid",
+              "type": "string"
+            },
+            "type": "array"
+          },
           "city": {
             "nullable": true,
             "type": "string"
@@ -11813,6 +11827,13 @@
       },
       "SmartSearchDto": {
         "properties": {
+          "albumIds": {
+            "items": {
+              "format": "uuid",
+              "type": "string"
+            },
+            "type": "array"
+          },
           "city": {
             "nullable": true,
             "type": "string"

open-api/typescript-sdk/src/fetch-client.ts

@@ -799,6 +799,7 @@ export type SearchExploreResponseDto = {
     items: SearchExploreItem[];
 };
 export type MetadataSearchDto = {
+    albumIds?: string[];
     checksum?: string;
     city?: string | null;
     country?: string | null;
@@ -877,6 +878,7 @@ export type PlacesResponseDto = {
     name: string;
 };
 export type RandomSearchDto = {
+    albumIds?: string[];
     city?: string | null;
     country?: string | null;
     createdAfter?: string;
@@ -912,6 +914,7 @@ export type RandomSearchDto = {
     withStacked?: boolean;
 };
 export type SmartSearchDto = {
+    albumIds?: string[];
     city?: string | null;
     country?: string | null;
     createdAfter?: string;

server/src/dtos/search.dto.ts

@@ -109,6 +109,9 @@ class BaseSearchDto {
   @ValidateBoolean({ optional: true })
   isNotInAlbum?: boolean;
 
+  @ValidateUUID({ each: true, optional: true })
+  albumIds?: string[];
+
   @ValidateUUID({ each: true, optional: true })
   personIds?: string[];
 

server/src/entities/asset.entity.ts

@@ -440,6 +440,16 @@ export function searchAssetBuilder(kysely: Kysely<DB>, options: AssetSearchBuild
         eb.not(eb.exists((eb) => eb.selectFrom('albums_assets_assets').whereRef('assetsId', '=', 'assets.id'))),
       ),
     )
+    .$if(!!options.albumIds && options.albumIds.length > 0, (qb) =>
+      qb.where((eb) =>
+        eb.exists((eb) =>
+          eb
+            .selectFrom('albums_assets_assets')
+            .whereRef('albums_assets_assets.assetsId', '=', 'assets.id')
+            .where('albums_assets_assets.albumsId', 'in', options.albumIds!),
+        ),
+      ),
+    )
     .$if(!!options.withExif, withExifInner)
     .$if(!!(options.withFaces || options.withPeople || options.personIds), (qb) => qb.select(withFacesAndPeople))
     .$if(!options.withDeleted, (qb) => qb.where('assets.deletedAt', 'is', null))

server/src/repositories/search.repository.ts

@@ -66,6 +66,7 @@ export interface SearchStatusOptions {
   isOffline?: boolean;
   isVisible?: boolean;
   isNotInAlbum?: boolean;
+  albumIds?: string[];
   type?: AssetType;
   status?: AssetStatus;
   withArchived?: boolean;