sr-npm 1.7.63 → 1.7.64

package/backend/collectionConsts.js

@@ -9,27 +9,24 @@ const COLLECTIONS_FIELDS = {
     AMOUNT_OF_JOBS_PER_DEPARTMENT: [
       {key:'title', type: 'TEXT'},
       { key: 'count', type: 'NUMBER' },
+      { key: 'image', type: 'IMAGE' },
     ],
     CITIES: [
-      {key:'title', type: 'TEXT'},
-      { key: 'regionCode', type: 'TEXT' },
+      { key: 'title', type: 'TEXT' },
       { key: 'city', type: 'TEXT' },
-      {key:'location', type: 'OBJECT'},
+      {key:'locationAddress', type: 'ADDRESS'},
       {key:'count', type: 'NUMBER'},
       {key:'country', type: 'TEXT'},
-      {key:'remote', type: 'TEXT'},
-      {key:'countryCode', type: 'TEXT'},
-      {key:'manual', type: 'TEXT'},      
-      {key:'region', type: 'TEXT'},
-      {key:'latitude', type: 'NUMBER'},
-      {key:'longitude', type: 'NUMBER'},
     ],
     JOBS: [
         {key:'location', type: 'OBJECT'},
+        {key:'title', type: 'TEXT'},
+        {key:'locationAddress', type: 'ADDRESS'},
         {key:'postingStatus', type: 'TEXT'},
         {key:'country', type: 'TEXT'},
         {key:'department', type: 'TEXT'},
         {key:'language', type: 'TEXT'},
+        {key:'remote', type: 'BOOLEAN'},
         {key:'jobDescription', type: 'OBJECT'},  
         {key:'cityText', type: 'TEXT'},         
         {key:'departmentRef', type: 'REFERENCE', typeMetadata: { reference: { referencedCollectionId: 'AmountOfJobsPerDepartment1' } } },
@@ -41,7 +38,6 @@ const COLLECTIONS_FIELDS = {
   };
 
 
-
   module.exports = {
     COLLECTIONS,
     COLLECTIONS_FIELDS,

package/backend/consts.js

@@ -45,7 +45,7 @@ const TASKS = {
   [TASKS_NAMES.CREATE_JOBS_COLLECTION]: {
     name: TASKS_NAMES.CREATE_JOBS_COLLECTION,
     getIdentifier: () => 'SHOULD_NEVER_SKIP',
-    process: () => createCollectionIfMissing(COLLECTIONS.JOBS, COLLECTIONS_FIELDS.JOBS),
+    process: () => createCollectionIfMissing(COLLECTIONS.JOBS, COLLECTIONS_FIELDS.JOBS,{ insert: 'ADMIN', update: 'ADMIN', remove: 'ADMIN', read: 'ANYONE' }),
     shouldSkipCheck: () => false,
     estimatedDurationSec: 3,
   },
@@ -86,7 +86,7 @@ const TASKS = {
     getIdentifier: () => 'SHOULD_NEVER_SKIP',
     process: () =>
       aggregateJobsByFieldToCMS({
-        field: COLLECTIONS_FIELDS.JOBS[6].key,
+        field: COLLECTIONS_FIELDS.JOBS[9].key,
         collection: COLLECTIONS.CITIES,
       }),
     shouldSkipCheck: () => false,
@@ -97,7 +97,7 @@ const TASKS = {
     getIdentifier: () => 'SHOULD_NEVER_SKIP',
     process: () =>
       aggregateJobsByFieldToCMS({
-        field: COLLECTIONS_FIELDS.JOBS[3].key,
+        field: COLLECTIONS_FIELDS.JOBS[5].key,
         collection: COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT,
       }),
     shouldSkipCheck: () => false,
@@ -108,9 +108,9 @@ const TASKS = {
     getIdentifier: () => 'SHOULD_NEVER_SKIP',
     process: () =>
       referenceJobsToField({
-        referenceField: COLLECTIONS_FIELDS.JOBS[8].key,
+        referenceField: COLLECTIONS_FIELDS.JOBS[11].key,
         sourceCollection: COLLECTIONS.CITIES,
-        jobField: COLLECTIONS_FIELDS.JOBS[6].key,
+        jobField: COLLECTIONS_FIELDS.JOBS[9].key,
       }),
     shouldSkipCheck: () => false,
     estimatedDurationSec: 3,
@@ -120,9 +120,9 @@ const TASKS = {
     getIdentifier: () => 'SHOULD_NEVER_SKIP',
     process: () =>
       referenceJobsToField({
-        referenceField: COLLECTIONS_FIELDS.JOBS[7].key,
+        referenceField: COLLECTIONS_FIELDS.JOBS[10].key,
         sourceCollection: COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT,
-        jobField: COLLECTIONS_FIELDS.JOBS[3].key,
+        jobField: COLLECTIONS_FIELDS.JOBS[5].key,
       }),
     shouldSkipCheck: () => false,
     estimatedDurationSec: 3,

package/backend/data.js

@@ -4,7 +4,7 @@ const { createCollectionIfMissing } = require('@hisense-staging/velo-npm/backend
 const { COLLECTIONS, COLLECTIONS_FIELDS } = require('./collectionConsts');
 const { secrets } = require("@wix/secrets");
 const { auth } = require('@wix/essentials');
-const { chunkedBulkOperation, delay, countJobsPerGivenField, fillCityLocation ,prepateToSaveArray,normalizeCityName} = require('./utils');
+const { chunkedBulkOperation, delay, countJobsPerGivenField, fillCityLocationAndLocationAddress ,prepareToSaveArray,normalizeCityName} = require('./utils');
 const { getAllPositions } = require('./queries');
 
 
@@ -143,18 +143,19 @@ async function saveJobsDescriptionsAndLocationToCMS() {
 function iterateOverAllJobs(results, field) {
   const jobsPerField = {};
   const cityLocations = {};
+  const citylocationAddress = {};
     countJobsPerGivenField(results, field, jobsPerField);
     if (field === 'cityText') {
-      fillCityLocation(results, cityLocations);
+      fillCityLocationAndLocationAddress(results, cityLocations,citylocationAddress);
     }
-    return { jobsPerField, cityLocations };
+    return { jobsPerField, cityLocations,citylocationAddress };
 }
 
 async function aggregateJobsByFieldToCMS({ field, collection }) {
   console.log(`counting jobs per ${field}.`);
   let results = await getAllPositions();
-  const { jobsPerField, cityLocations } = iterateOverAllJobs(results, field);
-  const toSave = prepateToSaveArray(jobsPerField, cityLocations, field);
+  const { jobsPerField, cityLocations,citylocationAddress } = iterateOverAllJobs(results, field);
+  const toSave = prepareToSaveArray(jobsPerField, cityLocations, field,citylocationAddress);
   if (toSave.length === 0) {
     console.log('No jobs found.');
     return { success: true, message: 'No jobs to save.' };
@@ -253,7 +254,6 @@ function fetchJobLocation(jobDetails) {
 }
 
 
-
 function getSmartToken() {
   const elevatedGetSecretValue = auth.elevate(secrets.getSecretValue);
   return elevatedGetSecretValue("x-smarttoken")
@@ -262,6 +262,7 @@ function getSmartToken() {
     })
     .catch((error) => {
       console.error(error);
+      throw error;
     });
 }
 

package/backend/fetchPositionsFromSRAPI.js

@@ -116,7 +116,7 @@ async function getSmartTokenFromCMS() {
   if (result.items.length > 0) {
       return result.items[0].token; // This is your string token
   } else {
-      return null; // No token found
+      throw new Error('[getSmartTokenFromCMS], No token found');
   }
 }
 

package/backend/utils.js

@@ -18,34 +18,29 @@ function countJobsPerGivenField(jobs, field,jobsPerField) {
   }
 }
 
-function fillCityLocation(jobs, cityLocations) {
+function fillCityLocationAndLocationAddress(jobs, cityLocations,citylocationAddress) {
   for (const job of jobs) {
-    if (!cityLocations[job.cityText]) {
+    if (!cityLocations[job.cityText] && !citylocationAddress[job.cityText]) {
       cityLocations[job.cityText] = job.location;
+      citylocationAddress[job.cityText] = job.locationAddress;
     }
   }
 }
 
-function prepareToSaveArray(jobsPerField, cityLocations, field) {
+function prepareToSaveArray(jobsPerField, cityLocations, field,citylocationAddress) {
   if (field === 'cityText') {
     return Object.entries(jobsPerField).map(([value, amount]) => {
       const loc = cityLocations[value] || {};
+      const locAddress = citylocationAddress[value] || {};
       value = normalizeCityName(value);
       return {
         title: value,
         _id: value.replace(/\s+/g, ''),
         count: amount,
-        location: loc,
-        countryCode: loc.countryCode,
+        locationAddress: locAddress,
         country: loc.country,
-        region: loc.region,
         city: loc.city,
-        manual: loc.manual.toString(),
-        remote: loc.remote.toString(),
-        regionCode: loc.regionCode,
-        latitude: loc.latitude,
-        longitude: loc.longitude,
-      };
+    };
     });
   } else {
     return Object.entries(jobsPerField).map(([value, amount]) => ({
@@ -69,7 +64,7 @@ module.exports = {
   chunkedBulkOperation,
   delay,
   countJobsPerGivenField,
-  fillCityLocation,
-  prepateToSaveArray: prepareToSaveArray,
+  fillCityLocationAndLocationAddress,
+  prepareToSaveArray,
   normalizeCityName,
 };

package/package.json

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