commit for version 2.2.0

vamsee · vamsee · commit fd8a05143a6f · 2020-04-30T22:53:03.000+05:30
diff --git a/.eslintignore b/.eslintignore
@@ -1,7 +1,7 @@
-/client/
-/coverage/
-/node_modules/
-server/dropdb.js
-/lib/expression-language/expression-syntax-parser.js
-/test/
-/drop.js
+build/
+client/
+coverage/
+node_modules/
+test/
+drop.js
+Gruntfile.js
diff --git a/.eslintrc b/.eslintrc
@@ -111,7 +111,7 @@
     "no-undefined": 1,               // http://eslint.org/docs/rules/no-undefined
     "no-with": 2,                    // http://eslint.org/docs/rules/no-with
     "handle-callback-err": 1,        // http://eslint.org/docs/rules/handle-callback-err
-    "radix": 2,                      // http://eslint.org/docs/rules/radix
+    "radix": 0,                      // http://eslint.org/docs/rules/radix
     "wrap-iife": [2, "any"],         // http://eslint.org/docs/rules/wrap-iife
     "yoda": 2,                       // http://eslint.org/docs/rules/yoda
 
diff --git a/.gitignore b/.gitignore
@@ -41,3 +41,4 @@ out/
 *.zip
 /common/models/test
 package-lock.json
+oracle-user.sh
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -40,12 +40,8 @@ module.exports = function GruntConfig(grunt) {
   });
 
   // Add the grunt-mocha-test tasks.
-  grunt.loadNpmTasks('grunt-mocha-test');
-  grunt.loadNpmTasks('grunt-mocha-istanbul');
   grunt.loadNpmTasks('grunt-contrib-clean');
-
-  grunt.loadNpmTasks('grunt-mkdir');
-  grunt.loadNpmTasks('grunt-contrib-copy');
+  grunt.loadNpmTasks('grunt-mocha-istanbul');
 
   grunt.registerTask('test-with-coverage', ['clean:coverage', 'mocha_istanbul']);
 };
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oe-model-personalization",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "oe-cloud modularization project aka oecloud.io",
   "engines": {
     "node": ">=6"
@@ -14,36 +14,30 @@
     "grunt-cover": "grunt test-with-coverage"
   },
   "dependencies": {
-    "camelcase": "5.0.0",
     "async": "2.6.1",
     "lodash": "4.17.14"
   },
   "devDependencies": {
     "babel-eslint": "7.2.3",
     "chai": "3.4.1",
-    "chai-datetime": "1.4.0",
     "chai-things": "0.2.0",
     "chalk": "1.1.1",
     "eslint": "4.10.0",
     "grunt": "1.0.4",
-    "grunt-banner": "0.6.0",
     "grunt-cli": "1.3.2",
     "grunt-contrib-clean": "2.0.0",
-    "grunt-contrib-copy": "1.0.0",
-    "grunt-jsbeautifier": "0.2.13",
-    "grunt-mkdir": "1.0.0",
     "grunt-mocha-istanbul": "5.0.2",
-    "grunt-mocha-test": "0.13.3",
     "istanbul": "0.4.5",
     "mocha": "5.2.0",
-    "superagent-defaults": "0.1.14",
-    "supertest": "3.4.2",
-    "loopback-connector-mongodb": "3.9.2",
+    "oe-cloud": "^2.0.0",
+    "oe-connector-mongodb": "^2.0.0",
+    "oe-connector-oracle": "^2.0.0",
     "oe-connector-postgresql": "^2.0.0",
     "oe-model-composite": "^2.0.0",
-    "oe-cloud": "^2.0.0",
+    "oe-multi-tenancy": "^2.0.0",
     "oe-validation": "^2.0.0",
-    "oe-multi-tenancy": "^2.0.0"
+    "superagent-defaults": "0.1.14",
+    "supertest": "3.4.2"
   },
   "repository": {
     "type": "git",
diff --git a/test/app-list.json b/test/app-list.json
@@ -5,14 +5,17 @@
   },
   {
     "path": "oe-multi-tenancy",
+    "autoEnableMixins" : true,
     "enabled": true
   },
   {
     "path": "oe-expression",
+    "autoEnableMixins" : true,
     "enabled":true 
   },
   {
     "path": "oe-validation",
+    "autoEnableMixins" : true,
     "enabled":true 
   },
   {
diff --git a/test/boot/populate-data.js b/test/boot/populate-data.js
@@ -2,11 +2,11 @@ var loopback = require('loopback');
 
 module.exports = function (app, done) {
   var Customer = loopback.findModel('Customer');
-  Customer.destroyAll({}, { ignoreAutoScope : true }, function (err) {
+  Customer.destroyAll({}, { ignoreAutoScope: true }, function (err) {
     console.log(err);
     var item1 = {
       'name': 'Customer A',
-      id : "abcd",
+      id: 'abcd',
       'age': 10
     };
     var item2 = {
@@ -25,15 +25,15 @@ module.exports = function (app, done) {
       'name': 'BPO Customer A',
       'age': 30
     };
-    Customer.create(item1, { ctx: { tenantId: "/default" } }, function (err, r) {
-      Customer.create(item2, { ctx: { tenantId: "/default/infosys" } }, function (err, r) {
-        Customer.create(item3, { ctx: { tenantId: "/default/infosys/ev" } }, function (err, r) {
-          Customer.create([item4, item5], { ctx: { tenantId: "/default/infosys/bpo" } }, function (err, r) {
+    Customer.create(item1, { ctx: { tenantId: '/default' } }, function (err, r) {
+      Customer.create(item2, { ctx: { tenantId: '/default/infosys' } }, function (err, r) {
+        Customer.create(item3, { ctx: { tenantId: '/default/infosys/ev' } }, function (err, r) {
+          Customer.create([item4, item5], { ctx: { tenantId: '/default/infosys/bpo' } }, function (err, r) {
             return done();
           });
         });
       });
     });
   });
-}
+};
 
diff --git a/test/datasources.json b/test/datasources.json
@@ -7,15 +7,14 @@
     "name": "transient",
     "connector": "transient"
   },
-
   "db": {
     "host": "localhost",
     "port": 27017,
     "url": "mongodb://localhost:27017/oe-model-personalization-test",
     "database": "oe-model-personalization-test",
     "password": "admin",
     "name": "db",
-    "connector": "mongodb",
+    "connector": "oe-connector-mongodb",
     "user": "admin",
     "connectionTimeout": 500000,
     "connectTimeoutMS": 500000,
diff --git a/test/datasources.mongo.js b/test/datasources.mongo.js
@@ -5,27 +5,24 @@
  *
  */
 var mongoHost = process.env.MONGO_HOST || 'localhost';
+var mongoPort = process.env.MONGO_PORT ? parseInt(process.env.MONGO_PORT) : 27017;
 var dbName = process.env.DB_NAME || 'oe-model-personalization-test';
-module.exports = 
-{
-  "memdb": {
-    "name": "memdb",
-    "connector": "memory"
+module.exports = {
+  'memdb': {
+    'name': 'memdb',
+    'connector': 'memory'
   },
-  "transient": {
-    "name": "transient",
-    "connector": "transient"
+  'transient': {
+    'name': 'transient',
+    'connector': 'transient'
   },
-  "db": {
-    "host": mongoHost,
-    "port": 27017,
-    "url": "mongodb://" + mongoHost + ":27017/" + dbName,
-    "database": dbName,
-    "password": "admin",
-    "name": "db",
-    "connector": "mongodb",
-    "user": "admin",
-    "connectionTimeout": 500000
+  'db': {
+    'host': mongoHost,
+    'port': mongoPort,
+    'url': 'mongodb://' + mongoHost + ':' + mongoPort + '/' + dbName,
+    'database': dbName,
+    'name': 'db',
+    'connector': 'oe-connector-mongodb',
+    'connectionTimeout': 500000
   }
 };
-
diff --git a/test/datasources.oracle.js b/test/datasources.oracle.js
@@ -4,16 +4,10 @@
  * Bangalore, India. All Rights Reserved.
  *
  */
-/**
- **
- ** ©2016-2017 EdgeVerve Systems Limited (a fully owned Infosys subsidiary),
- ** Bangalore, India. All Rights Reserved.
- **
- **/
 
-var oracleSID = process.env.ORACLE_SID || 'orclpdb.ad.infosys.com';
+var oracleSID = process.env.ORACLE_SID || 'ORCLCDB';
 var oracleHost = process.env.ORACLE_HOST || 'localhost';
-var oraclePort = process.env.ORACLE_PORT || 1521;
+var oraclePort = process.env.ORACLE_PORT ? parseInt(process.env.ORACLE_PORT) : 1521;
 var oracleUserName = process.env.ORACLE_USERNAME || 'oeadmin';
 var oracleUserPassword = process.env.ORACLE_PASSWORD || 'oeadmin';
 
diff --git a/test/datasources.postgres.js b/test/datasources.postgres.js
@@ -5,29 +5,28 @@
  *
  */
 var postgresHost = process.env.POSTGRES_HOST || 'localhost';
+var postgresPort = process.env.POSTGRES_PORT ? parseInt(process.env.POSTGRES_PORT) : 5432;
 var dbName = process.env.DB_NAME || 'oe-model-personalization-test';
-module.exports = 
+module.exports =
 {
-  "memdb": {
-    "name": "memdb",
-    "connector": "memory"
+  'memdb': {
+    'name': 'memdb',
+    'connector': 'memory'
   },
-  "transient": {
-    "name": "transient",
-    "connector": "transient"
+  'transient': {
+    'name': 'transient',
+    'connector': 'transient'
   },
-
-  "db": {
-    "host": postgresHost,
-    "port": 5432,
-    "url": "postgres://postgres:postgres@" + postgresHost + ":5432/" + dbName,
-    "database": dbName,
-    "password": "postgres",
-    "name": "db",
-    "connector": "oe-connector-postgresql",
-    "user": "postgres",
-    "max": 50,
-    "connectionTimeout": 50000
+  'db': {
+    'host': postgresHost,
+    'port': postgresPort,
+    'url': 'postgres://postgres:postgres@' + postgresHost + ':' + postgresPort + '/' + dbName,
+    'database': dbName,
+    'password': 'postgres',
+    'name': 'db',
+    'connector': 'oe-connector-postgresql',
+    'user': 'postgres',
+    'max': 50,
+    'connectionTimeout': 50000
   }
 };
-
diff --git a/test/oracle-utility.js b/test/oracle-utility.js
diff --git a/test/server.js b/test/server.js

Original file line number	Diff line number	Diff line change
`@@ -5,14 +5,17 @@`
`5`	`5`	`},`
`6`	`6`	`{`
`7`	`7`	`"path": "oe-multi-tenancy",`
	`8`	`+ "autoEnableMixins" : true,`
`8`	`9`	`"enabled": true`
`9`	`10`	`},`
`10`	`11`	`{`
`11`	`12`	`"path": "oe-expression",`
	`13`	`+ "autoEnableMixins" : true,`
`12`	`14`	`"enabled":true`
`13`	`15`	`},`
`14`	`16`	`{`
`15`	`17`	`"path": "oe-validation",`
	`18`	`+ "autoEnableMixins" : true,`
`16`	`19`	`"enabled":true`
`17`	`20`	`},`
`18`	`21`	`{`