sr-npm 1.7.154 → 1.7.155

package/backend/consts.js

@@ -1,4 +1,4 @@
-const {saveJobsDataToCMS,saveJobsDescriptionsAndLocationApplyUrlToCMS,aggregateJobsByFieldToCMS,referenceJobsToField,createApiKeyCollectionAndFillIt} = require('./data');
+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');
 
@@ -8,14 +8,11 @@ const TASKS_NAMES = {
     SYNC_JOBS: 'syncJobsFromSRAPIToCMS',
     INSERT_JOBS_TO_CMS: 'insertJobsToCMS',
     INSERT_JOBS_DESCRIPTIONS_LOCATION_APPLY_URL_TO_CMS: 'insertJobsDescriptionsLocationApplyUrlToCMS',
-    FILL_JOBS_PER_CITY_COLLECTION: 'fillJobsPerCityCollection',
-    FILL_JOBS_PER_DEPARTMENT_COLLECTION: 'fillJobsPerDepartmentCollection',
-    REFERENCE_JOBS_TO_LOCATIONS: 'referenceJobsToLocations',
-    REFERENCE_JOBS_TO_DEPARTMENT: 'referenceJobsToDepartment',
-    CREATE_JOBS_COLLECTION: 'createJobsCollection',
-    CREATE_CITIES_COLLECTION: 'createCitiesCollection',
-    CREATE_AMOUNT_OF_JOBS_PER_DEPARTMENT_COLLECTION: 'createAmountOfJobsPerDepartmentCollection',
+    AGGREGATE_JOBS_BY_FIELD_TO_CMS: 'aggregateJobsByFieldToCMS',
+    REFERENCE_JOBS: 'referenceJobs',
+    CREATE_COLLECTIONS: 'createCollections',
     CREATE_API_KEY_COLLECTION_AND_FILL_IT: 'createApiKeyCollectionAndFillIt',
+    SYNC_JOBS_FAST: 'syncJobsFast',
 }
 
 
@@ -23,39 +20,21 @@ const TASKS = {
     [TASKS_NAMES.SYNC_JOBS]: {
       name: TASKS_NAMES.SYNC_JOBS,
       childTasks: [
-        { name: TASKS_NAMES.CREATE_JOBS_COLLECTION },
-        { name: TASKS_NAMES.CREATE_CITIES_COLLECTION },
-        {name:  TASKS_NAMES.CREATE_AMOUNT_OF_JOBS_PER_DEPARTMENT_COLLECTION},
+        { name: TASKS_NAMES.CREATE_COLLECTIONS},
         { name: TASKS_NAMES.INSERT_JOBS_TO_CMS },
         { name: TASKS_NAMES.INSERT_JOBS_DESCRIPTIONS_LOCATION_APPLY_URL_TO_CMS },
-        { name: TASKS_NAMES.FILL_JOBS_PER_CITY_COLLECTION },
-        { name: TASKS_NAMES.FILL_JOBS_PER_DEPARTMENT_COLLECTION },
-        { name: TASKS_NAMES.REFERENCE_JOBS_TO_LOCATIONS },
-        { name: TASKS_NAMES.REFERENCE_JOBS_TO_DEPARTMENT },
+        { name: TASKS_NAMES.AGGREGATE_JOBS_BY_FIELD_TO_CMS },
+        {name: TASKS_NAMES.REFERENCE_JOBS},
       ],
       scheduleChildrenSequentially: true,
-      estimatedDurationSec: 30,
+      estimatedDurationSec: 60,
     },
-    [TASKS_NAMES.CREATE_JOBS_COLLECTION]: {
-      name: TASKS_NAMES.CREATE_JOBS_COLLECTION,
+    [TASKS_NAMES.CREATE_COLLECTIONS]: {
+      name: TASKS_NAMES.CREATE_COLLECTIONS,
       getIdentifier:()=> "SHOULD_NEVER_SKIP",
-      process:()=>createCollectionIfMissing(COLLECTIONS.JOBS, COLLECTIONS_FIELDS.JOBS,{ insert: 'ADMIN', update: 'ADMIN', remove: 'ADMIN', read: 'ANYONE' }),
+      process:createCollections,
       shouldSkipCheck:()=>false,
-      estimatedDurationSec:3
-    },
-    [TASKS_NAMES.CREATE_CITIES_COLLECTION]: {
-      name: TASKS_NAMES.CREATE_CITIES_COLLECTION,
-      getIdentifier:()=> "SHOULD_NEVER_SKIP",
-      process:()=>createCollectionIfMissing(COLLECTIONS.CITIES, COLLECTIONS_FIELDS.CITIES),
-      shouldSkipCheck:()=>false,
-      estimatedDurationSec:3
-    },
-    [TASKS_NAMES.CREATE_AMOUNT_OF_JOBS_PER_DEPARTMENT_COLLECTION]: {
-      name: TASKS_NAMES.CREATE_AMOUNT_OF_JOBS_PER_DEPARTMENT_COLLECTION,
-      getIdentifier:()=> "SHOULD_NEVER_SKIP",
-      process:()=>createCollectionIfMissing(COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT, COLLECTIONS_FIELDS.AMOUNT_OF_JOBS_PER_DEPARTMENT),
-      shouldSkipCheck:()=>false,
-      estimatedDurationSec:3
+      estimatedDurationSec:7
     },
     [TASKS_NAMES.INSERT_JOBS_TO_CMS]: {
       name: TASKS_NAMES.INSERT_JOBS_TO_CMS,
@@ -71,40 +50,33 @@ const TASKS = {
       shouldSkipCheck:()=>false,
       estimatedDurationSec:20
     },
-    [TASKS_NAMES.FILL_JOBS_PER_CITY_COLLECTION]: {
-        name: TASKS_NAMES.FILL_JOBS_PER_CITY_COLLECTION,
-        getIdentifier:()=> "SHOULD_NEVER_SKIP",
-        process:()=>aggregateJobsByFieldToCMS({ field: JOBS_COLLECTION_FIELDS.CITY_TEXT, collection: COLLECTIONS.CITIES }),
-        shouldSkipCheck:()=>false,
-        estimatedDurationSec:3
-      },
-      [TASKS_NAMES.FILL_JOBS_PER_DEPARTMENT_COLLECTION]: {
-        name: TASKS_NAMES.FILL_JOBS_PER_DEPARTMENT_COLLECTION,
-        getIdentifier:()=> "SHOULD_NEVER_SKIP",
-        process:()=>aggregateJobsByFieldToCMS({ field: JOBS_COLLECTION_FIELDS.DEPARTMENT, collection: COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT }),
-        shouldSkipCheck:()=>false,
-        estimatedDurationSec:3
-      },
-      [TASKS_NAMES.REFERENCE_JOBS_TO_LOCATIONS]: {
-        name: TASKS_NAMES.REFERENCE_JOBS_TO_LOCATIONS,
-        getIdentifier:()=> "SHOULD_NEVER_SKIP",
-        process:()=>referenceJobsToField({ referenceField: JOBS_COLLECTION_FIELDS.CITY, sourceCollection: COLLECTIONS.CITIES, jobField: JOBS_COLLECTION_FIELDS.CITY_TEXT }),
-        shouldSkipCheck:()=>false,
-        estimatedDurationSec:3
-      },
-      [TASKS_NAMES.REFERENCE_JOBS_TO_DEPARTMENT]: {
-        name: TASKS_NAMES.REFERENCE_JOBS_TO_DEPARTMENT,
-        getIdentifier:()=> "SHOULD_NEVER_SKIP",
-        process:()=>referenceJobsToField({ referenceField: JOBS_COLLECTION_FIELDS.DEPARTMENT_REF, sourceCollection: COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT, jobField: JOBS_COLLECTION_FIELDS.DEPARTMENT }),
-        shouldSkipCheck:()=>false,
-        estimatedDurationSec:3
-      },
+    [TASKS_NAMES.AGGREGATE_JOBS_BY_FIELD_TO_CMS]: {
+      name: TASKS_NAMES.AGGREGATE_JOBS_BY_FIELD_TO_CMS,
+      getIdentifier:()=> "SHOULD_NEVER_SKIP",
+      process:aggregateJobs,
+      shouldSkipCheck:()=>false,
+      estimatedDurationSec:6
+    },
+    [TASKS_NAMES.REFERENCE_JOBS]: {
+      name: TASKS_NAMES.REFERENCE_JOBS,
+      getIdentifier:()=> "SHOULD_NEVER_SKIP",
+      process:referenceJobs,
+      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
       }
 }
 

package/backend/data.js

@@ -29,8 +29,6 @@ async function saveJobsDataToCMS() {
   // bulk insert to jobs collection without descriptions first
   const jobsData = positions.content.map(position => {
     validatePosition(position);
-    console.log("before: position.department.label", position.department.label);
-    console.log("after: position.department.label", position.department.label.replace('&', ' and '));
     const basicJob = {
       _id: position.id,
       title: position.title,
@@ -45,7 +43,6 @@ async function saveJobsDataToCMS() {
     };
     return basicJob;
   });
-  console.log("jobsData@@@@@@@", jobsData);
 
   const chunkSize = 1000;
   let totalSaved = 0;
@@ -299,8 +296,57 @@ async function createApiKeyCollectionAndFillIt() {
     console.log("Smart token inserted into the ApiKey collection");
 }
 
+async function createCollections() {
+  console.log("Creating collections");
+  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)
+]);
+  console.log("finished creating Collections");
+}
+
+async function aggregateJobs() {
+  console.log("Aggregating jobs");
+  Promise.all([
+    aggregateJobsByFieldToCMS({ field: JOBS_COLLECTION_FIELDS.CITY_TEXT, collection: COLLECTIONS.CITIES }),
+    aggregateJobsByFieldToCMS({ field: JOBS_COLLECTION_FIELDS.DEPARTMENT, collection: COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT })
+  ]);
+  console.log("finished aggregating jobs");
+}
+
+async function referenceJobs() {
+  console.log("Reference jobs");
+  await referenceJobsToField({ referenceField: JOBS_COLLECTION_FIELDS.DEPARTMENT_REF, sourceCollection: COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT, jobField: JOBS_COLLECTION_FIELDS.DEPARTMENT })
+  await referenceJobsToField({ referenceField: JOBS_COLLECTION_FIELDS.CITY, sourceCollection: COLLECTIONS.CITIES, jobField: JOBS_COLLECTION_FIELDS.CITY_TEXT }),
+  console.log("finished referencing jobs");
+}
+
+async function syncJobsFast() {
+  console.log("Syncing jobs fast");
+  console.log("Creating collections");
+  await createCollections();
+  console.log("created collections successfully");
+  console.log("saving jobs data to CMS");
+  await saveJobsDataToCMS();
+  console.log("saved jobs data to CMS successfully");
+  console.log("saving jobs descriptions and location apply url to CMS");
+  await saveJobsDescriptionsAndLocationApplyUrlToCMS();
+  console.log("saved jobs descriptions and location apply url to CMS successfully");
+  console.log("aggregating jobs");
+  await aggregateJobs();
+  console.log("aggregated jobs successfully");
+  console.log("referencing jobs");
+  await referenceJobs();
+  console.log("referenced jobs successfully");
+  console.log("syncing jobs fast finished successfully");
+}
 
 module.exports = {
+  syncJobsFast,
+  referenceJobs,
+  aggregateJobs,
+  createCollections,
     saveJobsDataToCMS,
     saveJobsDescriptionsAndLocationApplyUrlToCMS,
     aggregateJobsByFieldToCMS,

package/package.json

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

package/pages/careersPage.js

@@ -1,7 +1,7 @@
 const { getAllPositions } = require('../backend/queries');
 const {wixData} = require('wix-data');
 const { window } = require('@wix/site-window');
-const { query,queryParams,to,url } = require("wix-location-frontend");
+const { query,queryParams,to } = require("wix-location-frontend");
 const {
     debounce,
     getFilter,
@@ -21,7 +21,6 @@ async function careersPageOnReady(_$w,thisObject,query) {
 queryPageVar=query.page;
 queryKeyWordVar=query.keyWord;
 queryDepartmentVar=query.department;
-console.log("query", query);
 thisObjectVar=thisObject;
 allJobs=await getAllPositions();
 await handleUrlParams(_$w);
@@ -179,7 +178,7 @@ async function applyFilters(_$w, skipUrlUpdate = false) {
 		{ elementId: '#searchInput', field: 'title', value: _$w('#searchInput').value }
 		];
     
-        console.log("dropdownFiltersMapping:###### ", dropdownFiltersMapping);
+
 
 	let filters = [];
 	let value;
@@ -260,42 +259,37 @@ async function updateCount(_$w) {
 
 async function handleDepartmentParam(_$w,department) {
     const departmentValue = department.replace('-', ' ');
-    console.log("department inside handleDepartmentParam", departmentValue);
     
-    // Debug: Check dropdown options
+        
     
-    console.log("after refresh");
     let dropdownOptions = _$w('#dropdownDepartment').options;
     console.log("dropdown options:", dropdownOptions);
     const optionsFromCMS=await wixData.query("AmountOfJobsPerDepartment").find();
     //+1 because of the "All" option
 
     if(dropdownOptions.length!==optionsFromCMS.items.length+1){
-
-        dropdownOptions=[{
-            label: "All",
-            value: "RESET_ALL"
-        }]
-        dropdownOptions.push(...optionsFromCMS.items.map(item=>({
-            label: item.title,
-            value: item.title
-        })));
-        _$w('#dropdownDepartment').options=dropdownOptions;
-        console.warn("something is wrong with the dropdown options, fixing it");
+        fixDropdownOptions(optionsFromCMS, _$w);
     }
 
-    
-    // Try setting the value
     _$w('#dropdownDepartment').value = departmentValue;
-    console.log("after setting, dropdown value:", _$w('#dropdownDepartment').value);
     
-    console.log("before applyFilters_$w('#dropdownDepartment').value", _$w('#dropdownDepartment').value);
-
      await applyFilters(_$w, true); // Skip URL update since we're handling initial URL params
-    // console.log("url", url);
-    // await to(url);
 }
 
+function fixDropdownOptions(optionsFromCMS, _$w){
+    let dropdownOptions = [];
+    dropdownOptions=[{
+        label: "All",
+        value: "RESET_ALL"
+    }]
+    dropdownOptions.push(...optionsFromCMS.items.map(item=>({
+        label: item.title,
+        value: item.title
+    })));
+    _$w('#dropdownDepartment').options=dropdownOptions;
+    console.warn("something is wrong with the dropdown options, fixing it");
+
+}