sr-npm 1.7.449 → 1.7.451

package/backend/collectionConsts.js

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

package/backend/consts.js

@@ -73,7 +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',
@@ -85,4 +93,6 @@ const TASK_TYPE = {
     TASK_TYPE,
     TASKS,
     QUERY_MAX_LIMIT,
+    TEMPLATE_TYPE,
+    TOKEN_NAME
 };

package/backend/data.js

@@ -1,9 +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,TEMPLATE_TYPE,TOKEN_NAME } = require('./collectionConsts');
+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) {
@@ -344,18 +345,16 @@ async function clearCollections() {
 
 async function markTemplateAsExternal() {
   await createCollectionIfMissing(COLLECTIONS.TEMPLATE_TYPE, COLLECTIONS_FIELDS.TEMPLATE_TYPE,null,'singleItem');
-  const tempalte = await wixData.save(COLLECTIONS.TEMPLATE_TYPE, {
+  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, {
+  await wixData.save(COLLECTIONS.TEMPLATE_TYPE, {
     templateType: TEMPLATE_TYPE.INTERNAL
   });
-  return tempalte;
 }
 
 async function fillSecretManagerMirror() {

package/backend/fetchPositionsFromSRAPI.js

@@ -1,6 +1,8 @@
 const { fetch } = require('wix-fetch');
 const { items: wixData } = require('@wix/data');
-const { COLLECTIONS,TEMPLATE_TYPE,TOKEN_NAME } = require('./collectionConsts');
+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}`;
@@ -32,18 +34,12 @@ async function makeSmartRecruitersRequest(path,templateType) {
   }
 }
 
-async function fetchPositionsFromSRAPI(testObject=undefined) {
+async function fetchPositionsFromSRAPI(companyID=undefined) {
   let allPositions = [];
   let totalFound = 0;
   let page = 0;
   const MAX_PAGES = 30 // Safety limit to prevent infinite loops
-  
-  let companyId, templateType;
-  if (testObject) {
-    ({ companyId, templateType } = testObject);
-  } else {
-    ({ companyId, templateType } = await getApiKeys());
-  }
+  const {companyId,templateType} = await getApiKeys();
   console.log('Starting to fetch all positions with pagination...');
   let offset=0;
 
@@ -103,15 +99,6 @@ async function fetchPositionsFromSRAPI(testObject=undefined) {
   return result;
 }
 
-// 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 fetchJobDescription(jobId) {
   const {companyId,templateType} = await getApiKeys();
   return await makeSmartRecruitersRequest(`/v1/companies/${companyId}/postings/${jobId}`,templateType);

package/backend/secretsData.js

@@ -11,17 +11,11 @@ function getSmartToken() {
 }
 
   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")
+    console.log("Getting the#$#@@$# company ID from the secrets");
+    return getSecretValue("companyID")
       .then((secret) => {
         return secret;
-      }).catch((error) => {
-        console.error("Error getting the company ID from the secrets: ", error);
-        throw error;
-      });
+      })
   }
   module.exports = {
     getCompanyId,

package/package.json

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

package/tests/fetchPositionsFromSRApiTest.spec.js

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

@@ -1,22 +1,24 @@
 const { executeApiRequest } = require('tests-utils');
+const { items: wixData } = require('@wix/data');
 const { clearCollections } = require('./testsUtils');
 const { TEMPLATE_TYPE } = require('./consts');
+const { COLLECTIONS } = require('./consts');
 
 beforeAll(async () => {
-    clearCollections();
+    clearCollections(wixData);
 });
 
 
 
+
 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);
+    { 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 TemplateTypeFromCMS = await wixData.query(COLLECTIONS.TEMPLATE_TYPE).limit(1).find();
+    expect(TemplateTypeFromCMS.items[0].templateType).toBe(templateType);
   });
 
 

package/tests/testsUtils.js

@@ -1,6 +1,5 @@
 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)];
@@ -14,7 +13,7 @@ async function executeRequestAndTest(requestBody) {
     }
 }
 
-async function clearCollections() {
+async function clearCollections(wixData) {
 
     for (const collection of Object.values(COLLECTIONS)) {
         await wixData.truncate(collection);