Merge pull request #8 from nailtonvital/novas-consultas-de-relacionam…

…entos-de-endpoints adjusts comments and likes
nailtonvital · May 31, 2024 · e0ed908 · e0ed908
2 parents 33532c0 + b2a11cd
commit e0ed908
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 10 deletions.
diff --git a/src/posts/dto/likePost.dto.ts b/src/posts/dto/likePost.dto.ts
@@ -0,0 +1,12 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsString, IsNumber, IsDate, IsOptional } from 'class-validator';
+
+export class LikePostDto {
+ @ApiProperty()
+ @IsNumber()
+ idPost: number;
+
+ @ApiProperty()
+ @IsNumber()
+ idUser: number;
+}
diff --git a/src/posts/posts.controller.ts b/src/posts/posts.controller.ts
@@ -2,6 +2,7 @@ import { Controller, Get, Post, Body, Patch, Param, Delete } from '@nestjs/commo
 import { PostsService } from './posts.service';
 import { CreatePostDto } from './dto/create-post.dto';
 import { UpdatePostDto } from './dto/update-post.dto';
+import { LikePostDto } from './dto/likePost.dto';
 
 @Controller('posts')
 export class PostsController {
@@ -53,7 +54,7 @@ export class PostsController {
  }
 
  @Post('post/addLike')
- async addLike(@Body() body) {
+ async addLike(@Body() body: LikePostDto) {
  const { idPost, idUser } = body;
  try {
  return await this.postsService.addLike(idPost, idUser);
@@ -63,7 +64,7 @@ export class PostsController {
  }
 
  @Post('post/removeLike')
- async removeLike(@Body() body) {
+ async removeLike(@Body() body: LikePostDto) {
  const { idPost, idUser } = body;
  try {
  return await this.postsService.removeLike(idPost, idUser);

diff --git a/src/posts/posts.service.ts b/src/posts/posts.service.ts
@@ -72,10 +72,14 @@ export class PostsService {
 
  async findOne(id: number) {
  try {
- return await this.postRepository.findOne({
- where: { idPost: id },
- relations: ['interests', 'user', 'comments', 'likes']
- });
+ return await this.postRepository.createQueryBuilder('post')
+ .where('post.idPost = :id', { id })
+ .leftJoinAndSelect('post.interests', 'interests')
+ .leftJoinAndSelect('post.user', 'user')
+ .leftJoinAndSelect('post.comments', 'comments')
+ .leftJoinAndSelect('post.likes', 'likes')
+ .loadRelationCountAndMap('post.commentsCount', 'post.comments')
+ .getOne();
  } catch (error) {
  throw error;
  }

diff --git a/src/users/users.service.ts b/src/users/users.service.ts
@@ -70,10 +70,16 @@ export class UsersService {
 
  async findOneById(id: number) {
  try {
- return await this.userRepository.findOne({
- where: { idUser: id },
- relations: ['interests', 'posts'],
- });
+ return await this.userRepository.createQueryBuilder('user')
+ .where('user.idUser = :id', { id: id })
+ .leftJoinAndSelect('user.interests', 'interests')
+ .leftJoinAndSelect('user.posts', 'posts')
+ .leftJoinAndSelect('posts.likes', 'likes')
+ .leftJoinAndSelect('posts.comments', 'comments')
+ .leftJoinAndSelect('posts.interests', 'post_interests')
+ .loadRelationCountAndMap('user.postsCount', 'user.posts')
+ .loadRelationCountAndMap('posts.commentsCount', 'posts.comments')
+ .getOne();
  } catch (error) {
  throw error;
  }