From 8b888ef60abef9ad656ff40f2671117fb4f37d9c Mon Sep 17 00:00:00 2001
From: sriramv <sriram.v@venbainfotech.com>
Date: Fri, 20 Aug 2021 15:45:47 +0530
Subject: [PATCH 1/2] merging:gwm

---
 app/controllers/financial.controller.js | 8 +++-----
 app/routes/routes.js                    | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/controllers/financial.controller.js b/app/controllers/financial.controller.js
index c106c0d..097d8e7 100644
--- a/app/controllers/financial.controller.js
+++ b/app/controllers/financial.controller.js
@@ -1,8 +1,6 @@
-//const db = require("../models");
-//const Entities = db.tutorials;
-const { Op } = require("sequelize");
 
-const { sequelize, Entities , Financials , Statementsmaster  ,Sectionsmaster , Subsectionsmaster , Brokenperiods } = require('../models')
+
+const { sequelize, Entities , Financials , Statementsmaster  , Sectionsmaster , Subsectionsmaster , Brokenperiods } = require('../models')
 const { logMsg } = require('../services/logger.js');
 
 
@@ -27,7 +25,7 @@ exports.MenuList = async (req, res) => {
                                                                        }],  
                                                               required :false
                                                               }],
-                                                              required :false 
+                                                    required :false 
 
                                                     });
   
diff --git a/app/routes/routes.js b/app/routes/routes.js
index 6016385..91d8973 100644
--- a/app/routes/routes.js
+++ b/app/routes/routes.js
@@ -215,7 +215,7 @@ module.exports = app => {
     // third party api call example 
     router.get('/third_party_api', (req, res) => {
     const options = {
-     url: "http://localhost:3000/api/EntitiesList",
+     url: "http://localhost:4000/api/MenuList/MW112233",
                     };
      request.get(options).pipe(res);
     })

From 99b74dd31856ce0848967b52f7e8e4a4009dfd5e Mon Sep 17 00:00:00 2001
From: sriramv <sriram.v@venbainfotech.com>
Date: Sat, 21 Aug 2021 16:06:10 +0530
Subject: [PATCH 2/2] masterdata:GWM

---
 app/controllers/financial.controller.js | 33 +++++++++++++++++++++++--
 app/routes/routes.js                    |  3 +++
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/app/controllers/financial.controller.js b/app/controllers/financial.controller.js
index 097d8e7..7ab62c0 100644
--- a/app/controllers/financial.controller.js
+++ b/app/controllers/financial.controller.js
@@ -1,8 +1,36 @@
 
-
 const { sequelize, Entities , Financials , Statementsmaster  , Sectionsmaster , Subsectionsmaster , Brokenperiods } = require('../models')
 const { logMsg } = require('../services/logger.js');
 
+// all master data list
+exports.MasterDatas = async (req, res) => {
+   await Statementsmaster.findAll({
+                                    where :{is_active : 1} ,
+                                    attributes: ['id', 'statement', 'is_active'],
+                                    include :[{ 
+                                                association: 'sectionsmasterData' , 
+                                                where :{is_active : 1} ,
+                                                attributes: ['id', 'section', 'is_active'],
+                                                include :[{ 
+                                                            association: 'subsectionsmasterData' , 
+                                                            where :{is_active : 1} ,
+                                                            attributes: ['id', 'subsection', 'is_active'],
+                                                            required :false
+                                                          }],  
+                                                required :false
+                                              }],
+                                    required :false 
+                                    })
+ .then(data => 
+      {
+        res.send({'status':200,'message':"success",'data':data});
+        logMsg.info("Master Data List api call Success");
+     })
+        .catch(err => {
+              res.status(404).send({'status':404,
+              message: err.message || "Some error occurred while retrieving statements." ,'data': "No data" });
+                      });
+};
 
 // menu list api 
 exports.MenuList = async (req, res) => {
@@ -35,7 +63,8 @@ exports.MenuList = async (req, res) => {
     obj_data = { ...value.dataValues , statementsmasterrData:MasterData}
     data.push(obj_data);
    });
-    return res.send({'status':200,'message':"success",'data':data});
+    res.send({'status':200,'message':"success",'data':data});
+    logMsg.info("MenuList api working");
   } catch (err) {
     console.log(err)
     return res.status(500).json({'status':404,'message':"failed",'data':"No data"})
diff --git a/app/routes/routes.js b/app/routes/routes.js
index 91d8973..75f9f31 100644
--- a/app/routes/routes.js
+++ b/app/routes/routes.js
@@ -26,6 +26,9 @@ module.exports = app => {
     // Retrieve all Broken periods
     router.get("/BrokenPeriodsList/:entityid", financials.BrokenPeriodsList);
 
+    // fetchind all master data
+    router.get("/MasterDatas", financials.MasterDatas);
+    
 
     //master.controller api's
       // get statment master data