Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/smc_cet_financials_backend

app/config/db.config.js

@@ -1,4 +1,6 @@
 require('dotenv').config();
+
+const { logMsg } = require('../services/logger');
 module.exports = {
    
   "development": {
@@ -7,6 +9,8 @@ module.exports = {
     "database": process.env.DATABASE,
     "port": process.env.PORT,
     "host": process.env.HOST,
-    "dialect": "mssql"
+    "dialect": "mssql",
+    "logging": (message) =>(logMsg.info(message))
+
   }
   };

app/controllers/master.controller.js

@@ -342,6 +342,370 @@ exports.Deleteitem = (req, res) => {
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//const db = require("../models");
+//const Entities = db.tutorials;
+//const Op = db.Sequelize.Op;
+
+const { sequelize, Statementsmaster  ,Sectionsmaster , Subsectionsmaster,Itemsmaster } = require('../models')
+const { logMsg } = require('../services/logger.js');
+
+
+//statementmaster
+
+// Retrieve all statements from the database.
+exports.StatementsList = (req, res) => {
+ 
+  Statementsmaster.findAll({where : { is_active : 1 } })
+    .then(data => {
+      res.send({'status':200,'message':"success",'data':data});
+      logMsg.info("Success :"(data));
+    })
+    .catch(err => {
+      res.send({'status':404,
+        message: err.message || "Some error occurred while retrieving statements." ,'data': "No data" });
+    });
+};
+
+
+exports.Insertstatement = (req, res) => {
+  // Create a statement
+    const statement = {
+      statement: req.body.statement,
+      is_active: req.body.is_active,
+      createdby: req.body.createdby,
+      updatedby: req.body.updatedby,
+    };
+
+    // Save Tutorial in the database
+    Statementsmaster.create(statement)
+    .then(data => {
+      res.send({'status':200,'message':"success",'data':data});
+      logMsg.info("Success :"(data));
+    })
+    .catch(err => {
+      res.status(500).send({'status':404,
+        message: err.message || "Some error occurred while insertinging statements." ,'data': "No data"
+       });
+    });
+};
+
+// updates datas into statementmaster table.
+exports.Updatestatement = (req, res) => {
+  const id = req.params.id;
+
+  Statementsmaster.update(req.body, {
+    where: { id: id }
+  })
+    .then(data => {   
+        res.send({'status':200,'message':"success",'data':data});
+        logMsg.info("Success :"(data));    
+      })
+    .catch(err => {
+      res.send({'status':404,
+        message: err.message || "Some error occurred while updating statements." ,'data': "No data"
+       });
+    });
+};  
+
+//delete 
+exports.Deletestatement = (req, res) => {
+  const id = req.params.id;
+
+  Statementsmaster.update({ is_active : 0 },{
+    where: { id: id }
+  })
+  .then(data => {   
+    res.send({'status':200,'message':"success",'data':data});
+    logMsg.info("Success :"(data));    
+  })
+.catch(err => {
+  res.send({'status':404,
+    message: err.message || "Some error occurred while updating statements." ,'data': "No data"
+   });
+});
+};
+
+
+//Sectionsmaster
+
+// Retrieve all Sectionsmaster from the database.
+exports.SectionList = (req, res) => {
+ 
+  Sectionsmaster.findAll({where : { is_active : 1 } })
+    .then(data => {
+      res.send({'status':200,'message':"success",'data':data});
+      logMsg.info("Success :"(data));
+    })
+    .catch(err => {
+      res.send({'status':404,
+        message: err.message || "Some error occurred while retrieving sections." ,'data': "No data" });
+    });
+};
+
+exports.Insertsection = (req, res) => {
+  // Create a section
+    const section = {
+      statement: req.body.statement,
+      section: req.body.section,
+      is_active: req.body.is_active,
+      createdby: req.body.createdby,
+      updatedby: req.body.updatedby,
+    };
+
+    // Save section in the database
+    Sectionsmaster.create(section)
+    .then(data => {
+      res.send({'status':200,'message':"success",'data':data});
+      logMsg.info("Success :"(data));
+    })
+    .catch(err => {
+      res.send({'status':404,
+        message: err.message || "Some error occurred while insertinging sectino." ,'data': "No data"
+       });
+    });
+};
+
+exports.Updatesection = (req, res) => {
+  const id = req.params.id;
+
+  Sectionsmaster.update(req.body, {
+    where: { id: id }
+  })
+  .then(data => {   
+    res.send({'status':200,'message':"success",'data':data});
+    logMsg.info("Success :"(data));    
+  })
+.catch(err => {
+  res.send({'status':404,
+    message: err.message || "Some error occurred while updating statements." ,'data': "No data"
+   });
+});
+};  
+
+//delete 
+exports.Deletesection = (req, res) => {
+  const id = req.params.id;
+
+  Sectionsmaster.update({ is_active : 0 },{
+    where: { id: id }
+  })
+
+  .then(data => {   
+    res.send({'status':200,'message':"success",'data':data});
+    logMsg.info("Success :"(data));    
+  })
+
+.catch(err => {
+  res.send({'status':404,
+    message: err.message || "Some error occurred while updating statements." ,'data': "No data"
+   });
+});
+};
+
+
+
+//Subsectionsmaster
+// Retrieve all Subsectionsmaster from the database.
+exports.SubsectionList = (req, res) => {
+ 
+  Subsectionsmaster.findAll({where : { is_active : 1 } })
+    .then(data => {
+      res.send({'status':200,'message':"success",'data':data});
+      logMsg.info("Success :"(data));
+    })
+    .catch(err => {
+      res.send({'status':404,
+        message: err.message || "Some error occurred while retrieving subsections." ,'data': "No data" });
+    });
+};
+
+exports.Insertsubsection = (req, res) => {
+  // Create a statement
+    const subsection = {   
+      section: req.body.section,
+      subsection: req.body.subsection,
+      itemtext: req.body.itemtext,
+      is_active: req.body.is_active,
+      createdby: req.body.createdby,
+      updatedby: req.body.updatedby,
+    };
+
+    // Save Tutorial in the database
+    Subsectionsmaster.create(subsection)
+    .then(data => {
+      res.send({'status':200,'message':"success",'data':data});
+      logMsg.info("Success :"(data));
+    })
+    .catch(err => {
+      res.send({'status':404,
+        message: err.message || "Some error occurred while insertinging subsection." ,'data': "No data"
+       });
+    });
+};
+
+exports.Updatesubsection = (req, res) => {
+  const id = req.params.id;
+
+  Subsectionsmaster.update(req.body, {
+    where: { id: id }
+  })
+  .then(data => {   
+    res.send({'status':200,'message':"success",'data':data});
+    logMsg.info("Success :"(data));    
+  })
+.catch(err => {
+  res.send({'status':404,
+    message: err.message || "Some error occurred while updating statements." ,'data': "No data"
+   });
+});
+
+};  
+
+//delete 
+exports.Deletesubsection = (req, res) => {
+  const id = req.params.id;
+
+  Subsectionsmaster.update({ is_active : 0 },{
+    where: { id: id }
+  })
+  .then(data => {   
+    res.send({'status':200,'message':"success",'data':data});
+    logMsg.info("Success :"(data));    
+  })
+.catch(err => {
+  res.send({'status':404,
+    message: err.message || "Some error occurred while updating statements." ,'data': "No data"
+   });
+});
+};
+
+
+//itemsmaster
+// Retrieve all itemsmaster from the database.
+exports.ItemList = (req, res) => {
+ 
+  Itemsmaster.findAll({where : { is_active : 1 } })
+    .then(data => {
+      res.send({'status':200,'message':"success",'data':data});
+      logMsg.info("Success :"(data));
+    })
+    .catch(err => {
+      res.send({'status':404,
+        message: err.message || "Some error occurred while retrieving items." ,'data': "No data" });
+    });
+};
+
+exports.Insertitem = (req, res) => {
+  // Create a item
+    const item = {
+      statement: req.body.statement,
+      section: req.body.section,
+      subsection: req.body.subsection,
+      itemtext: req.body.itemtext,
+      is_active: req.body.is_active,
+      pvt_ltd: req.body.pvt_ltd,
+      llp: req.body.llp,
+      others: req.body.others,
+      formula: req.body.formula,
+      is_calculated: req.body.is_calculated,
+      createdby: req.body.createdby,
+      updatedby: req.body.updatedby,
+    };
+
+    // Save Tutorial in the database
+    Itemsmaster.create(item)
+    .then(data => {
+      res.send({'status':200,'message':"success",'data':data});
+      logMsg.info("Success :"(data));
+    })
+    .catch(err => {
+      res.send({'status':404,
+        message: err.message || "Some error occurred while insertinging items." ,'data': "No data"
+       });
+    });
+};
+
+exports.Updateitem = (req, res) => {
+  const id = req.params.id;
+
+  Itemsmaster.update(req.body, {
+    where: { id: id }
+  })
+  .then(data => {   
+    res.send({'status':200,'message':"success",'data':data});
+    logMsg.info("Success :"(data));    
+  })
+.catch(err => {
+  res.send({'status':404,
+    message: err.message || "Some error occurred while updating statements." ,'data': "No data"
+   });
+});
+};  
+
+//delete 
+exports.Deleteitem = (req, res) => {
+  const id = req.params.id;
+
+  Itemsmaster.update({ is_active : 0 },{
+    where: { id: id }
+  })
+  .then(data => {   
+    res.send({'status':200,'message':"success",'data':data});
+    logMsg.info("Success :"(data));    
+  })
+.catch(err => {
+  res.send({'status':404,
+    message: err.message || "Some error occurred while updating statements." ,'data': "No data"
+   });
+});
+};
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

app/services/logger.js

@@ -5,7 +5,7 @@
   require('winston-daily-rotate-file');
 
   var transport = new winston.transports.DailyRotateFile({
-    filename: '../storage/log/msg.log',
+    filename: 'storage/log/msg.log',
     datePattern: 'YYYY-MM-DD-HH',
     zippedArchive: true,
     maxSize: '20m',

package-lock.json

@@ -1114,6 +1114,11 @@
         "assert-plus": "^1.0.0"
       }
     },
+    "date-format": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/date-format/-/date-format-3.0.0.tgz",
+      "integrity": "sha512-eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w=="
+    },
     "date-utils": {
       "version": "1.2.21",
       "resolved": "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz",
@@ -1388,6 +1393,11 @@
         "unpipe": "~1.0.0"
       }
     },
+    "flatted": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
+      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="
+    },
     "fn.name": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz",
@@ -1429,6 +1439,16 @@
       "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
       "optional": true
     },
+    "fs-extra": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+      "requires": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -1558,8 +1578,7 @@
     "graceful-fs": {
       "version": "4.2.8",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
-      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
-      "dev": true
+      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="
     },
     "har-schema": {
       "version": "2.0.0",
@@ -1894,6 +1913,14 @@
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
+    "jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "requires": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
     "jsonwebtoken": {
       "version": "8.5.1",
       "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",
@@ -2057,6 +2084,33 @@
       "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
       "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
     },
+    "log4js": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.3.0.tgz",
+      "integrity": "sha512-Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw==",
+      "requires": {
+        "date-format": "^3.0.0",
+        "debug": "^4.1.1",
+        "flatted": "^2.0.1",
+        "rfdc": "^1.1.4",
+        "streamroller": "^2.2.4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.2",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        }
+      }
+    },
     "logform": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/logform/-/logform-2.2.0.tgz",
@@ -2869,6 +2923,36 @@
       "resolved": "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz",
       "integrity": "sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw=="
     },
+    "streamroller": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-2.2.4.tgz",
+      "integrity": "sha512-OG79qm3AujAM9ImoqgWEY1xG4HX+Lw+yY6qZj9R1K2mhF5bEmQ849wvrb+4vt4jLMLzwXttJlQbOdPOQVRv7DQ==",
+      "requires": {
+        "date-format": "^2.1.0",
+        "debug": "^4.1.1",
+        "fs-extra": "^8.1.0"
+      },
+      "dependencies": {
+        "date-format": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz",
+          "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA=="
+        },
+        "debug": {
+          "version": "4.3.2",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        }
+      }
+    },
     "string-width": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",

package.json

@@ -14,6 +14,7 @@
     "cors": "^2.8.5",
     "dotenv": "^10.0.0",
     "express": "^4.17.1",
+    "log4js": "^6.3.0",
     "mssql": "^7.2.0",
     "request": "^2.88.2",
     "sequelize": "^6.6.5",

server.js

@@ -1,6 +1,7 @@
 require('dotenv').config();
 const express = require('express')
 const app = express()
+const {logMsg}  = require('./app/services/logger.js');
 
 const swaggerJsdoc = require('swagger-jsdoc');
 const swaggerUi = require('swagger-ui-express');
@@ -35,10 +36,12 @@ app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerDocument));
 
 app.get("/", (req, res) => {
   res.json({ message: "Welcome to the application." });
+   logMsg.info("Server Sent A Welcome to the application!");
+  
 });
 
 app.use(express.json())  
-
+app.use(express.urlencoded({ extended: true }));
 
 
 require("./app/routes/routes.js")(app);
@@ -46,5 +49,6 @@ require("./app/routes/routes.js")(app);
 const PORT_NUMBER =  process.env.SERVER_PORT
 app.listen({ port: PORT_NUMBER }, async () => {
   console.log('Server up on http://localhost:8000')
+ 
   //await sequelize.authenticate()
 })