sr-npm 1.0.18 → 1.0.21

package/backend/collectionConsts.js

@@ -78,6 +78,7 @@ const COLLECTIONS_FIELDS = {
 
   const TOKEN_NAME = {
     COMPANY_ID: 'companyId',
+    COMPANY_ID_SM: 'companyID',
     SMART_TOKEN: 'x-smarttoken',
   }
   

package/backend/data.js

@@ -336,8 +336,7 @@ async function clearCollections() {
   await Promise.all([
     wixData.truncate(COLLECTIONS.CITIES),
     wixData.truncate(COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT),
-    wixData.truncate(COLLECTIONS.JOBS),
-    wixData.truncate(COLLECTIONS.SECRET_MANAGER_MIRROR)
+    wixData.truncate(COLLECTIONS.JOBS)
   ]);
   console.log("cleared collections successfully");
 }
@@ -375,11 +374,13 @@ async function fillSecretManagerMirror() {
     });
     console.log("x-smarttoken inserted into the SecretManagerMirror collection");
   } catch (error) {
-    console.log("Error creating SecretManagerMirror collection:", error);
+    console.warn("Error with inserting x-smarttoken into the SecretManagerMirror collection:", error);
   }
 }
 
 
+
+
 module.exports = {
   syncJobsFast,
   referenceJobs,

package/backend/fetchPositionsFromSRAPI.js

@@ -1,6 +1,6 @@
 const { fetch } = require('wix-fetch');
-const { items: wixData } = require('@wix/data');
-const { COLLECTIONS,TEMPLATE_TYPE,TOKEN_NAME } = require('./collectionConsts');
+const { TEMPLATE_TYPE,TOKEN_NAME } = require('./collectionConsts');
+const { getTokenFromCMS,getApiKeys } = require('./secretsData');
 async function makeSmartRecruitersRequest(path,templateType) {
    const baseUrl = 'https://api.smartrecruiters.com';
   const fullUrl = `${baseUrl}${path}`;
@@ -103,38 +103,21 @@ async function fetchPositionsFromSRAPI(testObject=undefined) {
   return result;
 }
 
-async function fetchJobDescription(jobId) {
-  const {companyId,templateType} = await getApiKeys();
+async function fetchJobDescription(jobId,testObject=undefined) {
+  let companyId, templateType;
+  if (testObject) {
+    ({ companyId, templateType } = testObject);
+  } else {
+    ({ companyId, templateType } = await getApiKeys());
+  }
   return await makeSmartRecruitersRequest(`/v1/companies/${companyId}/postings/${jobId}`,templateType);
 }
 
 
-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(`[getTokenFromCMS], No ${tokenName} found`);
-  }
-}
-async function getTemplateTypeFromCMS() {
-  const result = await wixData.query(COLLECTIONS.TEMPLATE_TYPE).limit(1).find();
-  if (result.items.length > 0) {
-      return result.items[0].templateType; 
-  } else {
-      throw new Error('[getTemplateTypeFromCMS], No templateType found');
-  }
-}
 
-async function getApiKeys() {
-  const companyId = await getTokenFromCMS(TOKEN_NAME.COMPANY_ID);
-  const templateType = await getTemplateTypeFromCMS();
-  return {companyId,templateType};
-}
 
 module.exports = {
   fetchPositionsFromSRAPI,
   fetchJobDescription,
-  getTokenFromCMS,
   makeSmartRecruitersRequest
 };

package/backend/secretsData.js

@@ -1,22 +1,57 @@
 const { secrets } = require("@wix/secrets");
 const { auth } = require('@wix/essentials');
+const { items: wixData } = require('@wix/data');
+const { COLLECTIONS,TOKEN_NAME } = require('./collectionConsts');
 
 const getSecretValue = auth.elevate(secrets.getSecretValue);
 
 function getSmartToken() {
-  return getSecretValue("x-smarttoken")
+  return retrieveSecretVal(TOKEN_NAME.SMART_TOKEN)
+}
+
+  function getCompanyId() {
+    return retrieveSecretVal(TOKEN_NAME.COMPANY_ID_SM)
+  }
+
+  async function retrieveSecretVal(tokenName)
+  {
+    return getSecretValue(tokenName)
     .then((secret) => {
       return secret;
+    }).catch(async (error) => {
+      console.warn("Error retrieving secret value: ", error)
+      console.warn("Retrying with getTokenFromCMS")
+      const secret = await getTokenFromCMS(tokenName);
+      return secret
     })
-}
+  }
 
-  function getCompanyId() {
-    return getSecretValue("companyID")
-      .then((secret) => {
-        return secret;
-      })
+  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(`[getTokenFromCMS], No ${tokenName} found`);
+    }
+  }
+  async function getTemplateTypeFromCMS() {
+    const result = await wixData.query(COLLECTIONS.TEMPLATE_TYPE).limit(1).find();
+    if (result.items.length > 0) {
+        return result.items[0].templateType; 
+    } else {
+        throw new Error('[getTemplateTypeFromCMS], No templateType found');
+    }
   }
+  
+  async function getApiKeys() {
+    const companyId = await getTokenFromCMS(TOKEN_NAME.COMPANY_ID);
+    const templateType = await getTemplateTypeFromCMS();
+    return {companyId,templateType};
+  }
+
   module.exports = {
     getCompanyId,
-    getSmartToken
+    getSmartToken,
+    getTokenFromCMS,
+    getApiKeys
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sr-npm",
-  "version": "1.0.18",
+  "version": "1.0.21",
   "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.53",
     "@wix/site-location": "^1.0.0",
     "@wix/site-window": "^1.0.0",
     "axios": "^1.11.0",

package/tests/fetchPositionsFromSRApiTest.spec.js

@@ -3,33 +3,43 @@ 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 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 (${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 (${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', () => {

package/tests/markTemplateTest.spec.js

@@ -7,7 +7,6 @@ beforeAll(async () => {
 });
 
 
-
 it.each([
     { templateName: 'Internal', templateType: TEMPLATE_TYPE.INTERNAL },
     { templateName: 'External', templateType: TEMPLATE_TYPE.EXTERNAL },