Skip to content

fix: implement existing withStacked on searchAssetBuilder #26607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danieldietzler merged 4 commits into from
Mar 3, 2026
Merged

fix: implement existing withStacked on searchAssetBuilder #26607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c093af3
implement existing withStacked on searchAssetBuilder
Mar 1, 2026
3de28d7
remove double bang to preserve original behavior
Mar 1, 2026
5d0049d
Merge branch 'main' of https://github.com/immich-app/immich into BF/w…
Mar 1, 2026
b7463cc
remove comments from test in line with existing style
Mar 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions server/src/utils/database.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
20 changes: 20 additions & 0 deletions server/test/medium/specs/services/search.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
});
});
Loading