oradm-to-gql 35.0.9 → 35.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oradm-to-gql",
-  "version": "35.0.9",
+  "version": "35.1.0",
   "description": "Oracle Data Modeler CSV Export to Apollo GraphQL Endpoint Generator",
   "main": "index.js",
   "scripts": {
@@ -34,10 +34,10 @@
     "uuid": "^3.3.2"
   },
   "peerDependencies": {
-    "graphql": "^0.10.3",
+    "graphql": "^15",
     "graphql-server-express": "^0.8.5",
     "graphql-tools": "^1.0.0",
-    "knex": "^0.95.11",
+    "knex": "^0.13.0",
     "tg-knex-query-resolver": "^4.0.0"
   },
   "repository": "https://github.com/TeselaGen/oradm-to-gql",
@@ -47,12 +47,12 @@
     "clean-deep": "^3.0.5",
     "express": "^4.15.3",
     "express-graphql": "^0.6.6",
-    "graphql": "^0.10.3",
+    "graphql": "^15",
     "graphql-server-express": "^0.8.5",
     "graphql-tools": "^1.0.0",
     "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/applyModuleSchema.js

@@ -5,10 +5,7 @@ const path = require("path");
 const { applySchema } = require("./knex-tools/");
 
 async function applyModuleSchema(appConfig, options = {}) {
-  const knexSpecPath = path.join(
-    appConfig.graphql.dataLibPath,
-    "db/knex-spec.json"
-  );
+  const knexSpecPath = path.join(appConfig.graphql.dataLibPath, "db/knex-spec.json");
   const knexSpec = fse.readJSONSync(knexSpecPath);
   const db = knex(appConfig.db.app);
 

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

@@ -3,12 +3,16 @@ const path = require("path");
 const fse = require("fs-extra");
 
 module.exports = function generateTableMap(csvPath, outputDir, opts = {}) {
-  const { extend, timestamps, verbose, maxNameLength } = opts;
+  const { extend, timestamps, verbose, maxNameLength, user } = 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

@@ -5,6 +5,7 @@ module.exports = {
     options: {
         "-v, --verbose": "Display verbose output",
         "-t, --timestamps": "Add timestamp attributes to all models",
+        "-u, --user": "Add updated by attribute 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

@@ -32,27 +32,17 @@ async function create{{makePlural(entityName)}}(createRecords, trx, opts){
     let allowQuery = await Promise.resolve(this.entities.{{table.modelName}}.extensions.onCreate.allow.call(this, opts));
 
     if(!allowQuery) return Promise.resolve([]);
-    
-    {% set doneLoop = 'false' %}
-    {% for propName, attrDef in table.attributes %}
-        {% if attrDef.dataType === 'Boolean' and doneLoop !== 'true' %}
-        createRecords.forEach(rec => {
-            {% for propName, attrDef in table.attributes %}
-                {% if attrDef.dataType === 'Boolean' %}
-                if (rec.{{attrDef.name}} === null) {
-                    delete rec.{{attrDef.name}}
-                }
-                {% endif %}
-            {% endfor %}
-        })
-        {% set doneLoop = 'true' %}
-        {% endif %}
-    {% endfor %}
 
     let records = await Promise.resolve(this.entities.{{table.modelName}}.extensions.onCreate.records.call(this, createRecords, opts));
 
 
     let createdTimestamp = new Date();
+    let modifiedUser = undefined;
+    
+    if(this.context.req.user){        
+        modifiedUser = await dataAccessLib.entities.user.get(this.context.req.user.id, "username")        
+    }
+
     records.forEach((rec) => {
         {% for propName, attrDef in table.attributes %}
             {% if attrDef.isPrimaryKey %}
@@ -68,6 +58,10 @@ async function create{{makePlural(entityName)}}(createRecords, trx, opts){
             //set timestamps
             rec.{{attrDef.name}} = createdTimestamp;
             {% endif %}
+            {% if attrDef.user == 'modified' %}
+            //set modified user
+            rec.{{attrDef.name}} = modifiedUser;
+            {% endif %}
         {% endfor %}
         });
 

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

@@ -22,22 +22,6 @@ async function update{{makePlural(entityName)}}(updateRecords, fkFilter, trx, op
 
     if(!allowQuery) return Promise.resolve([]);
 
-    {% set doneLoop = 'false' %}
-    {% for propName, attrDef in table.attributes %}
-        {% if attrDef.dataType === 'Boolean' and doneLoop !== 'true' %}
-        updateRecords.forEach(rec => {
-            {% for propName, attrDef in table.attributes %}
-                {% if attrDef.dataType === 'Boolean' %}
-                if (rec.{{attrDef.name}} === null) {
-                    delete rec.{{attrDef.name}}
-                }
-                {% endif %}
-            {% endfor %}
-        })
-        {% set doneLoop = 'true' %}
-        {% endif %}
-    {% endfor %}
-
     let records = await Promise.resolve(this.entities.{{table.modelName}}.extensions.onUpdate.records.call(this, updateRecords, opts));
 
     let qry = this.db;
@@ -55,6 +39,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 = await dataAccessLib.entities.user.get(this.context.req.user.id, "username")        
+    }
+
     return Promise.each(records, async (updateRecord) =>
     {
         let recordId = updateRecord.{{table.primaryKeyField}};
@@ -118,6 +108,9 @@ async function update{{makePlural(entityName)}}(updateRecords, fkFilter, trx, op
             {% if attrDef.timestamp == 'modified' %}
         values.{{attrDef.columnName}} = modifiedTimestamp;
             {% endif %}
+            {% if attrDef.user == 'modified' %}
+        values.{{attrDef.columnName}} = modifiedUser;
+            {% endif %}
         {% endfor %}
 
 

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

@@ -0,0 +1,39 @@
+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;
+};

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

@@ -4,10 +4,10 @@ const applyNamingRules = require("./applyNamingRules");
 const populateRelationshipAttributes = require("./populateRelationshipAttributes");
 const extendTableMap = require("./extendTableMap");
 const addTimestampColumns = require("./addTimestampColumns");
+const addUserColumn = require("./addUserColumn")
 const { addIndexes } = require("./addIndexes");
 const { processViews } = require("./views");
 const { mergeCommonTableMap } = require("./mergeCommonTableMap");
-// const { defaultBooleans } = require("./defaultBooleans");
 
 module.exports = function parseDatamodelCSV(
   csvPath,
@@ -45,9 +45,12 @@ 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);
 
   tableMap = addIndexes(tableMap, opts);
-  // tableMap = defaultBooleans(tableMap, opts);
   tableMap = applyNamingRules(tableMap, opts);
   tableMap = processViews(tableMap, opts);
   tableMap = populateRelationshipAttributes(tableMap, opts);

package/src/knex-tools/createTables.js

@@ -45,17 +45,10 @@ function createTables(db, tableSpecs, opts = {}) {
           if (colSpec.unique) {
             table.unique(colSpec.name);
           }
-          if (colSpec.type === "boolean") {
-            colSpec.defaultValue = colSpec.defaultValue || false;
-          }
-          if (colSpec.defaultValue || colSpec.defaultValue === false) {
+          if (colSpec.defaultValue) {
             let defaultValue = colSpec.defaultValue;
             if (colSpec.type === "boolean") {
-              if (
-                defaultValue === "false" ||
-                defaultValue === "0" ||
-                defaultValue === false
-              ) {
+              if (defaultValue === "false" || defaultValue === "0") {
                 defaultValue = false;
               } else {
                 defaultValue = true;

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

@@ -1,20 +0,0 @@
-const { each } = require("lodash");
-
-function defaultBooleans(tableMap) {
-  each(tableMap, (tableDef) => {
-    if (tableDef.type !== "view") {
-      each(tableDef.attributes, (attrDef, attrName) => {
-        if (attrDef.dataType === "Boolean") {
-          attrDef.nullable = false;
-          if (!attrDef.defaultValue) {
-            attrDef.defaultValue = false;
-          }
-        }
-      });
-    }
-  });
-
-  return tableMap;
-}
-
-module.exports = { defaultBooleans };