Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/smc_cet_mainapp_backend
This commit is contained in:
commit
31152c19d5
@ -1,6 +1,6 @@
|
|||||||
const { sequelize,EntityApplicantMaster,StateMaster,CityMaster,PinMaster,ChecktypeCheckresultRelationMaster
|
const { sequelize,EntityApplicantMaster,StateMaster,CityMaster,PinMaster,ChecktypeCheckresultRelationMaster
|
||||||
,DueDiligenceCheck,CheckResultMaster} = require('../models')
|
,DueDiligenceCheck,CheckResultMaster,CheckTypeMaster} = require('../models')
|
||||||
const { logMsg } = require('../services/logger.js');
|
const { logMsg } = require('../services/logger.js');
|
||||||
|
|
||||||
|
|
||||||
// select entityMaster data
|
// select entityMaster data
|
||||||
@ -16,12 +16,12 @@ const { sequelize,EntityApplicantMaster,StateMaster,CityMaster,PinMaster,Checkty
|
|||||||
})
|
})
|
||||||
.catch(err => {
|
.catch(err => {
|
||||||
res.send({'status':404,
|
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) {
|
} catch(err) {
|
||||||
res.send({'status':404,
|
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
|
} //end of try catch
|
||||||
|
|
||||||
@ -30,26 +30,23 @@ const { sequelize,EntityApplicantMaster,StateMaster,CityMaster,PinMaster,Checkty
|
|||||||
// create entity master data
|
// create entity master data
|
||||||
exports.CreateEntityApplicantMasterData = async (req, res) =>
|
exports.CreateEntityApplicantMasterData = async (req, res) =>
|
||||||
{
|
{
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
await EntityApplicantMaster.create(req.body)
|
await EntityApplicantMaster.create(req.body)
|
||||||
.then(data =>
|
.then(data =>
|
||||||
{
|
{
|
||||||
res.send({'status':200,'message':"success",'data':data});
|
res.send({'status':200,'message':"success",'data': data});
|
||||||
|
|
||||||
})
|
})
|
||||||
.catch(err => {
|
.catch(err => {
|
||||||
res.send({'status':404,
|
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) {
|
} catch(err) {
|
||||||
res.send({'status':404,
|
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
|
try
|
||||||
{
|
{
|
||||||
await StateMaster.findAll()
|
await StateMaster.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});
|
||||||
@ -66,12 +63,12 @@ const { sequelize,EntityApplicantMaster,StateMaster,CityMaster,PinMaster,Checkty
|
|||||||
})
|
})
|
||||||
.catch(err => {
|
.catch(err => {
|
||||||
res.send({'status':404,
|
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) {
|
} catch(err) {
|
||||||
res.send({'status':404,
|
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
|
} //end of try catch
|
||||||
|
|
||||||
@ -82,7 +79,7 @@ const { sequelize,EntityApplicantMaster,StateMaster,CityMaster,PinMaster,Checkty
|
|||||||
{
|
{
|
||||||
try
|
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 =>
|
.then(data =>
|
||||||
{
|
{
|
||||||
res.send({'status':200,'message':"success",'data':data });
|
res.send({'status':200,'message':"success",'data':data });
|
||||||
@ -90,12 +87,12 @@ const { sequelize,EntityApplicantMaster,StateMaster,CityMaster,PinMaster,Checkty
|
|||||||
})
|
})
|
||||||
.catch(err => {
|
.catch(err => {
|
||||||
res.send({'status':404,
|
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) {
|
} catch(err) {
|
||||||
res.send({'status':404,
|
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
|
} //end of try catch
|
||||||
|
|
||||||
@ -106,7 +103,7 @@ const { sequelize,EntityApplicantMaster,StateMaster,CityMaster,PinMaster,Checkty
|
|||||||
{
|
{
|
||||||
try
|
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 =>
|
.then(data =>
|
||||||
{
|
{
|
||||||
res.send({'status':200,'message':"success",'data':data});
|
res.send({'status':200,'message':"success",'data':data});
|
||||||
@ -114,31 +111,85 @@ const { sequelize,EntityApplicantMaster,StateMaster,CityMaster,PinMaster,Checkty
|
|||||||
})
|
})
|
||||||
.catch(err => {
|
.catch(err => {
|
||||||
res.send({'status':404,
|
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) {
|
} catch(err) {
|
||||||
res.send({'status':404,
|
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
|
} //end of try catch
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// select checkResultMaster
|
||||||
exports.CheckResultMaster = async (req, res) =>
|
exports.CheckResultMaster = async (req, res) =>
|
||||||
{
|
{
|
||||||
try
|
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')
|
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});
|
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) {
|
} catch(err) {
|
||||||
res.send({'status':404,
|
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
|
} //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
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -6,7 +6,8 @@ module.exports = (sequelize, DataTypes) => {
|
|||||||
}
|
}
|
||||||
CheckResultMaster.init(
|
CheckResultMaster.init(
|
||||||
{
|
{
|
||||||
value: { type: DataTypes.STRING }
|
value: { type: DataTypes.STRING },
|
||||||
|
is_active: { type: DataTypes.INTEGER }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
sequelize,
|
sequelize,
|
||||||
|
|||||||
23
app/models/CheckTypeMaster.js
Normal file
23
app/models/CheckTypeMaster.js
Normal 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
|
||||||
|
}
|
||||||
@ -8,7 +8,8 @@ module.exports = (sequelize, DataTypes) => {
|
|||||||
ChecktypeCheckresultRelationMaster.init(
|
ChecktypeCheckresultRelationMaster.init(
|
||||||
{
|
{
|
||||||
check_type_id: { type: DataTypes.INTEGER },
|
check_type_id: { type: DataTypes.INTEGER },
|
||||||
check_result_id: { type: DataTypes.INTEGER }
|
check_result_id: { type: DataTypes.INTEGER },
|
||||||
|
is_active: { type: DataTypes.INTEGER }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
sequelize,
|
sequelize,
|
||||||
|
|||||||
@ -7,7 +7,8 @@ module.exports = (sequelize, DataTypes) => {
|
|||||||
CityMaster.init(
|
CityMaster.init(
|
||||||
{
|
{
|
||||||
state_id: { type: DataTypes.INTEGER },
|
state_id: { type: DataTypes.INTEGER },
|
||||||
city: { type: DataTypes.STRING }
|
city: { type: DataTypes.STRING },
|
||||||
|
is_active: { type: DataTypes.INTEGER }
|
||||||
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@ -7,7 +7,8 @@ module.exports = (sequelize, DataTypes) => {
|
|||||||
PinMaster.init(
|
PinMaster.init(
|
||||||
{
|
{
|
||||||
state_id: { type: DataTypes.STRING },
|
state_id: { type: DataTypes.STRING },
|
||||||
pin: { type: DataTypes.INTEGER }
|
pin: { type: DataTypes.INTEGER },
|
||||||
|
is_active: { type: DataTypes.INTEGER }
|
||||||
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@ -6,7 +6,8 @@ module.exports = (sequelize, DataTypes) => {
|
|||||||
}
|
}
|
||||||
StateMaster.init(
|
StateMaster.init(
|
||||||
{
|
{
|
||||||
state: { type: DataTypes.STRING }
|
state: { type: DataTypes.STRING },
|
||||||
|
is_active: { type: DataTypes.INTEGER }
|
||||||
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user