From 9ebe8bc221efb7db733f0af0e5a074527c52b218 Mon Sep 17 00:00:00 2001 From: merelendor Date: Fri, 7 Apr 2023 23:16:10 +0300 Subject: [PATCH] sending to CRM fields hotfixes --- pages/api/questionnaire/send.js | 39 ++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/pages/api/questionnaire/send.js b/pages/api/questionnaire/send.js index d217765..5b3a1bf 100644 --- a/pages/api/questionnaire/send.js +++ b/pages/api/questionnaire/send.js @@ -22,6 +22,14 @@ import RedisClient from '../../../lib/RedisClient'; const storage = multer.memoryStorage(); const upload = multer({ storage: storage }); +function checkNullEmpty(value) +{ + if(value === null) { return false; } + if(value === "") { return false; } + + return true; +} + export default async function handler(req, res) { console.log("API", "questionnaire", "send"); @@ -69,10 +77,10 @@ export default async function handler(req, res) let payload = { ...parsed.main, ...{ head_person: parsed.head_person }, ...{ signatory_person: parsed.signatory_person }, }; - payload.telephone = payload.telephone.replace(/[^0-9]/g, ''); - payload.individual_executive_inn = payload.individual_executive_inn.replace(/[^0-9]/g, ''); - payload.individual_executive_kpp = payload.individual_executive_kpp.replace(/[^0-9]/g, ''); - payload.individual_executive_docdate = payload.individual_executive_docdate !== null ? moment(payload.individual_executive_docdate).format("YYYY-MM-DD") : null; + payload.telephone = checkNullEmpty(payload.telephone) ? payload.telephone.replace(/[^0-9]/g, '') : null; + payload.individual_executive_inn = checkNullEmpty(payload.individual_executive_inn) ? payload.individual_executive_inn.replace(/[^0-9]/g, '') : null; + payload.individual_executive_kpp = checkNullEmpty(payload.individual_executive_kpp) ? payload.individual_executive_kpp.replace(/[^0-9]/g, '') : null; + payload.individual_executive_docdate = checkNullEmpty(payload.individual_executive_docdate) ? moment(payload.individual_executive_docdate).format("YYYY-MM-DD") : null; if(payload.head_person.middlename !== "" && payload.head_person.middlename !== null) { @@ -83,9 +91,9 @@ export default async function handler(req, res) payload.head_person.no_middle_name = true; } payload.head_person.identity_document.citizenship_code = payload.head_person.identity_document.citizenship.code; - payload.head_person.telephone = payload.head_person.telephone.replace(/[^0-9]/g, ''); - payload.head_person.identity_document.issuedate = payload.head_person.identity_document.issuedate !== null ? moment(payload.head_person.identity_document.issuedate).format("YYYY-MM-DD") : null; - payload.head_person.evo_assignment_date = payload.head_person.evo_assignment_date !== null ? moment(payload.head_person.evo_assignment_date).format("YYYY-MM-DD") : null; + payload.head_person.telephone = checkNullEmpty(payload.head_person.telephone) ? payload.head_person.telephone.replace(/[^0-9]/g, '') : null; + payload.head_person.identity_document.issuedate = checkNullEmpty(payload.head_person.identity_document.issuedate) ? moment(payload.head_person.identity_document.issuedate).format("YYYY-MM-DD") : null; + payload.head_person.evo_assignment_date = checkNullEmpty(payload.head_person.evo_assignment_date) ? moment(payload.head_person.evo_assignment_date).format("YYYY-MM-DD") : null; if(payload.signatory_person.not_head_person) { @@ -105,18 +113,18 @@ export default async function handler(req, res) ]) }; } payload.signatory_person.identity_document.citizenship_code = payload.signatory_person.identity_document.citizenship.code; - payload.signatory_person.telephone = payload.signatory_person.telephone.replace(/[^0-9]/g, ''); - payload.signatory_person.identity_document.issuedate = payload.signatory_person.identity_document.issuedate !== null ? moment(payload.signatory_person.identity_document.issuedate).format("YYYY-MM-DD") : null; - payload.signatory_person.docdate = payload.signatory_person.docdate !== null ? moment(payload.signatory_person.docdate).format("YYYY-MM-DD") : null; - payload.signatory_person.assignment_date = payload.signatory_person.assignment_date !== null ? moment(payload.signatory_person.assignment_date).format("YYYY-MM-DD") : null; + payload.signatory_person.telephone = checkNullEmpty(payload.signatory_person.telephone) ? payload.signatory_person.telephone.replace(/[^0-9]/g, '') : null; + payload.signatory_person.identity_document.issuedate = checkNullEmpty(payload.signatory_person.identity_document.issuedate) ? moment(payload.signatory_person.identity_document.issuedate).format("YYYY-MM-DD") : null; + payload.signatory_person.docdate = checkNullEmpty(payload.signatory_person.docdate) ? moment(payload.signatory_person.docdate).format("YYYY-MM-DD") : null; + payload.signatory_person.assignment_date = checkNullEmpty(payload.signatory_person.assignment_date) ? moment(payload.signatory_person.assignment_date).format("YYYY-MM-DD") : null; const founder_persons = parsed.founder_persons; for(let i in founder_persons) { founder_persons[i].founder_number = parseInt(i, 10) + 1; - founder_persons[i].telephone = founder_persons[i].telephone.replace(/[^0-9]/g, ''); - founder_persons[i].identity_document.issuedate = founder_persons[i].identity_document.issuedate !== null ? moment(founder_persons[i].identity_document.issuedate).format("YYYY-MM-DD") : null; + founder_persons[i].telephone = checkNullEmpty(founder_persons[i].telephone) ? founder_persons[i].telephone.replace(/[^0-9]/g, '') : null; + founder_persons[i].identity_document.issuedate = checkNullEmpty(founder_persons[i].identity_document.issuedate) ? moment(founder_persons[i].identity_document.issuedate).format("YYYY-MM-DD") : null; if(founder_persons[i].middlename !== "" && founder_persons[i].middlename !== null) { @@ -138,7 +146,8 @@ export default async function handler(req, res) purpose_use_lkt: parsed.non_profit.fin_goals_trucks, purpose_use_gt_sc: parsed.non_profit.fin_goals_special, } }; - payload.financial_loan = parseFloat(payload.financial_loan.replace(/[^0-9.]/g, '')); + console.error("payload.financial_loanpayload.financial_loan", payload.financial_loan); + payload.financial_loan = checkNullEmpty(payload.financial_loan) ? parseFloat(payload.financial_loan.toString().replace(/[^0-9.]/g, '')) : null; console.log("=".repeat(50)); console.log(inspect(payload, true, null, true)); @@ -255,7 +264,7 @@ export default async function handler(req, res) catch(upload_single_error) { console.error("upload_single_error"); - console.error(upload_single_error.response.data); + console.error(upload_single_error); res.status(500).send(); resolve();