Merge branch 'main' of github.com:immich-app/immich into feat/show-archived-assets-for-a-person

server/test/fixtures/library.stub.ts

@@ -68,7 +68,7 @@ export const libraryStub = {
     assets: [],
     owner: userStub.admin,
     ownerId: 'user-id',
-    importPaths: ['upload/thumbs', '/xyz', 'upload/library'],
+    importPaths: ['upload/thumbs', 'xyz', 'upload/library'],
     createdAt: new Date('2023-01-01'),
     updatedAt: new Date('2023-01-01'),
     refreshedAt: null,

server/test/fixtures/media.stub.ts

@@ -154,6 +154,13 @@ export const probeStub = {
     ...probeStubDefault,
     audioStreams: [{ index: 1, codecName: 'aac', frameCount: 100 }],
   }),
+  audioStreamUnknown: Object.freeze<VideoInfo>({
+    ...probeStubDefault,
+    audioStreams: [
+      { index: 0, codecName: 'aac', frameCount: 100 },
+      { index: 1, codecName: 'unknown', frameCount: 200 },
+    ],
+  }),
   matroskaContainer: Object.freeze<VideoInfo>({
     ...probeStubDefault,
     format: {

server/test/fixtures/user.stub.ts

@@ -7,6 +7,7 @@ export const userStub = {
     ...authStub.admin.user,
     password: 'admin_password',
     name: 'admin_name',
+    id: 'admin_id',
     storageLabel: 'admin',
     oauthId: '',
     shouldChangePassword: false,

server/test/repositories/job.repository.mock.ts

@@ -16,5 +16,6 @@ export const newJobRepositoryMock = (): Mocked<IJobRepository> => {
     getJobCounts: vitest.fn(),
     clear: vitest.fn(),
     waitForQueueCompletion: vitest.fn(),
+    removeJob: vitest.fn(),
   };
 };

server/test/repositories/metric.repository.mock.ts

@@ -1,31 +0,0 @@
-import { IMetricRepository } from 'src/interfaces/metric.interface';
-import { Mocked, vitest } from 'vitest';
-
-export const newMetricRepositoryMock = (): Mocked<IMetricRepository> => {
-  return {
-    api: {
-      addToCounter: vitest.fn(),
-      addToGauge: vitest.fn(),
-      addToHistogram: vitest.fn(),
-      configure: vitest.fn(),
-    },
-    host: {
-      addToCounter: vitest.fn(),
-      addToGauge: vitest.fn(),
-      addToHistogram: vitest.fn(),
-      configure: vitest.fn(),
-    },
-    jobs: {
-      addToCounter: vitest.fn(),
-      addToGauge: vitest.fn(),
-      addToHistogram: vitest.fn(),
-      configure: vitest.fn(),
-    },
-    repo: {
-      addToCounter: vitest.fn(),
-      addToGauge: vitest.fn(),
-      addToHistogram: vitest.fn(),
-      configure: vitest.fn(),
-    },
-  };
-};

server/test/repositories/telemetry.repository.mock.ts

@@ -0,0 +1,21 @@
+import { ITelemetryRepository } from 'src/interfaces/telemetry.interface';
+import { Mocked, vitest } from 'vitest';
+
+const newMetricGroupMock = () => {
+  return {
+    addToCounter: vitest.fn(),
+    addToGauge: vitest.fn(),
+    addToHistogram: vitest.fn(),
+    configure: vitest.fn(),
+  };
+};
+
+export const newTelemetryRepositoryMock = (): Mocked<ITelemetryRepository> => {
+  return {
+    setup: vitest.fn(),
+    api: newMetricGroupMock(),
+    host: newMetricGroupMock(),
+    jobs: newMetricGroupMock(),
+    repo: newMetricGroupMock(),
+  };
+};

server/test/utils.ts

@@ -20,7 +20,6 @@ import { newMapRepositoryMock } from 'test/repositories/map.repository.mock';
 import { newMediaRepositoryMock } from 'test/repositories/media.repository.mock';
 import { newMemoryRepositoryMock } from 'test/repositories/memory.repository.mock';
 import { newMetadataRepositoryMock } from 'test/repositories/metadata.repository.mock';
-import { newMetricRepositoryMock } from 'test/repositories/metric.repository.mock';
 import { newMoveRepositoryMock } from 'test/repositories/move.repository.mock';
 import { newNotificationRepositoryMock } from 'test/repositories/notification.repository.mock';
 import { newOAuthRepositoryMock } from 'test/repositories/oauth.repository.mock';
@@ -34,6 +33,7 @@ import { newStackRepositoryMock } from 'test/repositories/stack.repository.mock'
 import { newStorageRepositoryMock } from 'test/repositories/storage.repository.mock';
 import { newSystemMetadataRepositoryMock } from 'test/repositories/system-metadata.repository.mock';
 import { newTagRepositoryMock } from 'test/repositories/tag.repository.mock';
+import { newTelemetryRepositoryMock } from 'test/repositories/telemetry.repository.mock';
 import { newTrashRepositoryMock } from 'test/repositories/trash.repository.mock';
 import { newUserRepositoryMock } from 'test/repositories/user.repository.mock';
 import { newVersionHistoryRepositoryMock } from 'test/repositories/version-history.repository.mock';
@@ -73,7 +73,6 @@ export const newTestService = <T extends BaseService>(
   const mediaMock = newMediaRepositoryMock();
   const memoryMock = newMemoryRepositoryMock();
   const metadataMock = (metadataRepository || newMetadataRepositoryMock()) as Mocked<IMetadataRepository>;
-  const metricMock = newMetricRepositoryMock();
   const moveMock = newMoveRepositoryMock();
   const notificationMock = newNotificationRepositoryMock();
   const oauthMock = newOAuthRepositoryMock();
@@ -87,6 +86,7 @@ export const newTestService = <T extends BaseService>(
   const storageMock = newStorageRepositoryMock();
   const systemMock = newSystemMetadataRepositoryMock();
   const tagMock = newTagRepositoryMock();
+  const telemetryMock = newTelemetryRepositoryMock();
   const trashMock = newTrashRepositoryMock();
   const userMock = newUserRepositoryMock();
   const versionHistoryMock = newVersionHistoryRepositoryMock();
@@ -112,7 +112,6 @@ export const newTestService = <T extends BaseService>(
     mediaMock,
     memoryMock,
     metadataMock,
-    metricMock,
     moveMock,
     notificationMock,
     oauthMock,
@@ -126,6 +125,7 @@ export const newTestService = <T extends BaseService>(
     storageMock,
     systemMock,
     tagMock,
+    telemetryMock,
     trashMock,
     userMock,
     versionHistoryMock,
@@ -153,7 +153,6 @@ export const newTestService = <T extends BaseService>(
     mediaMock,
     memoryMock,
     metadataMock,
-    metricMock,
     moveMock,
     notificationMock,
     oauthMock,
@@ -167,6 +166,7 @@ export const newTestService = <T extends BaseService>(
     storageMock,
     systemMock,
     tagMock,
+    telemetryMock,
     trashMock,
     userMock,
     versionHistoryMock,