refactor: asset e2e (#7769)

server/e2e/api/jest-e2e.json

@@ -1,23 +0,0 @@
-{
-  "moduleFileExtensions": ["js", "json", "ts"],
-  "modulePaths": ["<rootDir>"],
-  "rootDir": "../..",
-  "globalSetup": "<rootDir>/e2e/api/setup.ts",
-  "testEnvironment": "node",
-  "testMatch": ["**/e2e/api/specs/*.e2e-spec.[tj]s"],
-  "transform": {
-    "^.+\\.(t|j)s$": "ts-jest"
-  },
-  "collectCoverageFrom": [
-    "<rootDir>/src/**/*.(t|j)s",
-    "!<rootDir>/src/**/*.spec.(t|s)s",
-    "!<rootDir>/src/infra/migrations/**"
-  ],
-  "coverageDirectory": "./coverage",
-  "moduleNameMapper": {
-    "^@test(|/.*)$": "<rootDir>/test/$1",
-    "^@app/immich(|/.*)$": "<rootDir>/src/immich/$1",
-    "^@app/infra(|/.*)$": "<rootDir>/src/infra/$1",
-    "^@app/domain(|/.*)$": "<rootDir>/src/domain/$1"
-  }
-}

server/e2e/api/setup.ts

@@ -1,29 +0,0 @@
-import { PostgreSqlContainer } from '@testcontainers/postgresql';
-import path from 'node:path';
-
-export default async () => {
-  let IMMICH_TEST_ASSET_PATH: string = '';
-
-  if (process.env.IMMICH_TEST_ASSET_PATH === undefined) {
-    IMMICH_TEST_ASSET_PATH = path.normalize(`${__dirname}/../../test/assets/`);
-    process.env.IMMICH_TEST_ASSET_PATH = IMMICH_TEST_ASSET_PATH;
-  } else {
-    IMMICH_TEST_ASSET_PATH = process.env.IMMICH_TEST_ASSET_PATH;
-  }
-
-  const pg = await new PostgreSqlContainer('tensorchord/pgvecto-rs:pg14-v0.2.0')
-    .withDatabase('immich')
-    .withUsername('postgres')
-    .withPassword('postgres')
-    .withReuse()
-    .withCommand(['-c', 'fsync=off', '-c', 'shared_preload_libraries=vectors.so'])
-    .start();
-
-  process.env.DB_URL = pg.getConnectionUri();
-  process.env.NODE_ENV = 'development';
-  process.env.TZ = 'Z';
-
-  if (process.env.LOG_LEVEL === undefined) {
-    process.env.LOG_LEVEL = 'fatal';
-  }
-};

server/e2e/api/utils.ts

@@ -1,118 +0,0 @@
-import { AssetCreate, IJobRepository, IMetadataRepository, LibraryResponseDto } from '@app/domain';
-import { AppModule } from '@app/immich';
-import { InfraModule, InfraTestModule, dataSource } from '@app/infra';
-import { AssetEntity, AssetType, LibraryType } from '@app/infra/entities';
-import { INestApplication } from '@nestjs/common';
-import { Test } from '@nestjs/testing';
-import { DateTime } from 'luxon';
-import { randomBytes } from 'node:crypto';
-import { EntityTarget, ObjectLiteral } from 'typeorm';
-import { AppService } from '../../src/microservices/app.service';
-import { newJobRepositoryMock, newMetadataRepositoryMock } from '../../test';
-
-export const today = DateTime.fromObject({ year: 2023, month: 11, day: 3 });
-export const yesterday = today.minus({ days: 1 });
-
-export interface ResetOptions {
-  entities?: EntityTarget<ObjectLiteral>[];
-}
-export const db = {
-  reset: async (options?: ResetOptions) => {
-    if (!dataSource.isInitialized) {
-      await dataSource.initialize();
-    }
-    await dataSource.transaction(async (em) => {
-      const entities = options?.entities || [];
-      const tableNames =
-        entities.length > 0
-          ? entities.map((entity) => em.getRepository(entity).metadata.tableName)
-          : dataSource.entityMetadatas
-              .map((entity) => entity.tableName)
-              .filter((tableName) => !tableName.startsWith('geodata'));
-
-      if (tableNames.includes('asset_stack')) {
-        await em.query(`DELETE FROM "asset_stack" CASCADE;`);
-      }
-      let deleteUsers = false;
-      for (const tableName of tableNames) {
-        if (tableName === 'users') {
-          deleteUsers = true;
-          continue;
-        }
-        await em.query(`DELETE FROM ${tableName} CASCADE;`);
-      }
-      if (deleteUsers) {
-        await em.query(`DELETE FROM "users" CASCADE;`);
-      }
-    });
-  },
-  disconnect: async () => {
-    if (dataSource.isInitialized) {
-      await dataSource.destroy();
-    }
-  },
-};
-
-let app: INestApplication;
-
-export const testApp = {
-  create: async (): Promise<INestApplication> => {
-    const moduleFixture = await Test.createTestingModule({ imports: [AppModule], providers: [AppService] })
-      .overrideModule(InfraModule)
-      .useModule(InfraTestModule)
-      .overrideProvider(IJobRepository)
-      .useValue(newJobRepositoryMock())
-      .overrideProvider(IMetadataRepository)
-      .useValue(newMetadataRepositoryMock())
-      .compile();
-
-    app = await moduleFixture.createNestApplication().init();
-    await app.get(AppService).init();
-
-    return app;
-  },
-  reset: async (options?: ResetOptions) => {
-    await db.reset(options);
-  },
-  teardown: async () => {
-    if (app) {
-      await app.get(AppService).teardown();
-      await app.close();
-    }
-    await db.disconnect();
-  },
-};
-
-function randomDate(start: Date, end: Date): Date {
-  return new Date(start.getTime() + Math.random() * (end.getTime() - start.getTime()));
-}
-
-let assetCount = 0;
-export function generateAsset(
-  userId: string,
-  libraries: LibraryResponseDto[],
-  other: Partial<AssetEntity> = {},
-): AssetCreate {
-  const id = assetCount++;
-  const { fileCreatedAt = randomDate(new Date(1970, 1, 1), new Date(2023, 1, 1)) } = other;
-
-  return {
-    createdAt: today.toJSDate(),
-    updatedAt: today.toJSDate(),
-    ownerId: userId,
-    checksum: randomBytes(20),
-    originalPath: `/tests/test_${id}`,
-    deviceAssetId: `test_${id}`,
-    deviceId: 'e2e-test',
-    libraryId: (
-      libraries.find(({ ownerId, type }) => ownerId === userId && type === LibraryType.UPLOAD) as LibraryResponseDto
-    ).id,
-    isVisible: true,
-    fileCreatedAt,
-    fileModifiedAt: new Date(),
-    localDateTime: fileCreatedAt,
-    type: AssetType.IMAGE,
-    originalFileName: `test_${id}`,
-    ...other,
-  };
-}

server/e2e/client/asset-api.ts

@@ -1,77 +1,10 @@
 import { AssetResponseDto } from '@app/domain';
-import { CreateAssetDto } from '@app/immich/api-v1/asset/dto/create-asset.dto';
-import { AssetFileUploadResponseDto } from '@app/immich/api-v1/asset/response-dto/asset-file-upload-response.dto';
-import { randomBytes } from 'node:crypto';
 import request from 'supertest';
 
-type UploadDto = Partial<CreateAssetDto> & { content?: Buffer; filename?: string };
-
-const asset = {
-  deviceAssetId: 'test-1',
-  deviceId: 'test',
-  fileCreatedAt: new Date(),
-  fileModifiedAt: new Date(),
-};
-
 export const assetApi = {
-  create: async (
-    server: any,
-    accessToken: string,
-    dto?: Omit<CreateAssetDto, 'assetData'>,
-  ): Promise<AssetResponseDto> => {
-    dto = dto || asset;
-    const { status, body } = await request(server)
-      .post(`/asset/upload`)
-      .field('deviceAssetId', dto.deviceAssetId)
-      .field('deviceId', dto.deviceId)
-      .field('fileCreatedAt', dto.fileCreatedAt.toISOString())
-      .field('fileModifiedAt', dto.fileModifiedAt.toISOString())
-      .attach('assetData', randomBytes(32), 'example.jpg')
-      .set('Authorization', `Bearer ${accessToken}`);
-
-    expect([200, 201].includes(status)).toBe(true);
-
-    return body as AssetResponseDto;
-  },
-  get: async (server: any, accessToken: string, id: string): Promise<AssetResponseDto> => {
-    const { body, status } = await request(server).get(`/asset/${id}`).set('Authorization', `Bearer ${accessToken}`);
-    expect(status).toBe(200);
-    return body as AssetResponseDto;
-  },
   getAllAssets: async (server: any, accessToken: string) => {
     const { body, status } = await request(server).get(`/asset/`).set('Authorization', `Bearer ${accessToken}`);
     expect(status).toBe(200);
     return body as AssetResponseDto[];
   },
-  upload: async (server: any, accessToken: string, deviceAssetId: string, dto: UploadDto = {}) => {
-    const { content, filename, isFavorite = false, isArchived = false } = dto;
-    const { body, status } = await request(server)
-      .post('/asset/upload')
-      .set('Authorization', `Bearer ${accessToken}`)
-      .field('deviceAssetId', deviceAssetId)
-      .field('deviceId', 'TEST')
-      .field('fileCreatedAt', new Date().toISOString())
-      .field('fileModifiedAt', new Date().toISOString())
-      .field('isFavorite', isFavorite)
-      .field('isArchived', isArchived)
-      .field('duration', '0:00:00.000000')
-      .attach('assetData', content || randomBytes(32), filename || 'example.jpg');
-
-    expect(status).toBe(201);
-    return body as AssetFileUploadResponseDto;
-  },
-  getWebpThumbnail: async (server: any, accessToken: string, assetId: string) => {
-    const { body, status } = await request(server)
-      .get(`/asset/thumbnail/${assetId}`)
-      .set('Authorization', `Bearer ${accessToken}`);
-    expect(status).toBe(200);
-    return body;
-  },
-  getJpegThumbnail: async (server: any, accessToken: string, assetId: string) => {
-    const { body, status } = await request(server)
-      .get(`/asset/thumbnail/${assetId}?format=JPEG`)
-      .set('Authorization', `Bearer ${accessToken}`);
-    expect(status).toBe(200);
-    return body;
-  },
 };

server/e2e/client/auth-api.ts

@@ -1,4 +1,4 @@
-import { LoginCredentialDto, LoginResponseDto, UserResponseDto } from '@app/domain';
+import { LoginResponseDto, UserResponseDto } from '@app/domain';
 import { adminSignupStub, loginResponseStub, loginStub } from '@test';
 import request from 'supertest';
 
@@ -17,14 +17,6 @@ export const authApi = {
     expect(body).toMatchObject({ accessToken: expect.any(String) });
     expect(status).toBe(201);
 
-    return body as LoginResponseDto;
-  },
-  login: async (server: any, dto: LoginCredentialDto) => {
-    const { status, body } = await request(server).post('/auth/login').send(dto);
-
-    expect(status).toEqual(201);
-    expect(body).toMatchObject({ accessToken: expect.any(String) });
-
     return body as LoginResponseDto;
   },
 };

server/e2e/client/index.ts

@@ -1,15 +1,9 @@
 import { assetApi } from './asset-api';
 import { authApi } from './auth-api';
 import { libraryApi } from './library-api';
-import { sharedLinkApi } from './shared-link-api';
-import { trashApi } from './trash-api';
-import { userApi } from './user-api';
 
 export const api = {
   authApi,
   assetApi,
   libraryApi,
-  sharedLinkApi,
-  trashApi,
-  userApi,
 };

server/e2e/client/library-api.ts

@@ -1,12 +1,4 @@
-import {
-  CreateLibraryDto,
-  LibraryResponseDto,
-  LibraryStatsResponseDto,
-  ScanLibraryDto,
-  UpdateLibraryDto,
-  ValidateLibraryDto,
-  ValidateLibraryResponseDto,
-} from '@app/domain';
+import { CreateLibraryDto, LibraryResponseDto, ScanLibraryDto } from '@app/domain';
 import request from 'supertest';
 
 export const libraryApi = {
@@ -38,34 +30,4 @@ export const libraryApi = {
       .send(dto);
     expect(status).toBe(204);
   },
-  removeOfflineFiles: async (server: any, accessToken: string, id: string) => {
-    const { status } = await request(server)
-      .post(`/library/${id}/removeOffline`)
-      .set('Authorization', `Bearer ${accessToken}`)
-      .send();
-    expect(status).toBe(204);
-  },
-  getLibraryStatistics: async (server: any, accessToken: string, id: string): Promise<LibraryStatsResponseDto> => {
-    const { body, status } = await request(server)
-      .get(`/library/${id}/statistics`)
-      .set('Authorization', `Bearer ${accessToken}`);
-    expect(status).toBe(200);
-    return body;
-  },
-  update: async (server: any, accessToken: string, id: string, data: UpdateLibraryDto) => {
-    const { body, status } = await request(server)
-      .put(`/library/${id}`)
-      .set('Authorization', `Bearer ${accessToken}`)
-      .send(data);
-    expect(status).toBe(200);
-    return body as LibraryResponseDto;
-  },
-  validate: async (server: any, accessToken: string, id: string, data: ValidateLibraryDto) => {
-    const { body, status } = await request(server)
-      .post(`/library/${id}/validate`)
-      .set('Authorization', `Bearer ${accessToken}`)
-      .send(data);
-    expect(status).toBe(200);
-    return body as ValidateLibraryResponseDto;
-  },
 };

server/e2e/client/shared-link-api.ts

@@ -1,13 +0,0 @@
-import { SharedLinkCreateDto, SharedLinkResponseDto } from '@app/domain';
-import request from 'supertest';
-
-export const sharedLinkApi = {
-  create: async (server: any, accessToken: string, dto: SharedLinkCreateDto) => {
-    const { status, body } = await request(server)
-      .post('/shared-link')
-      .set('Authorization', `Bearer ${accessToken}`)
-      .send(dto);
-    expect(status).toBe(201);
-    return body as SharedLinkResponseDto;
-  },
-};

server/e2e/client/trash-api.ts

@@ -1,13 +0,0 @@
-import request from 'supertest';
-import type { App } from 'supertest/types';
-
-export const trashApi = {
-  async empty(server: App, accessToken: string) {
-    const { status } = await request(server).post('/trash/empty').set('Authorization', `Bearer ${accessToken}`);
-    expect(status).toBe(204);
-  },
-  async restore(server: App, accessToken: string) {
-    const { status } = await request(server).post('/trash/restore').set('Authorization', `Bearer ${accessToken}`);
-    expect(status).toBe(204);
-  },
-};

server/e2e/client/user-api.ts

@@ -1,37 +0,0 @@
-import { CreateUserDto, UpdateUserDto, UserResponseDto } from '@app/domain';
-import request from 'supertest';
-
-export const userApi = {
-  create: async (server: any, accessToken: string, dto: CreateUserDto) => {
-    const { status, body } = await request(server)
-      .post('/user')
-      .set('Authorization', `Bearer ${accessToken}`)
-      .send(dto);
-
-    expect(status).toBe(201);
-    expect(body).toMatchObject({
-      id: expect.any(String),
-      createdAt: expect.any(String),
-      updatedAt: expect.any(String),
-      email: dto.email,
-    });
-
-    return body as UserResponseDto;
-  },
-  update: async (server: any, accessToken: string, dto: UpdateUserDto) => {
-    const { status, body } = await request(server).put('/user').set('Authorization', `Bearer ${accessToken}`).send(dto);
-
-    expect(status).toBe(200);
-    expect(body).toMatchObject({ id: dto.id });
-
-    return body as UserResponseDto;
-  },
-  delete: async (server: any, accessToken: string, id: string) => {
-    const { status, body } = await request(server).delete(`/user/${id}`).set('Authorization', `Bearer ${accessToken}`);
-
-    expect(status).toBe(200);
-    expect(body).toMatchObject({ id, deletedAt: expect.any(String) });
-
-    return body as UserResponseDto;
-  },
-};

server/package.json

@@ -23,7 +23,6 @@
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
     "e2e:jobs": "jest --config e2e/jobs/jest-e2e.json --runInBand",
-    "e2e:api": "jest --config e2e/api/jest-e2e.json --runInBand",
     "typeorm": "typeorm",
     "typeorm:migrations:create": "typeorm migration:create",
     "typeorm:migrations:generate": "typeorm migration:generate -d ./dist/infra/database.config.js",