helpy4/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2025-11-07 17:27:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix(server): run migrations after database checks (#5832)

Browse source 
* run migrations after checks

* optional migrations

* only run checks in server and e2e

* re-add migrations for microservices

* refactor

* move e2e init

* remove assert from migration

* update providers

* update microservices app service

* fixed logging

* refactored version check, added unit tests

* more version tests

* don't use mocks for sut

* refactor tests

* suggest image only if postgres is 14, 15 or 16

* review suggestions

* fixed regexp escape

* fix typing

* update migration
This commit is contained in:
Mert 2023-12-21 11:06:26 -05:00 • committed by GitHub
parent 2790a46703
commit cc2dc12f6c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 383 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

12
server/test/test-utils.ts
View file

@ -1,6 +1,6 @@
import { AssetCreate, IJobRepository, JobItem, JobItemHandler, LibraryResponseDto, QueueName } from '@app/domain';
import { AppModule } from '@app/immich';
import { dataSource, databaseChecks } from '@app/infra';
import { dataSource } from '@app/infra';
import { AssetEntity, AssetType, LibraryType } from '@app/infra/entities';
import { INestApplication } from '@nestjs/common';
import { Test } from '@nestjs/testing';
@ -24,7 +24,9 @@ export interface ResetOptions {
}
export const db = {
reset: async (options?: ResetOptions) => {
await databaseChecks();
if (!dataSource.isInitialized) {
await dataSource.initialize();
}
await dataSource.transaction(async (em) => {
const entities = options?.entities || [];
const tableNames =
@ -87,10 +89,7 @@ export const testApp = {
app = await moduleFixture.createNestApplication().init();
await app.listen(0);
if (jobs) {
await app.get(AppService).init();
}
await app.get(AppService).init();
const port = app.getHttpServer().address().port;
const protocol = app instanceof Server ? 'https' : 'http';
@ -99,6 +98,7 @@ export const testApp = {
return app;
},
reset: async (options?: ResetOptions) => {
await app.get(AppService).init();
await db.reset(options);
},
teardown: async () => {