chore: use models to generate seeds

Author: gregberge

apps/backend/db/seeds/seeds.js

@@ -15,7 +15,7 @@
     "db:drop": "knex-scripts drop",
     "db:dump": "pnpm run db:migrate:latest && knex-scripts dump",
     "db:load": "knex-scripts load",
-    "db:seed": "knex seed:run",
+    "db:seed": "node dist/database/bin/run-seed.js",
     "db:truncate": "knex-scripts truncate",
     "db:migrate:latest": "knex migrate:latest",
     "db:migrate:rollback": "knex migrate:rollback",

apps/backend/package.json

@@ -25,23 +25,26 @@ export async function concludeBuild(input: {
   if (conclusion === null) {
     return;
   }
-  const [, buildNotification] = await transaction(async (trx) => {
-    return Promise.all([
-      Build.query(trx).findById(buildId).patch({
-        conclusion,
-        stats,
-      }),
-      notify
-        ? BuildNotification.query(trx).insert({
-            buildId,
-            type: getNotificationType(conclusion),
-            jobStatus: "pending",
-          })
-        : null,
-    ]);
-  });
-  if (buildNotification) {
+  if (notify) {
+    const [, buildNotification] = await transaction(async (trx) => {
+      return Promise.all([
+        Build.query(trx).findById(buildId).patch({
+          conclusion,
+          stats,
+        }),
+        BuildNotification.query(trx).insert({
+          buildId,
+          type: getNotificationType(conclusion),
+          jobStatus: "pending",
+        }),
+      ]);
+    });
     await buildNotificationJob.push(buildNotification.id);
+  } else {
+    await Build.query().findById(buildId).patch({
+      conclusion,
+      stats,
+    });
   }
 }
 

apps/backend/src/build/concludeBuild.ts

@@ -286,13 +286,6 @@ const config = convict({
         default: join(__dirname, "../../db/migrations"),
       },
     },
-    seeds: {
-      directory: {
-        doc: "Seeds directory",
-        format: String,
-        default: join(__dirname, "../../db/seeds"),
-      },
-    },
     client: {
       doc: "Knex client",
       format: String,

apps/backend/src/config/index.ts

@@ -0,0 +1,5 @@
+import { seed } from "../seeds";
+
+await seed();
+console.log("Seeding complete");
+process.exit(0);

apps/backend/src/database/bin/run-seed.ts

@@ -143,7 +143,11 @@ describe("models/Build", () => {
     describe("with complete job", () => {
       describe("and one in error screenshot diff", () => {
         it("should be error", async () => {
-          build = await factory.Build.create();
+          build = await factory.Build.create({
+            jobStatus: "complete",
+            conclusion: null,
+            stats: null,
+          });
           await factory.ScreenshotDiff.createMany(2, [
             { buildId: build.id, jobStatus: "complete" },
             { buildId: build.id, jobStatus: "error" },
@@ -154,7 +158,11 @@ describe("models/Build", () => {
 
       describe("and one pending screenshot diff", () => {
         it("should be pending", async () => {
-          build = await factory.Build.create();
+          build = await factory.Build.create({
+            jobStatus: "complete",
+            conclusion: null,
+            stats: null,
+          });
           await factory.ScreenshotDiff.createMany(2, [
             { buildId: build.id, jobStatus: "complete" },
             { buildId: build.id, jobStatus: "pending" },
@@ -165,7 +173,11 @@ describe("models/Build", () => {
 
       describe("and one in progress screenshot diff", () => {
         it("should be progress", async () => {
-          build = await factory.Build.create();
+          build = await factory.Build.create({
+            jobStatus: "complete",
+            conclusion: null,
+            stats: null,
+          });
           await factory.ScreenshotDiff.createMany(2, [
             { buildId: build.id, jobStatus: "complete" },
             { buildId: build.id, jobStatus: "progress" },
@@ -176,7 +188,11 @@ describe("models/Build", () => {
 
       describe("with complete screenshot diffs", () => {
         it("should be error", async () => {
-          build = await factory.Build.create();
+          build = await factory.Build.create({
+            jobStatus: "complete",
+            conclusion: null,
+            stats: null,
+          });
           await factory.ScreenshotDiff.createMany(2, [
             { buildId: build.id, jobStatus: "complete" },
             { buildId: build.id, jobStatus: "complete" },

apps/backend/src/database/models/Build.e2e.test.ts

@@ -19,8 +19,8 @@ export class Plan extends Model {
     properties: {
       name: { type: "string" },
       includedScreenshots: { type: "number" },
-      githubPlanId: { type: "number" },
-      stripeProductId: { type: "string" },
+      githubPlanId: { type: ["number", "null"] },
+      stripeProductId: { type: ["string", "null"] },
       usageBased: { type: "boolean" },
       githubSsoIncluded: { type: "boolean" },
       fineGrainedAccessControlIncluded: { type: "boolean" },
@@ -29,8 +29,8 @@ export class Plan extends Model {
 
   name!: string;
   includedScreenshots!: number;
-  githubPlanId!: number;
-  stripeProductId!: string;
+  githubPlanId!: number | null;
+  stripeProductId!: string | null;
   usageBased!: boolean;
   githubSsoIncluded!: boolean;
   fineGrainedAccessControlIncluded!: boolean;