From 6acb68166d1ea8d3e4f5feb69b91b71ef0ffa5b4 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Wed, 13 Apr 2022 21:59:57 -0300 Subject: [PATCH 1/4] RecruitCRM API - Remove jobs data if job not open --- src/server/services/recruitCRM.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/server/services/recruitCRM.js b/src/server/services/recruitCRM.js index 3ae3841cb3..922ff60f76 100644 --- a/src/server/services/recruitCRM.js +++ b/src/server/services/recruitCRM.js @@ -209,6 +209,14 @@ export default class RecruitCRMService { return res.send(error); } const data = await response.json(); + + // If job not open return just job status + if (data.job_status && data.job_status.id !== 1) { + return res.send({ + job_status: data.job_status, + }); + } + return res.send(sanitizeJob(data)); } catch (err) { return next(err); From 6204827fc540528ea5ae497676fdd5bc5ead8a60 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Thu, 14 Apr 2022 00:16:15 -0300 Subject: [PATCH 2/4] Removed data from enable_job_application_form not open --- src/server/services/recruitCRM.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/server/services/recruitCRM.js b/src/server/services/recruitCRM.js index 922ff60f76..4473ce9688 100644 --- a/src/server/services/recruitCRM.js +++ b/src/server/services/recruitCRM.js @@ -210,8 +210,9 @@ export default class RecruitCRMService { } const data = await response.json(); - // If job not open return just job status - if (data.job_status && data.job_status.id !== 1) { + // If job or form not open return just job status + if ((data.job_status && data.job_status.id !== 1) + || data.enable_job_application_form !== 1) { return res.send({ job_status: data.job_status, }); From 6cd1e2df6db81d187d672c0f967137a33a523eb6 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Thu, 14 Apr 2022 00:38:02 -0300 Subject: [PATCH 3/4] Added enable_job_application_form to return --- src/server/services/recruitCRM.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/server/services/recruitCRM.js b/src/server/services/recruitCRM.js index 4473ce9688..99afbe0e19 100644 --- a/src/server/services/recruitCRM.js +++ b/src/server/services/recruitCRM.js @@ -215,6 +215,7 @@ export default class RecruitCRMService { || data.enable_job_application_form !== 1) { return res.send({ job_status: data.job_status, + enable_job_application_form: data.enable_job_application_form, }); } From e2974a959eccb91ea60aedb1401170ee43fca173 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Thu, 14 Apr 2022 07:23:25 -0300 Subject: [PATCH 4/4] Move enable_job_application_form filter to API return --- src/server/services/recruitCRM.js | 16 ++++++++++++++++ src/shared/reducers/recruitCRM.js | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/server/services/recruitCRM.js b/src/server/services/recruitCRM.js index 99afbe0e19..16edc366fe 100644 --- a/src/server/services/recruitCRM.js +++ b/src/server/services/recruitCRM.js @@ -271,10 +271,18 @@ export default class RecruitCRMService { const pageData = await pageDataRsp.json(); data.data = _.flatten(data.data.concat(pageData.data)); } + + // Filter by Job Application active + data.data = _.filter(data.data, job => job.enable_job_application_form === 1); + const toSend = _.map(data.data, j => sanitizeJob(j)); return toSend; }); } + + // Filter by Job Application active + data.data = _.filter(data.data, job => job.enable_job_application_form === 1); + const toSend = _.map(data.data, j => sanitizeJob(j)); return toSend; } catch (err) { @@ -332,6 +340,10 @@ export default class RecruitCRMService { const pageData = await pageDataRsp.json(); data.data = _.flatten(data.data.concat(pageData.data)); } + + // Filter by Job Application active + data.data = _.filter(data.data, job => job.enable_job_application_form === 1); + const toSend = _.map(data.data, j => sanitizeJob(j)); gigsCache.set(CACHE_KEY, toSend); return res.send(toSend); @@ -340,6 +352,10 @@ export default class RecruitCRMService { error: e, })); } + + // Filter by Job Application active + data.data = _.filter(data.data, job => job.enable_job_application_form === 1); + const toSend = _.map(data.data, j => sanitizeJob(j)); gigsCache.set(CACHE_KEY, toSend); return res.send(toSend); diff --git a/src/shared/reducers/recruitCRM.js b/src/shared/reducers/recruitCRM.js index 888b46dfb5..4ed3a878e3 100644 --- a/src/shared/reducers/recruitCRM.js +++ b/src/shared/reducers/recruitCRM.js @@ -26,7 +26,7 @@ function onDone(state, { payload }) { return { ...state, loading: false, - jobs: _.filter(payload.data, job => job.enable_job_application_form === 1), + jobs: payload.data, }; }