[Fix] Jest Test e2e

api/src/connection/datasource.ts

@@ -0,0 +1,58 @@
+import { DataSource, DataSourceOptions, DefaultNamingStrategy } from 'typeorm';
+import * as process from 'process';
+import { SnakeNamingStrategy } from '../utils/snake-naming-strategy';
+
+const env = process.env;
+
+/**
+ * Retrieves the connection options for TypeORM DataSource or TypeORMModule.
+ *
+ * @returns The connection options for TypeORM DataSource or TypeORMModule.
+ */
+export const dataSourceOptions = (): DataSourceOptions => {
+    // Safely cast the database type or default to 'mysql'
+    const dbType = (env.TR_DB_TYPE as any) || 'mysql';
+
+    // Parse the port safely with fallback to 3306 if parsing fails
+    const port = isNaN(parseInt(env.TR_DB_PORT, 10)) ? 3306 : parseInt(env.TR_DB_PORT, 10);
+
+    // Base options object using the more generic DataSourceOptions
+    const options: DataSourceOptions = {
+      type: dbType,
+      host: env.TR_DB_HOST || 'localhost',
+      port,
+      username: env.TR_DB_USER || 'root',
+      password: env.TR_DB_PASSWORD || 'root',
+      database: env.TR_DB_DATABASE || 'tr_dev',
+      charset: 'utf8mb4',
+      synchronize: false,
+      logging: false,
+      entities: [__dirname + '/../entity/*.entity.{js,ts}'],
+      migrations: [__dirname + '/../migrations/*.{js,ts}'],
+      namingStrategy: dbType === 'postgres' ? new SnakeNamingStrategy() : new DefaultNamingStrategy(),
+    };
+
+    return options;
+};
+
+/**
+ * Creates and initializes a TypeORM DataSource instance with the provided configuration options.
+ *
+ * @returns Initialized TypeORM DataSource instance.
+ */
+let dataSource: DataSource;
+export const getDataSourceConnection = async (): Promise<DataSource> => {
+	if (!dataSource) {
+		dataSource = new DataSource(dataSourceOptions());
+	}
+
+	try {
+		if (!dataSource.isInitialized) {
+			await dataSource.initialize();
+		}
+	} catch (error) {
+		console.error(`Error initializing database connection: ${error?.message}`);
+	}
+
+	return dataSource;
+};

api/src/controllers/exports.controller.ts

@@ -54,7 +54,9 @@ export class ExportsController {
     // Ensure locale is requested project locale
     const projectLocale = await this.projectLocaleRepo.findOne({
       where: {
-        project: membership.project,
+        project: {
+          id: membership.project.id,
+        },
         locale: {
           code: query.locale,
         },
@@ -98,7 +100,9 @@ export class ExportsController {
     if (query.fallbackLocale) {
       const fallbackProjectLocale = await this.projectLocaleRepo.findOne({
         where: {
-          project: membership.project,
+          project: {
+            id: membership.project.id,
+          },
           locale: {
             code: query.fallbackLocale,
           },

api/src/controllers/import.controller.ts

@@ -94,7 +94,9 @@ export class ImportController {
           // Extract into service for creating project locales
           projectLocale = this.projectLocaleRepo.create({
             locale: locale,
-            project: membership.project,
+            project: {
+              id: membership.project.id,
+            },
           });
           projectLocale = await entityManager.save(ProjectLocale, projectLocale);
           await entityManager.increment(Project, { id: membership.project.id }, 'localesCount', 1);

api/src/controllers/project-label.controller.ts

@@ -107,7 +107,7 @@ export default class ProjectLabelController {
   async delete(@Req() req, @Param('projectId') projectId: string, @Param('labelId') labelId: string) {
     const user = this.auth.getRequestUserOrClient(req);
     const membership = await this.auth.authorizeProjectAction(user, projectId, ProjectAction.DeleteLabel);
-    const label = await this.labelRepo.findOneOrFail({ where: { id: labelId, project: membership.project } });
+    const label = await this.labelRepo.findOneOrFail({ where: { id: labelId, project: { id: membership.project.id } } });
     await this.labelRepo.remove(label);
   }
 
@@ -122,8 +122,8 @@ export default class ProjectLabelController {
     const user = this.auth.getRequestUserOrClient(req);
     const membership = await this.auth.authorizeProjectAction(user, projectId, ProjectAction.EditLabel);
 
-    const label = await this.labelRepo.findOneOrFail({ where: { id: labelId, project: membership.project } });
-    const term = await this.termsRepo.findOneOrFail({ where: { id: termId, project: membership.project }, relations: ['labels'] });
+    const label = await this.labelRepo.findOneOrFail({ where: { id: labelId, project: { id: membership.project.id } } });
+    const term = await this.termsRepo.findOneOrFail({ where: { id: termId, project: { id: membership.project.id } }, relations: ['labels'] });
 
     term.labels.push(label);
 
@@ -149,8 +149,8 @@ export default class ProjectLabelController {
     const user = this.auth.getRequestUserOrClient(req);
     const membership = await this.auth.authorizeProjectAction(user, projectId, ProjectAction.EditLabel);
 
-    const label = await this.labelRepo.findOneOrFail({ where: { id: labelId, project: membership.project } });
-    const term = await this.termsRepo.findOneOrFail({ where: { id: termId, project: membership.project }, relations: ['labels'] });
+    const label = await this.labelRepo.findOneOrFail({ where: { id: labelId, project: { id: membership.project.id } } });
+    const term = await this.termsRepo.findOneOrFail({ where: { id: termId, project: { id: membership.project.id } }, relations: ['labels'] });
 
     term.labels = term.labels.filter(t => t.id !== label.id);
 
@@ -174,19 +174,21 @@ export default class ProjectLabelController {
     const user = this.auth.getRequestUserOrClient(req);
     const membership = await this.auth.authorizeProjectAction(user, projectId, ProjectAction.EditLabel);
 
-    const label = await this.labelRepo.findOneOrFail({ where: { id: labelId, project: membership.project } });
+    const label = await this.labelRepo.findOneOrFail({ where: { id: labelId, project: { id: membership.project.id } } });
 
     const projectLocale = await this.projectLocaleRepo.findOneOrFail({
       where: {
-        project: membership.project,
+        project: {
+          id: membership.project.id,
+        },
         locale: {
           code: localeCode,
         },
       },
     });
 
     const translation = await this.translationsRepo.findOneOrFail({
-      where: { termId: termId, projectLocale: projectLocale },
+      where: { termId: termId, projectLocale: { id: projectLocale.id } },
       relations: ['labels'],
     });
 
@@ -212,19 +214,19 @@ export default class ProjectLabelController {
     const user = this.auth.getRequestUserOrClient(req);
     const membership = await this.auth.authorizeProjectAction(user, projectId, ProjectAction.EditLabel);
 
-    const label = await this.labelRepo.findOneOrFail({ where: { id: labelId, project: membership.project } });
+    const label = await this.labelRepo.findOneOrFail({ where: { id: labelId, project: { id: membership.project.id } } });
 
     const projectLocale = await this.projectLocaleRepo.findOneOrFail({
       where: {
-        project: membership.project,
+        project: { id: membership.project.id },
         locale: {
           code: localeCode,
         },
       },
     });
 
     const translation = await this.translationsRepo.findOneOrFail({
-      where: { termId: termId, projectLocale: projectLocale },
+      where: { termId: termId, projectLocale: { id: projectLocale.id } },
       relations: ['labels'],
     });
 

api/src/controllers/project-stats.controller.ts

@@ -37,7 +37,7 @@ export default class ProjectStatsController {
     const membership = await this.auth.authorizeProjectAction(user, projectId, ProjectAction.ViewTranslation);
     const locales = await this.projectLocaleRepo.find({
       where: {
-        project: membership.project,
+        project: { id: membership.project.id },
       },
       relations: ['locale'],
     });

api/src/controllers/project-user.controller.ts

@@ -13,7 +13,10 @@ import AuthorizationService from '../services/authorization.service';
 @ApiOAuth2([])
 @ApiTags('Project Users')
 export default class ProjectUserController {
-  constructor(private auth: AuthorizationService, @InjectRepository(ProjectUser) private projectUserRepo: Repository<ProjectUser>) {}
+  constructor(
+    private auth: AuthorizationService,
+    @InjectRepository(ProjectUser) private projectUserRepo: Repository<ProjectUser>,
+  ) {}
 
   @Get(':projectId/users')
   @ApiOperation({ summary: 'List all users with access to a project' })

api/src/controllers/term.controller.ts

@@ -75,7 +75,9 @@ export default class TermController {
 
       const projectLocales = await this.projectLocaleRepo.find({
         where: {
-          project: membership.project,
+          project: {
+            id: membership.project.id,
+          },
         },
       });
 
@@ -143,7 +145,7 @@ export default class TermController {
     const user = this.auth.getRequestUserOrClient(req);
     const membership = await this.auth.authorizeProjectAction(user, projectId, ProjectAction.DeleteTerm);
     await this.termRepo.manager.transaction(async entityManager => {
-      const term = await entityManager.findOneOrFail(Term, { where: { id: termId, project: membership.project } });
+      const term = await entityManager.findOneOrFail(Term, { where: { id: termId, project: { id: membership.project.id } } });
       await entityManager.remove(term);
       await entityManager.decrement(Project, { id: membership.project.id }, 'termsCount', 1);
     });

api/src/controllers/translation.controller.ts

@@ -44,7 +44,7 @@ export default class TranslationController {
     const membership = await this.auth.authorizeProjectAction(user, projectId, ProjectAction.ViewTranslation);
     const locales = await this.projectLocaleRepo.find({
       where: {
-        project: membership.project,
+        project: { id: membership.project.id },
       },
       relations: ['locale'],
     });
@@ -95,8 +95,10 @@ export default class TranslationController {
     });
 
     const result = await this.projectLocaleRepo.findOneByOrFail({
-      locale,
-      project: membership.project,
+      locale: {
+        code: locale.code,
+      },
+      project: { id: membership.project.id },
     });
 
     return {
@@ -126,7 +128,7 @@ export default class TranslationController {
       // Ensure locale is requested project locale
       const projectLocale = await this.projectLocaleRepo.findOneOrFail({
         where: {
-          project: membership.project,
+          project: { id: membership.project.id },
           locale: {
             code: localeCode,
           },
@@ -135,7 +137,9 @@ export default class TranslationController {
       try {
         const translations = await this.translationRepo.find({
           where: {
-            projectLocale,
+            projectLocale: {
+              id: projectLocale.id,
+            },
           },
           relations: ['term', 'labels'],
         });
@@ -186,7 +190,9 @@ export default class TranslationController {
         let translation = await this.translationRepo.findOne({
           where: {
             termId: term.id,
-            projectLocale: projectLocale,
+            projectLocale: {
+              id: projectLocale.id,
+            },
           },
           relations: ['labels'],
         });
@@ -231,7 +237,7 @@ export default class TranslationController {
     await this.projectLocaleRepo.manager.transaction(async entityManager => {
       const projectLocale = await entityManager.findOneOrFail(ProjectLocale, {
         where: {
-          project: membership.project,
+          project: { id: membership.project.id },
           locale: {
             code: localeCode,
           },

api/src/controllers/user.controller.ts

@@ -10,7 +10,10 @@ import { UserService } from '../services/user.service';
 @ApiOAuth2([])
 @ApiTags('Users')
 export default class UserController {
-  constructor(private auth: AuthorizationService, private userService: UserService) {}
+  constructor(
+    private auth: AuthorizationService,
+    private userService: UserService,
+  ) {}
 
   @Get('me')
   @ApiOperation({ summary: `Get the current user's profile` })

api/test/jest-e2e.json

@@ -1,10 +1,14 @@
 {
-	"moduleFileExtensions": ["js", "json", "ts"],
+	"moduleFileExtensions": [
+		"js",
+		"json",
+		"ts"
+	],
 	"rootDir": ".",
 	"testEnvironment": "node",
-	"testTimeout": 60000,
+	"testTimeout": 120000,
 	"testRegex": ".e2e-spec.ts$",
 	"transform": {
 		"^.+\\.(t|j)s$": "ts-jest"
 	}
-}
+}

api/test/user.e2e-spec.ts

@@ -1,7 +1,7 @@
-import { Connection } from 'typeorm';
+import { DataSource } from 'typeorm';
 import { INestApplication } from '@nestjs/common';
 import * as request from 'supertest';
-import { getRepository } from 'typeorm';
+import { getDataSourceConnection } from '../src/connection/datasource';
 import { ProjectLocale } from '../src/entity/project-locale.entity';
 import { Project } from '../src/entity/project.entity';
 import { Term } from '../src/entity/term.entity';
@@ -10,6 +10,7 @@ import { createAndMigrateApp, createTestProject, signupTestUser, TestingProject,
 
 describe('UserController (e2e)', () => {
   let app: INestApplication;
+  let connection: DataSource;
   let testingUser: TestingUser;
   let testingUser2: TestingUser;
   let testingUser3: TestingUser;
@@ -18,6 +19,7 @@ describe('UserController (e2e)', () => {
 
   beforeEach(async () => {
     app = await createAndMigrateApp();
+    connection = await getDataSourceConnection();
     testingUser = await signupTestUser(app);
     testingUser2 = await signupTestUser(app, 'e2e-user2@test.com');
     testingUser3 = await signupTestUser(app, 'e2e-user3@test.com');
@@ -224,15 +226,15 @@ describe('UserController (e2e)', () => {
 
     await request(app.getHttpServer()).get('/api/v1/projects').set('Authorization', `Bearer ${testingUser3.accessToken}`).expect(401);
 
-    const project = await getRepository(Project).findOneBy({ id: testProject.id });
+    const project = await connection.getRepository(Project).findOneBy({ id: testProject.id });
     expect(project).toBeDefined();
     expect(project.id).toEqual(testProject.id);
 
-    const term = await getRepository(Term).findOneBy({ id: termId });
+    const term = await connection.getRepository(Term).findOneBy({ id: termId });
     expect(term).toBeDefined();
     expect(term.id).toEqual(termId);
 
-    const projectLocales = await getRepository(ProjectLocale).find({
+    const projectLocales = await connection.getRepository(ProjectLocale).find({
       where: { project: { id: testProject.id } },
       relations: ['locale'],
     });
@@ -242,7 +244,7 @@ describe('UserController (e2e)', () => {
   });
 
   afterEach(async () => {
-    await app.get(Connection).close();
+    await connection.destroy();
     await app.close();
   });
 });