mirror of
https://github.com/immich-app/immich.git
synced 2025-12-12 15:50:43 -08:00
fix: bad merge (#23610)
This commit is contained in:
@@ -351,8 +351,8 @@ export class ExifTestContext extends MediumTestContext<MetadataService> {
|
||||
getTags(assetId: string) {
|
||||
return this.database
|
||||
.selectFrom('tag')
|
||||
.innerJoin('tag_asset', 'tag.id', 'tag_asset.tagsId')
|
||||
.where('tag_asset.assetsId', '=', assetId)
|
||||
.innerJoin('tag_asset', 'tag.id', 'tag_asset.tagId')
|
||||
.where('tag_asset.assetId', '=', assetId)
|
||||
.selectAll()
|
||||
.execute();
|
||||
}
|
||||
|
||||
@@ -27,8 +27,8 @@ describe('exif tags', () => {
|
||||
await sut.handleMetadataExtraction({ id: asset.id });
|
||||
|
||||
await expect(ctx.getTags(asset.id)).resolves.toEqual([
|
||||
expect.objectContaining({ assetsId: asset.id, value: 'Frost', parentId: null }),
|
||||
expect.objectContaining({ assetsId: asset.id, value: 'Yard', parentId: null }),
|
||||
expect.objectContaining({ assetId: asset.id, value: 'Frost', parentId: null }),
|
||||
expect.objectContaining({ assetId: asset.id, value: 'Yard', parentId: null }),
|
||||
]);
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user