better table naming, delete handling, dev data

cloud-gov · Aug 30, 2023 · 5e47633 · 5e47633
1 parent 77be825
commit 5e47633
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 4 deletions.
diff --git a/api/models/build-task-type.js b/api/models/build-task-type.js
@@ -4,7 +4,7 @@ const associate = ({
 }) => {
   // Associations
   BuildTaskType.hasMany(BuildTask, {
-    foreignKey: 'build_task_type',
+    foreignKey: 'buildTaskTypeId',
   });
 };
 
@@ -23,6 +23,8 @@ module.exports = (sequelize, DataTypes) => {
       metadata: {
         type: DataTypes.JSON,
       },
+    }, {
+      tableName: 'build_task_type',
     }
   );
 

diff --git a/api/models/build-task.js b/api/models/build-task.js
@@ -31,6 +31,16 @@ module.exports = (sequelize, DataTypes) => {
           isIn: [Statuses.values],
         },
       },
+    }, {
+      tableName: 'build_task',
+      paranoid: true,
+      indexes: [
+        {
+          name: 'build_task_build_id_type_index',
+          unique: true,
+          fields: ['buildId'],
+        },
+      ],
     }
   );
 

diff --git a/api/models/build.js b/api/models/build.js
@@ -39,7 +39,7 @@ const associate = ({
     allowNull: false,
   });
   Build.hasMany(BuildTask, {
-    foreignKey: 'build_task',
+    foreignKey: 'buildId',
   });
 
   // Scopes

diff --git a/migrations/20230829172947-build-tasks.js b/migrations/20230829172947-build-tasks.js
@@ -5,6 +5,8 @@ const TYPE_TABLE_SCHEMA = {
   name: { type: "string", notNull: true },
   description: { type: "string", notNull: true },
   metadata: { type: "jsonb", allowNull: true },
+  createdAt: { type: "timestamp", notNull: true },
+  updatedAt: { type: "timestamp", notNull: true },
 };
 
 const TABLE_NAME = "build_task";
@@ -18,7 +20,7 @@ const TABLE_SCHEMA = {
       name: "build_task_build_id_fk",
       table: "build",
       rules: {
-        onDelete: "RESTRICT",
+        onDelete: "CASCADE",
         onUpdate: "RESTRICT"
       },
       mapping: "id"
@@ -31,7 +33,7 @@ const TABLE_SCHEMA = {
       name: "build_task_build_task_type_id_fk",
       table: "build_task_type",
       rules: {
-        onDelete: "RESTRICT",
+        onDelete: "CASCADE",
         onUpdate: "RESTRICT"
       },
       mapping: "id"
@@ -40,6 +42,9 @@ const TABLE_SCHEMA = {
   name: { type: "string", notNull: true },
   status: { type: "string", notNull: true, default: "created" },
   artifact: { type: "string", allowNull: true },
+  createdAt: { type: "timestamp", notNull: true },
+  updatedAt: { type: "timestamp", notNull: true },
+  deletedAt: { type: "timestamp", allowNull: true },
 };
 
 exports.up = async (db) => {

diff --git a/scripts/create-dev-data.js b/scripts/create-dev-data.js
@@ -8,6 +8,8 @@ const cleanDatabase = require('../api/utils/cleanDatabase');
 const {
   ActionType,
   Build,
+  BuildTaskType,
+  BuildTask,
   BuildLog,
   Domain,
   Event,
@@ -434,6 +436,20 @@ async function createData() {
     })),
   ]);
 
+  const taskType = await BuildTaskType.create({
+    name: 'test',
+    description: 'test',
+    metadata: {
+      foo: 'bar',
+    },
+  });
+  await BuildTask.create({
+    buildId: nodeSiteBuilds[0].id,
+    buildTaskTypeId: taskType.id,
+    name: 'type',
+    status: 'processing',
+  });
+
   const goSiteBuilds = await Promise.all([
     Build.create({
       branch: goSite.defaultBranch,