sr-npm 1.7.418 → 1.7.420

package/backend/consts.js

@@ -73,6 +73,15 @@ const TASKS = {
 }
 
 
+const TEMPLATE_TYPE = {
+  INTERNAL: 'INTERNAL',
+  EXTERNAL: 'PUBLIC',
+}
+
+const TOKEN_NAME = {
+  COMPANY_ID: 'companyId',
+  SMART_TOKEN: 'x-smarttoken',
+}
 
 const TASK_TYPE = {
   SCHEDULED: 'scheduled',
@@ -83,5 +92,7 @@ const TASK_TYPE = {
     TASKS_NAMES,
     TASK_TYPE,
     TASKS,
-    QUERY_MAX_LIMIT
+    QUERY_MAX_LIMIT,
+    TEMPLATE_TYPE,
+    TOKEN_NAME
 };

package/backend/data.js

@@ -4,6 +4,7 @@ const { createCollectionIfMissing } = require('@hisense-staging/velo-npm/backend
 const { COLLECTIONS, COLLECTIONS_FIELDS,JOBS_COLLECTION_FIELDS } = require('./collectionConsts');
 const { chunkedBulkOperation, countJobsPerGivenField, fillCityLocationAndLocationAddress ,prepareToSaveArray,normalizeCityName} = require('./utils');
 const { getAllPositions } = require('./queries');
+const{TEMPLATE_TYPE,TOKEN_NAME} = require('./consts');
 const { getCompanyId, getSmartToken } = require('./secretsData');
 
 function validatePosition(position) {
@@ -317,9 +318,6 @@ async function referenceJobs() {
 
 async function syncJobsFast() {
   console.log("Syncing jobs fast");
-  //database
-
-  
   await createCollections();
   await clearCollections();
   await fillSecretManagerMirror();
@@ -348,14 +346,14 @@ async function clearCollections() {
 async function markTemplateAsExternal() {
   await createCollectionIfMissing(COLLECTIONS.TEMPLATE_TYPE, COLLECTIONS_FIELDS.TEMPLATE_TYPE,null,'singleItem');
   await wixData.save(COLLECTIONS.TEMPLATE_TYPE, {
-    templateType: "PUBLIC"
+    templateType: TEMPLATE_TYPE.EXTERNAL
   });
 }
 
 async function markTemplateAsInternal() {
   await createCollectionIfMissing(COLLECTIONS.TEMPLATE_TYPE, COLLECTIONS_FIELDS.TEMPLATE_TYPE,null,'singleItem');
   await wixData.save(COLLECTIONS.TEMPLATE_TYPE, {
-    templateType: "INTERNAL"
+    templateType: TEMPLATE_TYPE.INTERNAL
   });
 }
 
@@ -364,14 +362,14 @@ async function fillSecretManagerMirror() {
   const companyId = await getCompanyId();
   console.log("companyId is :  ", companyId);
   await wixData.insert(COLLECTIONS.SECRET_MANAGER_MIRROR, {
-    tokenName: "companyId",
+    tokenName: TOKEN_NAME.COMPANY_ID,
     tokenValue: companyId.value
   });
   console.log("companyId inserted into the SecretManagerMirror collection");
   try{
     const token = await getSmartToken();
     await wixData.insert(COLLECTIONS.SECRET_MANAGER_MIRROR, {
-      tokenName: "x-smarttoken",
+      tokenName: TOKEN_NAME.SMART_TOKEN,
       tokenValue: token.value
     });
     console.log("x-smarttoken inserted into the SecretManagerMirror collection");

package/backend/fetchPositionsFromSRAPI.js

@@ -1,21 +1,20 @@
 const { fetch } = require('wix-fetch');
 const { items: wixData } = require('@wix/data');
 const { COLLECTIONS } = require('./collectionConsts');
+const { TEMPLATE_TYPE,TOKEN_NAME } = require('./consts');
 
 async function makeSmartRecruitersRequest(path,templateType) {
    const baseUrl = 'https://api.smartrecruiters.com';
   const fullUrl = `${baseUrl}${path}`;
   
   try {
-    //if templatetype is internal make headers object with x-smarttoken
     const headers = {
       'Accept-Language': 'en',
       'accept': 'application/json',
       'Cookie': 'AWSALB=GYltFw3fLKortMxHR5vIOT1CuUROyhWNIX/qL8ZnPl1/8mhOcnIsBKYslzmNJPEzSy/jvNbO+6tXpH8yqcpQJagYt57MhbKlLqTSzoNq1G/w7TjOxPGR3UTdXW0d; AWSALBCORS=GYltFw3fLKortMxHR5vIOT1CuUROyhWNIX/qL8ZnPl1/8mhOcnIsBKYslzmNJPEzSy/jvNbO+6tXpH8yqcpQJagYt57MhbKlLqTSzoNq1G/w7TjOxPGR3UTdXW0d'
     };
-    //here is the only place where we check templateType
-    if (templateType === 'INTERNAL') {
-      const smartToken = await getSmartTokenFromCMS();
+    if (templateType === TEMPLATE_TYPE.INTERNAL) {
+      const smartToken = await getTokenFromCMS(TOKEN_NAME.SMART_TOKEN);
       headers['x-smarttoken'] = smartToken;
     }
     const response = await fetch(fullUrl, {
@@ -35,7 +34,7 @@ async function makeSmartRecruitersRequest(path,templateType) {
   }
 }
 
-async function fetchPositionsFromSRAPI() {
+async function fetchPositionsFromSRAPI(companyID=undefined) {
   let allPositions = [];
   let totalFound = 0;
   let page = 0;
@@ -105,21 +104,13 @@ async function fetchJobDescription(jobId) {
   return await makeSmartRecruitersRequest(`/v1/companies/${companyId}/postings/${jobId}`,templateType);
 }
 
-async function getCompanyIdFromCMS() {
-  const result = await wixData.query(COLLECTIONS.SECRET_MANAGER_MIRROR).eq('tokenName','companyId').find();
-  if (result.items.length > 0) {
-      return result.items[0].tokenValue; 
-  } else {
-      throw new Error('[getCompanyIdFromCMS], No companyId found');
-  }
-}
 
-async function getSmartTokenFromCMS() {
-  const result = await wixData.query(COLLECTIONS.SECRET_MANAGER_MIRROR).eq('tokenName','x-smarttoken').find();
+async function getTokenFromCMS(tokenName) {
+  const result = await wixData.query(COLLECTIONS.SECRET_MANAGER_MIRROR).eq('tokenName',tokenName).find();
   if (result.items.length > 0) {
       return result.items[0].tokenValue; 
   } else {
-      throw new Error('[getSmartTokenFromCMS], No smarttoken found');
+      throw new Error(`[getTokenFromCMS], No ${tokenName} found`);
   }
 }
 async function getTemplateTypeFromCMS() {
@@ -132,7 +123,7 @@ async function getTemplateTypeFromCMS() {
 }
 
 async function getApiKeys() {
-  const companyId = await getCompanyIdFromCMS();
+  const companyId = await getTokenFromCMS(TOKEN_NAME.COMPANY_ID);
   const templateType = await getTemplateTypeFromCMS();
   return {companyId,templateType};
 }
@@ -140,5 +131,5 @@ async function getApiKeys() {
 module.exports = {
   fetchPositionsFromSRAPI,
   fetchJobDescription,
-  getCompanyIdFromCMS
+  getTokenFromCMS
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sr-npm",
-  "version": "1.7.418",
+  "version": "1.7.420",
   "description": "",
   "main": "index.js",
   "scripts": {

package/tests/consts.js

@@ -0,0 +1,7 @@
+const COLLECTIONS = {
+    TEMPLATE_TYPE: 'templateType',
+}
+
+module.exports = {
+    COLLECTIONS
+}

package/tests/fetchPositionsFromSRApiTest.spec.js

@@ -1,35 +1,59 @@
-const { executeApiRequest } = require('tests-utils');
-const { getRandomPosition } = require('./testsUtils');
+// const { executeApiRequest } = require('tests-utils');
+// const { getRandomPosition, executeRequestAndTest } = require('./testsUtils');
 
-describe('Job details fetch from SR API Tests', () => {
+// describe('Job details fetch from SR API Tests', () => {
 
-    let positions;
-    beforeAll(async () => {
-        const requestBody = `fetchPositionsFromSRAPI();`;
-        positions = await executeApiRequest(requestBody);
-    });
+//     let positions;
+//     beforeAll(async () => {
+//         const requestBody = `fetchPositionsFromSRAPI();`;
+//         positions = await executeApiRequest(requestBody);
+//     });
   
-      test('should successfully fetch job details from SR API', async () => {
-        const randomPosition = getRandomPosition(positions.data.result.content);
-        expect(positions.data.result.totalFound).toBeGreaterThan(0);
-        expect(positions.data.result.content.length).toBeGreaterThan(0);
-        expect(randomPosition.id.length).toBeGreaterThan(0);
-        expect(randomPosition.name.length).toBeGreaterThan(0);
-        expect(randomPosition.jobAdId.length).toBeGreaterThan(0);
-        expect(randomPosition.location).toBeDefined();
-        expect(randomPosition.department).toBeDefined();
-      });
-
-      test('should successfully fetch job description from SR API', async () => {
-        const randomPosition = getRandomPosition(positions.data.result.content);
-        const fetchJobDescriptionRequestBody = `fetchJobDescription(${randomPosition.id});`;
-        const jobFetchResponse = await executeApiRequest(fetchJobDescriptionRequestBody);
-        expect(jobFetchResponse.data.result.id).toBe(randomPosition.id);
-        expect(jobFetchResponse.data.result.jobAd.sections.jobDescription).toBeDefined();
-        expect(jobFetchResponse.data.result.jobAd.sections.jobDescription.text.length).toBeGreaterThan(0);
-        expect(jobFetchResponse.data.result.applyUrl.length).toBeGreaterThan(0);
-        expect(jobFetchResponse.data.result.location).toBeDefined();
-      });
-  
-  
-  });
+//       test('should successfully fetch job details from SR API', async () => {
+//         const randomPosition = getRandomPosition(positions.data.result.content);
+//         expect(positions.data.result.totalFound).toBeGreaterThan(0);
+//         expect(positions.data.result.content.length).toBeGreaterThan(0);
+//         expect(randomPosition.id.length).toBeGreaterThan(0);
+//         expect(randomPosition.name.length).toBeGreaterThan(0);
+//         expect(randomPosition.jobAdId.length).toBeGreaterThan(0);
+//         expect(randomPosition.location).toBeDefined();
+//         expect(randomPosition.department).toBeDefined();
+//       });
+
+//       test('should successfully fetch job description from SR API', async () => {
+//         const randomPosition = getRandomPosition(positions.data.result.content);
+//         const fetchJobDescriptionRequestBody = `fetchJobDescription(${randomPosition.id});`;
+//         const jobFetchResponse = await executeApiRequest(fetchJobDescriptionRequestBody);
+//         expect(jobFetchResponse.data.result.id).toBe(randomPosition.id);
+//         expect(jobFetchResponse.data.result.jobAd.sections.jobDescription).toBeDefined();
+//         expect(jobFetchResponse.data.result.jobAd.sections.jobDescription.text.length).toBeGreaterThan(0);
+//         expect(jobFetchResponse.data.result.applyUrl.length).toBeGreaterThan(0);
+//         expect(jobFetchResponse.data.result.location).toBeDefined();
+//       });
+//   });
+
+// describe('fetchPositionsFromSRAPI error handling', () => {
+//   test('should throw error if invalid companyId is found', async () => {
+//     const requestBody = `fetchPositionsFromSRAPI('invalid_company_id');`;
+//     executeRequestAndTest(requestBody)
+//   });
+
+//   test('should throw error when a bad URL is used', async () => {
+//     const requestBody = `makeSmartRecruitersRequest('/v1/error/companyId/postings');`;
+//     executeRequestAndTest(requestBody)
+//   });
+
+
+
+// });
+
+// describe('fetchJobDescription error handling', () => {
+//   test('should throw error if invalid jobId is given', async () => {
+//     const requestBody = `fetchJobDescription('invalid_job_id');`;
+//     executeRequestAndTest(requestBody)
+//   });
+//   test('should throw error when given a valid but wrong jobId is given', async () => {
+//     const requestBody = `fetchJobDescription('1234567890');`;
+//     executeRequestAndTest(requestBody)
+//   });
+// });

package/tests/markTemplateTest.spec.js

@@ -0,0 +1,27 @@
+const { executeApiRequest } = require('tests-utils');
+const { items: wixData } = require('@wix/data');
+const { clearCollections } = require('./testsUtils');
+const { TEMPLATE_TYPE } = require('../backend/consts');
+const { COLLECTIONS } = require('./consts');
+
+beforeAll(async () => {
+    clearCollections(wixData);
+});
+
+
+
+
+it.each([
+    { name: 'internal', templateType: TEMPLATE_TYPE.INTERNAL },
+    { name: 'external', templateType: TEMPLATE_TYPE.EXTERNAL },
+])('should successfully mark template as $name', async ({ templateType }) => {
+    const requestBody = `markTemplateAs${templateType}();`;
+    await executeApiRequest(requestBody);
+    const templateType = await wixData.query(COLLECTIONS.TEMPLATE_TYPE).limit(1).find();
+    expect(templateType.items[0].templateType).toBe(templateType);
+  });
+
+
+
+
+

package/tests/testsUtils.js

@@ -1,7 +1,27 @@
+const { executeApiRequest } = require('tests-utils');
+const { COLLECTIONS } = require('./consts');
+
 function getRandomPosition(positions) {
     return positions[Math.floor(Math.random() * positions.length)];
 }
+async function executeRequestAndTest(requestBody) {
+    try{
+        response = await executeApiRequest(requestBody);
+        expect(response.status).not.toBe(500);
+    }catch(error){
+        expect(error.message).toBe('Request failed with status code 500');
+    }
+}
+
+async function clearCollections(wixData) {
+
+    for (const collection of Object.values(COLLECTIONS)) {
+        await wixData.truncate(collection);
+    }
+}
 
 module.exports = {
-    getRandomPosition
+    getRandomPosition, 
+    executeRequestAndTest,
+    clearCollections
 }