From 438238f2bf286cdbb1636eed42dccfab5389dd03 Mon Sep 17 00:00:00 2001 From: laurejablonski Date: Sat, 5 Apr 2025 19:21:01 +0200 Subject: [PATCH] style: lint op backend --- backend/seed.ts | 11 +++++++---- backend/src/orm.ts | 4 ++-- backend/tests/test_assets/users/students.testdata.ts | 3 +-- backend/tests/test_assets/users/teachers.testdata.ts | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/backend/seed.ts b/backend/seed.ts index f2ca1d32..1798af3a 100644 --- a/backend/seed.ts +++ b/backend/seed.ts @@ -13,15 +13,18 @@ import { makeTestAnswers } from "./tests/test_assets/questions/answers.testdata. import { makeTestQuestions } from "./tests/test_assets/questions/questions.testdata.js"; import { makeTestStudents } from "./tests/test_assets/users/students.testdata.js"; import { makeTestTeachers } from "./tests/test_assets/users/teachers.testdata.js"; +import { getLogger, Logger } from './src/logging/initalize.js'; -export async function seedDatabase() { +const logger: Logger = getLogger(); + +export async function seedDatabase() : Promise { dotenv.config({ path: '.env.development.local' }); const orm = await initORM(); await orm.schema.clearDatabase(); const em = forkEntityManager(); - console.log("seeding database...") + logger.info("seeding database...") const students = makeTestStudents(em); const teachers = makeTestTeachers(em); @@ -61,9 +64,9 @@ export async function seedDatabase() { ...submissions, ]); - console.log('Development database seeded successfully!'); + logger.info('Development database seeded successfully!'); await orm.close(); } -seedDatabase().catch(console.error); \ No newline at end of file +seedDatabase().catch(logger.error); \ No newline at end of file diff --git a/backend/src/orm.ts b/backend/src/orm.ts index aa59f0c8..76cd0ee9 100644 --- a/backend/src/orm.ts +++ b/backend/src/orm.ts @@ -1,10 +1,10 @@ -import { Connection, EntityManager, IDatabaseDriver, MikroORM } from '@mikro-orm/core'; +import { EntityManager, IDatabaseDriver, MikroORM } from '@mikro-orm/core'; import config from './mikro-orm.config.js'; import { envVars, getEnvVar } from './util/envVars.js'; import { getLogger, Logger } from './logging/initalize.js'; let orm: MikroORM | undefined; -export async function initORM(testingMode = false): Promise, EntityManager>>> { +export async function initORM(testingMode = false): Promise> { const logger: Logger = getLogger(); logger.info('Initializing ORM'); diff --git a/backend/tests/test_assets/users/students.testdata.ts b/backend/tests/test_assets/users/students.testdata.ts index e38ab25c..b2dc1899 100644 --- a/backend/tests/test_assets/users/students.testdata.ts +++ b/backend/tests/test_assets/users/students.testdata.ts @@ -1,6 +1,5 @@ import { EntityManager } from '@mikro-orm/core'; import { Student } from '../../../src/entities/users/student.entity'; -import { fixupRule } from '@eslint/compat'; // 🔓 Ruwe testdata array — herbruikbaar in assertions export const TEST_STUDENTS = [ @@ -12,7 +11,7 @@ export const TEST_STUDENTS = [ { username: 'TheDoors', firstName: 'Jim', lastName: 'Morisson' }, // ⚠️ Deze mag niet gebruikt worden in elke test! { username: 'Nirvana', firstName: 'Kurt', lastName: 'Cobain' }, - // makes sure when logged in as leerling1, there exists a corresponding user + // Makes sure when logged in as leerling1, there exists a corresponding user { username: 'testleerling1', firstName: 'Gerald', lastName: 'Schmittinger'}, ]; diff --git a/backend/tests/test_assets/users/teachers.testdata.ts b/backend/tests/test_assets/users/teachers.testdata.ts index d2af704b..4ecc3274 100644 --- a/backend/tests/test_assets/users/teachers.testdata.ts +++ b/backend/tests/test_assets/users/teachers.testdata.ts @@ -27,7 +27,7 @@ export function makeTestTeachers(em: EntityManager): Teacher[] { lastName: 'Cappelle', }); - // makes sure when logged in as testleerkracht1, there exists a corresponding user + // Makes sure when logged in as testleerkracht1, there exists a corresponding user const teacher05 = em.create(Teacher, { username: 'testleerkracht1', firstName: 'Bob',