SMC-CET/smc_cet_financials_backend
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merging:gwm

Browse Source
This commit is contained in:
sriramv 2021-08-20 15:46:52 +05:30
commit d6d5d75a67
6 changed files with 172 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/config/db.config.js
View File

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

84
app/controllers/master.controller.js
View File

@ -2,6 +2,8 @@
//const Entities = db.tutorials; //const Entities = db.tutorials;
//const Op = db.Sequelize.Op; //const Op = db.Sequelize.Op;
const {sequelize , Statementsmaster ,Sectionsmaster , Subsectionsmaster,Itemsmaster } = require('../models') const {sequelize , Statementsmaster ,Sectionsmaster , Subsectionsmaster,Itemsmaster } = require('../models')
const { logMsg } = require('../services/logger.js'); const { logMsg } = require('../services/logger.js');
@ -9,9 +11,9 @@ const { logMsg } = require('../services/logger.js');
//statementmaster //statementmaster
// Retrieve all statements from the database. // Retrieve all statements from the database.
exports.StatementsList = (req, res) => { exports.StatementsList = async (req, res) => {
Statementsmaster.findAll({where : { is_active : 1 } }) await Statementsmaster.findAll({where : { is_active : 1 } })
.then(data => { .then(data => {
res.send({'status':200,'message':"success",'data':data}); res.send({'status':200,'message':"success",'data':data});
logMsg.info("Success :"(data)); logMsg.info("Success :"(data));
@ -23,7 +25,7 @@ exports.StatementsList = (req, res) => {
}; };
exports.Insertstatement = (req, res) => { exports.Insertstatement = async (req, res) => {
// Create a statement // Create a statement
const statement = { const statement = {
statement: req.body.statement, statement: req.body.statement,
@ -33,23 +35,23 @@ exports.Insertstatement = (req, res) => {
}; };
// Save Tutorial in the database // Save Tutorial in the database
Statementsmaster.create(statement) await Statementsmaster.create(statement)
.then(data => { .then(data => {
res.send({'status':200,'message':"success",'data':data}); res.send({'status':200,'message':"success",'data':data});
logMsg.info("Success :"(data)); logMsg.info("Success :"(data));
}) })
.catch(err => { .catch(err => {
res.status(500).send({'status':404, res.status(500).send({'status':404,
message: err.message || "Some error occurred while insertinging statements." ,'data': "No data" message: err.message || "Some error occurred while inserting statements." ,'data': "No data"
}); });
}); });
}; };
// updates datas into statementmaster table. // updates datas into statementmaster table.
exports.Updatestatement = (req, res) => { exports.Updatestatement = async (req, res) => {
const id = req.params.id; const id = req.params.id;
Statementsmaster.update(req.body, { await Statementsmaster.update(req.body, {
where: { id: id } where: { id: id }
}) })
.then(data => { .then(data => {
@ -64,10 +66,10 @@ exports.Updatestatement = (req, res) => {
}; };
//delete //delete
exports.Deletestatement = (req, res) => { exports.Deletestatement = async (req, res) => {
const id = req.params.id; const id = req.params.id;
Statementsmaster.update({ is_active : 0 },{ await Statementsmaster.update({ is_active : 0 },{
where: { id: id } where: { id: id }
}) })
.then(data => { .then(data => {
@ -76,7 +78,7 @@ exports.Deletestatement = (req, res) => {
}) })
.catch(err => { .catch(err => {
res.send({'status':404, res.send({'status':404,
message: err.message || "Some error occurred while updating statements." ,'data': "No data" message: err.message || "Some error occurred while deleting statements." ,'data': "No data"
}); });
}); });
}; };
@ -116,7 +118,7 @@ exports.Insertsection = (req, res) => {
}) })
.catch(err => { .catch(err => {
res.send({'status':404, res.send({'status':404,
message: err.message || "Some error occurred while insertinging sectino." ,'data': "No data" message: err.message || "Some error occurred while inserting sections." ,'data': "No data"
}); });
}); });
}; };
@ -133,7 +135,7 @@ exports.Updatesection = (req, res) => {
}) })
.catch(err => { .catch(err => {
res.send({'status':404, res.send({'status':404,
message: err.message || "Some error occurred while updating statements." ,'data': "No data" message: err.message || "Some error occurred while updating sections." ,'data': "No data"
}); });
}); });
}; };
@ -153,7 +155,7 @@ exports.Deletesection = (req, res) => {
.catch(err => { .catch(err => {
res.send({'status':404, res.send({'status':404,
message: err.message || "Some error occurred while updating statements." ,'data': "No data" message: err.message || "Some error occurred while deleting sections." ,'data': "No data"
}); });
}); });
}; };
@ -194,7 +196,7 @@ exports.Insertsubsection = (req, res) => {
}) })
.catch(err => { .catch(err => {
res.send({'status':404, res.send({'status':404,
message: err.message || "Some error occurred while insertinging subsection." ,'data': "No data" message: err.message || "Some error occurred while inserting subsection." ,'data': "No data"
}); });
}); });
}; };
@ -211,7 +213,7 @@ exports.Updatesubsection = (req, res) => {
}) })
.catch(err => { .catch(err => {
res.send({'status':404, res.send({'status':404,
message: err.message || "Some error occurred while updating statements." ,'data': "No data" message: err.message || "Some error occurred while updating subsection." ,'data': "No data"
}); });
}); });
@ -230,7 +232,7 @@ exports.Deletesubsection = (req, res) => {
}) })
.catch(err => { .catch(err => {
res.send({'status':404, res.send({'status':404,
message: err.message || "Some error occurred while updating statements." ,'data': "No data" message: err.message || "Some error occurred while dleleting subsection." ,'data': "No data"
}); });
}); });
}; };
@ -276,7 +278,7 @@ exports.Insertitem = (req, res) => {
}) })
.catch(err => { .catch(err => {
res.send({'status':404, res.send({'status':404,
message: err.message || "Some error occurred while insertinging items." ,'data': "No data" message: err.message || "Some error occurred while inserting items." ,'data': "No data"
}); });
}); });
}; };
@ -293,7 +295,7 @@ exports.Updateitem = (req, res) => {
}) })
.catch(err => { .catch(err => {
res.send({'status':404, res.send({'status':404,
message: err.message || "Some error occurred while updating statements." ,'data': "No data" message: err.message || "Some error occurred while updating items." ,'data': "No data"
}); });
}); });
}; };
@ -311,7 +313,7 @@ exports.Deleteitem = (req, res) => {
}) })
.catch(err => { .catch(err => {
res.send({'status':404, res.send({'status':404,
message: err.message || "Some error occurred while updating statements." ,'data': "No data" message: err.message || "Some error occurred while deleting items." ,'data': "No data"
}); });
}); });
}; };
@ -342,6 +344,50 @@ exports.Deleteitem = (req, res) => {

2
app/services/logger.js
View File

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

88
package-lock.json generated
View File

@ -1114,6 +1114,11 @@
"assert-plus": "^1.0.0" "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": { "date-utils": {
"version": "1.2.21", "version": "1.2.21",
"resolved": "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz", "resolved": "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz",
@ -1388,6 +1393,11 @@
"unpipe": "~1.0.0" "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": { "fn.name": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz", "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==", "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
"optional": true "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": { "fs.realpath": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@ -1558,8 +1578,7 @@
"graceful-fs": { "graceful-fs": {
"version": "4.2.8", "version": "4.2.8",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
"integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==", "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="
"dev": true
}, },
"har-schema": { "har-schema": {
"version": "2.0.0", "version": "2.0.0",
@ -1894,6 +1913,14 @@
"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" "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": { "jsonwebtoken": {
"version": "8.5.1", "version": "8.5.1",
"resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", "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", "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
"integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=" "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": { "logform": {
"version": "2.2.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/logform/-/logform-2.2.0.tgz", "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", "resolved": "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz",
"integrity": "sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==" "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": { "string-width": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",

1
package.json
View File

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

14
server.js
View File

@ -2,6 +2,14 @@ require('dotenv').config();
const express = require('express') const express = require('express')
const app = express() const app = express()
app.use(function(req, res, next) {
res.set("Cache-Control", "no-cache, no-store, must-revalidate, max-age=0")
res.set("Pragma", "no-cache")
res.set("Expires", 0)
next()
})
const {logMsg} = require('./app/services/logger.js');
const swaggerJsdoc = require('swagger-jsdoc'); const swaggerJsdoc = require('swagger-jsdoc');
const swaggerUi = require('swagger-ui-express'); const swaggerUi = require('swagger-ui-express');
@ -35,10 +43,13 @@ app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerDocument));
app.get("/", (req, res) => { app.get("/", (req, res) => {
res.json({ message: "Welcome to the application." }); res.json({ message: "Welcome to the application." });
logMsg.info("Server Sent A Welcome to the application!");
}); });
app.use(express.json())
app.use(express.json())
app.use(express.urlencoded({ extended: true }));
require("./app/routes/routes.js")(app); require("./app/routes/routes.js")(app);
@ -46,5 +57,6 @@ require("./app/routes/routes.js")(app);
const PORT_NUMBER = process.env.SERVER_PORT const PORT_NUMBER = process.env.SERVER_PORT
app.listen({ port: PORT_NUMBER }, async () => { app.listen({ port: PORT_NUMBER }, async () => {
console.log('Server up on http://localhost:8000') console.log('Server up on http://localhost:8000')
//await sequelize.authenticate() //await sequelize.authenticate()
}) })