From e39d51d33565ba53a5cca642d0f8d6dde8915896 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 29 Dec 2021 23:16:33 +0100 Subject: [PATCH 1/3] Update backend/src/graphql/resolver/UserResolver.ts Co-authored-by: Ulf Gebhardt --- backend/src/graphql/resolver/UserResolver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index ccdef9794..2f98a2f6f 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -477,7 +477,7 @@ export class UserResolver { firstName: string, lastName: string, email: string, - ): Promise { + ): Promise { return sendEMail({ from: `Gradido (nicht antworten) <${CONFIG.EMAIL_SENDER}>`, to: `${firstName} ${lastName} <${email}>`, From 69d983b891f14bb6cc5668c986f4979c8f6ee8c1 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 29 Dec 2021 23:16:47 +0100 Subject: [PATCH 2/3] Update backend/jest.config.js Co-authored-by: Ulf Gebhardt --- backend/jest.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/jest.config.js b/backend/jest.config.js index 9e6ca4602..79add8789 100644 --- a/backend/jest.config.js +++ b/backend/jest.config.js @@ -6,6 +6,7 @@ module.exports = { collectCoverageFrom: ['src/**/*.ts', '!**/node_modules/**'], moduleNameMapper: { '@entity/(.*)': '/../database/build/entity/$1', + // This is hack to fix a problem with the library `ts-mysql-migrate` which does differentiate between its ts/js state '@dbTools/(.*)': process.env.NODE_ENV === 'development' ? '/../database/src/$1' : '/../database/build/src/$1', }, } From 1b16e80ad485ea95b976feb69b2619a11b24e667 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 29 Dec 2021 23:17:27 +0100 Subject: [PATCH 3/3] Update database/tsconfig.json Co-authored-by: Ulf Gebhardt --- database/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/tsconfig.json b/database/tsconfig.json index c2e0ae6c2..445b9d11f 100644 --- a/database/tsconfig.json +++ b/database/tsconfig.json @@ -46,7 +46,7 @@ /* Module Resolution Options */ // "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */ - // "paths": {} /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ + // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ // "rootDirs": [".", "../database"], /* List of root folders whose combined content represents the structure of the project at runtime. */ // "typeRoots": [], /* List of folders to include type definitions from. */ // "types": [], /* Type declaration files to be included in compilation. */