neuro_llc/neuro-reply-website
2
0
Fork 0
mirror of https://github.com/MrSedan/neuro-reply-website.git synced 2026-01-14 20:49:42 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Using transactions where it needed

Browse Source
This commit is contained in:
Sergey Elpashev
2024-02-13 23:10:43 +03:00
parent 9097e6cc4f
commit e003a87ba2
2 changed files with 54 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
backend/src/modules/image/image.service.ts
View File

@@ -1,27 +1,23 @@
import { HttpException, HttpStatus, Injectable, Logger } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Admin } from 'libs/database/admin.entity';
import { Image } from 'libs/database/image.entity';
import { Post } from 'libs/database/post.entity';
import { Repository } from 'typeorm';
import { DataSource, EntityManager } from 'typeorm';
import { IAddImage } from './image.dto';
@Injectable()
export class ImageService {
private readonly logger: Logger = new Logger(ImageService.name);
constructor(
@InjectRepository(Image) private imageRepository: Repository<Image>,
@InjectRepository(Post) private postRepository: Repository<Post>,
@InjectRepository(Admin) private adminRepository: Repository<Admin>,
) {}
constructor(private dataSource: DataSource) {}
async add(data: IAddImage) {
try {
this.logger.log(`[image.add] data: ${JSON.stringify(data)}`);
let created_new = false;
await this.dataSource.transaction(async (manager: EntityManager) => {
this.logger.log(`[image.add] data: ${JSON.stringify(data)}`);
if (data.media_group_id) {
let post = await this.postRepository.findOne({ where: { media_group_id: data.media_group_id } });
let post = await manager.findOne(Post, { where: { media_group_id: data.media_group_id } });
if (post) {
await this.imageRepository.save({
await manager.save(Image, {
post: post,
file_id: data.file_id,
has_spoiler: data.has_spoiler,
@@ -30,11 +26,11 @@ export class ImageService {
if (data.post_text) {
post.text = data.post_text;
post.message_entities = data.message_entities;
post = await this.postRepository.save(post);
post = await manager.save(Post, post);
}
} else {
const user = await this.adminRepository.findOne({ where: { user: { id: data.from_user_id } }, relations: { user: true } });
post = await this.postRepository.save({
const user = await manager.findOne(Admin, { where: { user: { id: data.from_user_id } }, relations: { user: true } });
post = await manager.save(Post, {
media_group_id: data.media_group_id,
text: data.post_text,
message_entities: data.message_entities,
@@ -42,29 +38,29 @@ export class ImageService {
from_user: user,
});
created_new = true;
await this.imageRepository.save({
await manager.save(Image, {
post: post,
file_id: data.file_id,
has_spoiler: data.has_spoiler,
message_id: data.message_id,
});
this.logger.log('Created post');
}
} else {
const user = await this.adminRepository.findOne({ where: { user: { id: data.from_user_id } }, relations: { user: true } });
const post = await this.postRepository.save({
const user = await manager.findOne(Admin, { where: { user: { id: data.from_user_id } }, relations: { user: true } });
const post = await manager.save(Post, {
text: data.post_text,
message_entities: data.message_entities,
timestamp: new Date(),
from_user: user,
});
await this.imageRepository.save({
await manager.save(Image, {
post: post,
file_id: data.file_id,
has_spoiler: data.has_spoiler,
message_id: data.message_id,
});
}
});
return { status: 'ok', created: created_new };
} catch (error) {
this.logger.debug(`[image.add] error: ${JSON.stringify(error)}`);

15
backend/src/modules/post/post.service.ts
View File

@@ -1,9 +1,9 @@
import { HttpException, HttpStatus, Injectable, Logger } from '@nestjs/common';
import { HttpException, HttpStatus, Inject, Injectable, Logger } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Admin } from 'libs/database/admin.entity';
import { Post } from 'libs/database/post.entity';
import { EGetAll } from 'libs/enums/getAll.enum';
import { Repository } from 'typeorm';
import { DataSource, EntityManager, Repository } from 'typeorm';
import { ICreatePost, IEditPost } from './post.dto';
@Injectable()
@@ -12,19 +12,23 @@ export class PostService {
constructor(
@InjectRepository(Post) private postRepository: Repository<Post>,
@InjectRepository(Admin) private adminRepository: Repository<Admin>,
@Inject(DataSource) private dataSource: DataSource,
) {}
async newPost(data: ICreatePost) {
try {
this.logger.log(`[post.newPost] data: ${JSON.stringify(data)}`);
let result: Post = null;
const user = await this.adminRepository.findOne({ where: { user: { id: data.from_user_id } }, relations: { user: true } });
const result = await this.postRepository.save({
await this.dataSource.transaction(async (manager: EntityManager) => {
result = await manager.save(Post, {
text: data.text,
media_group_id: data.media_group_id,
from_user: user,
timestamp: new Date(),
message_entities: data.message_entities,
});
});
this.logger.log(`Created new post: ${result.uuid}`);
return result;
} catch (error) {
@@ -113,7 +117,10 @@ export class PostService {
async getByMediaGroup(mediaGroupId: string) {
try {
this.logger.log(`[post.getByMediaGroup] data: ${mediaGroupId}`);
const post = await this.postRepository.findOne({ where: { media_group_id: mediaGroupId } });
let post: Post = null;
await this.dataSource.transaction(async (manager: EntityManager) => {
post = await manager.findOne(Post, { where: { media_group_id: mediaGroupId } });
});
if (!post) throw new Error("Can't find post");
return post;
} catch (error) {