transaction
This commit is contained in:
@@ -18,6 +18,7 @@ import JwtAuthenticationGuard from './jwt-authentication.guard';
|
|||||||
import {ApiBody} from '@nestjs/swagger';
|
import {ApiBody} from '@nestjs/swagger';
|
||||||
import LogInDto from './dto/logIn.dto';
|
import LogInDto from './dto/logIn.dto';
|
||||||
import {UsersService} from 'src/users/user.service';
|
import {UsersService} from 'src/users/user.service';
|
||||||
|
import JwtRefreshGuard from "./jwtRefreshGuard.guard";
|
||||||
|
|
||||||
@Controller('authentication')
|
@Controller('authentication')
|
||||||
@UseInterceptors(ClassSerializerInterceptor)
|
@UseInterceptors(ClassSerializerInterceptor)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import {HttpException, HttpStatus, Injectable} from '@nestjs/common';
|
import {HttpException, HttpStatus, Injectable, InternalServerErrorException} from '@nestjs/common';
|
||||||
import {InjectRepository} from '@nestjs/typeorm';
|
import {InjectRepository} from '@nestjs/typeorm';
|
||||||
import {Repository} from 'typeorm';
|
import {Repository, Connection} from 'typeorm';
|
||||||
import User from './entities/user.entity';
|
import User from './entities/user.entity';
|
||||||
import CreateUserDto from './dto/createUser.dto';
|
import CreateUserDto from './dto/createUser.dto';
|
||||||
import * as bcrypt from 'bcrypt';
|
import * as bcrypt from 'bcrypt';
|
||||||
@@ -11,7 +11,8 @@ export class UsersService {
|
|||||||
constructor(
|
constructor(
|
||||||
@InjectRepository(User)
|
@InjectRepository(User)
|
||||||
private usersRepository: Repository<User>,
|
private usersRepository: Repository<User>,
|
||||||
private readonly filesService: FilesService
|
private readonly filesService: FilesService,
|
||||||
|
private connection: Connection,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,12 +58,38 @@ export class UsersService {
|
|||||||
return avatar;
|
return avatar;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async deleteAvatar(userId: number) {
|
||||||
|
const queryRunner = this.connection.createQueryRunner();
|
||||||
|
|
||||||
|
const user = await this.getById(userId);
|
||||||
|
const fileId = user.avatar?.id;
|
||||||
|
if (fileId) {
|
||||||
|
await queryRunner.connect();
|
||||||
|
await queryRunner.startTransaction();
|
||||||
|
|
||||||
|
try {
|
||||||
|
await queryRunner.manager.update(User, userId, {
|
||||||
|
...user,
|
||||||
|
avatar: null
|
||||||
|
});
|
||||||
|
await this.filesService.deletePublicFileWithQueryRunner(fileId, queryRunner);
|
||||||
|
await queryRunner.commitTransaction();
|
||||||
|
} catch (error) {
|
||||||
|
await queryRunner.rollbackTransaction();
|
||||||
|
throw new InternalServerErrorException();
|
||||||
|
} finally {
|
||||||
|
await queryRunner.release();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async create(userData: CreateUserDto) {
|
async create(userData: CreateUserDto) {
|
||||||
const newUser = this.usersRepository.create(userData);
|
const newUser = this.usersRepository.create(userData);
|
||||||
await this.usersRepository.save(newUser);
|
await this.usersRepository.save(newUser);
|
||||||
return newUser;
|
return newUser;
|
||||||
}
|
}
|
||||||
|
//region token
|
||||||
async setCurrentRefreshToken(refreshToken: string, userId: number) {
|
async setCurrentRefreshToken(refreshToken: string, userId: number) {
|
||||||
const currentHashedRefreshToken = await bcrypt.hash(refreshToken, 10);
|
const currentHashedRefreshToken = await bcrypt.hash(refreshToken, 10);
|
||||||
await this.usersRepository.update(userId, {
|
await this.usersRepository.update(userId, {
|
||||||
@@ -75,4 +102,7 @@ export class UsersService {
|
|||||||
currentHashedRefreshToken: null,
|
currentHashedRefreshToken: null,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
//endregion
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user