oradm-to-gql 35.0.11 → 35.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oradm-to-gql",
-  "version": "35.0.11",
+  "version": "35.0.12",
   "description": "Oracle Data Modeler CSV Export to Apollo GraphQL Endpoint Generator",
   "main": "index.js",
   "scripts": {
@@ -45,7 +45,7 @@
     "express": "^4.15.3",
     "jest": "^23.2.0",
     "knex": "^0.95.11",
-    "pg": "^6.4.0",
+    "pg": "^8.7.1",
     "require-from-string": "^1.2.1",
     "tg-client-query-builder": "^2.2.0",
     "tg-knex-query-resolver": "^4.1.0"

package/src/data-lib-generator/templates/createEntity.njk

@@ -53,6 +53,12 @@ async function create{{makePlural(entityName)}}(createRecords, trx, opts){
 
 
     let createdTimestamp = new Date();
+    let modifiedUser = undefined;
+    
+    if(this.context.req.user){        
+        modifiedUser = this.context.req.user.id;
+    }
+
     records.forEach((rec) => {
         {% for propName, attrDef in table.attributes %}
             {% if attrDef.isPrimaryKey %}
@@ -68,6 +74,10 @@ async function create{{makePlural(entityName)}}(createRecords, trx, opts){
             //set timestamps
             rec.{{attrDef.name}} = createdTimestamp;
             {% endif %}
+            {% if attrDef.updatedBy == 'modified' %}
+            //set modified user
+            rec.{{attrDef.name}} = modifiedUser;
+            {% endif %}
         {% endfor %}
         });
 

package/src/data-lib-generator/templates/updateEntity.njk

@@ -55,6 +55,12 @@ async function update{{makePlural(entityName)}}(updateRecords, fkFilter, trx, op
     
     let ids = [];
     let modifiedTimestamp = new Date();
+    let modifiedUser = undefined;
+    
+    if(this.context.req.user){        
+        modifiedUser = this.context.req.user.id;      
+    }
+
     return Promise.each(records, async (updateRecord) =>
     {
         let recordId = updateRecord.{{table.primaryKeyField}};
@@ -118,6 +124,9 @@ async function update{{makePlural(entityName)}}(updateRecords, fkFilter, trx, op
             {% if attrDef.timestamp == 'modified' %}
         values.{{attrDef.columnName}} = modifiedTimestamp;
             {% endif %}
+            {% if attrDef.updatedBy == 'modified' %}
+        values.{{attrDef.columnName}} = modifiedUser;
+            {% endif %}
         {% endfor %}
 
 

package/src/datamodel-csv-parser/addUpdatedByColumn.js

@@ -0,0 +1,44 @@
+const { each } = require("lodash");
+
+module.exports = function addUpdatedByColumn(tableMap, updatedBy, opts) {
+  opts = opts || {};  
+  each(tableMap, (table, tableName) => {
+    if (table.type !== "view") {
+      if (updatedBy.modified) {
+        var modifiedColName = updatedBy.modified;
+        if (typeof table.attributes[modifiedColName] === "undefined") {
+          table.attributes[modifiedColName] = {     
+            name: modifiedColName,
+            columnName: modifiedColName,
+            dataType: "UUID",
+            isPrimaryKey: false,
+            isForeignKey: true,
+            size: "",
+            precision: "",
+            scale: "",
+            nullable: true,
+            referenceName: "User",
+            relAttrName: "user",
+            referenceKey: "id",
+            referenceIdentifying: false,
+            referenceIsPlural: true,
+            fkName: "modifiedBy_usrId_fk",
+            updatedBy: "modified"
+          };
+        } else {
+          if (updatedBy.errorOnConflict) {
+            throw new Error(
+              `[DM GEN ERROR] updatedBy ${modifiedColName} field already exists on ${tableName}. Unset updatedBy.errorOnConflict to warn instead of throwing.`
+            );
+          } else {
+            console.warn(
+              `[DM GEN WARNING] updatedBy ${modifiedColName} field already exists on ${tableName}. Set updatedBy.errorOnConflict throw an error instead of warning`
+            );
+          }
+        }
+      }
+    }
+  });
+
+  return tableMap;
+};

package/src/datamodel-csv-parser/index.js

@@ -4,6 +4,7 @@ const applyNamingRules = require("./applyNamingRules");
 const populateRelationshipAttributes = require("./populateRelationshipAttributes");
 const extendTableMap = require("./extendTableMap");
 const addTimestampColumns = require("./addTimestampColumns");
+const addUpdatedByColumn = require("./addUpdatedByColumn");
 const { addIndexes } = require("./addIndexes");
 const { processViews } = require("./views");
 const { mergeCommonTableMap } = require("./mergeCommonTableMap");
@@ -46,6 +47,10 @@ module.exports = function parseDatamodelCSV(
     tableMap = addTimestampColumns(tableMap, opts.timestamps, opts);
   }
 
+  if (opts.updatedBy) {
+    tableMap = addUpdatedByColumn(tableMap, opts.updatedBy, opts);
+  }
+
   tableMap = addIndexes(tableMap, opts);
   // tableMap = defaultBooleans(tableMap, opts);
   tableMap = applyNamingRules(tableMap, opts);