High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix: implement existing withStacked on searchAssetBuilder (#26607)
Joe Babbitt44eeb1e088dd
diff --git a/server/src/utils/database.ts b/server/src/utils/database.tsindex 4dd0c9b302..4a57cd1a98 100644--- a/server/src/utils/database.ts+++ b/server/src/utils/database.ts@@ -404,6 +404,7 @@ export function searchAssetBuilder(kysely: Kysely<DB>, options: AssetSearchBuild.$if(!!options.isNotInAlbum && (!options.albumIds || options.albumIds.length === 0), (qb) =>qb.where((eb) => eb.not(eb.exists((eb) => eb.selectFrom('album_asset').whereRef('assetId', '=', 'asset.id')))),)+ .$if(options.withStacked === false, (qb) => qb.where('asset.stackId', 'is', null)).$if(!!options.withExif, withExifInner).$if(!!(options.withFaces || options.withPeople), (qb) => qb.select(withFacesAndPeople)).$if(!options.withDeleted, (qb) => qb.where('asset.deletedAt', 'is', null));diff --git a/server/test/medium/specs/services/search.service.spec.ts b/server/test/medium/specs/services/search.service.spec.tsindex f58ffb6a25..c20b64ca7c 100644--- a/server/test/medium/specs/services/search.service.spec.ts+++ b/server/test/medium/specs/services/search.service.spec.ts@@ -88,4 +88,24 @@ describe(SearchService.name, () => {expect(result).toEqual({ total: 0 });});});++ describe('withStacked option', () => {+ it('should exclude stacked assets when withStacked is false', async () => {+ const { sut, ctx } = setup();+ const { user } = await ctx.newUser();++ const { asset: primaryAsset } = await ctx.newAsset({ ownerId: user.id });+ const { asset: stackedAsset } = await ctx.newAsset({ ownerId: user.id });+ const { asset: unstackedAsset } = await ctx.newAsset({ ownerId: user.id });++ await ctx.newStack({ ownerId: user.id }, [primaryAsset.id, stackedAsset.id]);++ const auth = factory.auth({ user: { id: user.id } });++ const response = await sut.searchMetadata(auth, { withStacked: false });++ expect(response.assets.items.length).toBe(1);+ expect(response.assets.items[0].id).toBe(unstackedAsset.id);+ });+ });});