add library teardown

server/e2e/jobs/specs/library-watcher.e2e-spec.ts

@@ -33,7 +33,7 @@ describe(`Library watcher (e2e)`, () => {
   });
 
   afterEach(async () => {
-    await libraryService.unwatchAll();
+    await libraryService.teardown();
   });
 
   afterAll(async () => {

server/src/domain/library/library.service.spec.ts

@@ -1312,7 +1312,7 @@ describe(LibraryService.name, () => {
       storageMock.watch.mockImplementation(makeMockWatcher({ close: mockClose }));
 
       await sut.init();
-      await sut.unwatchAll();
+      await sut.tearDown();
 
       expect(mockClose).toHaveBeenCalledTimes(2);
     });

server/src/domain/library/library.service.ts

@@ -78,8 +78,8 @@ export class LibraryService extends EventEmitter {
     if (watch.enabled) {
       // This ensures that library watching only occurs in one microservice
       // TODO: we could make the lock be per-library instead of global
-
       this.watchLock = await this.databaseRepository.tryLock(DatabaseLock.LibraryWatch);
+
       this.watchLibraries = this.watchLock;
     }
     this.jobRepository.addCronJob(
@@ -179,7 +179,15 @@ export class LibraryService extends EventEmitter {
     }
   }
 
-  async unwatchAll() {
+  async teardown() {
+    await this.unwatchAll();
+
+    if (this.watchLock) {
+      await this.databaseRepository.releaseLock(DatabaseLock.LibraryWatch);
+    }
+  }
+
+  private async unwatchAll() {
     for (const id in this.watchers) {
       await this.unwatch(id);
     }

server/src/domain/repositories/database.repository.ts

@@ -48,6 +48,7 @@ export interface IDatabaseRepository {
   runMigrations(options?: { transaction?: 'all' | 'none' | 'each' }): Promise<void>;
   withLock<R>(lock: DatabaseLock, callback: () => Promise<R>): Promise<R>;
   tryLock(lock: DatabaseLock): Promise<boolean>;
+  releaseLock(lock: DatabaseLock): Promise<void>;
   isBusy(lock: DatabaseLock): boolean;
   wait(lock: DatabaseLock): Promise<void>;
 }

server/src/infra/repositories/database.repository.ts

@@ -200,7 +200,7 @@ export class DatabaseRepository implements IDatabaseRepository {
         res = await callback();
       } finally {
         try {
-          await this.releaseLock(lock, queryRunner);
+          await this._releaseLock(lock, queryRunner);
         } finally {
           await queryRunner.release();
         }
@@ -215,6 +215,11 @@ export class DatabaseRepository implements IDatabaseRepository {
     return await this.acquireTryLock(lock, queryRunner);
   }
 
+  async releaseLock(lock: DatabaseLock): Promise<void> {
+    const queryRunner = this.dataSource.createQueryRunner();
+    return await this._releaseLock(lock, queryRunner);
+  }
+
   isBusy(lock: DatabaseLock): boolean {
     return this.asyncLock.isBusy(DatabaseLock[lock]);
   }
@@ -232,7 +237,7 @@ export class DatabaseRepository implements IDatabaseRepository {
     return lockResult[0].pg_try_advisory_lock;
   }
 
-  private async releaseLock(lock: DatabaseLock, queryRunner: QueryRunner): Promise<void> {
+  private async _releaseLock(lock: DatabaseLock, queryRunner: QueryRunner): Promise<void> {
     return queryRunner.query('SELECT pg_advisory_unlock($1)', [lock]);
   }
 }

server/src/microservices/app.service.ts

@@ -87,8 +87,7 @@ export class AppService {
   }
 
   async teardown() {
-    await this.libraryService.unwatchAll();
+    await this.libraryService.teardown();
-
     await this.metadataService.teardown();
   }
 }

server/src/test-utils/utils.ts

@@ -48,6 +48,9 @@ export const db = {
       if (deleteUsers) {
         await em.query(`DELETE FROM "users" CASCADE;`);
       }
+
+      // Release all locks
+      await em.query('SELECT pg_advisory_unlock_all()');
     });
   },
   disconnect: async () => {
@@ -124,9 +127,6 @@ export const testApp = {
   },
   reset: async (options?: ResetOptions) => {
     await db.reset(options);
-    await app.get(AppService).init();
-
-    await app.get(MicroAppService).init();
   },
   get: (member: any) => app.get(member),
   teardown: async () => {

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

@@ -14,6 +14,7 @@ export const newDatabaseRepositoryMock = (): jest.Mocked<IDatabaseRepository> =>
     runMigrations: jest.fn(),
     withLock: jest.fn().mockImplementation((_, function_: <R>() => Promise<R>) => function_()),
     tryLock: jest.fn(),
+    releaseLock: jest.fn(),
     isBusy: jest.fn(),
     wait: jest.fn(),
   };