sr-npm 1.7.367 → 1.7.369

package/backend/collectionConsts.js

@@ -2,7 +2,7 @@ const COLLECTIONS = {
     AMOUNT_OF_JOBS_PER_DEPARTMENT: 'AmountOfJobsPerDepartment',
     CITIES: 'cities',
     JOBS: 'Jobs',
-    API_KEY: 'ApiKey',
+    COMPANY_ID: 'CompanyId',
 }
 const JOBS_COLLECTION_FIELDS = {
   LOCATION: 'location',
@@ -59,8 +59,8 @@ const COLLECTIONS_FIELDS = {
         {key:'city', type: 'REFERENCE', typeMetadata: { reference: { referencedCollectionId: COLLECTIONS.CITIES } } },
         { key: 'image', type: 'IMAGE' },
     ],  
-    API_KEY: [
-      {key:'token', type: 'TEXT'},
+    COMPANY_ID: [
+      {key:'companyId', type: 'TEXT'},
     ],
   };
 

package/backend/consts.js

@@ -1,6 +1,5 @@
-const {saveJobsDataToCMS,saveJobsDescriptionsAndLocationApplyUrlToCMS,aggregateJobsByFieldToCMS,referenceJobsToField,createApiKeyCollectionAndFillIt,createCollections,aggregateJobs,referenceJobs,syncJobsFast} = require('./data');
-const { createCollectionIfMissing } = require('@hisense-staging/velo-npm/backend');
-const { COLLECTIONS, COLLECTIONS_FIELDS, JOBS_COLLECTION_FIELDS } = require('./collectionConsts');
+const {saveJobsDataToCMS,saveJobsDescriptionsAndLocationApplyUrlToCMS,createCollections,aggregateJobs,referenceJobs,syncJobsFast} = require('./data')
+
 
 const QUERY_MAX_LIMIT = 1000;
 
@@ -11,7 +10,7 @@ const TASKS_NAMES = {
     AGGREGATE_JOBS_BY_FIELD_TO_CMS: 'aggregateJobsByFieldToCMS',
     REFERENCE_JOBS: 'referenceJobs',
     CREATE_COLLECTIONS: 'createCollections',
-    CREATE_API_KEY_COLLECTION_AND_FILL_IT: 'createApiKeyCollectionAndFillIt',
+    CREATE_COMPANY_ID_COLLECTION_AND_FILL_IT: 'createCompanyIdCollectionAndFillIt',
     SYNC_JOBS_FAST: 'syncJobsFast',
 }
 
@@ -64,20 +63,13 @@ const TASKS = {
       shouldSkipCheck:()=>false,
       estimatedDurationSec:6
     },
-      [TASKS_NAMES.CREATE_API_KEY_COLLECTION_AND_FILL_IT]: {
-        name: TASKS_NAMES.CREATE_API_KEY_COLLECTION_AND_FILL_IT,
-        getIdentifier:()=> "SHOULD_NEVER_SKIP",
-        process:createApiKeyCollectionAndFillIt,
-        shouldSkipCheck:()=>false,
-        estimatedDurationSec:3
-      },
-      [TASKS_NAMES.SYNC_JOBS_FAST]: {
-        name: TASKS_NAMES.SYNC_JOBS_FAST,
-        getIdentifier:()=> "SHOULD_NEVER_SKIP",
-        process:syncJobsFast,
-        shouldSkipCheck:()=>false,
-        estimatedDurationSec:60
-      }
+    [TASKS_NAMES.SYNC_JOBS_FAST]: {
+      name: TASKS_NAMES.SYNC_JOBS_FAST,
+      getIdentifier:()=> "SHOULD_NEVER_SKIP",
+      process:syncJobsFast,
+      shouldSkipCheck:()=>false,
+      estimatedDurationSec:60
+    }
 }
 
 

package/backend/data.js

@@ -1,10 +1,10 @@
-const { items: wixData, collections } = require('@wix/data');
+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 { chunkedBulkOperation, delay, countJobsPerGivenField, fillCityLocationAndLocationAddress ,prepareToSaveArray,normalizeCityName} = require('./utils');
+const { chunkedBulkOperation, countJobsPerGivenField, fillCityLocationAndLocationAddress ,prepareToSaveArray,normalizeCityName} = require('./utils');
 const { getAllPositions } = require('./queries');
-const { getSmartToken } = require('./secretsData');
+const { getCompanyIdFromCMS } = require('./fetchPositionsFromSRAPI');
 
 function validatePosition(position) {
   if (!position.id) {
@@ -288,21 +288,21 @@ function fetchJobLocation(jobDetails) {
 
 
 
-async function createApiKeyCollectionAndFillIt() {
-    console.log("Creating ApiKey collection and filling it with the smart token");
-    await createCollectionIfMissing(COLLECTIONS.API_KEY, COLLECTIONS_FIELDS.API_KEY,null,'singleItem');
-    console.log("Getting the smart token ");
-    const token = await getSmartToken();
-    console.log("token is :  ", token);
-    console.log("Inserting the smart token into the ApiKey collection");
+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 getCompanyIdFromCMS();
+    console.log("companyId is :  ", companyId);
+    console.log("Inserting the company ID into the CompanyId collection");
     try {
-      await wixData.insert(COLLECTIONS.API_KEY, {
-          token: token.value
+      await wixData.insert(COLLECTIONS.COMPANY_ID, {
+        companyId: companyId.value
       });
-      console.log("Smart token inserted into the ApiKey collection");
+      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("Smart token already exists in the ApiKey collection");
+        console.log("company ID already exists in the CompanyId collection");
       }
       else {
         throw error;
@@ -340,7 +340,6 @@ async function referenceJobs() {
 
 async function syncJobsFast() {
   console.log("Syncing jobs fast");
-  //await createApiKeyCollectionAndFillIt();
   await createCollections();
   await clearCollections();
   console.log("saving jobs data to CMS");
@@ -373,5 +372,5 @@ module.exports = {
     saveJobsDescriptionsAndLocationApplyUrlToCMS,
     aggregateJobsByFieldToCMS,
     referenceJobsToField,
-    createApiKeyCollectionAndFillIt,
+    createCompanyIdCollectionAndFillIt,
 };

package/backend/fetchPositionsFromSRAPI.js

@@ -33,7 +33,7 @@ async function fetchPositionsFromSRAPI() {
   let totalFound = 0;
   let page = 0;
   const MAX_PAGES = 30 // Safety limit to prevent infinite loops
-  const companyId = await secretsData.getCompanyId();
+  const companyId = await getCompanyIdFromCMS();
   console.log('Starting to fetch all positions with pagination...');
   let offset=0;
 
@@ -95,16 +95,16 @@ async function fetchPositionsFromSRAPI() {
 }
 
 async function fetchJobDescription(jobId) {
-  const companyId = await secretsData.getCompanyId();
+  const companyId = await getCompanyIdFromCMS();
   return await makeSmartRecruitersRequest(`/v1/companies/${companyId.value}/postings/${jobId}`);
 }
 
-async function getSmartTokenFromCMS() {
-  const result = await wixData.query(COLLECTIONS.API_KEY).limit(1).find();
+async function getCompanyIdFromCMS() {
+  const result = await wixData.query(COLLECTIONS.COMPANY_ID).limit(1).find();
   if (result.items.length > 0) {
-      return result.items[0].token; 
+      return result.items[0].companyId; 
   } else {
-      throw new Error('[getSmartTokenFromCMS], No token found');
+      throw new Error('[getCompanyIdFromCMS], No companyId found');
   }
 }
 
@@ -112,4 +112,5 @@ async function getSmartTokenFromCMS() {
 module.exports = {
   fetchPositionsFromSRAPI,
   fetchJobDescription,
+  getCompanyIdFromCMS
 };

package/backend/secretsData.js

@@ -2,13 +2,6 @@ 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")
@@ -17,6 +10,5 @@ function getSmartToken() {
       })
   }
   module.exports = {
-    getSmartToken,
     getCompanyId
   };

package/package.json

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

package/tests/fetchPositionsFromSRApiTest.spec.js

@@ -5,11 +5,11 @@ describe('Job details fetch from SR API Tests', () => {
   
       test('should successfully fetch job details from SR API', async () => {
         const requestBody = `fetchPositionsFromSRAPI();`;
-        const wixDataResponse = await executeApiRequest(requestBody);
-        const randomPosition = getRandomPosition(wixDataResponse.data.result.content);
+        const fetchJobsResponse = await executeApiRequest(requestBody);
+        const randomPosition = getRandomPosition(fetchJobsResponse.data.result.content);
         console.log("randomPosition: ", randomPosition);
-        expect(wixDataResponse.data.result.totalFound).toBeGreaterThan(0);
-        expect(wixDataResponse.data.result.content.length).toBeGreaterThan(0);
+        expect(fetchJobsResponse.data.result.totalFound).toBeGreaterThan(0);
+        expect(fetchJobsResponse.data.result.content.length).toBeGreaterThan(0);
         expect(randomPosition.id.length).toBeGreaterThan(0);
         expect(randomPosition.name.length).toBeGreaterThan(0);
         expect(randomPosition.jobAdId.length).toBeGreaterThan(0);
@@ -21,12 +21,15 @@ describe('Job details fetch from SR API Tests', () => {
         const fetchPositionsRequestBody = `fetchPositionsFromSRAPI();`;
         const positions = await executeApiRequest(fetchPositionsRequestBody);
         const randomPosition = getRandomPosition(positions.data.result.content);
-        const requestBody = `fetchJobDescription(${randomPosition.id});`;
-        const wixDataResponse = await executeApiRequest(requestBody);
-        console.log("wixDataResponse: ", wixDataResponse);
-        // expect(wixDataResponse.data.result.jobDescription.jobDescription.text).toBeDefined();
+        const fetchJobDescriptionRequestBody = `fetchJobDescription(${randomPosition.id});`;
+        const jobFetchResponse = await executeApiRequest(fetchJobDescriptionRequestBody);
+        console.log("jobFetchResponse: ", jobFetchResponse.data.result);
+        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();
       });
   
   
-
   });