Merge pull request #3 from Visual-Regression-Tracker/8-diff-size

8 diff size

Author: pashidlos

.env

@@ -12,4 +12,4 @@ APP_FRONTEND_URL=http://localhost:8080
 POSTGRES_PORT=5432
 POSTGRES_USER=postgres
 POSTGRES_PASSWORD=postgres
-POSTGRES_DB=vrt_db
+POSTGRES_DB=vrt_db_dev

.prettierrc

@@ -0,0 +1,5 @@
+{
+  "singleQuote": true,
+  "printWidth": 120,
+  "trailingComma": "es5"
+}

prisma/.env

@@ -1 +1 @@
-DATABASE_URL="postgresql://postgres:postgres@localhost:5432/vrt_db"
+DATABASE_URL="postgresql://postgres:postgres@localhost:5432/vrt_db_dev"

prisma/migrations/20200526195312-approved-test-status-added/README.md

@@ -0,0 +1,37 @@
+# Migration `20200526195312-approved-test-status-added`
+
+This migration has been generated by Pavel Strunkin at 5/26/2020, 7:53:12 PM.
+You can check out the [state of the schema](./schema.prisma) after the migration.
+
+## Database Steps
+
+```sql
+ALTER TYPE "TestStatus" ADD VALUE 'approved'
+```
+
+## Changes
+
+```diff
+diff --git schema.prisma schema.prisma
+migration 20200524162125-baseline-history..20200526195312-approved-test-status-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
+@@ -101,5 +101,6 @@
+   failed
+   new
+   ok
+   unresolved
++  approved
+ }
+```
+
+

prisma/migrations/20200526195312-approved-test-status-added/schema.prisma

@@ -0,0 +1,106 @@
+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("[]")
+  // Baseline
+  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[]
+  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
+}

prisma/migrations/20200526195312-approved-test-status-added/steps.json

@@ -0,0 +1,12 @@
+{
+  "version": "0.3.14-fixed",
+  "steps": [
+    {
+      "tag": "UpdateEnum",
+      "enum": "TestStatus",
+      "createdValues": [
+        "approved"
+      ]
+    }
+  ]
+}

prisma/migrations/migrate.lock

@@ -4,4 +4,5 @@
 # Read more about conflict resolution here: TODO
 
 20200503001556-init
-20200524162125-baseline-history
+20200524162125-baseline-history
+20200526195312-approved-test-status-added

prisma/schema.prisma

@@ -102,4 +102,5 @@ enum TestStatus {
   new
   ok
   unresolved
+  approved
 }

src/shared/static/static.service.ts

@@ -9,12 +9,20 @@ export class StaticService {
   constructor(private configService: ConfigService) {
   }
 
-  saveImage(imageName: string, imageBuffer: Buffer) {
+  saveImage(type: 'screenshot' | 'diff' | 'baseline', imageBuffer: Buffer): string {
+    const imageName = `${Date.now()}.${type}.png`
     writeFileSync(this.getImagePath(imageName), imageBuffer);
+    return imageName
   }
 
   getImage(imageName: string): PNGWithMetadata {
-    return PNG.sync.read(readFileSync(this.getImagePath(imageName)));
+    let image: PNGWithMetadata
+    try {
+      image = PNG.sync.read(readFileSync(this.getImagePath(imageName)))
+    } catch (ex) {
+      console.log(`Cannot image: ${imageName}. ${ex}`)
+    }
+    return image;
   }
 
   async deleteImage(imageName: string): Promise<boolean> {

src/test-runs/diffResult.ts

@@ -0,0 +1,9 @@
+import { TestStatus } from '@prisma/client';
+
+export interface DiffResult {
+  status: TestStatus;
+  imageName: string;
+  pixelMisMatchCount: number;
+  diffPercent: number;
+  isSameDimension: boolean;
+}