Merge branch 'master' of bitbucket.org:venbainformationtechnology/smc_cet_credit_policy_backend

app/controllers/test.controller.js

@@ -1,4 +1,4 @@
-const { sequelize,Test , AdjustableTang , PolicyParameterMaster } = require('../models')
+const { sequelize,Test , AdjustableTang , PolicyParameterMaster , DoubleWhammy} = require('../models')
 const { logMsg } = require('../services/logger.js');
 
 

app/models/DoubleWhammy.js

@@ -2,16 +2,6 @@
 const { Model } = require('sequelize')
 module.exports = (sequelize, DataTypes) => {
   class DoubleWhammy extends Model {
-    /**
-     * Helper method for defining associations.
-     * This method is not a part of Sequelize lifecycle.
-     * The `models/index` file will call this method automatically.
-     */
-    // define association here 
-    // static associate({ Financials }) {
-      // this.hasMany(Financials, { foreignKey: 'entity_id', as: 'financialsData' })
-    // }
-    
     
   }
   DoubleWhammy.init(
@@ -20,11 +10,11 @@ module.exports = (sequelize, DataTypes) => {
       check_type_id : { type:  DataTypes.INTEGER },       
       property_type_id : { type:  DataTypes.INTEGER },    
       property_usage : { type:  DataTypes.STRING },       
-      eligibility_factor_1 : { type:  DataTypes.INTEGER },
-      eligibility_factor_2 : { type:  DataTypes.INTEGER },
-      eligibility_factor_3 : { type:  DataTypes.INTEGER },
-      eligibility_factor_4 : { type:  DataTypes.INTEGER },
-      eligibility_factor_5 : { type:  DataTypes.INTEGER },
+      eligibility_factor_1 : { type:  DataTypes.STRING },
+      eligibility_factor_2 : { type:  DataTypes.STRING },
+      eligibility_factor_3 : { type:  DataTypes.STRING },
+      eligibility_factor_4 : { type:  DataTypes.STRING },
+      eligibility_factor_5 : { type:  DataTypes.STRING },
       result : { type:  DataTypes.STRING },
       is_active : { type:  DataTypes.INTEGER },
       createdby : { type:  DataTypes.INTEGER },

app/models/PolicyParameterMaster.js

@@ -29,3 +29,4 @@ module.exports = (sequelize, DataTypes) => {
   )
   return PolicyParameterMaster
 }
+

app/routes/routes.js

@@ -7,6 +7,7 @@ module.exports = app => {
   var router = require("express").Router();
 
 
+
    
  
 //Master Data select api
@@ -23,6 +24,8 @@ module.exports = app => {
 router.get("/MasterDataList", CreditPolicy.MasterDataList); 
 
 
+
+ // Parameter MasterData select api
 /**
 * @swagger
 * definitions:

package.json

@@ -17,6 +17,7 @@
     "json-rules-engine": "^6.1.2",
     "log4js": "^6.3.0",
     "mssql": "^7.2.0",
+    "pm2": "^5.2.0",
     "request": "^2.88.2",
     "sequelize": "^6.6.5",
     "swagger-jsdoc": "^6.1.0",

server.js

@@ -59,12 +59,4 @@ app.listen({ port: PORT_NUMBER }, async () => {
   console.log('Server up on http://localhost:'+PORT_NUMBER)
  
   //await sequelize.authenticate()
-})
-
-
-
-
-
-
-
-
+})