oradm-to-gql 35.1.0 → 35.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oradm-to-gql",
-  "version": "35.1.0",
+  "version": "35.1.2",
   "description": "Oracle Data Modeler CSV Export to Apollo GraphQL Endpoint Generator",
   "main": "index.js",
   "scripts": {

package/src/commands/table-map/generateTableMap.js

@@ -3,16 +3,12 @@ const path = require("path");
 const fse = require("fs-extra");
 
 module.exports = function generateTableMap(csvPath, outputDir, opts = {}) {
-  const { extend, timestamps, verbose, maxNameLength, user } = opts;  
+  const { extend, timestamps, verbose, maxNameLength } = opts;  
 
   let log = () => {};
   if (verbose) log = console.log;
 
   let parseOpts = { log, maxNameLength };
-  
-  if (user) {
-    parseOpts.user = { modified: "updatedBy" };
-  }
 
   if (timestamps) {
     parseOpts.timestamps = { created: "createdAt", modified: "updatedAt" };

package/src/commands/table-map/index.js

@@ -4,8 +4,7 @@ module.exports = {
     command: "table-map <csvPath> <outputDir>",
     options: {
         "-v, --verbose": "Display verbose output",
-        "-t, --timestamps": "Add timestamp attributes to all models",
-        "-u, --user": "Add updated by attribute to all models",
+        "-t, --timestamps": "Add timestamp attributes to all models",        
         "-x, --extend <extendTableMap>": "Uses the specified module to extend the table map"
     },
     action: generateTableMap

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

@@ -40,7 +40,7 @@ async function create{{makePlural(entityName)}}(createRecords, trx, opts){
     let modifiedUser = undefined;
     
     if(this.context.req.user){        
-        modifiedUser = await dataAccessLib.entities.user.get(this.context.req.user.id, "username")        
+        modifiedUser = this.context.req.user.id;
     }
 
     records.forEach((rec) => {
@@ -58,7 +58,7 @@ async function create{{makePlural(entityName)}}(createRecords, trx, opts){
             //set timestamps
             rec.{{attrDef.name}} = createdTimestamp;
             {% endif %}
-            {% if attrDef.user == 'modified' %}
+            {% if attrDef.updatedBy == 'modified' %}
             //set modified user
             rec.{{attrDef.name}} = modifiedUser;
             {% endif %}

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

@@ -42,7 +42,7 @@ async function update{{makePlural(entityName)}}(updateRecords, fkFilter, trx, op
     let modifiedUser = undefined;
     
     if(this.context.req.user){        
-        modifiedUser = await dataAccessLib.entities.user.get(this.context.req.user.id, "username")        
+        modifiedUser = this.context.req.user.id;      
     }
 
     return Promise.each(records, async (updateRecord) =>
@@ -108,7 +108,7 @@ async function update{{makePlural(entityName)}}(updateRecords, fkFilter, trx, op
             {% if attrDef.timestamp == 'modified' %}
         values.{{attrDef.columnName}} = modifiedTimestamp;
             {% endif %}
-            {% if attrDef.user == 'modified' %}
+            {% if attrDef.updatedBy == 'modified' %}
         values.{{attrDef.columnName}} = modifiedUser;
             {% endif %}
         {% endfor %}

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

@@ -0,0 +1,43 @@
+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"            
+          };
+        } 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,7 +4,7 @@ const applyNamingRules = require("./applyNamingRules");
 const populateRelationshipAttributes = require("./populateRelationshipAttributes");
 const extendTableMap = require("./extendTableMap");
 const addTimestampColumns = require("./addTimestampColumns");
-const addUserColumn = require("./addUserColumn")
+const addUpdatedByColumn = require("./addUpdatedByColumn");
 const { addIndexes } = require("./addIndexes");
 const { processViews } = require("./views");
 const { mergeCommonTableMap } = require("./mergeCommonTableMap");
@@ -45,10 +45,10 @@ module.exports = function parseDatamodelCSV(
   if (opts.timestamps) {
     tableMap = addTimestampColumns(tableMap, opts.timestamps, opts);
   }
-  // if (opts.user) {
-  //   tableMap = addUserColumn(tableMap, opts.user, opts);
-  // }
-  tableMap = addUserColumn(tableMap, { modified: "updatedBy" }, opts);
+
+  if (opts.updatedBy) {
+    tableMap = addUpdatedByColumn(tableMap, opts.updatedBy, opts);
+  }
 
   tableMap = addIndexes(tableMap, opts);
   tableMap = applyNamingRules(tableMap, opts);

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

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