refactor(server): remove face, person and face search entities (#17535)

* remove face, person and face search entities update tests and mappers check if face relation exists update sql unused imports * pr feedback generate sql, remove unused imports
2025-12-22 01:11:20 +03:00 · 2025-04-11 14:44:45 -04:00
parent ae6653392e
commit 25f2b9602f
19 changed files with 384 additions and 322 deletions
--- a/server/test/fixtures/asset.stub.ts
+++ b/server/test/fixtures/asset.stub.ts
@@ -7,7 +7,7 @@ import { authStub } from 'test/fixtures/auth.stub';
 import { fileStub } from 'test/fixtures/file.stub';
 import { userStub } from 'test/fixtures/user.stub';

-const previewFile: AssetFile = {
+export const previewFile: AssetFile = {
  id: 'file-1',
  type: AssetFileType.PREVIEW,
  path: '/uploads/user-id/thumbs/path.jpg',
--- a/server/test/fixtures/face.stub.ts
+++ b/server/test/fixtures/face.stub.ts
@@ -1,15 +1,17 @@
-import { AssetFaceEntity } from 'src/entities/asset-face.entity';
 import { SourceType } from 'src/enum';
 import { assetStub } from 'test/fixtures/asset.stub';
 import { personStub } from 'test/fixtures/person.stub';

-type NonNullableProperty<T> = { [P in keyof T]: NonNullable<T[P]> };
-
 export const faceStub = {
-  face1: Object.freeze<NonNullableProperty<AssetFaceEntity>>({
+  face1: Object.freeze({
    id: 'assetFaceId1',
    assetId: assetStub.image.id,
-    asset: assetStub.image,
+    asset: {
+      ...assetStub.image,
+      libraryId: null,
+      updateId: '0d1173e3-4d80-4d76-b41e-57d56de21125',
+      stackId: null,
+    },
    personId: personStub.withName.id,
    person: personStub.withName,
    boundingBoxX1: 0,
@@ -22,7 +24,7 @@ export const faceStub = {
    faceSearch: { faceId: 'assetFaceId1', embedding: '[1, 2, 3, 4]' },
    deletedAt: new Date(),
  }),
-  primaryFace1: Object.freeze<AssetFaceEntity>({
+  primaryFace1: Object.freeze({
    id: 'assetFaceId2',
    assetId: assetStub.image.id,
    asset: assetStub.image,
@@ -38,7 +40,7 @@ export const faceStub = {
    faceSearch: { faceId: 'assetFaceId2', embedding: '[1, 2, 3, 4]' },
    deletedAt: null,
  }),
-  mergeFace1: Object.freeze<AssetFaceEntity>({
+  mergeFace1: Object.freeze({
    id: 'assetFaceId3',
    assetId: assetStub.image.id,
    asset: assetStub.image,
@@ -54,55 +56,7 @@ export const faceStub = {
    faceSearch: { faceId: 'assetFaceId3', embedding: '[1, 2, 3, 4]' },
    deletedAt: null,
  }),
-  start: Object.freeze<AssetFaceEntity>({
-    id: 'assetFaceId5',
-    assetId: assetStub.image.id,
-    asset: assetStub.image,
-    personId: personStub.newThumbnail.id,
-    person: personStub.newThumbnail,
-    boundingBoxX1: 5,
-    boundingBoxY1: 5,
-    boundingBoxX2: 505,
-    boundingBoxY2: 505,
-    imageHeight: 2880,
-    imageWidth: 2160,
-    sourceType: SourceType.MACHINE_LEARNING,
-    faceSearch: { faceId: 'assetFaceId5', embedding: '[1, 2, 3, 4]' },
-    deletedAt: null,
-  }),
-  middle: Object.freeze<AssetFaceEntity>({
-    id: 'assetFaceId6',
-    assetId: assetStub.image.id,
-    asset: assetStub.image,
-    personId: personStub.newThumbnail.id,
-    person: personStub.newThumbnail,
-    boundingBoxX1: 100,
-    boundingBoxY1: 100,
-    boundingBoxX2: 200,
-    boundingBoxY2: 200,
-    imageHeight: 500,
-    imageWidth: 400,
-    sourceType: SourceType.MACHINE_LEARNING,
-    faceSearch: { faceId: 'assetFaceId6', embedding: '[1, 2, 3, 4]' },
-    deletedAt: null,
-  }),
-  end: Object.freeze<AssetFaceEntity>({
-    id: 'assetFaceId7',
-    assetId: assetStub.image.id,
-    asset: assetStub.image,
-    personId: personStub.newThumbnail.id,
-    person: personStub.newThumbnail,
-    boundingBoxX1: 300,
-    boundingBoxY1: 300,
-    boundingBoxX2: 495,
-    boundingBoxY2: 495,
-    imageHeight: 500,
-    imageWidth: 500,
-    sourceType: SourceType.MACHINE_LEARNING,
-    faceSearch: { faceId: 'assetFaceId7', embedding: '[1, 2, 3, 4]' },
-    deletedAt: null,
-  }),
-  noPerson1: Object.freeze<AssetFaceEntity>({
+  noPerson1: Object.freeze({
    id: 'assetFaceId8',
    assetId: assetStub.image.id,
    asset: assetStub.image,
@@ -118,7 +72,7 @@ export const faceStub = {
    faceSearch: { faceId: 'assetFaceId8', embedding: '[1, 2, 3, 4]' },
    deletedAt: null,
  }),
-  noPerson2: Object.freeze<AssetFaceEntity>({
+  noPerson2: Object.freeze({
    id: 'assetFaceId9',
    assetId: assetStub.image.id,
    asset: assetStub.image,
@@ -134,7 +88,7 @@ export const faceStub = {
    faceSearch: { faceId: 'assetFaceId9', embedding: '[1, 2, 3, 4]' },
    deletedAt: null,
  }),
-  fromExif1: Object.freeze<AssetFaceEntity>({
+  fromExif1: Object.freeze({
    id: 'assetFaceId9',
    assetId: assetStub.image.id,
    asset: assetStub.image,
@@ -149,7 +103,7 @@ export const faceStub = {
    sourceType: SourceType.EXIF,
    deletedAt: null,
  }),
-  fromExif2: Object.freeze<AssetFaceEntity>({
+  fromExif2: Object.freeze({
    id: 'assetFaceId9',
    assetId: assetStub.image.id,
    asset: assetStub.image,
@@ -164,7 +118,7 @@ export const faceStub = {
    sourceType: SourceType.EXIF,
    deletedAt: null,
  }),
-  withBirthDate: Object.freeze<AssetFaceEntity>({
+  withBirthDate: Object.freeze({
    id: 'assetFaceId10',
    assetId: assetStub.image.id,
    asset: assetStub.image,
--- a/server/test/fixtures/person.stub.ts
+++ b/server/test/fixtures/person.stub.ts
@@ -1,11 +1,15 @@
-import { PersonEntity } from 'src/entities/person.entity';
+import { AssetType } from 'src/enum';
+import { previewFile } from 'test/fixtures/asset.stub';
 import { userStub } from 'test/fixtures/user.stub';

+const updateId = '0d1173e3-4d80-4d76-b41e-57d56de21125';
+
 export const personStub = {
-  noName: Object.freeze<PersonEntity>({
+  noName: Object.freeze({
    id: 'person-1',
    createdAt: new Date('2021-01-01'),
    updatedAt: new Date('2021-01-01'),
+    updateId,
    ownerId: userStub.admin.id,
    name: '',
    birthDate: null,
@@ -15,11 +19,13 @@ export const personStub = {
    faceAsset: null,
    isHidden: false,
    isFavorite: false,
+    color: 'red',
  }),
-  hidden: Object.freeze<PersonEntity>({
+  hidden: Object.freeze({
    id: 'person-1',
    createdAt: new Date('2021-01-01'),
    updatedAt: new Date('2021-01-01'),
+    updateId,
    ownerId: userStub.admin.id,
    name: '',
    birthDate: null,
@@ -29,11 +35,13 @@ export const personStub = {
    faceAsset: null,
    isHidden: true,
    isFavorite: false,
+    color: 'red',
  }),
-  withName: Object.freeze<PersonEntity>({
+  withName: Object.freeze({
    id: 'person-1',
    createdAt: new Date('2021-01-01'),
    updatedAt: new Date('2021-01-01'),
+    updateId,
    ownerId: userStub.admin.id,
    name: 'Person 1',
    birthDate: null,
@@ -43,25 +51,29 @@ export const personStub = {
    faceAsset: null,
    isHidden: false,
    isFavorite: false,
+    color: 'red',
  }),
-  withBirthDate: Object.freeze<PersonEntity>({
+  withBirthDate: Object.freeze({
    id: 'person-1',
    createdAt: new Date('2021-01-01'),
    updatedAt: new Date('2021-01-01'),
+    updateId,
    ownerId: userStub.admin.id,
    name: 'Person 1',
-    birthDate: '1976-06-30',
+    birthDate: new Date('1976-06-30'),
    thumbnailPath: '/path/to/thumbnail.jpg',
    faces: [],
    faceAssetId: null,
    faceAsset: null,
    isHidden: false,
    isFavorite: false,
+    color: 'red',
  }),
-  noThumbnail: Object.freeze<PersonEntity>({
+  noThumbnail: Object.freeze({
    id: 'person-1',
    createdAt: new Date('2021-01-01'),
    updatedAt: new Date('2021-01-01'),
+    updateId,
    ownerId: userStub.admin.id,
    name: '',
    birthDate: null,
@@ -71,11 +83,13 @@ export const personStub = {
    faceAsset: null,
    isHidden: false,
    isFavorite: false,
+    color: 'red',
  }),
-  newThumbnail: Object.freeze<PersonEntity>({
+  newThumbnail: Object.freeze({
    id: 'person-1',
    createdAt: new Date('2021-01-01'),
    updatedAt: new Date('2021-01-01'),
+    updateId,
    ownerId: userStub.admin.id,
    name: '',
    birthDate: null,
@@ -85,11 +99,13 @@ export const personStub = {
    faceAsset: null,
    isHidden: false,
    isFavorite: false,
+    color: 'red',
  }),
-  primaryPerson: Object.freeze<PersonEntity>({
+  primaryPerson: Object.freeze({
    id: 'person-1',
    createdAt: new Date('2021-01-01'),
    updatedAt: new Date('2021-01-01'),
+    updateId,
    ownerId: userStub.admin.id,
    name: 'Person 1',
    birthDate: null,
@@ -99,11 +115,13 @@ export const personStub = {
    faceAsset: null,
    isHidden: false,
    isFavorite: false,
+    color: 'red',
  }),
-  mergePerson: Object.freeze<PersonEntity>({
+  mergePerson: Object.freeze({
    id: 'person-2',
    createdAt: new Date('2021-01-01'),
    updatedAt: new Date('2021-01-01'),
+    updateId,
    ownerId: userStub.admin.id,
    name: 'Person 2',
    birthDate: null,
@@ -113,11 +131,13 @@ export const personStub = {
    faceAsset: null,
    isHidden: false,
    isFavorite: false,
+    color: 'red',
  }),
-  randomPerson: Object.freeze<PersonEntity>({
+  randomPerson: Object.freeze({
    id: 'person-3',
    createdAt: new Date('2021-01-01'),
    updatedAt: new Date('2021-01-01'),
+    updateId,
    ownerId: userStub.admin.id,
    name: '',
    birthDate: null,
@@ -127,11 +147,13 @@ export const personStub = {
    faceAsset: null,
    isHidden: false,
    isFavorite: false,
+    color: 'red',
  }),
-  isFavorite: Object.freeze<PersonEntity>({
+  isFavorite: Object.freeze({
    id: 'person-4',
    createdAt: new Date('2021-01-01'),
    updatedAt: new Date('2021-01-01'),
+    updateId,
    ownerId: userStub.admin.id,
    name: 'Person 1',
    birthDate: null,
@@ -141,5 +163,51 @@ export const personStub = {
    faceAsset: null,
    isHidden: false,
    isFavorite: true,
+    color: 'red',
+  }),
+};
+
+export const personThumbnailStub = {
+  newThumbnailStart: Object.freeze({
+    ownerId: userStub.admin.id,
+    x1: 5,
+    y1: 5,
+    x2: 505,
+    y2: 505,
+    oldHeight: 2880,
+    oldWidth: 2160,
+    type: AssetType.IMAGE,
+    originalPath: '/original/path.jpg',
+    exifImageHeight: 3840,
+    exifImageWidth: 2160,
+    previewPath: previewFile.path,
+  }),
+  newThumbnailMiddle: Object.freeze({
+    ownerId: userStub.admin.id,
+    x1: 100,
+    y1: 100,
+    x2: 200,
+    y2: 200,
+    oldHeight: 500,
+    oldWidth: 400,
+    type: AssetType.IMAGE,
+    originalPath: '/original/path.jpg',
+    exifImageHeight: 1000,
+    exifImageWidth: 1000,
+    previewPath: previewFile.path,
+  }),
+  newThumbnailEnd: Object.freeze({
+    ownerId: userStub.admin.id,
+    x1: 300,
+    y1: 300,
+    x2: 495,
+    y2: 495,
+    oldHeight: 500,
+    oldWidth: 500,
+    type: AssetType.IMAGE,
+    originalPath: '/original/path.jpg',
+    exifImageHeight: 1000,
+    exifImageWidth: 1000,
+    previewPath: previewFile.path,
  }),
 };
--- a/server/test/repositories/person.repository.mock.ts
+++ b/server/test/repositories/person.repository.mock.ts
@@ -14,7 +14,8 @@ export const newPersonRepositoryMock = (): Mocked<RepositoryInterface<PersonRepo
    getAllWithoutFaces: vitest.fn(),
    getFaces: vitest.fn(),
    getFaceById: vitest.fn(),
-    getFaceByIdWithAssets: vitest.fn(),
+    getFaceForFacialRecognitionJob: vitest.fn(),
+    getDataForThumbnailGenerationJob: vitest.fn(),
    reassignFace: vitest.fn(),
    getById: vitest.fn(),
    getByName: vitest.fn(),