commit for version 2.2.0

EdgeVerve · Apr 30, 2020 · 3527505 · 3527505
2 parents 417d04c + b94dc04
commit 3527505
Show file tree

Hide file tree

Showing 13 changed files with 283 additions and 426 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,8 +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
@@ -10,38 +10,6 @@ module.exports = function GruntConfig(grunt) {
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
 
-    mkdir: {
-      all: {
-        options: {
-          create: ['dist']
-        }
-      }
-    },
-
-    copy: {
-      main: {
-        files: [
-          // includes files within path and its sub-directories
-          {
-            expand: true,
-            src: ['**', '!node_modules/**', '!coverage/**'],
-            dest: 'dist/'
-          }
-        ]
-      }
-    },
-
-    mochaTest: {
-      test: {
-        options: {
-          quiet: false,
-          clearRequireCache: true,
-          timeout: 100000
-        },
-        src: ['test/test.js']
-      }
-    },
-
     clean: {
       coverage: {
         src: ['coverage/']
@@ -72,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-datasource-personalization",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "oe-cloud modularization project aka oecloud.io",
   "engines": {
     "node": ">=6"
@@ -19,27 +19,22 @@
   "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-multi-tenancy": "^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,6 +5,7 @@
   },
   {
     "path": "oe-multi-tenancy",
+    "autoEnableMixins" : true,
     "enabled": true
   },
   {

diff --git a/test/datasources.json b/test/datasources.json
@@ -7,16 +7,13 @@
     "name": "transient",
     "connector": "transient"
   },
-
   "db": {
     "host": "localhost",
     "port": 27017,
     "url": "mongodb://localhost:27017/oe-datasource-personalization-test",
     "database": "oe-datasource-personalization-test",
-    "password": "admin",
     "name": "db",
-    "connector": "mongodb",
-    "user": "admin",
+    "connector": "oe-connector-mongodb",
     "connectionTimeout": 500000,
     "connectTimeoutMS": 500000,
     "socketTimeoutMS": 500000
@@ -27,10 +24,8 @@
     "port": 27017,
     "url": "mongodb://localhost:27017/oe-datasource-appdb",
     "database": "oe-datasource-appdb",
-    "password": "admin",
     "name": "appdb",
-    "connector": "mongodb",
-    "user": "admin",
+    "connector": "oe-connector-mongodb",
     "connectionTimeout": 500000,
     "connectTimeoutMS": 500000,
     "socketTimeoutMS": 500000

diff --git a/test/datasources.mongo.js b/test/datasources.mongo.js
@@ -5,44 +5,36 @@
  *
  */
 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-datasource-personalization-test';
-if (process.env.DB_NAME) {
-  dbName2 = process.env.DB_NAME + '-appdb';
-}
-else
-  dbName2 = 'oe-datasource-appdb';
+var dbName2 = process.env.DB_NAME ? process.env.DB_NAME + '-appdb' : 'oe-datasource-appdb';
 
-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
   },
-  "appdb": {
-    "host": mongoHost,
-    "port": 27017,
-    "url": "mongodb://" + mongoHost + ":27017/" + dbName2,
-    "database": dbName2,
-    "password": "admin",
-    "name": "appdb",
-    "connector": "mongodb",
-    "user": "admin",
-    "connectionTimeout": 500000
+  'appdb': {
+    'host': mongoHost,
+    'port': mongoPort,
+    'url': 'mongodb://' + mongoHost + ':' + mongoPort + '/' + dbName2,
+    'database': dbName2,
+    'name': 'appdb',
+    '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,49 +5,43 @@
  *
  */
 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-datasource-personalization-test';
-var dbName2;
-if (process.env.DB_NAME) {
-  dbName2 = process.env.DB_NAME + '-appdb';
-}
-else
-  dbName2 = 'oe-datasource-appdb';
+var dbName2 = process.env.DB_NAME ? process.env.DB_NAME + '-appdb' : 'oe-datasource-appdb';
 
-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": postgresHost,
-    "port": 5432,
-    "url": "postgres://postgres:postgres@" + postgresHost + ":5432/" + dbName,
-    "database": dbName,
-    "password": "postgres",
-    "enableDbCreation" : true,
-    "name": "db",
-    "connector": "oe-connector-postgresql",
-    "user": "postgres",
-    "connectionTimeout": 50000
+  'db': {
+    'host': postgresHost,
+    'port': 5432,
+    'url': 'postgres://postgres:postgres@' + postgresHost + ':5432/' + dbName,
+    'database': dbName,
+    'password': 'postgres',
+    'enableDbCreation': true,
+    'name': 'db',
+    'connector': 'oe-connector-postgresql',
+    'user': 'postgres',
+    'connectionTimeout': 50000
   },
 
-  "appdb": {
-    "host": postgresHost,
-    "port": 5432,
-    "url": "postgres://postgres:postgres@" + postgresHost + ":5432/" + dbName2,
-    "database": dbName2,
-    "password": "postgres",
-    "enableDbCreation": true,
-    "name": "appdb",
-    "connector": "oe-connector-postgresql",
-    "user": "postgres",
-    "connectionTimeout": 50000
+  'appdb': {
+    'host': postgresHost,
+    'port': 5432,
+    'url': 'postgres://postgres:postgres@' + postgresHost + ':5432/' + dbName2,
+    'database': dbName2,
+    'password': 'postgres',
+    'enableDbCreation': true,
+    'name': 'appdb',
+    'connector': 'oe-connector-postgresql',
+    'user': 'postgres',
+    'connectionTimeout': 50000
   }
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ @@
       },
       {
         "path": "oe-multi-tenancy",
+        "autoEnableMixins" : true,
         "enabled": true
       },
       {
@@ Expand Down @@