Merge branch 'main' of https://github.com/immich-app/immich into feat/sidecar-asset-files
This commit is contained in:
Vendored
+1
-1
@@ -47,7 +47,7 @@ export const stackStub = (stackId: string, assets: (MapAsset & { exifInfo: Exif
|
||||
primaryAssetId: assets[0].id,
|
||||
createdAt: new Date('2023-02-23T05:06:29.716Z'),
|
||||
updatedAt: new Date('2023-02-23T05:06:29.716Z'),
|
||||
updateId: 'uuid-v7',
|
||||
updateId: expect.any(String),
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Vendored
+5
-1
@@ -1,5 +1,6 @@
|
||||
import { Tag } from 'src/database';
|
||||
import { TagResponseDto } from 'src/dtos/tag.dto';
|
||||
import { newUuidV7 } from 'test/small.factory';
|
||||
|
||||
const parent = Object.freeze<Tag>({
|
||||
id: 'tag-parent',
|
||||
@@ -37,7 +38,10 @@ const color = {
|
||||
parentId: null,
|
||||
};
|
||||
|
||||
const upsert = { userId: 'tag-user', updateId: 'uuid-v7' };
|
||||
const upsert = {
|
||||
userId: 'tag-user',
|
||||
updateId: newUuidV7(),
|
||||
};
|
||||
|
||||
export const tagStub = {
|
||||
tag,
|
||||
|
||||
Reference in New Issue
Block a user