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

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

Browse Source
This commit is contained in:
sriramv 2022-03-09 17:04:47 +05:30
commit 31152c19d5
7 changed files with 107 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
const { sequelize,EntityApplicantMaster,StateMaster,CityMaster,PinMaster,ChecktypeCheckresultRelationMaster
,DueDiligenceCheck,CheckResultMaster} = require('../models')
const { logMsg } = require('../services/logger.js');
,DueDiligenceCheck,CheckResultMaster,CheckTypeMaster} = require('../models')
const { logMsg } = require('../services/logger.js');
// select entityMaster data
@ -16,12 +16,12 @@ const { sequelize,EntityApplicantMaster,StateMaster,CityMaster,PinMaster,Checkty
})
.catch(err => {
res.send({'status':404,
message: err.message || "Some error occurred while retrieving statements." ,'data': "No data" });
message: err.message || "Some error occurred while fetching entity applicant masterdata." ,'data': "No data" });
});
} catch(err) {
res.send({'status':404,
message: err.message || "Some error occurred while inserting statements." ,'data': "No data"
message: err.message || "Some error occurred while fetching entity applicant masterdata." ,'data': "No data"
});
} //end of try catch
@ -30,26 +30,23 @@ const { sequelize,EntityApplicantMaster,StateMaster,CityMaster,PinMaster,Checkty
// create entity master data
exports.CreateEntityApplicantMasterData = async (req, res) =>
{
try
{
await EntityApplicantMaster.create(req.body)
.then(data =>
{
res.send({'status':200,'message':"success",'data':data});
res.send({'status':200,'message':"success",'data': data});
})
.catch(err => {
res.send({'status':404,
message: err.message || "Some error occurred while retrieving statements." ,'data': "No data" });
message: err.message || "Some error occurred while create entity applicant masterdata." ,'data': "No data" });
});
} catch(err) {
res.send({'status':404,
message: err.message || "Some error occurred while inserting statements." ,'data': "No data"
message: err.message || "Some error occurred while create entity applicant masterdata." ,'data': "No data"
});
} //end of try catch
} //end of try catch
};
@ -58,7 +55,7 @@ const { sequelize,EntityApplicantMaster,StateMaster,CityMaster,PinMaster,Checkty
{
try
{
await StateMaster.findAll()
await StateMaster.findAll({ where : {"is_active" : 1}})
.then(data =>
{
res.send({'status':200,'message':"success",'data':data});
@ -66,12 +63,12 @@ const { sequelize,EntityApplicantMaster,StateMaster,CityMaster,PinMaster,Checkty
})
.catch(err => {
res.send({'status':404,
message: err.message || "Some error occurred while retrieving statements." ,'data': "No data" });
message: err.message || "Some error occurred while fetching state masterdata." ,'data': "No data" });
});
} catch(err) {
res.send({'status':404,
message: err.message || "Some error occurred while inserting statements." ,'data': "No data"
message: err.message || "Some error occurred while fetching state masterdata." ,'data': "No data"
});
} //end of try catch
@ -82,7 +79,7 @@ const { sequelize,EntityApplicantMaster,StateMaster,CityMaster,PinMaster,Checkty
{
try
{
await CityMaster.findAll({ where : { "state_id" : req.query.state_id }})
await CityMaster.findAll({ where : { "state_id" : req.query.state_id , "is_active" : 1 }})
.then(data =>
{
res.send({'status':200,'message':"success",'data':data });
@ -90,12 +87,12 @@ const { sequelize,EntityApplicantMaster,StateMaster,CityMaster,PinMaster,Checkty
})
.catch(err => {
res.send({'status':404,
message: err.message || "Some error occurred while retrieving statements." ,'data': "No data" });
message: err.message || "Some error occurred while fetching city masterdata." ,'data': "No data" });
});
} catch(err) {
res.send({'status':404,
message: err.message || "Some error occurred while inserting statements." ,'data': "No data"
message: err.message || "Some error occurred while fetching city masterdata." ,'data': "No data"
});
} //end of try catch
@ -106,7 +103,7 @@ const { sequelize,EntityApplicantMaster,StateMaster,CityMaster,PinMaster,Checkty
{
try
{
await PinMaster.findAll({ where : { "state_id" : req.query.state_id }})
await PinMaster.findAll({ where : { "state_id" : req.query.state_id , "is_active" : 1 }})
.then(data =>
{
res.send({'status':200,'message':"success",'data':data});
@ -114,31 +111,85 @@ const { sequelize,EntityApplicantMaster,StateMaster,CityMaster,PinMaster,Checkty
})
.catch(err => {
res.send({'status':404,
message: err.message || "Some error occurred while retrieving statements." ,'data': "No data" });
message: err.message || "Some error occurred while fetching pin masterdata." ,'data': "No data" });
});
} catch(err) {
res.send({'status':404,
message: err.message || "Some error occurred while inserting statements." ,'data': "No data"
message: err.message || "Some error occurred while fetching pin masterdata." ,'data': "No data"
});
} //end of try catch
};
// select checkResultMaster
exports.CheckResultMaster = async (req, res) =>
{
try
{
const storeData = await sequelize.query('SELECT checktype_checkresult_relation_master.check_type_id , checktype_checkresult_relation_master.check_result_id, check_type_master.value AS check_type, check_result_master.value AS check_result FROM checktype_checkresult_relation_master JOIN check_type_master ON checktype_checkresult_relation_master.check_type_id = check_type_master.id JOIN check_result_master ON checktype_checkresult_relation_master.check_result_id = check_result_master.id')
res.send({'status':200,'message':"success",'data':storeData});
const storeData = await sequelize.query('SELECT checktype_checkresult_relation_master.check_type_id , checktype_checkresult_relation_master.check_result_id, check_type_master.value AS check_type, check_result_master.value AS check_result FROM checktype_checkresult_relation_master JOIN check_type_master ON checktype_checkresult_relation_master.check_type_id = check_type_master.id and check_type_master.is_active = 1JOIN check_result_master ON checktype_checkresult_relation_master.check_result_id = check_result_master.id and check_result_master.is_active = 1 where checktype_checkresult_relation_master.is_active = 1 ')
res.send({'status':200,'message':"success",'data':storeData
})
.catch(err => {
res.send({'status':404,
message: err.message || "Some error occurred while fetching check result master data." ,'data': "No data" });
});
} catch(err) {
res.send({'status':404,
message: err.message || "Some error occurred while inserting statements." ,'data': "No data"
message: err.message || "Some error occurred while fetching check result master data." ,'data': "No data"
});
} //end of try catch
};
// create check type master
exports.CreateCheckTypeMaster = async (req, res) =>
{
try
{
await CheckTypeMaster.create(req.body)
.then(data =>
{
res.send({'status':200,'message':"success",'data':"success"});
})
.catch(err => {
res.send({'status':404,
message: err.message || "Some error occurred while create type masterdata." ,'data': "No data" });
});
} catch(err) {
res.send({'status':404,
message: err.message || "Some error occurred while create type masterdata." ,'data': "No data"
});
} //end of try catch
};
// create relation master
exports.CreateRelationMaster = async (req, res) =>
{
try
{
await ChecktypeCheckresultRelationMaster.create(req.body)
.then(data =>
{
res.send({'status':200,'message':"success",'data':"success"});
})
.catch(err => {
res.send({'status':404,
message: err.message || "Some error occurred while create relation masterdata." ,'data': "No data" });
});
} catch(err) {
res.send({'status':404,
message: err.message || "Some error occurred while create relation masterdata." ,'data': "No data"
});
} //end of try catch
};

3
app/models/CheckResultMaster.js
View File

@ -6,7 +6,8 @@ module.exports = (sequelize, DataTypes) => {
}
CheckResultMaster.init(
{
value: { type: DataTypes.STRING }
value: { type: DataTypes.STRING },
is_active: { type: DataTypes.INTEGER }
},
{
sequelize,

23
app/models/CheckTypeMaster.js Normal file
View File

@ -0,0 +1,23 @@
'use strict'
const { Model } = require('sequelize')
module.exports = (sequelize, DataTypes) => {
class CheckTypeMaster extends Model {
}
CheckTypeMaster.init(
{
value: { type: DataTypes.STRING },
is_active: { type: DataTypes.INTEGER }
},
{
sequelize,
tableName: 'check_type_master',
modelName: 'CheckTypeMaster',
}
)
return CheckTypeMaster
}

3
app/models/ChecktypeCheckresultRelationMaster.js
View File

@ -8,7 +8,8 @@ module.exports = (sequelize, DataTypes) => {
ChecktypeCheckresultRelationMaster.init(
{
check_type_id: { type: DataTypes.INTEGER },
check_result_id: { type: DataTypes.INTEGER }
check_result_id: { type: DataTypes.INTEGER },
is_active: { type: DataTypes.INTEGER }
},
{
sequelize,

3
app/models/CityMaster.js
View File

@ -7,7 +7,8 @@ module.exports = (sequelize, DataTypes) => {
CityMaster.init(
{
state_id: { type: DataTypes.INTEGER },
city: { type: DataTypes.STRING }
city: { type: DataTypes.STRING },
is_active: { type: DataTypes.INTEGER }
},
{

3
app/models/PinMaster.js
View File

@ -7,7 +7,8 @@ module.exports = (sequelize, DataTypes) => {
PinMaster.init(
{
state_id: { type: DataTypes.STRING },
pin: { type: DataTypes.INTEGER }
pin: { type: DataTypes.INTEGER },
is_active: { type: DataTypes.INTEGER }
},
{

3
app/models/StateMaster.js
View File

@ -6,7 +6,8 @@ module.exports = (sequelize, DataTypes) => {
}
StateMaster.init(
{
state: { type: DataTypes.STRING }
state: { type: DataTypes.STRING },
is_active: { type: DataTypes.INTEGER }
},
{