Visual-Regression-Tracker · pashidlos · Jun 27, 2020 · Jun 27, 2020 · Jun 27, 2020 · Jun 27, 2020
diff --git a/prisma/migrations/20200627134248-comment-added/README.md b/prisma/migrations/20200627134248-comment-added/README.md
@@ -0,0 +1,58 @@
+# Migration `20200627134248-comment-added`
+
+This migration has been generated by Pavel Strunkin at 6/27/2020, 1:42:48 PM.
+You can check out the [state of the schema](./schema.prisma) after the migration.
+
+## Database Steps
+
+```sql
+ALTER TABLE "public"."TestRun" ADD COLUMN "comment" text   ;
+
+ALTER TABLE "public"."TestVariation" ADD COLUMN "comment" text   ;
+```
+
+## Changes
+
+```diff
+diff --git schema.prisma schema.prisma
+migration 20200526195312-approved-test-status-added..20200627134248-comment-added
+--- datamodel.dml
++++ datamodel.dml
+@@ -3,9 +3,9 @@
+ }
+ datasource db {
+   provider = "postgresql"
+-  url = "***"
++  url      = env("DATABASE_URL")
+ }
+ model Build {
+   id         String    @default(uuid()) @id
+@@ -51,9 +51,9 @@
+   os                    String?
+   viewport              String?
+   baselineName          String?
+   ignoreAreas           String        @default("[]")
+-  // Baseline
++  comment               String?
+   baseline              Baseline?
+ }
+ model TestVariation {
+@@ -68,8 +68,9 @@
+   projectId    String
+   project      Project    @relation(fields: [projectId], references: [id])
+   testRuns     TestRun[]
+   baselines    Baseline[]
++  comment      String?
+   updatedAt    DateTime   @updatedAt
+   createdAt    DateTime   @default(now())
+ }
+@@ -102,5 +103,5 @@
+   new
+   ok
+   unresolved
+   approved
+-}
++}
+```
+
+
diff --git a/prisma/migrations/20200627134248-comment-added/schema.prisma b/prisma/migrations/20200627134248-comment-added/schema.prisma
@@ -0,0 +1,107 @@
+generator client {
+  provider = "prisma-client-js"
+}
+
+datasource db {
+  provider = "postgresql"
+  url = "***"
+}
+
+model Build {
+  id         String    @default(uuid()) @id
+  number     Int?
+  branchName String?
+  status     String?
+  testRuns   TestRun[]
+  projectId  String
+  project    Project   @relation(fields: [projectId], references: [id])
+  updatedAt  DateTime  @updatedAt
+  createdAt  DateTime  @default(now())
+  user       User?     @relation(fields: [userId], references: [id])
+  userId     String?
+}
+
+model Project {
+  id             String          @default(uuid()) @id
+  name           String
+  builds         Build[]
+  testVariations TestVariation[]
+  updatedAt      DateTime        @updatedAt
+  createdAt      DateTime        @default(now())
+}
+
+model TestRun {
+  id                    String        @default(uuid()) @id
+  imageName             String
+  diffName              String?
+  diffPercent           Float?
+  diffTollerancePercent Float         @default(1.0)
+  pixelMisMatchCount    Int?
+  status                TestStatus
+  buildId               String
+  build                 Build         @relation(fields: [buildId], references: [id])
+  testVariationId       String
+  testVariation         TestVariation @relation(fields: [testVariationId], references: [id])
+  updatedAt             DateTime      @updatedAt
+  createdAt             DateTime      @default(now())
+  // Test variation data
+  name                  String        @default("")
+  browser               String?
+  device                String?
+  os                    String?
+  viewport              String?
+  baselineName          String?
+  ignoreAreas           String        @default("[]")
+  comment               String?
+  baseline              Baseline?
+}
+
+model TestVariation {
+  id           String     @default(uuid()) @id
+  name         String
+  browser      String?
+  device       String?
+  os           String?
+  viewport     String?
+  baselineName String?
+  ignoreAreas  String     @default("[]")
+  projectId    String
+  project      Project    @relation(fields: [projectId], references: [id])
+  testRuns     TestRun[]
+  baselines    Baseline[]
+  comment      String?
+  updatedAt    DateTime   @updatedAt
+  createdAt    DateTime   @default(now())
+}
+
+model Baseline {
+  id              String        @default(uuid()) @id
+  baselineName    String
+  testVariationId String
+  testVariation   TestVariation @relation(fields: [testVariationId], references: [id])
+  testRunId       String?
+  testRun         TestRun?      @relation(fields: [testRunId], references: [id])
+  updatedAt       DateTime      @updatedAt
+  createdAt       DateTime      @default(now())
+}
+
+model User {
+  id        String   @default(uuid()) @id
+  email     String   @unique
+  password  String
+  firstName String?
+  lastName  String?
+  apiKey    String   @unique
+  isActive  Boolean  @default(true)
+  builds    Build[]
+  updatedAt DateTime @updatedAt
+  createdAt DateTime @default(now())
+}
+
+enum TestStatus {
+  failed
+  new
+  ok
+  unresolved
+  approved
+}
diff --git a/prisma/migrations/20200627134248-comment-added/steps.json b/prisma/migrations/20200627134248-comment-added/steps.json
@@ -0,0 +1,19 @@
+{
+  "version": "0.3.14-fixed",
+  "steps": [
+    {
+      "tag": "CreateField",
+      "model": "TestRun",
+      "field": "comment",
+      "type": "String",
+      "arity": "Optional"
+    },
+    {
+      "tag": "CreateField",
+      "model": "TestVariation",
+      "field": "comment",
+      "type": "String",
+      "arity": "Optional"
+    }
+  ]
+}
diff --git a/prisma/migrations/migrate.lock b/prisma/migrations/migrate.lock
@@ -1,8 +1,6 @@
-# IF THERE'S A GIT CONFLICT IN THIS FILE, DON'T SOLVE IT MANUALLY!
-# INSTEAD EXECUTE `prisma migrate fix`
 # Prisma Migrate lockfile v1
-# Read more about conflict resolution here: TODO
 
 20200503001556-init
 20200524162125-baseline-history
-20200526195312-approved-test-status-added
+20200526195312-approved-test-status-added
+20200627134248-comment-added
diff --git a/prisma/package.json b/prisma/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vrt-migration",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "description": "",
   "author": "",
   "private": true,

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -52,7 +52,7 @@ model TestRun {
   viewport              String?
   baselineName          String?
   ignoreAreas           String        @default("[]")
-  // Baseline
+  comment               String?
   baseline              Baseline?
 }
 
@@ -69,6 +69,7 @@ model TestVariation {
   project      Project    @relation(fields: [projectId], references: [id])
   testRuns     TestRun[]
   baselines    Baseline[]
+  comment      String?
   updatedAt    DateTime   @updatedAt
   createdAt    DateTime   @default(now())
 }
@@ -103,4 +104,4 @@ enum TestStatus {
   ok
   unresolved
   approved
-}
+}
diff --git a/src/builds/builds.service.spec.ts b/src/builds/builds.service.spec.ts
@@ -84,6 +84,7 @@ describe('BuildsService', () => {
         viewport: '1800x1600',
         baselineName: null,
         ignoreAreas: '[]',
+        comment: 'some comment',
       },
     ],
   };

diff --git a/src/builds/dto/build.dto.spec.ts b/src/builds/dto/build.dto.spec.ts
@@ -53,7 +53,9 @@ describe('BuildDto', () => {
   });
 
   it('passed', () => {
-    const build = {
+    const build: Build & {
+      testRuns: TestRun[];
+    } = {
       id: 'a9385fc1-884d-4f9f-915e-40da0e7773d5',
       number: null,
       branchName: 'develop',
@@ -82,6 +84,7 @@ describe('BuildDto', () => {
           viewport: '1800x1600',
           baselineName: null,
           ignoreAreas: '[]',
+          comment: 'some comment1',
         },
         {
           id: '10fb5e02-64e0-4cf5-9f17-c00ab3c96658',
@@ -102,6 +105,7 @@ describe('BuildDto', () => {
           viewport: '1800x1600',
           baselineName: null,
           ignoreAreas: '[]',
+          comment: 'some comment2',
         },
       ],
     };
@@ -154,6 +158,7 @@ describe('BuildDto', () => {
           viewport: '1800x1600',
           baselineName: null,
           ignoreAreas: '[]',
+          comment: 'some comment',
         },
         {
           id: '10fb5e02-64e0-4cf5-9f17-c00ab3c96658',
@@ -174,6 +179,7 @@ describe('BuildDto', () => {
           viewport: '1800x1600',
           baselineName: null,
           ignoreAreas: '[]',
+          comment: 'some comment1',
         },
         {
           id: '10fb5e02-64e0-4cf5-9f17-c00ab3c96658',
@@ -194,6 +200,7 @@ describe('BuildDto', () => {
           viewport: '1800x1600',
           baselineName: null,
           ignoreAreas: '[]',
+          comment: 'some comment2',
         },
       ],
     };
@@ -246,6 +253,7 @@ describe('BuildDto', () => {
           viewport: '1800x1600',
           baselineName: null,
           ignoreAreas: '[]',
+          comment: 'some comment1',
         },
         {
           id: '10fb5e02-64e0-4cf5-9f17-c00ab3c96658',
@@ -266,6 +274,7 @@ describe('BuildDto', () => {
           viewport: '1800x1600',
           baselineName: null,
           ignoreAreas: '[]',
+          comment: 'some comment2',
         },
         {
           id: '10fb5e02-64e0-4cf5-9f17-c00ab3c96658',
@@ -286,6 +295,7 @@ describe('BuildDto', () => {
           viewport: '1800x1600',
           baselineName: null,
           ignoreAreas: '[]',
+          comment: null,
         },
         {
           id: '10fb5e02-64e0-4cf5-9f17-c00ab3c96658',
@@ -306,6 +316,7 @@ describe('BuildDto', () => {
           viewport: '1800x1600',
           baselineName: null,
           ignoreAreas: '[]',
+          comment: 'some comment',
         },
         {
           id: '10fb5e02-64e0-4cf5-9f17-c00ab3c96658',
@@ -326,6 +337,7 @@ describe('BuildDto', () => {
           viewport: '1800x1600',
           baselineName: null,
           ignoreAreas: '[]',
+          comment: 'some comment',
         },
       ],
     };

diff --git a/src/shared/dto/comment.dto.ts b/src/shared/dto/comment.dto.ts
@@ -0,0 +1,8 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsString } from 'class-validator';
+
+export class CommentDto {
+  @ApiProperty()
+  @IsString()
+  comment: string;
+}