IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change the commit strategy so that the query runner store the commits and roll them back if their is an error.

Browse Source
This commit is contained in:
elweyn 2021-11-04 10:50:47 +01:00
parent 2bd63985b2
commit 1142f7359a
1 changed files with 57 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
backend/src/graphql/resolver/UserResolver.ts
View File

@ -3,7 +3,7 @@
import fs from 'fs' import fs from 'fs'
import { Resolver, Query, Args, Arg, Authorized, Ctx, UseMiddleware, Mutation } from 'type-graphql' import { Resolver, Query, Args, Arg, Authorized, Ctx, UseMiddleware, Mutation } from 'type-graphql'
import { getCustomRepository } from 'typeorm' import { getConnection, getCustomRepository } from 'typeorm'
import CONFIG from '../../config' import CONFIG from '../../config'
import { LoginViaVerificationCode } from '../model/LoginViaVerificationCode' import { LoginViaVerificationCode } from '../model/LoginViaVerificationCode'
import { SendPasswordResetEmailResponse } from '../model/SendPasswordResetEmailResponse' import { SendPasswordResetEmailResponse } from '../model/SendPasswordResetEmailResponse'
@ -324,7 +324,7 @@ export class UserResolver {
const encryptedPrivkey = SecretKeyCryptographyEncrypt(keyPair[1], passwordHash[1]) const encryptedPrivkey = SecretKeyCryptographyEncrypt(keyPair[1], passwordHash[1])
// Table: login_users // Table: login_users
const loginUser = new LoginUser() let loginUser = new LoginUser()
loginUser.email = email loginUser.email = email
loginUser.firstName = firstName loginUser.firstName = firstName
loginUser.lastName = lastName loginUser.lastName = lastName
@ -339,10 +339,15 @@ export class UserResolver {
loginUser.privKey = encryptedPrivkey loginUser.privKey = encryptedPrivkey
// TODO transaction // TODO transaction
const loginUserRepository = getCustomRepository(LoginUserRepository) const queryRunner = getConnection().createQueryRunner()
const { id: loginUserId } = await loginUserRepository.save(loginUser).catch((error) => { // belong to debugging mysql query / typeorm line
// const startTime = new Date()
await queryRunner.connect()
await queryRunner.startTransaction('READ UNCOMMITTED')
try {
const { id: loginUserId } = await queryRunner.manager.save(loginUser).catch((error) => {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.log('insert user failed', error) console.log('insert LoginUser failed', error)
throw new Error('insert user failed') throw new Error('insert user failed')
}) })
@ -353,8 +358,9 @@ export class UserResolver {
loginUserBackup.mnemonicType = 2 // ServerConfig::MNEMONIC_BIP0039_SORTED_ORDER; loginUserBackup.mnemonicType = 2 // ServerConfig::MNEMONIC_BIP0039_SORTED_ORDER;
// TODO transaction // TODO transaction
const loginUserBackupRepository = getCustomRepository(LoginUserBackupRepository) await queryRunner.manager.save(loginUserBackup).catch((error) => {
await loginUserBackupRepository.save(loginUserBackup).catch(() => { // eslint-disable-next-line no-console
console.log('insert LoginUserBackup failed', error)
throw new Error('insert user backup failed') throw new Error('insert user backup failed')
}) })
@ -367,7 +373,7 @@ export class UserResolver {
dbUser.username = username dbUser.username = username
// TDOO transaction // TDOO transaction
await userRepository.save(dbUser).catch((er) => { await queryRunner.manager.save(dbUser).catch((er) => {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.log('Error while saving dbUser', er) console.log('Error while saving dbUser', er)
throw new Error('error saving user') throw new Error('error saving user')
@ -376,6 +382,8 @@ export class UserResolver {
// TODO: send EMail (EMAIL_OPT_IN_REGISTER) // TODO: send EMail (EMAIL_OPT_IN_REGISTER)
// const emailType = 2 // const emailType = 2
// auto emailOptIn = controller::EmailVerificationCode::create(userModel->getID(), model::table::EMAIL_OPT_IN_REGISTER); // auto emailOptIn = controller::EmailVerificationCode::create(userModel->getID(), model::table::EMAIL_OPT_IN_REGISTER);
// auto code = createEmailVerificationCode();
// auto db = new model::table::EmailOptIn(code, userModel->getID(), model::table::EMAIL_OPT_IN_REGISTER);
// auto emailOptInModel = emailOptIn->getModel(); // auto emailOptInModel = emailOptIn->getModel();
// if (!emailOptInModel->insertIntoDB(false)) { // if (!emailOptInModel->insertIntoDB(false)) {
// emailOptInModel->sendErrorsAsEmail(); // emailOptInModel->sendErrorsAsEmail();
@ -383,8 +391,14 @@ export class UserResolver {
// } // }
// emailOptIn->setBaseUrl(user->getGroupBaseUrl() + ServerConfig::g_frontend_checkEmailPath); // emailOptIn->setBaseUrl(user->getGroupBaseUrl() + ServerConfig::g_frontend_checkEmailPath);
// em->addEmail(new model::Email(emailOptIn, user, model::Email::convertTypeFromInt(emailType))); // em->addEmail(new model::Email(emailOptIn, user, model::Email::convertTypeFromInt(emailType)));
await queryRunner.commitTransaction()
return 'success' return 'success'
} catch (e) {
await queryRunner.rollbackTransaction()
throw e
} finally {
await queryRunner.release()
}
} }
@Query(() => SendPasswordResetEmailResponse) @Query(() => SendPasswordResetEmailResponse)