Merge branch 'develop' into slash-tc

Author: luizrrodrigues

.circleci/config.yml

@@ -356,7 +356,7 @@ workflows:
           filters:
             branches:
               only:
-                - free
+                - gig-cache-layer
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global

config/default.js

@@ -436,6 +436,7 @@ module.exports = {
   TC_EDU_SEARCH_BAR_MAX_RESULTS_EACH_GROUP: 3,
   POLICY_PAGES_PATH: '/policy',
   GIGS_PAGES_PATH: '/gigs',
+  GIGS_LISTING_CACHE_TIME: 300, // in seconds
   START_PAGE_PATH: '/start',
   GUIKIT: {
     DEBOUNCE_ON_CHANGE_TIME: 150,

package-lock.json

@@ -90,6 +90,7 @@
     "multer": "^1.4.2",
     "navigation-component": "github:topcoder-platform/navigation-component#new-dashboard",
     "navigation-component-tco": "github:topcoder-platform/navigation-component-tco#new-dev",
+    "node-cache": "^5.1.2",
     "node-forge": "^0.7.5",
     "nuka-carousel": "^4.5.3",
     "postcss": "^6.0.23",

package.json

@@ -28,9 +28,11 @@ routes.use(cors());
 routes.options('*', cors());
 
 routes.get('/jobs', (req, res, next) => new RecruitCRMService().getAllJobs(req, res, next));
+routes.get('/jobs/cache', (req, res, next) => new RecruitCRMService().getJobsCacheStats(req, res, next));
+routes.get('/jobs/cache/flush', (req, res, next) => authenticator(authenticatorOptions)(req, res, next), (req, res, next) => new RecruitCRMService().getJobsCacheFlush(req, res, next));
 routes.get('/jobs/search', (req, res, next) => new RecruitCRMService().getJobs(req, res, next));
 routes.get('/jobs/:id', (req, res, next) => new RecruitCRMService().getJob(req, res, next));
-routes.post('/jobs/:id/apply', upload.single('resume'), (req, res, next) => new RecruitCRMService().applyForJob(req, res, next));
+routes.post('/jobs/:id/apply', (req, res, next) => authenticator(authenticatorOptions)(req, res, next), upload.single('resume'), (req, res, next) => new RecruitCRMService().applyForJob(req, res, next));
 routes.get('/candidates/search', (req, res, next) => new RecruitCRMService().searchCandidates(req, res, next));
 // new router added
 routes.get('/profile', (req, res, next) => authenticator(authenticatorOptions)(req, res, next), (req, res, next) => new RecruitCRMService().getProfile(req, res, next));

src/server/routes/recruitCRM.js

@@ -15,6 +15,11 @@ import { sendEmailDirect } from './sendGrid';
 const { api } = services;
 
 const FormData = require('form-data');
+const NodeCache = require('node-cache');
+
+// gigs list caching
+const CACHE_KEY = 'jobs';
+const gigsCache = new NodeCache({ stdTTL: config.GIGS_LISTING_CACHE_TIME, checkperiod: 10 });
 
 const JOB_FIELDS_RESPONSE = [
   'id',
@@ -90,6 +95,17 @@ export default class RecruitCRMService {
     };
   }
 
+  // eslint-disable-next-line class-methods-use-this
+  getJobsCacheStats(req, res) {
+    return res.send(gigsCache.getStats());
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  getJobsCacheFlush(req, res) {
+    gigsCache.flushAll();
+    return res.send(gigsCache.getStats());
+  }
+
   /**
    * getJobsFromTaas endpoint.
    * @return {Promise}
@@ -180,12 +196,72 @@ export default class RecruitCRMService {
     }
   }
 
+  /**
+   * Gets all jobs method.
+   * @return {Promise}
+   * @param {Object} query the request query.
+   */
+  async getAll(query) {
+    try {
+      const response = await fetch(`${this.private.baseUrl}/v1/jobs/search?${qs.stringify(query)}`, {
+        method: 'GET',
+        headers: {
+          'Content-Type': 'application/json',
+          Authorization: this.private.authorization,
+        },
+      });
+      if (response.status === 429) {
+        await new Promise(resolve => setTimeout(resolve, 30000)); // wait 30sec
+        return this.getAll(query);
+      }
+      if (response.status >= 400) {
+        const error = {
+          error: true,
+          status: response.status,
+          url: `${this.private.baseUrl}/v1/jobs/search?${qs.stringify(query)}`,
+          errObj: await response.json(),
+        };
+        return error;
+      }
+      const data = await response.json();
+      if (data.current_page < data.last_page) {
+        const pages = _.range(2, data.last_page + 1);
+        return Promise.all(
+          pages.map(page => fetch(`${this.private.baseUrl}/v1/jobs/search?${qs.stringify(query)}&page=${page}`, {
+            method: 'GET',
+            headers: {
+              'Content-Type': 'application/json',
+              Authorization: this.private.authorization,
+            },
+          })),
+        )
+          .then(async (allPages) => {
+            // eslint-disable-next-line no-restricted-syntax
+            for (const pageDataRsp of allPages) {
+              // eslint-disable-next-line no-await-in-loop
+              const pageData = await pageDataRsp.json();
+              data.data = _.flatten(data.data.concat(pageData.data));
+            }
+            const toSend = _.map(data.data, j => _.pick(j, JOB_FIELDS_RESPONSE));
+            return toSend;
+          });
+      }
+      const toSend = _.map(data.data, j => _.pick(j, JOB_FIELDS_RESPONSE));
+      return toSend;
+    } catch (err) {
+      return err;
+    }
+  }
+
   /**
    * Gets all jobs endpoint.
    * @return {Promise}
    * @param {Object} the request.
    */
   async getAllJobs(req, res, next) {
+    if (gigsCache.has(CACHE_KEY)) {
+      return res.send(gigsCache.get(CACHE_KEY));
+    }
     try {
       const response = await fetch(`${this.private.baseUrl}/v1/jobs/search?${qs.stringify(req.query)}`, {
         method: 'GET',
@@ -227,17 +303,17 @@ export default class RecruitCRMService {
               const pageData = await pageDataRsp.json();
               data.data = _.flatten(data.data.concat(pageData.data));
             }
-            return res.send(
-              _.map(data.data, j => _.pick(j, JOB_FIELDS_RESPONSE)),
-            );
+            const toSend = _.map(data.data, j => _.pick(j, JOB_FIELDS_RESPONSE));
+            gigsCache.set(CACHE_KEY, toSend);
+            return res.send(toSend);
           })
           .catch(e => res.send({
             error: e,
           }));
       }
-      return res.send(
-        _.map(data.data, j => _.pick(j, JOB_FIELDS_RESPONSE)),
-      );
+      const toSend = _.map(data.data, j => _.pick(j, JOB_FIELDS_RESPONSE));
+      gigsCache.set(CACHE_KEY, toSend);
+      return res.send(toSend);
     } catch (err) {
       return next(err);
     }
@@ -697,3 +773,16 @@ export default class RecruitCRMService {
     return data.data[0];
   }
 }
+
+// Self update cache on expire to keep it fresh
+gigsCache.on('expired', async (key) => {
+  if (key === CACHE_KEY) {
+    const ss = new RecruitCRMService();
+    const gigs = await ss.getAll({
+      job_status: 1,
+    });
+    if (!gigs.error) {
+      gigsCache.set(CACHE_KEY, gigs);
+    }
+  }
+});

src/server/services/recruitCRM.js

@@ -114,10 +114,10 @@ function normalizeRecruitPayload(job, payload) {
 /**
  * Apply for Job done
  */
-async function applyForJobDone(job, payload) {
+async function applyForJobDone(job, payload, tokenV3) {
   const ss = new Service();
   try {
-    const res = await ss.applyForJob(job.slug, normalizeRecruitPayload(job, payload));
+    const res = await ss.applyForJob(job.slug, normalizeRecruitPayload(job, payload), tokenV3);
 
     return {
       id: job.slug,

src/shared/actions/recruitCRM.js

@@ -49,7 +49,7 @@ function ReferralCode(props) {
                 button: buttonThemes.tc['primary-borderless-sm'],
               }}
             >
-              REFFER A FRIEND
+              REFER A FRIEND
             </PrimaryButton>
             {
               loginModalOpen
@@ -98,7 +98,7 @@ function ReferralCode(props) {
               )
             }
             {
-              growSurfState.error && <span>Ops, we couldn&apos;t load your profile. Please try again later or contact <a href="mailto:support@topcoder.com">support</a>.</span>
+              growSurfState.error && <span>Oops, we couldn&apos;t load your profile. Please try again later or contact <a href="mailto:support@topcoder.com">support</a>.</span>
             }
           </React.Fragment>
         )

src/shared/components/Gigs/ReferralCode/index.jsx

@@ -123,12 +123,14 @@ class RecruitCRMJobApplyContainer extends React.Component {
   }
 
   onApplyClick() {
-    const { applyForJob, job, optimizely } = this.props;
+    const {
+      applyForJob, job, optimizely, auth,
+    } = this.props;
     const { formData } = this.state;
     this.validateForm();
     this.setState((state) => {
       if (_.isEmpty(state.formErrors)) {
-        applyForJob(job, formData);
+        applyForJob(job, formData, auth.tokenV3);
         optimizely.track('Submit Application Form');
         const isFeatured = _.find(job.custom_fields, ['field_name', 'Featured']);
         const jobTags = _.find(job.custom_fields, ['field_name', 'Job Tag']);
@@ -279,6 +281,7 @@ RecruitCRMJobApplyContainer.defaultProps = {
   applying: false,
   application: null,
   recruitProfile: null,
+  auth: {},
 };
 
 RecruitCRMJobApplyContainer.propTypes = {
@@ -290,6 +293,7 @@ RecruitCRMJobApplyContainer.propTypes = {
   searchCandidates: PT.func.isRequired,
   recruitProfile: PT.shape(),
   optimizely: PT.shape().isRequired,
+  auth: PT.object,
 };
 
 function mapStateToProps(state, ownProps) {
@@ -313,15 +317,18 @@ function mapStateToProps(state, ownProps) {
       ? state.recruitCRM[job.slug].application : null,
     recruitProfile: state.recruitCRM && profile && state.recruitCRM[profile.email]
       ? state.recruitCRM[profile.email].profile : null,
+    auth: {
+      ...state.auth,
+    },
   };
 }
 
 function mapDispatchToActions(dispatch) {
   const a = actions.recruit;
   return {
-    applyForJob: (job, payload) => {
+    applyForJob: (job, payload, tokenV3) => {
       dispatch(a.applyForJobInit(job, payload));
-      dispatch(a.applyForJobDone(job, payload));
+      dispatch(a.applyForJobDone(job, payload, tokenV3));
     },
     searchCandidates: (email) => {
       dispatch(a.searchCandidatesInit(email));

src/shared/containers/Gigs/RecruitCRMJobApply.jsx

@@ -179,9 +179,9 @@ class RecruitCRMJobsContainer extends React.Component {
     // build current locations dropdown based on all data
     // and filter by selected location
     jobsToDisplay = _.filter(jobs, (job) => {
-      const country = !job.country || job.country === 'Anywhere' || job.country === 'Any' ? 'All' : job.country;
+      const country = _.trim(!job.country || job.country === 'Anywhere' || job.country === 'Any' ? 'All' : job.country);
       // build dropdown
-      const found = _.findIndex(locations, { label: country });
+      const found = _.findIndex(locations, l => l.label.toLowerCase() === country.toLowerCase());
       if (found === -1) {
         locations.push({
           label: country, selected: location.toLowerCase() === country.toLowerCase(),

src/shared/containers/Gigs/RecruitCRMJobs.jsx

@@ -75,15 +75,19 @@ export default class Service {
    * applyForJob for candidate
    * @param {string} id The job id to apply to
    * @param {object} payload The apply payload
+   * @param {string} tokenV3 User token
    */
-  async applyForJob(id, payload) {
+  async applyForJob(id, payload, tokenV3) {
     const { resume } = payload;
     const data = new FormData();
     data.append('resume', resume);
     data.append('form', JSON.stringify(_.omit(payload, 'resume')));
     const res = await fetch(`${this.baseUrl}/jobs/${id}/apply`, {
       method: 'POST',
       body: data,
+      headers: new Headers({
+        Authorization: `Bearer ${tokenV3}`,
+      }),
     });
     if (!res.ok) {
       const error = new Error('Failed to apply for job');