156 build pagination (#86)

* Builds pagination added

Author: pashidlos

package-lock.json

@@ -30,7 +30,7 @@
     "@nestjs/platform-socket.io": "^7.4.2",
     "@nestjs/swagger": "^4.5.12",
     "@nestjs/websockets": "^7.4.2",
-    "@prisma/client": "^2.8.1",
+    "@prisma/client": "2.12.1",
     "bcryptjs": "^2.4.3",
     "class-transformer": "^0.3.1",
     "class-validator": "^0.12.2",
@@ -52,7 +52,7 @@
     "@nestjs/cli": "^7.4.1",
     "@nestjs/schematics": "^7.0.1",
     "@nestjs/testing": "^7.4.2",
-    "@prisma/cli": "^2.8.1",
+    "@prisma/cli": "2.12.1",
     "@types/bcryptjs": "^2.4.2",
     "@types/express": "^4.17.7",
     "@types/jest": "26.0.14",

package.json

@@ -7,12 +7,12 @@
   "license": "UNLICENSED",
   "scripts": {},
   "dependencies": {
-    "@prisma/client": "^2.8.1",
+    "@prisma/client": "2.12.1",
     "bcryptjs": "^2.4.3",
     "uuid-apikey": "^1.4.6"
   },
   "devDependencies": {
-    "@prisma/cli": "^2.8.1",
+    "@prisma/cli": "2.12.1",
     "@types/bcryptjs": "^2.4.2",
     "@types/uuid-apikey": "^1.4.0",
     "ts-node": "^8.10.2",

prisma/package-lock.json

@@ -1,6 +1,5 @@
 generator client {
-  provider        = "prisma-client-js"
-  previewFeatures = ["atomicNumberOperations"]
+  provider = "prisma-client-js"
 }
 
 datasource db {

prisma/package.json

@@ -9,7 +9,7 @@ export class ApiGuard implements CanActivate {
   async canActivate(context: ExecutionContext): Promise<boolean> {
     const request: Request = context.switchToHttp().getRequest();
     try {
-      const user = await this.prismaService.user.findOne({
+      const user = await this.prismaService.user.findUnique({
         where: { apiKey: request.header('apiKey') },
       });
       return !!user;

prisma/schema.prisma

@@ -16,7 +16,7 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
   }
 
   async validate(payload: JwtPayload, done: VerifiedCallback) {
-    const user = await this.prismaService.user.findOne({
+    const user = await this.prismaService.user.findUnique({
       where: { email: payload.email }
     });
 

src/auth/guards/api.guard.ts

@@ -1,4 +1,17 @@
-import { Controller, Get, UseGuards, Post, Body, Param, ParseUUIDPipe, Delete, Query, Patch } from '@nestjs/common';
+import {
+  Controller,
+  Get,
+  UseGuards,
+  Post,
+  Body,
+  Param,
+  ParseUUIDPipe,
+  Delete,
+  Query,
+  Patch,
+  ParseIntPipe,
+  ParseBoolPipe,
+} from '@nestjs/common';
 import { BuildsService } from './builds.service';
 import { JwtAuthGuard } from '../auth/guards/auth.guard';
 import { ApiBearerAuth, ApiTags, ApiSecurity, ApiOkResponse } from '@nestjs/swagger';
@@ -7,18 +20,31 @@ import { ApiGuard } from '../auth/guards/api.guard';
 import { Build } from '@prisma/client';
 import { BuildDto } from './dto/build.dto';
 import { MixedGuard } from '../auth/guards/mixed.guard';
+import { PaginatedBuildDto } from './dto/build-paginated.dto';
 
 @Controller('builds')
 @ApiTags('builds')
 export class BuildsController {
   constructor(private buildsService: BuildsService) {}
 
   @Get()
-  @ApiOkResponse({ type: [BuildDto] })
+  @ApiOkResponse({ type: PaginatedBuildDto })
   @ApiBearerAuth()
   @UseGuards(JwtAuthGuard)
-  get(@Query('projectId', new ParseUUIDPipe()) projectId: string): Promise<BuildDto[]> {
-    return this.buildsService.findMany(projectId);
+  get(
+    @Query('projectId', new ParseUUIDPipe()) projectId: string,
+    @Query('take', new ParseIntPipe()) take: number,
+    @Query('skip', new ParseIntPipe()) skip: number
+  ): Promise<PaginatedBuildDto> {
+    return this.buildsService.findMany(projectId, take, skip);
+  }
+
+  @Get(':id')
+  @ApiOkResponse({ type: BuildDto })
+  @ApiBearerAuth()
+  @UseGuards(JwtAuthGuard)
+  getDetails(@Param('id', new ParseUUIDPipe()) id: string): Promise<BuildDto> {
+    return this.buildsService.findOne(id);
   }
 
   @Delete(':id')
@@ -44,4 +70,15 @@ export class BuildsController {
   stop(@Param('id', new ParseUUIDPipe()) id: string): Promise<BuildDto> {
     return this.buildsService.stop(id);
   }
+
+  @Patch(':id/approve')
+  @ApiOkResponse({ type: BuildDto })
+  @ApiBearerAuth()
+  @UseGuards(JwtAuthGuard)
+  approve(
+    @Param('id', new ParseUUIDPipe()) id: string,
+    @Query('merge', new ParseBoolPipe()) merge: boolean
+  ): Promise<BuildDto> {
+    return this.buildsService.approve(id, merge);
+  }
 }