sr-npm 1.7.27 → 1.7.29

package/backend/collectionConsts.js

@@ -11,25 +11,19 @@ const COLLECTIONS_FIELDS = {
       { key: 'count', type: 'NUMBER' },
     ],
     CITIES: [
-      {key:'title', type: 'TEXT'},
-      { key: 'regionCode', 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:'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: 'AmountOfJobsPerDepartment' } } },

package/backend/data.js

@@ -4,7 +4,7 @@ const { chunkedBulkOperation } = require('./utils');
 const { createCollectionIfMissing } = require('@hisense-staging/velo-npm/backend');
 const { COLLECTIONS, COLLECTIONS_FIELDS } = require('./collectionConsts');
 const { secrets } = require("@wix/secrets");
-const { elevate } = require("wix-auth");
+const { auth } = require('@wix/essentials');
 
 // Utility function to normalize city names
 function normalizeCityName(city) {
@@ -170,6 +170,7 @@ async function aggregateJobsByFieldToCMS({ field, collection }) {
     let cityLocations = {};
     let query = wixData.query("Jobs").limit(1000);
     let results = await query.find();
+    const cityLocationAddress={}
     let page = 1;
     do {
         console.log(`Page ${page}: ${results.items.length} jobs.`);
@@ -179,7 +180,8 @@ async function aggregateJobsByFieldToCMS({ field, collection }) {
                     throw new Error(`Job ${job._id} has no ${field} field`);
                 } 
             jobsPerField[job[field]] = (jobsPerField[job[field]] || 0) + 1;
-            if (field === 'cityText' && !cityLocations[job[field]]) {
+            if (field === 'cityText' && !cityLocationAddress[job[field]] && cityLocations[job[field]]) {
+                cityLocationAddress[job[field]] = job.locationAddress;
                 cityLocations[job[field]] = job.location;
             }
         }
@@ -191,23 +193,16 @@ async function aggregateJobsByFieldToCMS({ field, collection }) {
     let toSave = [];
     if (field === 'cityText') {
          toSave = Object.entries(jobsPerField).map(([value, amount]) => {
+            const locAddress = cityLocationAddress[value] || {};
             const loc = cityLocations[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
             };
         });
     }
@@ -320,7 +315,7 @@ function fetchJobLocation(jobDetails) {
 
 
 function getSmartToken() {
-  const elevatedGetSecretValue = elevate(secrets.getSecretValue);
+  const elevatedGetSecretValue = auth.elevate(secrets.getSecretValue);
   return elevatedGetSecretValue("x-smarttoken")
     .then((secret) => {
       return secret;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sr-npm",
-  "version": "1.7.27",
+  "version": "1.7.29",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -19,6 +19,7 @@
   "dependencies": {
     "@hisense-staging/velo-npm": "1.7.249",
     "@wix/data": "^1.0.211",
+    "@wix/essentials": "^0.1.24",
     "@wix/secrets": "1.0.53"
   }
 }