fix: ciBuildId ignores project scope (#91)

pashidlos · web-flow · commit 0a5b99f9f5f9 · 2021-01-19T11:45:45.000+02:00
Closes Visual-Regression-Tracker/Visual-Regression-Tracker#183
diff --git a/prisma/migrations/20210118201534-build--project-id---ci-build-id-constraint/README.md b/prisma/migrations/20210118201534-build--project-id---ci-build-id-constraint/README.md
@@ -0,0 +1,52 @@
+# Migration `20210118201534-build--project-id---ci-build-id-constraint`
+
+This migration has been generated by Pavel Strunkin at 1/18/2021, 10:15:34 PM.
+You can check out the [state of the schema](./schema.prisma) after the migration.
+
+## Database Steps
+
+```sql
+DROP INDEX "Build.ciBuildId_unique"
+
+CREATE UNIQUE INDEX "Build.projectId_ciBuildId_unique" ON "Build"("projectId", "ciBuildId")
+```
+
+## Changes
+
+```diff
+diff --git schema.prisma schema.prisma
+migration 20201201211711-test-run--temp-ignore-areas-added..20210118201534-build--project-id---ci-build-id-constraint
+--- datamodel.dml
++++ datamodel.dml
+@@ -1,17 +1,16 @@
+ generator client {
+-  provider        = "prisma-client-js"
+-  previewFeatures = ["atomicNumberOperations"]
++  provider = "prisma-client-js"
+ }
+ datasource db {
+   provider = "postgresql"
+-  url = "***"
++  url = "***"
+ }
+ model Build {
+   id         String    @id @default(uuid())
+-  ciBuildId  String?   @unique
++  ciBuildId  String?
+   number     Int?
+   branchName String?
+   status     String?
+   testRuns   TestRun[]
+@@ -21,8 +20,10 @@
+   createdAt  DateTime  @default(now())
+   user       User?     @relation(fields: [userId], references: [id])
+   userId     String?
+   isRunning  Boolean?
++
++  @@unique([projectId, ciBuildId])
+ }
+ model Project {
+   id             String          @id @default(uuid())
+```
+
+
diff --git a/prisma/migrations/20210118201534-build--project-id---ci-build-id-constraint/schema.prisma b/prisma/migrations/20210118201534-build--project-id---ci-build-id-constraint/schema.prisma
@@ -0,0 +1,122 @@
+generator client {
+  provider = "prisma-client-js"
+}
+
+datasource db {
+  provider = "postgresql"
+  url = "***"
+}
+
+model Build {
+  id         String    @id @default(uuid())
+  ciBuildId  String?
+  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?
+  isRunning  Boolean?
+
+  @@unique([projectId, ciBuildId])
+}
+
+model Project {
+  id             String          @id @default(uuid())
+  name           String
+  mainBranchName String          @default("master")
+  builds         Build[]
+  buildsCounter  Int             @default(0)
+  testVariations TestVariation[]
+  updatedAt      DateTime        @updatedAt
+  createdAt      DateTime        @default(now())
+
+  @@unique([name])
+}
+
+model TestRun {
+  id                    String        @id @default(uuid())
+  imageName             String
+  diffName              String?
+  diffPercent           Float?
+  diffTollerancePercent Float         @default(0)
+  pixelMisMatchCount    Int?
+  status                TestStatus
+  buildId               String
+  build                 Build         @relation(fields: [buildId], references: [id])
+  testVariationId       String
+  testVariation         TestVariation @relation(fields: [testVariationId], references: [id])
+  merge                 Boolean       @default(false)
+  updatedAt             DateTime      @updatedAt
+  createdAt             DateTime      @default(now())
+  // Test variation data
+  name                  String        @default("")
+  browser               String?
+  device                String?
+  os                    String?
+  viewport              String?
+  baselineName          String?
+  comment               String?
+  baseline              Baseline?
+  branchName            String        @default("master")
+  baselineBranchName    String?
+  ignoreAreas           String        @default("[]")
+  tempIgnoreAreas       String        @default("[]")
+}
+
+model TestVariation {
+  id           String     @id @default(uuid())
+  name         String
+  branchName   String     @default("master")
+  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())
+
+  @@unique([projectId, name, browser, device, os, viewport, branchName])
+}
+
+model Baseline {
+  id              String        @id @default(uuid())
+  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   @id @default(uuid())
+  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/20210118201534-build--project-id---ci-build-id-constraint/steps.json b/prisma/migrations/20210118201534-build--project-id---ci-build-id-constraint/steps.json
@@ -0,0 +1,32 @@
+{
+  "version": "0.3.14-fixed",
+  "steps": [
+    {
+      "tag": "DeleteDirective",
+      "location": {
+        "path": {
+          "tag": "Field",
+          "model": "Build",
+          "field": "ciBuildId"
+        },
+        "directive": "unique"
+      }
+    },
+    {
+      "tag": "CreateDirective",
+      "location": {
+        "path": {
+          "tag": "Model",
+          "model": "Build",
+          "arguments": [
+            {
+              "name": "",
+              "value": "[projectId, ciBuildId]"
+            }
+          ]
+        },
+        "directive": "unique"
+      }
+    }
+  ]
+}
diff --git a/prisma/migrations/migrate.lock b/prisma/migrations/migrate.lock
@@ -11,4 +11,5 @@
 20200909223305-test-variation-project-id-added-into-unique-constraint
 20201007145002-builds-counter
 20201115155739-ci-build-id-added
-20201201211711-test-run--temp-ignore-areas-added
+20201201211711-test-run--temp-ignore-areas-added
+20210118201534-build--project-id---ci-build-id-constraint
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -9,7 +9,7 @@ datasource db {
 
 model Build {
   id         String    @id @default(uuid())
-  ciBuildId  String?   @unique
+  ciBuildId  String?
   number     Int?
   branchName String?
   status     String?
@@ -21,6 +21,8 @@ model Build {
   user       User?     @relation(fields: [userId], references: [id])
   userId     String?
   isRunning  Boolean?
+
+  @@unique([projectId, ciBuildId])
 }
 
 model Project {
diff --git a/src/builds/builds.service.spec.ts b/src/builds/builds.service.spec.ts
@@ -215,7 +215,10 @@ describe('BuildsService', () => {
       expect(projectFindOneMock).toHaveBeenCalledWith(createBuildDto.project);
       expect(buildFindUniqueMock).toHaveBeenCalledWith({
         where: {
-          ciBuildId: createBuildDto.ciBuildId,
+          projectId_ciBuildId: {
+            projectId: project.id,
+            ciBuildId: createBuildDto.ciBuildId,
+          },
         },
       });
       expect(projectUpdateMock).toHaveBeenCalledWith({
@@ -254,12 +257,6 @@ describe('BuildsService', () => {
 
       const result = await service.create(createBuildDto);
 
-      expect(projectFindOneMock).toHaveBeenCalledWith(createBuildDto.project);
-      expect(buildFindUniqueMock).toHaveBeenCalledWith({
-        where: {
-          ciBuildId: createBuildDto.ciBuildId,
-        },
-      });
       expect(result).toBe(buildDto);
     });
   });
diff --git a/src/builds/builds.service.ts b/src/builds/builds.service.ts
@@ -59,7 +59,10 @@ export class BuildsService {
     if (createBuildDto.ciBuildId) {
       build = await this.prismaService.build.findUnique({
         where: {
-          ciBuildId: createBuildDto.ciBuildId,
+          projectId_ciBuildId: {
+            projectId: project.id,
+            ciBuildId: createBuildDto.ciBuildId,
+          },
         },
       });
     }
