sr-npm 1.7.461 → 1.7.462

package/backend/collectionConsts.js

@@ -71,6 +71,16 @@ const COLLECTIONS_FIELDS = {
     ],
   };
 
+  const TEMPLATE_TYPE = {
+    INTERNAL: 'INTERNAL',
+    EXTERNAL: 'PUBLIC',
+  }
+
+  const TOKEN_NAME = {
+    COMPANY_ID: 'companyId',
+    SMART_TOKEN: 'x-smarttoken',
+  }
+  
 
   module.exports = {
     COLLECTIONS,
@@ -78,4 +88,6 @@ const COLLECTIONS_FIELDS = {
     JOBS_COLLECTION_FIELDS,
     AMOUNT_OF_JOBS_PER_DEPARTMENT_COLLECTION_FIELDS,
     CITIES_COLLECTION_FIELDS,
+    TEMPLATE_TYPE,
+    TOKEN_NAME,
 };

package/backend/consts.js

@@ -74,6 +74,7 @@ const TASKS = {
 
 
 
+
 const TASK_TYPE = {
   SCHEDULED: 'scheduled',
   EVENT: 'event',
@@ -83,5 +84,5 @@ const TASK_TYPE = {
     TASKS_NAMES,
     TASK_TYPE,
     TASKS,
-    QUERY_MAX_LIMIT
+    QUERY_MAX_LIMIT,
 };

package/backend/data.js

@@ -1,7 +1,7 @@
 const { items: wixData } = require('@wix/data');
 const { fetchPositionsFromSRAPI, fetchJobDescription } = require('./fetchPositionsFromSRAPI');
 const { createCollectionIfMissing } = require('@hisense-staging/velo-npm/backend');
-const { COLLECTIONS, COLLECTIONS_FIELDS,JOBS_COLLECTION_FIELDS } = require('./collectionConsts');
+const { COLLECTIONS, COLLECTIONS_FIELDS,JOBS_COLLECTION_FIELDS,TEMPLATE_TYPE,TOKEN_NAME } = require('./collectionConsts');
 const { chunkedBulkOperation, countJobsPerGivenField, fillCityLocationAndLocationAddress ,prepareToSaveArray,normalizeCityName} = require('./utils');
 const { getAllPositions } = require('./queries');
 const { getCompanyId, getSmartToken } = require('./secretsData');
@@ -317,9 +317,6 @@ async function referenceJobs() {
 
 async function syncJobsFast() {
   console.log("Syncing jobs fast");
-  //database
-
-  
   await createCollections();
   await clearCollections();
   await fillSecretManagerMirror();
@@ -347,16 +344,18 @@ 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"
+  const tempalte = await wixData.save(COLLECTIONS.TEMPLATE_TYPE, {
+    templateType: TEMPLATE_TYPE.EXTERNAL
   });
+  return tempalte;
 }
 
 async function markTemplateAsInternal() {
   await createCollectionIfMissing(COLLECTIONS.TEMPLATE_TYPE, COLLECTIONS_FIELDS.TEMPLATE_TYPE,null,'singleItem');
-  await wixData.save(COLLECTIONS.TEMPLATE_TYPE, {
-    templateType: "INTERNAL"
+  const tempalte = await wixData.save(COLLECTIONS.TEMPLATE_TYPE, {
+    templateType: TEMPLATE_TYPE.INTERNAL
   });
+  return tempalte;
 }
 
 async function fillSecretManagerMirror() {
@@ -364,14 +363,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,18 @@
 const { fetch } = require('wix-fetch');
 const { items: wixData } = require('@wix/data');
-const { COLLECTIONS } = require('./collectionConsts');
-
+const { COLLECTIONS,TEMPLATE_TYPE,TOKEN_NAME } = require('./collectionConsts');
 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,12 +32,18 @@ async function makeSmartRecruitersRequest(path,templateType) {
   }
 }
 
-async function fetchPositionsFromSRAPI() {
+async function fetchPositionsFromSRAPI(testObject=undefined) {
   let allPositions = [];
   let totalFound = 0;
   let page = 0;
   const MAX_PAGES = 30 // Safety limit to prevent infinite loops
-  const {companyId,templateType} = await getApiKeys();
+  
+  let companyId, templateType;
+  if (testObject) {
+    ({ companyId, templateType } = testObject);
+  } else {
+    ({ companyId, templateType } = await getApiKeys());
+  }
   console.log('Starting to fetch all positions with pagination...');
   let offset=0;
 
@@ -100,26 +103,23 @@ async function fetchPositionsFromSRAPI() {
   return result;
 }
 
-async function fetchJobDescription(jobId) {
-  const {companyId,templateType} = await getApiKeys();
-  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; 
+async function fetchJobDescription(jobId,testObject=undefined) {
+  let companyId, templateType;
+  if (testObject) {
+    ({ companyId, templateType } = testObject);
   } else {
-      throw new Error('[getCompanyIdFromCMS], No companyId found');
+    ({ companyId, templateType } = await getApiKeys());
   }
+  return await makeSmartRecruitersRequest(`/v1/companies/${companyId}/postings/${jobId}`,templateType);
 }
 
-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 +132,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 +140,6 @@ async function getApiKeys() {
 module.exports = {
   fetchPositionsFromSRAPI,
   fetchJobDescription,
-  getCompanyIdFromCMS
+  getTokenFromCMS,
+  makeSmartRecruitersRequest
 };

package/backend/index.js

@@ -3,4 +3,5 @@ module.exports = {
   ...require('./queries'),
   ...require('./fetchPositionsFromSRAPI'),
   ...require('./consts'),
+  ...require('./data'),
 };

package/backend/secretsData.js

@@ -1,22 +1,20 @@
 const { secrets } = require("@wix/secrets");
 const { auth } = require('@wix/essentials');
 
-const getSecretValue2 = auth.elevate(secrets.getSecretValue);
+const getSecretValue = auth.elevate(secrets.getSecretValue);
 
 function getSmartToken() {
-  return getSecretValue2("x-smarttoken")
+  return getSecretValue("x-smarttoken")
     .then((secret) => {
       return secret;
     })
 }
 
-  async function getCompanyId() {
-    console.log("auth is : ", auth);
-    console.log("secrets is : ", secrets);
-    console.log("getSecretValuFSFSDFe is : ");
-    const print_me=await secrets.getSecretValue("companyID")
-    console.log("print_me is : ", print_me);
-    console.log("Getting the company ID$#%%$# from the ^$%$^^%secrets");
+  function getCompanyId() {
+    console.log("Getting the company ID from the secrets");
+    const getSecretValue2 = auth.elevate(secrets.getSecretValue);
+    console.log("getSecretValue2 is : ", getSecretValue2);
+
     return getSecretValue2("companyID")
       .then((secret) => {
         return secret;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sr-npm",
-  "version": "1.7.461",
+  "version": "1.7.462",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -20,7 +20,7 @@
     "@hisense-staging/velo-npm": "3.0.19",
     "@wix/data": "^1.0.211",
     "@wix/essentials": "^0.1.24",
-    "@wix/secrets": "^1.0.53",
+    "@wix/secrets": "^1.0.56",
     "@wix/site-location": "^1.0.0",
     "@wix/site-window": "^1.0.0",
     "axios": "^1.11.0",

package/tests/consts.js

@@ -0,0 +1,12 @@
+const COLLECTIONS = {
+    TEMPLATE_TYPE: 'templateType',
+}
+const TEMPLATE_TYPE = {
+    INTERNAL: 'INTERNAL',
+    EXTERNAL: 'PUBLIC',
+  }
+
+module.exports = {
+    COLLECTIONS,
+    TEMPLATE_TYPE
+}

package/tests/fetchPositionsFromSRApiTest.spec.js

@@ -1,35 +1,74 @@
 const { executeApiRequest } = require('tests-utils');
-const { getRandomPosition } = require('./testsUtils');
+const { getRandomPosition, executeRequestAndTest } = require('./testsUtils');
 
 describe('Job details fetch from SR API Tests', () => {
 
-    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();
-      });
+    const templateTypes = [
+      { templatename: 'External', templateType: 'PUBLIC'},
+      { templatename: 'Internal', templateType: 'INTERNAL'}
+    ];
+    
+    templateTypes.forEach(({ templateType ,templatename}) => {
+      describe(`Job details fetch from SR API Tests - ${templatename}`, () => {
+        let positions;
+        beforeAll(async () => {
+          const fetchPositionsFromSRAPIRequestBody = `fetchPositionsFromSRAPI({companyId:'WixTest',templateType: '${templateType}'});`;
+           positions = await executeApiRequest(fetchPositionsFromSRAPIRequestBody);
+        });
+        
+
+        test(`should successfully fetch job details from SR API (${templatename})`, 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 description from SR API (${templatename})`, async () => {
+          const randomPosition = getRandomPosition(positions.data.result.content);
+          const fetchJobDescriptionRequestBody = `fetchJobDescription(${randomPosition.id},{companyId:'WixTest',templateType: '${templateType}'});`;
+          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 external template', async () => {
+    const requestBody = `fetchPositionsFromSRAPI({companyId: 'invalid_company_id',templateType: 'EXTERNAL'});`;
+    executeRequestAndTest(requestBody)
+  });
+
+  test('should throw error if invalid companyId is found internal template', async () => {
+    const requestBody = `fetchPositionsFromSRAPI({companyId: 'invalid_company_id',templateType: 'INTERNAL'});`;
+    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,25 @@
+const { executeApiRequest } = require('tests-utils');
+const { clearCollections } = require('./testsUtils');
+const { TEMPLATE_TYPE } = require('./consts');
+
+beforeAll(async () => {
+    clearCollections();
+});
+
+
+
+it.each([
+    { templateName: 'Internal', templateType: TEMPLATE_TYPE.INTERNAL },
+    { templateName: 'External', templateType: TEMPLATE_TYPE.EXTERNAL },
+])('should successfully mark template as $templateName', async ({ templateName,templateType }) => {
+    const requestBody = `markTemplateAs${templateName}();`;
+    const response = await executeApiRequest(requestBody);
+    expect(response.status).toBe(200);
+    expect(response.data).toBeDefined();
+    expect(response.data.result.templateType).toBe(templateType);
+  });
+
+
+
+
+

package/tests/testsUtils.js

@@ -1,7 +1,28 @@
+const { executeApiRequest } = require('tests-utils');
+const { COLLECTIONS } = require('./consts');
+const { items: wixData } = require('@wix/data');
+
 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() {
+
+    for (const collection of Object.values(COLLECTIONS)) {
+        await wixData.truncate(collection);
+    }
+}
 
 module.exports = {
-    getRandomPosition
+    getRandomPosition, 
+    executeRequestAndTest,
+    clearCollections
 }