Add isLiked property to rules list (#93)

src/auth/auth.service.ts

@@ -1,4 +1,4 @@
-import { ForbiddenException, Injectable } from '@nestjs/common';
+import { ForbiddenException, HttpException, Injectable } from '@nestjs/common';
 import { JwtAuthDto, LoginDto, RegisterDto } from './dto';
 import { DbService } from '../db/db.service';
 import { sha512 } from 'js-sha512';
@@ -26,18 +26,19 @@ export class AuthService {
   }
 
   async login(dto: LoginDto): Promise<object> {
-    const user = await this.prisma.user.findUniqueOrThrow({
+    const user = await this.prisma.user.findUnique({
       where: { email: dto.email },
     });
 
+    if (!user || (user && !(sha512(dto.password) === user.password))) {
+      throw new HttpException('Wrong credentials!', 403);
+    }
+
     const roles = await this.prisma.roles.findMany({
       where: { userId: user.id },
       select: { role: true },
     });
 
-    if (!user || !(sha512(dto.password) === user.password))
-      throw new ForbiddenException('Wrong credentials!');
-
     const jwt = await this.generateAuthJwt({
       userId: user.id,
       roles: roles.map((role) => role.role),

src/auth/guards/optionalJwtAuth.guard.ts

@@ -0,0 +1,7 @@
+import { AuthGuard } from '@nestjs/passport';
+
+export class OptionalJwtAuthGuard extends AuthGuard('jwt') {
+  handleRequest(err, user) {
+    return user;
+  }
+}

src/rule/rule.controller.ts

@@ -2,24 +2,33 @@ import { Controller, Get, Param, Query, UseGuards } from '@nestjs/common';
 import { RuleService } from './rule.service';
 import { JwtAuthDto } from 'src/auth/dto';
 import { AuthGuard } from '@nestjs/passport';
-import { GetUser } from 'src/auth/decorator/getUser.decorator';
+import { GetUser } from '../auth/decorator/getUser.decorator';
+import { OptionalJwtAuthGuard } from '../auth/guards/optionalJwtAuth.guard';
 
 @Controller('rule')
 export class RuleController {
   constructor(private readonly ruleService: RuleService) {}
 
+  @UseGuards(OptionalJwtAuthGuard)
   @Get('search')
-  async searchRules(@Query('search') search: string) {
-    return await this.ruleService.searchRules(search);
+  async searchRules(
+    @Query('search') search: string,
+    @Query('skip') skip = 0,
+    @Query('take') take = 10,
+    @GetUser() user: JwtAuthDto,
+  ) {
+    return await this.ruleService.searchRules(search, skip, take, user.userId);
   }
 
+  @UseGuards(OptionalJwtAuthGuard)
   @Get('user/:userId')
   async getUserRules(
     @Param('userId') userId: number,
-    @Query('skip') skip: number,
-    @Query('take') take: number,
+    @Query('skip') skip = 0,
+    @Query('take') take = 10,
+    @GetUser() user: JwtAuthDto,
   ) {
-    return await this.ruleService.getUserRules(userId, skip, take);
+    return await this.ruleService.getUserRules(userId, skip, take, user.userId);
   }
   @UseGuards(AuthGuard('jwt'))
   @Get('like/:id')

src/rule/rule.service.ts

@@ -5,7 +5,7 @@ import { Injectable } from '@nestjs/common';
 export class RuleService {
   constructor(private readonly prisma: DbService) {}
 
-  async getUserRules(userId: number, skip = 0, take = 10) {
+  async getUserRules(userId: number, skip = 0, take = 10, requestedBy: number) {
     const rules: any = await this.prisma.rule.findMany({
       where: { ruleset: { userId } },
       skip,
@@ -16,6 +16,12 @@ export class RuleService {
         where: { ruleId: rule.id },
       });
       rule.likes = likes;
+      if (requestedBy) {
+        const liked = await this.prisma.likedRules.findFirst({
+          where: { ruleId: rule.id, userId: requestedBy },
+        });
+        rule.isLiked = !!liked;
+      }
     }
     return rules;
   }
@@ -42,11 +48,25 @@ export class RuleService {
     }
   }
 
-  async searchRules(search: string, skip = 0, take = 10) {
-    return await this.prisma.rule.findMany({
+  async searchRules(search: string, skip = 0, take = 10, requestedBy: number) {
+    const rules: any = await this.prisma.rule.findMany({
       where: { name: { contains: search } },
       skip,
       take,
     });
+
+    for (const rule of rules) {
+      const likes = await this.prisma.likedRules.count({
+        where: { ruleId: rule.id },
+      });
+      rule.likes = likes;
+      if (requestedBy) {
+        const liked = await this.prisma.likedRules.findFirst({
+          where: { ruleId: rule.id, userId: requestedBy },
+        });
+        rule.isLiked = !!liked;
+      }
+    }
+    return rules;
   }
 }