sr-npm 1.0.16 → 1.0.18

package/backend/collectionConsts.js

@@ -2,8 +2,8 @@ const COLLECTIONS = {
     AMOUNT_OF_JOBS_PER_DEPARTMENT: 'AmountOfJobsPerDepartment',
     CITIES: 'cities',
     JOBS: 'Jobs',
-    COMPANY_ID: 'CompanyId',
     TEMPLATE_TYPE: 'templateType',
+    SECRET_MANAGER_MIRROR: 'SecretManagerMirror',
 }
 const JOBS_COLLECTION_FIELDS = {
   LOCATION: 'location',
@@ -62,14 +62,25 @@ const COLLECTIONS_FIELDS = {
         {key:'city', type: 'REFERENCE', typeMetadata: { reference: { referencedCollectionId: COLLECTIONS.CITIES } } },
         { key: 'image', type: 'IMAGE' },
     ],  
-    COMPANY_ID: [
-      {key:'companyId', type: 'TEXT'},
-    ],
     TEMPLATE_TYPE: [
       {key:'templateType', type: 'TEXT'},
     ],
+    SECRET_MANAGER_MIRROR: [
+      {key:'tokenName', type: 'TEXT'},
+      {key:'tokenValue', type: 'TEXT'},
+    ],
   };
 
+  const TEMPLATE_TYPE = {
+    INTERNAL: 'INTERNAL',
+    EXTERNAL: 'PUBLIC',
+  }
+
+  const TOKEN_NAME = {
+    COMPANY_ID: 'companyId',
+    SMART_TOKEN: 'x-smarttoken',
+  }
+  
 
   module.exports = {
     COLLECTIONS,
@@ -77,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

@@ -10,7 +10,7 @@ const TASKS_NAMES = {
     AGGREGATE_JOBS_BY_FIELD_TO_CMS: 'aggregateJobsByFieldToCMS',
     REFERENCE_JOBS: 'referenceJobs',
     CREATE_COLLECTIONS: 'createCollections',
-    CREATE_COMPANY_ID_COLLECTION_AND_FILL_IT: 'createCompanyIdCollectionAndFillIt',
+    CREATE_SECRET_MANAGER_MIRROR_AND_FILL_IT: 'createSecretManagerMirrorAndFillIt',
     SYNC_JOBS_FAST: 'syncJobsFast',
 }
 
@@ -65,7 +65,7 @@ const TASKS = {
     },
     [TASKS_NAMES.SYNC_JOBS_FAST]: {
       name: TASKS_NAMES.SYNC_JOBS_FAST,
-      getIdentifier:()=> "SHOULD_NEVER_SKIP",
+      getIdentifier:()=>"SHOULD_NEVER_SKIP",
       process:syncJobsFast,
       shouldSkipCheck:()=>false,
       estimatedDurationSec:60
@@ -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,10 +1,10 @@
 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 } = require('./secretsData');
+const { getCompanyId, getSmartToken } = require('./secretsData');
 
 function validatePosition(position) {
   if (!position.id) {
@@ -288,37 +288,13 @@ function fetchJobLocation(jobDetails) {
 
 
 
-
-async function createCompanyIdCollectionAndFillIt() {
-    console.log("Creating CompanyId collection and filling it with the company ID");
-    await createCollectionIfMissing(COLLECTIONS.COMPANY_ID, COLLECTIONS_FIELDS.COMPANY_ID,null,'singleItem');
-    console.log("Getting the company ID ");
-    const companyId = await getCompanyId();
-    console.log("companyId is :  ", companyId);
-    console.log("Inserting the company ID into the CompanyId collection");
-    try {
-      await wixData.insert(COLLECTIONS.COMPANY_ID, {
-        companyId: companyId.value
-      });
-      console.log("company ID inserted into the CompanyId collection");
-    } catch (error) {
-      if (error.message.includes("WDE0074: An item with _id [SINGLE_ITEM_ID] already exists")) {
-        console.log("company ID already exists in the CompanyId collection");
-      }
-      else {
-        throw error;
-      }
-    }
-
-    
-}
-
 async function createCollections() {
   console.log("Creating collections");
   await Promise.all(
   [createCollectionIfMissing(COLLECTIONS.JOBS, JOBS_COLLECTION_FIELDS.JOBS,{ insert: 'ADMIN', update: 'ADMIN', remove: 'ADMIN', read: 'ANYONE' }),
   createCollectionIfMissing(COLLECTIONS.CITIES, COLLECTIONS_FIELDS.CITIES),
-  createCollectionIfMissing(COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT, COLLECTIONS_FIELDS.AMOUNT_OF_JOBS_PER_DEPARTMENT)
+  createCollectionIfMissing(COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT, COLLECTIONS_FIELDS.AMOUNT_OF_JOBS_PER_DEPARTMENT),
+  createCollectionIfMissing(COLLECTIONS.SECRET_MANAGER_MIRROR, COLLECTIONS_FIELDS.SECRET_MANAGER_MIRROR)
 ]);
   console.log("finished creating Collections");
 }
@@ -341,9 +317,9 @@ async function referenceJobs() {
 
 async function syncJobsFast() {
   console.log("Syncing jobs fast");
-  await createCompanyIdCollectionAndFillIt();
   await createCollections();
   await clearCollections();
+  await fillSecretManagerMirror();
   console.log("saving jobs data to CMS");
   await saveJobsDataToCMS();
   console.log("saved jobs data to CMS successfully");
@@ -360,19 +336,60 @@ 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.JOBS),
+    wixData.truncate(COLLECTIONS.SECRET_MANAGER_MIRROR)
   ]);
   console.log("cleared collections successfully");
 }
 
+async function markTemplateAsExternal() {
+  await createCollectionIfMissing(COLLECTIONS.TEMPLATE_TYPE, COLLECTIONS_FIELDS.TEMPLATE_TYPE,null,'singleItem');
+  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');
+  const tempalte = await wixData.save(COLLECTIONS.TEMPLATE_TYPE, {
+    templateType: TEMPLATE_TYPE.INTERNAL
+  });
+  return tempalte;
+}
+
+async function fillSecretManagerMirror() {
+  console.log("Getting the company ID ");
+  const companyId = await getCompanyId();
+  console.log("companyId is :  ", companyId);
+  await wixData.insert(COLLECTIONS.SECRET_MANAGER_MIRROR, {
+    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: TOKEN_NAME.SMART_TOKEN,
+      tokenValue: token.value
+    });
+    console.log("x-smarttoken inserted into the SecretManagerMirror collection");
+  } catch (error) {
+    console.log("Error creating SecretManagerMirror collection:", error);
+  }
+}
+
+
 module.exports = {
   syncJobsFast,
   referenceJobs,
   aggregateJobs,
   createCollections,
-    saveJobsDataToCMS,
-    saveJobsDescriptionsAndLocationApplyUrlToCMS,
-    aggregateJobsByFieldToCMS,
-    referenceJobsToField,
-    createCompanyIdCollectionAndFillIt,
+  saveJobsDataToCMS,
+  saveJobsDescriptionsAndLocationApplyUrlToCMS,
+  aggregateJobsByFieldToCMS,
+  referenceJobsToField,
+  fillSecretManagerMirror,
+  markTemplateAsExternal,
+  markTemplateAsInternal,
 };

package/backend/fetchPositionsFromSRAPI.js

@@ -1,19 +1,23 @@
 const { fetch } = require('wix-fetch');
 const { items: wixData } = require('@wix/data');
-const { COLLECTIONS } = require('./collectionConsts');
-const secretsData = require('./secretsData');
-async function makeSmartRecruitersRequest(path) {
+const { COLLECTIONS,TEMPLATE_TYPE,TOKEN_NAME } = require('./collectionConsts');
+async function makeSmartRecruitersRequest(path,templateType) {
    const baseUrl = 'https://api.smartrecruiters.com';
   const fullUrl = `${baseUrl}${path}`;
   
   try {
+    const headers = {
+      'Accept-Language': 'en',
+      'accept': 'application/json',
+      'Cookie': 'AWSALB=GYltFw3fLKortMxHR5vIOT1CuUROyhWNIX/qL8ZnPl1/8mhOcnIsBKYslzmNJPEzSy/jvNbO+6tXpH8yqcpQJagYt57MhbKlLqTSzoNq1G/w7TjOxPGR3UTdXW0d; AWSALBCORS=GYltFw3fLKortMxHR5vIOT1CuUROyhWNIX/qL8ZnPl1/8mhOcnIsBKYslzmNJPEzSy/jvNbO+6tXpH8yqcpQJagYt57MhbKlLqTSzoNq1G/w7TjOxPGR3UTdXW0d'
+    };
+    if (templateType === TEMPLATE_TYPE.INTERNAL) {
+      const smartToken = await getTokenFromCMS(TOKEN_NAME.SMART_TOKEN);
+      headers['x-smarttoken'] = smartToken;
+    }
     const response = await fetch(fullUrl, {
       method: 'GET',
-      headers: {
-        'Accept-Language': 'en',
-        'accept': 'application/json',
-        'Cookie': 'AWSALB=GYltFw3fLKortMxHR5vIOT1CuUROyhWNIX/qL8ZnPl1/8mhOcnIsBKYslzmNJPEzSy/jvNbO+6tXpH8yqcpQJagYt57MhbKlLqTSzoNq1G/w7TjOxPGR3UTdXW0d; AWSALBCORS=GYltFw3fLKortMxHR5vIOT1CuUROyhWNIX/qL8ZnPl1/8mhOcnIsBKYslzmNJPEzSy/jvNbO+6tXpH8yqcpQJagYt57MhbKlLqTSzoNq1G/w7TjOxPGR3UTdXW0d'
-      }
+      headers: headers
     });
 
     if (response.ok) {
@@ -28,25 +32,29 @@ async function makeSmartRecruitersRequest(path) {
   }
 }
 
-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 = await getCompanyIdFromCMS();
-  const templateType = await getTemplateTypeFromCMS();
+  
+  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;
 
   do {
     try {
       page++;
-
       // Build the API path - first request has no page parameter, subsequent use nextPageId
       const apiPath = `/v1/companies/${companyId}/postings?offset=${offset}&destination=${templateType}`;
       
       console.log(`Fetching page ${page} with path: ${apiPath}`);
-      const response = await makeSmartRecruitersRequest(apiPath);
+      const response = await makeSmartRecruitersRequest(apiPath,templateType);
       
       // Add positions from this page to our collection
       if (response.content && Array.isArray(response.content)) {
@@ -96,20 +104,20 @@ async function fetchPositionsFromSRAPI() {
 }
 
 async function fetchJobDescription(jobId) {
-  const companyId = await getCompanyIdFromCMS();
-  return await makeSmartRecruitersRequest(`/v1/companies/${companyId}/postings/${jobId}`);
+  const {companyId,templateType} = await getApiKeys();
+  return await makeSmartRecruitersRequest(`/v1/companies/${companyId}/postings/${jobId}`,templateType);
 }
 
-async function getCompanyIdFromCMS() {
-  const result = await wixData.query(COLLECTIONS.COMPANY_ID).limit(1).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].companyId; 
+      return result.items[0].tokenValue; 
   } else {
-      throw new Error('[getCompanyIdFromCMS], No companyId found');
+      throw new Error(`[getTokenFromCMS], No ${tokenName} found`);
   }
 }
 async function getTemplateTypeFromCMS() {
-  console.log("COLLECTIONS.TEMPLATE_TYPE is ",COLLECTIONS.TEMPLATE_TYPE)
   const result = await wixData.query(COLLECTIONS.TEMPLATE_TYPE).limit(1).find();
   if (result.items.length > 0) {
       return result.items[0].templateType; 
@@ -118,9 +126,15 @@ async function getTemplateTypeFromCMS() {
   }
 }
 
+async function getApiKeys() {
+  const companyId = await getTokenFromCMS(TOKEN_NAME.COMPANY_ID);
+  const templateType = await getTemplateTypeFromCMS();
+  return {companyId,templateType};
+}
 
 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

@@ -2,7 +2,14 @@ const { secrets } = require("@wix/secrets");
 const { auth } = require('@wix/essentials');
 
 const getSecretValue = auth.elevate(secrets.getSecretValue);
-  
+
+function getSmartToken() {
+  return getSecretValue("x-smarttoken")
+    .then((secret) => {
+      return secret;
+    })
+}
+
   function getCompanyId() {
     return getSecretValue("companyID")
       .then((secret) => {
@@ -10,5 +17,6 @@ const getSecretValue = auth.elevate(secrets.getSecretValue);
       })
   }
   module.exports = {
-    getCompanyId
+    getCompanyId,
+    getSmartToken
   };

package/package.json

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

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,5 +1,5 @@
 const { executeApiRequest } = require('tests-utils');
-const { getRandomPosition } = require('./testsUtils');
+const { getRandomPosition, executeRequestAndTest } = require('./testsUtils');
 
 describe('Job details fetch from SR API Tests', () => {
 
@@ -30,6 +30,35 @@ describe('Job details fetch from SR API Tests', () => {
         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
 }