Remove deprecated typeorm function and fix hanging test suite.

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     container:
-      image: node:18
+      image: node:20
     steps:
       - uses: actions/checkout@v4
       - name: Cache and restore node_modules
@@ -36,7 +36,7 @@ jobs:
     needs: [ lint ]
     runs-on: ubuntu-latest
     container:
-      image: node:18
+      image: node:20
     steps:
       - uses: actions/checkout@v4
       - name: Cache and restore node_modules
@@ -62,7 +62,7 @@ jobs:
     needs: [ lint ]
     runs-on: ubuntu-latest
     container:
-      image: node:18
+      image: node:20
     services:
       mariadb:
         image: mariadb:lts
@@ -196,7 +196,7 @@ jobs:
       STRIPE_WEBHOOK_SECRET: ${{ secrets.STRIPE_WEBHOOK_TEST_SECRET }}
       SKIP_SQLITE_DEFAULTS: true
     container:
-      image: node:18
+      image: node:20
     services:
       mariadb:
         image: mariadb:lts

src/database/database.ts

@@ -25,7 +25,7 @@
  */
 
 import {
-  createConnection, DataSource,
+  DataSource,
 } from 'typeorm';
 import fs from 'fs';
 import User from '../entity/user/user';
@@ -219,10 +219,10 @@ export let AppDataSource = new DataSource(options);
 
 const Database = {
   initialize: async () => {
-    if (AppDataSource && AppDataSource.isInitialized) return AppDataSource;
-    AppDataSource = await createConnection(options);
-    return AppDataSource;
+    if (AppDataSource.isInitialized) return AppDataSource;
+    return AppDataSource.initialize();
   },
 };
+
 export default Database;
 

test/root-hooks.ts

@@ -21,6 +21,7 @@
 import * as mocha from 'mocha';
 import sinon from 'sinon';
 import nodemailer, { Transporter } from 'nodemailer';
+import { AppDataSource } from '../src/database/database';
 
 /**
  * Object containing all global stubs that are set before each test case.
@@ -47,3 +48,10 @@ export const mochaHooks: mocha.RootHookObject = {
     rootStubs?.mail.restore();
   },
 };
+
+
+export const closeDBHook = {
+  after: async () => {
+    await AppDataSource.destroy();
+  },
+};

test/setup.ts

@@ -36,7 +36,7 @@ import { PERSISTENT_TEST_DATABASES } from '../src/helpers/database';
 import '../src/database/database';
 
 // Root hooks
-export { mochaHooks } from './root-hooks';
+export { mochaHooks, closeDBHook } from './root-hooks';
 
 use(chaiAsPromised);
 use(chaiHttp);