feat(pipeline): add model pipelineStep

teamstarter · May 25, 2021 · 3460423 · 3460423
1 parent 454647c
commit 3460423
Show file tree

Hide file tree

Showing 11 changed files with 155 additions and 5 deletions.
diff --git a/lib/gnj.js b/lib/gnj.js
@@ -62,6 +62,9 @@ commander_1["default"]
                     models = models_1["default"](config);
                     return [4 /*yield*/, migrate_1["default"](models)];
                 case 1:
+                    _a.sent();
+                    return [4 /*yield*/, models.sequelize.close()];
+                case 2:
                     _a.sent();
                     return [2 /*return*/];
             }

diff --git a/lib/graphql/getApolloServer.js b/lib/graphql/getApolloServer.js
@@ -19,6 +19,7 @@ var models_1 = __importDefault(require("../models"));
 var job_1 = __importDefault(require("./job"));
 var batch_1 = __importDefault(require("./batch"));
 var pipeline_1 = __importDefault(require("./pipeline"));
+var pipelineStep_1 = __importDefault(require("./pipelineStep"));
 var jobHoldType_1 = __importDefault(require("./jobHoldType"));
 /**
  * @param dbConfig Sequelize database configuration object
@@ -33,6 +34,7 @@ function getApolloServer(dbConfig, gsgParams, customMutations) {
         job: job_1["default"](types, models),
         batch: batch_1["default"](types, models),
         pipeline: pipeline_1["default"](types, models),
+        pipelineStep: pipelineStep_1["default"](types, models),
         jobHoldType: jobHoldType_1["default"](types, models)
     };
     return graphql_sequelize_generator_1.generateApolloServer(__assign({ graphqlSchemaDeclaration: graphqlSchemaDeclaration,

diff --git a/lib/graphql/job.js b/lib/graphql/job.js
@@ -70,15 +70,15 @@ var CancelRequestedError = /** @class */ (function (_super) {
 exports.CancelRequestedError = CancelRequestedError;
 var allInstanceOfDebounceBatch = [];
 function getInstanceOfDebounceBatch(batchId) {
-    var instanceAlreadyExist = allInstanceOfDebounceBatch.filter(function (instance) { return instance.batchId === batchId; });
-    if (!instanceAlreadyExist.length) {
+    var instance = allInstanceOfDebounceBatch.filter(function (instance) { return instance.batchId === batchId; });
+    if (!instance.length) {
         allInstanceOfDebounceBatch.push({
             batchId: batchId,
             debounce: debounce_1["default"](function (callback) { return callback(); }, 50)
         });
         return allInstanceOfDebounceBatch.filter(function (instance) { return instance.batchId === batchId; })[0].debounce;
     }
-    return instanceAlreadyExist[0].debounce;
+    return instance[0].debounce;
 }
 function JobConfiguration(graphqlTypes, models) {
     var _this = this;
@@ -192,7 +192,7 @@ function JobConfiguration(graphqlTypes, models) {
             }); }
         },
         create: {
-            preventDuplicateOnAttributes: ['jobUniqueId']
+        // preventDuplicateOnAttributes: ['jobUniqueId'],
         }
     };
 }

diff --git a/lib/graphql/pipelineStep.js b/lib/graphql/pipelineStep.js
@@ -0,0 +1,14 @@
+"use strict";
+exports.__esModule = true;
+function PipelineStepConfiguration(types, models) {
+    return {
+        model: models.pipelineStep,
+        actions: ['list', 'update', 'create', 'count'],
+        list: {
+            before: function (findOptions) {
+                return findOptions;
+            }
+        }
+    };
+}
+exports["default"] = PipelineStepConfiguration;
diff --git a/lib/models/pipeline.js b/lib/models/pipeline.js
@@ -8,6 +8,14 @@ function Pipeline(sequelize) {
             primaryKey: true,
             autoIncrement: true
         },
+        status: {
+            type: sequelize_1.DataTypes.STRING,
+            allowNull: false,
+            defaultValue: 'planned',
+            validate: {
+                isIn: [['planned', 'processing', 'failed', 'successful']]
+            }
+        },
         name: {
             type: sequelize_1.DataTypes.STRING
         },

diff --git a/lib/models/pipelineStep.js b/lib/models/pipelineStep.js
@@ -0,0 +1,37 @@
+"use strict";
+exports.__esModule = true;
+var sequelize_1 = require("sequelize");
+function PipelineStep(sequelize) {
+    var PipelineStep = sequelize.define('pipelineStep', {
+        id: {
+            type: sequelize_1.DataTypes.INTEGER,
+            primaryKey: true,
+            autoIncrement: true
+        },
+        jobId: {
+            type: sequelize_1.DataTypes.INTEGER
+        },
+        batchId: {
+            type: sequelize_1.DataTypes.INTEGER
+        },
+        index: {
+            type: sequelize_1.DataTypes.INTEGER
+        }
+    }, {
+        freezeTableName: true,
+        tableName: 'pipelineStep',
+        paranoid: true
+    });
+    PipelineStep.associate = function (models) {
+        models.job.belongsTo(models.job, {
+            foreignKey: 'jobId',
+            sourceKey: 'id'
+        });
+        models.job.belongsTo(models.batch, {
+            foreignKey: 'batchId',
+            sourceKey: 'id'
+        });
+    };
+    return PipelineStep;
+}
+exports["default"] = PipelineStep;
diff --git a/migrations/20201130230919-create-pipelineStep.js b/migrations/20201130230919-create-pipelineStep.js
@@ -0,0 +1,25 @@
+'use strict'
+module.exports = {
+  up: function (queryInterface, Sequelize) {
+    return queryInterface.createTable('pipelineStep', {
+      id: {
+        allowNull: false,
+        autoIncrement: true,
+        primaryKey: true,
+        type: Sequelize.INTEGER,
+      },
+      jobId: {
+        type: Sequelize.INTEGER,
+      },
+      batchId: {
+        type: Sequelize.INTEGER,
+      },
+      index: {
+        type: Sequelize.INTEGER,
+      },
+    })
+  },
+  down: function (queryInterface) {
+    return queryInterface.dropTable('pipelineStep')
+  },
+}
diff --git a/src/graphql/getApolloServer.ts b/src/graphql/getApolloServer.ts
@@ -7,6 +7,7 @@ import getModels from '../models'
 import job from './job'
 import batch from './batch'
 import pipeline from './pipeline'
+import pipelineStep from './pipelineStep'
 import jobHoldType from './jobHoldType'
 
 /**
@@ -26,6 +27,7 @@ export default function getApolloServer(
     job: job(types, models),
     batch: batch(types, models),
     pipeline: pipeline(types, models),
+    pipelineStep: pipelineStep(types, models),
     jobHoldType: jobHoldType(types, models),
   }
 

diff --git a/src/graphql/job.ts b/src/graphql/job.ts
@@ -142,7 +142,7 @@ export default function JobConfiguration(
       },
     },
     create: {
-      preventDuplicateOnAttributes: ['jobUniqueId'],
+      // preventDuplicateOnAttributes: ['jobUniqueId'],
     },
   }
 }
diff --git a/src/graphql/pipelineStep.ts b/src/graphql/pipelineStep.ts
@@ -0,0 +1,20 @@
+import {
+  InAndOutTypes,
+  ModelDeclarationType,
+  SequelizeModels,
+} from 'graphql-sequelize-generator/types'
+
+export default function PipelineStepConfiguration(
+  types: InAndOutTypes,
+  models: SequelizeModels
+): ModelDeclarationType {
+  return {
+    model: models.pipelineStep,
+    actions: ['list', 'update', 'create', 'count'],
+    list: {
+      before: (findOptions) => {
+        return findOptions
+      },
+    },
+  }
+}
diff --git a/src/models/pipelineStep.ts b/src/models/pipelineStep.ts
@@ -0,0 +1,39 @@
+import { DataTypes } from 'sequelize'
+
+export default function PipelineStep(sequelize: any) {
+  var PipelineStep = sequelize.define(
+    'pipelineStep',
+    {
+      id: {
+        type: DataTypes.INTEGER,
+        primaryKey: true,
+        autoIncrement: true,
+      },
+      jobId: {
+        type: DataTypes.INTEGER,
+      },
+      batchId: {
+        type: DataTypes.INTEGER,
+      },
+      index: {
+        type: DataTypes.INTEGER,
+      },
+    },
+    {
+      freezeTableName: true,
+      tableName: 'pipelineStep',
+      paranoid: true,
+    }
+  )
+  PipelineStep.associate = function (models: any) {
+    models.job.belongsTo(models.job, {
+      foreignKey: 'jobId',
+      sourceKey: 'id',
+    })
+    models.job.belongsTo(models.batch, {
+      foreignKey: 'batchId',
+      sourceKey: 'id',
+    })
+  }
+  return PipelineStep
+}