Skip to content

High performance self-hosted photo and video management solution.

refactor: metadata stub (#17532)

Jason Rasmussen75c83cb7048e
diff --git a/server/src/services/metadata.service.spec.ts b/server/src/services/metadata.service.spec.ts
index 1ba57eeff0..6e95430402 100644
--- a/server/src/services/metadata.service.spec.ts
+++ b/server/src/services/metadata.service.spec.ts
@@ -12,12 +12,34 @@ import { MetadataService } from 'src/services/metadata.service';
import { assetStub } from 'test/fixtures/asset.stub';
import { fileStub } from 'test/fixtures/file.stub';
import { probeStub } from 'test/fixtures/media.stub';
-import { metadataStub } from 'test/fixtures/metadata.stub';
import { personStub } from 'test/fixtures/person.stub';
import { tagStub } from 'test/fixtures/tag.stub';
import { factory } from 'test/small.factory';
import { newTestService, ServiceMocks } from 'test/utils';
+const makeFaceTags = (face: Partial<{ Name: string }> = {}) => ({
+ RegionInfo: {
+ AppliedToDimensions: {
+ W: 100,
+ H: 100,
+ Unit: 'normalized',
+ },
+ RegionList: [
+ {
+ Type: 'face',
+ Area: {
+ X: 0.05,
+ Y: 0.05,
+ W: 0.1,
+ H: 0.1,
+ Unit: 'normalized',
+ },
+ ...face,
+ },
+ ],
+ },
+});
+
describe(MetadataService.name, () => {
let sut: MetadataService;
let mocks: ServiceMocks;
@@ -969,7 +991,7 @@ describe(MetadataService.name, () => {
it('should skip importing metadata when the feature is disabled', async () => {
mocks.asset.getByIds.mockResolvedValue([assetStub.primaryImage]);
mocks.systemMetadata.get.mockResolvedValue({ metadata: { faces: { import: false } } });
- mockReadTags(metadataStub.withFace);
+ mockReadTags(makeFaceTags({ Name: 'Person 1' }));
await sut.handleMetadataExtraction({ id: assetStub.image.id });
expect(mocks.person.getDistinctNames).not.toHaveBeenCalled();
});
@@ -977,7 +999,7 @@ describe(MetadataService.name, () => {
it('should skip importing metadata face for assets without tags.RegionInfo', async () => {
mocks.asset.getByIds.mockResolvedValue([assetStub.primaryImage]);
mocks.systemMetadata.get.mockResolvedValue({ metadata: { faces: { import: true } } });
- mockReadTags(metadataStub.empty);
+ mockReadTags();
await sut.handleMetadataExtraction({ id: assetStub.image.id });
expect(mocks.person.getDistinctNames).not.toHaveBeenCalled();
});
@@ -985,7 +1007,7 @@ describe(MetadataService.name, () => {
it('should skip importing faces without name', async () => {
mocks.asset.getByIds.mockResolvedValue([assetStub.primaryImage]);
mocks.systemMetadata.get.mockResolvedValue({ metadata: { faces: { import: true } } });
- mockReadTags(metadataStub.withFaceNoName);
+ mockReadTags(makeFaceTags());
mocks.person.getDistinctNames.mockResolvedValue([]);
mocks.person.createAll.mockResolvedValue([]);
await sut.handleMetadataExtraction({ id: assetStub.image.id });
@@ -997,7 +1019,7 @@ describe(MetadataService.name, () => {
it('should skip importing faces with empty name', async () => {
mocks.asset.getByIds.mockResolvedValue([assetStub.primaryImage]);
mocks.systemMetadata.get.mockResolvedValue({ metadata: { faces: { import: true } } });
- mockReadTags(metadataStub.withFaceEmptyName);
+ mockReadTags(makeFaceTags({ Name: '' }));
mocks.person.getDistinctNames.mockResolvedValue([]);
mocks.person.createAll.mockResolvedValue([]);
await sut.handleMetadataExtraction({ id: assetStub.image.id });
@@ -1009,7 +1031,7 @@ describe(MetadataService.name, () => {
it('should apply metadata face tags creating new persons', async () => {
mocks.asset.getByIds.mockResolvedValue([assetStub.primaryImage]);
mocks.systemMetadata.get.mockResolvedValue({ metadata: { faces: { import: true } } });
- mockReadTags(metadataStub.withFace);
+ mockReadTags(makeFaceTags({ Name: personStub.withName.name }));
mocks.person.getDistinctNames.mockResolvedValue([]);
mocks.person.createAll.mockResolvedValue([personStub.withName.id]);
mocks.person.update.mockResolvedValue(personStub.withName);
@@ -1050,7 +1072,7 @@ describe(MetadataService.name, () => {
it('should assign metadata face tags to existing persons', async () => {
mocks.asset.getByIds.mockResolvedValue([assetStub.primaryImage]);
mocks.systemMetadata.get.mockResolvedValue({ metadata: { faces: { import: true } } });
- mockReadTags(metadataStub.withFace);
+ mockReadTags(makeFaceTags({ Name: personStub.withName.name }));
mocks.person.getDistinctNames.mockResolvedValue([{ id: personStub.withName.id, name: personStub.withName.name }]);
mocks.person.createAll.mockResolvedValue([]);
mocks.person.update.mockResolvedValue(personStub.withName);
diff --git a/server/test/fixtures/metadata.stub.ts b/server/test/fixtures/metadata.stub.ts
deleted file mode 100644
index e60d8d0eac..0000000000
--- a/server/test/fixtures/metadata.stub.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { ImmichTags } from 'src/repositories/metadata.repository';
-import { personStub } from 'test/fixtures/person.stub';
-
-export const metadataStub = {
- empty: Object.freeze<ImmichTags>({}),
- withFace: Object.freeze<ImmichTags>({
- RegionInfo: {
- AppliedToDimensions: {
- W: 100,
- H: 100,
- Unit: 'normalized',
- },
- RegionList: [
- {
- Type: 'face',
- Name: personStub.withName.name,
- Area: {
- X: 0.05,
- Y: 0.05,
- W: 0.1,
- H: 0.1,
- Unit: 'normalized',
- },
- },
- ],
- },
- }),
- withFaceEmptyName: Object.freeze<ImmichTags>({
- RegionInfo: {
- AppliedToDimensions: {
- W: 100,
- H: 100,
- Unit: 'normalized',
- },
- RegionList: [
- {
- Type: 'face',
- Name: '',
- Area: {
- X: 0.05,
- Y: 0.05,
- W: 0.1,
- H: 0.1,
- Unit: 'normalized',
- },
- },
- ],
- },
- }),
- withFaceNoName: Object.freeze<ImmichTags>({
- RegionInfo: {
- AppliedToDimensions: {
- W: 100,
- H: 100,
- Unit: 'normalized',
- },
- RegionList: [
- {
- Type: 'face',
- Area: {
- X: 0.05,
- Y: 0.05,
- W: 0.1,
- H: 0.1,
- Unit: 'normalized',
- },
- },
- ],
- },
- }),
-};