Fix: cannot add/update ignore areas (#248)

* Fix: cannot add/update ignore areas

closes Visual-Regression-Tracker/Visual-Regression-Tracker#419

Author: pashidlos

src/http-exception.filter.ts

@@ -21,7 +21,7 @@ export class HttpExceptionFilter implements ExceptionFilter {
         ? this.getCustomMessageForException(exception)
         : exception.message;
 
-    Logger.error(exception, exception.stack);
+    Logger.error(exception, exception.stack, exception.getResponse?.());
 
     response.status(status).json({
       path: request.url,

src/test-runs/dto/update-ignore-area.dto.ts

@@ -1,12 +1,11 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { IgnoreAreaDto } from './ignore-area.dto';
 import { Type } from 'class-transformer';
-import { ValidateNested } from 'class-validator';
+import { ValidateNested, IsString } from 'class-validator';
 
 export class UpdateIgnoreAreasDto {
   @ApiProperty({type: String, isArray: true })
-  @Type(() => String)
-  @ValidateNested({ each: true })
+  @IsString({each: true})
   readonly ids: string[];
 
   @ApiProperty({ type: IgnoreAreaDto, isArray: true })

test/builds.e2e-spec.ts

@@ -1,5 +1,5 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { INestApplication } from '@nestjs/common';
+import { INestApplication, ValidationPipe } from '@nestjs/common';
 import { AppModule } from '../src/app.module';
 import { UsersService } from '../src/users/users.service';
 import { haveTestRunCreated, haveUserLogged, requestWithApiKey, requestWithAuth } from './preconditions';
@@ -29,6 +29,7 @@ describe('Builds (e2e)', () => {
     }).compile();
 
     app = moduleFixture.createNestApplication();
+    app.useGlobalPipes(new ValidationPipe());
     buildsService = moduleFixture.get<BuildsService>(BuildsService);
     buildsController = moduleFixture.get<BuildsController>(BuildsController);
     usersService = moduleFixture.get<UsersService>(UsersService);

test/preconditions.ts

@@ -10,7 +10,7 @@ import { Build } from '@prisma/client';
 import { CreateUserDto } from 'src/users/dto/user-create.dto';
 
 export const generateUser = (password: string): CreateUserDto => ({
-  email: `${uuidAPIKey.create().uuid}@example.com`,
+  email: `email+${uuidAPIKey.create().apiKey.toLocaleLowerCase()}@example.com`,
   password,
   firstName: 'fName',
   lastName: 'lName',

test/projects.e2e-spec.ts

@@ -1,15 +1,25 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { INestApplication } from '@nestjs/common';
+import { INestApplication, ValidationPipe } from '@nestjs/common';
 import { AppModule } from '../src/app.module';
 import { UsersService } from '../src/users/users.service';
 import { requestWithAuth, haveUserLogged } from './preconditions';
 import { ProjectsService } from '../src/projects/projects.service';
 import uuidAPIKey from 'uuid-apikey';
 import { UserLoginResponseDto } from 'src/users/dto/user-login-response.dto';
+import { ProjectDto } from 'src/projects/dto/project.dto';
 
-const project = {
+const project: ProjectDto = {
   id: uuidAPIKey.create().uuid,
   name: 'Test project',
+  buildsCounter: 0,
+  mainBranchName: 'master',
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  autoApproveFeature: true,
+  imageComparison: 'pixelmatch',
+  maxBuildAllowed: 0,
+  maxBranchLifetime: 0,
+  imageComparisonConfig: '{}'
 };
 
 const projectServiceMock = {
@@ -33,6 +43,7 @@ describe('Projects (e2e)', () => {
       .compile();
 
     app = moduleFixture.createNestApplication();
+    app.useGlobalPipes(new ValidationPipe());
     usersService = moduleFixture.get<UsersService>(UsersService);
 
     await app.init();
@@ -81,7 +92,11 @@ describe('Projects (e2e)', () => {
     it('can delete', async () => {
       const res = await requestWithAuth(app, 'delete', `/projects/${project.id}`, loggedUser.token).send().expect(200);
 
-      expect(res.body).toStrictEqual(projectServiceMock.remove());
+      expect(res.body).toStrictEqual({
+        ...projectServiceMock.remove(),
+        createdAt: expect.any(String),
+        updatedAt: expect.any(String),
+      });
     });
 
     it('not valid UUID', async () => {
@@ -97,7 +112,11 @@ describe('Projects (e2e)', () => {
     it('can edit', async () => {
       const res = await requestWithAuth(app, 'put', `/projects`, loggedUser.token).send(project).expect(200);
 
-      expect(res.body).toStrictEqual(projectServiceMock.update());
+      expect(res.body).toStrictEqual({
+        ...projectServiceMock.update(),
+        createdAt: expect.any(String),
+        updatedAt: expect.any(String),
+      });
     });
 
     it('not valid token', async () => {

test/test-runs.e2e-spec.ts

@@ -1,5 +1,5 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { INestApplication } from '@nestjs/common';
+import { INestApplication, ValidationPipe } from '@nestjs/common';
 import { AppModule } from '../src/app.module';
 import { UsersService } from '../src/users/users.service';
 import { haveTestRunCreated, haveUserLogged, requestWithApiKey, requestWithAuth } from './preconditions';
@@ -11,6 +11,7 @@ import { BuildsService } from '../src/builds/builds.service';
 import { TestVariationsService } from '../src/test-variations/test-variations.service';
 import { TEST_PROJECT } from '../src/_data_';
 import uuidAPIKey from 'uuid-apikey';
+import { UpdateIgnoreAreasDto } from 'src/test-runs/dto/update-ignore-area.dto';
 
 describe('TestRuns (e2e)', () => {
   let app: INestApplication;
@@ -32,6 +33,7 @@ describe('TestRuns (e2e)', () => {
     }).compile();
 
     app = moduleFixture.createNestApplication();
+    app.useGlobalPipes(new ValidationPipe());
     testRunsService = moduleFixture.get<TestRunsService>(TestRunsService);
     usersService = moduleFixture.get<UsersService>(UsersService);
     projecstService = moduleFixture.get<ProjectsService>(ProjectsService);
@@ -444,4 +446,42 @@ describe('TestRuns (e2e)', () => {
       await requestWithAuth(app, 'post', `/test-runs/reject`, user.token).send([testRun1.id, testRun2.id]).expect(201);
     });
   });
+
+  describe('POST /ignoreAreas/update', () => {
+    it('200', async () => {
+      const { testRun } = await haveTestRunCreated(buildsService, testRunsService, project.id, 'develop', image_v1);
+
+      const request: UpdateIgnoreAreasDto = {
+        ids: [testRun.id],
+        ignoreAreas: [
+          {
+            x: 182,
+            y: 28,
+            width: 38,
+            height: 30,
+          },
+        ],
+      };
+      await requestWithAuth(app, 'post', `/test-runs/ignoreAreas/update`, user.token).send(request).expect(201);
+    });
+  });
+
+  describe('POST /ignoreAreas/add', () => {
+    it('200', async () => {
+      const { testRun } = await haveTestRunCreated(buildsService, testRunsService, project.id, 'develop', image_v1);
+
+      const request: UpdateIgnoreAreasDto = {
+        ids: [testRun.id],
+        ignoreAreas: [
+          {
+            x: 182,
+            y: 28,
+            width: 38,
+            height: 30,
+          },
+        ],
+      };
+      await requestWithAuth(app, 'post', `/test-runs/ignoreAreas/add`, user.token).send(request).expect(201);
+    });
+  });
 });

test/test-variations.e2e-spec.ts

@@ -1,5 +1,5 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { INestApplication } from '@nestjs/common';
+import { INestApplication, ValidationPipe } from '@nestjs/common';
 import { AppModule } from '../src/app.module';
 import { UsersService } from '../src/users/users.service';
 import { haveTestRunCreated, haveUserLogged } from './preconditions';
@@ -28,6 +28,7 @@ describe('TestVariations (e2e)', () => {
     }).compile();
 
     app = moduleFixture.createNestApplication();
+    app.useGlobalPipes(new ValidationPipe());
     testRunsService = moduleFixture.get<TestRunsService>(TestRunsService);
     usersService = moduleFixture.get<UsersService>(UsersService);
     projecstService = moduleFixture.get<ProjectsService>(ProjectsService);

test/users.e2e-spec.ts

@@ -1,8 +1,7 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { INestApplication } from '@nestjs/common';
+import { INestApplication, ValidationPipe } from '@nestjs/common';
 import request from 'supertest';
 import { AppModule } from '../src/app.module';
-import uuidAPIKey from 'uuid-apikey';
 import { UsersService } from '../src/users/users.service';
 import { UserLoginRequestDto } from '../src/users/dto/user-login-request.dto';
 import { compareSync } from 'bcryptjs';
@@ -20,6 +19,7 @@ describe('Users (e2e)', () => {
     }).compile();
 
     app = moduleFixture.createNestApplication();
+    app.useGlobalPipes(new ValidationPipe());
     usersService = moduleFixture.get<UsersService>(UsersService);
     await app.init();
   });
@@ -33,12 +33,7 @@ describe('Users (e2e)', () => {
   });
 
   it('POST /register', () => {
-    user = {
-      email: `${uuidAPIKey.create().uuid}@example.com'`,
-      password: '123456',
-      firstName: 'fName',
-      lastName: 'lName',
-    };
+    user = generateUser("123456");
     return request(app.getHttpServer())
       .post('/users/register')
       .send(user)
@@ -108,7 +103,7 @@ describe('Users (e2e)', () => {
     const password = '123456';
     user = await usersService.create(generateUser(password));
     const editedUser = {
-      email: `${uuidAPIKey.create().uuid}@example.com'`,
+      email: 'edited' + user.email,
       firstName: 'EDITEDfName',
       lastName: 'EDITEDlName',
     };