sr-npm 1.7.638 → 1.7.640

package/backend/collectionConsts.js

@@ -54,6 +54,7 @@ const CITIES_COLLECTION_FIELDS = {
   LOCATION_ADDRESS: 'locationAddress',
   COUNT: 'count',
   COUNTRY: 'country',
+  JOB_IDS: 'jobIds',
 }
 const COLLECTIONS_FIELDS = {
     AMOUNT_OF_JOBS_PER_DEPARTMENT: [
@@ -67,6 +68,7 @@ const COLLECTIONS_FIELDS = {
       {key:'locationAddress', type: 'ADDRESS'},
       {key:'count', type: 'NUMBER'},
       {key:'country', type: 'TEXT'},
+      {key:'jobIds', type: 'ARRAY'},
     ],
     JOBS: [
         {key:'location', type: 'OBJECT'},

package/backend/data.js

@@ -7,8 +7,9 @@ const { getAllPositions } = require('./queries');
 const { retrieveSecretVal, getTokenFromCMS } = require('./secretsData');
 
 
-let jobToCustomValues = {}
+//let jobToCustomValues = {}
 let customValuesToJobs = {}
+let locationToJobs = {}
 let siteconfig;
 const EXCLUDED_CUSTOM_FIELDS = new Set(["Department"]);
 
@@ -62,12 +63,17 @@ function validateSingleDesiredBrand(desiredBrand) {
     throw new Error("Desired brand must be a single brand");
   }
 }
+function getLocation(position,basicJob) {
+
+  locationToJobs[basicJob.cityText] ? locationToJobs[basicJob.cityText].push(position.id) : locationToJobs[basicJob.cityText]=[position.id]
+
+}
 function getEmploymentType(position,customFieldsValues) {
   if (!customFieldsValues["employmentType"]) {
     customFieldsValues["employmentType"] = {};
   }
   customFieldsValues["employmentType"][position.typeOfEmployment.id] = position.typeOfEmployment.label;
-  jobToCustomValues[position.id] ? jobToCustomValues[position.id].push(position.typeOfEmployment.id) : jobToCustomValues[position.id]=[position.typeOfEmployment.id]
+  //jobToCustomValues[position.id] ? jobToCustomValues[position.id].push(position.typeOfEmployment.id) : jobToCustomValues[position.id]=[position.typeOfEmployment.id]
   customValuesToJobs[position.typeOfEmployment.id] ? customValuesToJobs[position.typeOfEmployment.id].push(position.id) : customValuesToJobs[position.typeOfEmployment.id]=[position.id]
 }
 
@@ -86,7 +92,7 @@ function getCustomFieldsAndValuesFromPosition(position,customFieldsLabels,custom
     }
     customFieldsValues[fieldId][valueId] = valueLabel;
 
-    jobToCustomValues[position.id] ? jobToCustomValues[position.id].push(valueId) : jobToCustomValues[position.id]=[valueId]
+    //jobToCustomValues[position.id] ? jobToCustomValues[position.id].push(valueId) : jobToCustomValues[position.id]=[valueId]
     customValuesToJobs[valueId] ? customValuesToJobs[valueId].push(position.id) : customValuesToJobs[valueId]=[position.id]
   }
 }
@@ -125,6 +131,7 @@ async function saveJobsDataToCMS() {
 
     getCustomFieldsAndValuesFromPosition(position,customFieldsLabels,customFieldsValues);
     getEmploymentType(position,customFieldsValues);
+    getLocation(position,basicJob);
     return basicJob;
   });
   if(siteconfig===undefined) {
@@ -309,7 +316,7 @@ async function aggregateJobsByFieldToCMS({ field, collection }) {
   console.log(`counting jobs per ${field}.`);
   let results = await getAllPositions();
   const { jobsPerField, cityLocations,citylocationAddress } = iterateOverAllJobs(results, field);
-  const toSave = prepareToSaveArray(jobsPerField, cityLocations, field,citylocationAddress);
+  const toSave = prepareToSaveArray(jobsPerField, cityLocations, field,citylocationAddress,locationToJobs);
   if (toSave.length === 0) {
     console.log('No jobs found.');
     return { success: true, message: 'No jobs to save.' };

package/backend/utils.js

@@ -30,7 +30,7 @@ function fillCityLocationAndLocationAddress(jobs, cityLocations,citylocationAddr
   }
 }
 
-function prepareToSaveArray(jobsPerField, cityLocations, field,citylocationAddress) {
+function prepareToSaveArray(jobsPerField, cityLocations, field,citylocationAddress,customValuesToJobs=null) {
   if (field === 'cityText') {
     return Object.entries(jobsPerField).map(([value, amount]) => {
       const loc = cityLocations[value] || {};
@@ -43,6 +43,7 @@ function prepareToSaveArray(jobsPerField, cityLocations, field,citylocationAddre
         locationAddress: locAddress,
         country: loc.country,
         city: loc.city,
+        jobIds: customValuesToJobs[value],
     };
     });
   } else {

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -1,8 +1,7 @@
 const { COLLECTIONS,CUSTOM_VALUES_COLLECTION_FIELDS,JOBS_COLLECTION_FIELDS } = require('../backend/collectionConsts');
 const { items: wixData } = require('@wix/data');
 const {CAREERS_MULTI_BOXES_PAGE_CONSTS} = require('../backend/careersMultiBoxesPageIds');
-const { auth } = require('@wix/essentials');
-const getAllRecordsElevated = auth.elevate(wixData.query);
+
 let valuesByFieldIdGlobal = null; 
 let dontUpdateThisCheckBox;
 const selectedByField = new Map(); // fieldId -> array of selected value IDs
@@ -19,6 +18,7 @@ async function careersMultiBoxesPageOnReady(_$w) {
       }
     if(Object.keys(valueToJobs).length === 0){
         allvaluesobjects=await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
+        
         for (const value of allvaluesobjects) {
             valueToJobs[value._id]= value.jobIds;
         }
@@ -82,7 +82,8 @@ async function loadJobs(_$w) {
   async function loadFilters(_$w) {
     try {
       // 1) Load all categories (fields)
-      const fields = await getAllRecords(COLLECTIONS.CUSTOM_FIELDS);
+      let fields = await getAllRecords(COLLECTIONS.CUSTOM_FIELDS);
+      fields.push({_id:"Location",title:"Location"});
       console.log("fields: ",fields)
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.FILTER_REPEATER).data = fields;
       const cities=await getAllRecords(COLLECTIONS.CITIES);
@@ -156,15 +157,14 @@ async function loadJobs(_$w) {
       console.error('Failed to load filters:', err);
     }
   }
-  
+
   
   async function getAllRecords(collectionId) {
-    //let q = wixData.query(collectionId);
-    let q=getAllRecordsElevated(collectionId)
+    let q = wixData.query(collectionId);
   
   
     const items = [];
-    let res = await q.limit(1000).find()
+    let res = await q.limit(1000).find();
     items.push(...res.items);
   
     while (res.hasNext()) {