diff --git a/src/server/services/recruitCRM.js b/src/server/services/recruitCRM.js index 3ae3841cb3..16edc366fe 100644 --- a/src/server/services/recruitCRM.js +++ b/src/server/services/recruitCRM.js @@ -209,6 +209,16 @@ export default class RecruitCRMService { return res.send(error); } const data = await response.json(); + + // 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, + enable_job_application_form: data.enable_job_application_form, + }); + } + return res.send(sanitizeJob(data)); } catch (err) { return next(err); @@ -261,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) { @@ -322,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); @@ -330,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, }; }