sr-npm 1.7.35 → 1.7.37

package/backend/collectionConsts.js

@@ -9,29 +9,27 @@ 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:'cityText', type: 'TEXT'},
+        {key:'applyLink', type: 'URL'},         
         {key:'departmentref', type: 'REFERENCE', typeMetadata: { reference: { referencedCollectionId: 'AmountOfJobsPerDepartment' } } },
         {key:'city', type: 'REFERENCE', typeMetadata: { reference: { referencedCollectionId: 'cities' } } },
     ],  

package/backend/consts.js

@@ -1,10 +1,10 @@
-const {saveDataJobsToCMS,saveJobsDescriptionsAndLocationToCMS,aggregateJobsByFieldToCMS,referenceJobsToField,createApiKeyCollectionAndFillIt} = require('./data');
+const {saveDataJobsToCMS,saveJobsDescriptionsAndLocationApplyUrlToCMS,aggregateJobsByFieldToCMS,referenceJobsToField,createApiKeyCollectionAndFillIt} = require('./data');
 const { createCollectionIfMissing } = require('@hisense-staging/velo-npm/backend');
 const { COLLECTIONS, COLLECTIONS_FIELDS } = require('./collectionConsts');
 const TASKS_NAMES = {
     SYNC_JOBS: 'syncJobsFromSRAPIToCMS',
     INSERT_JOBS_TO_CMS: 'insertJobsToCMS',
-    INSERT_JOBS_DESCRIPTIONS_TO_CMS: 'insertJobsDescriptionsToCMS',
+    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',
@@ -24,7 +24,7 @@ const TASKS = {
         { name: TASKS_NAMES.CREATE_CITIES_COLLECTION },
         {name:  TASKS_NAMES.CREATE_AMOUNT_OF_JOBS_PER_DEPARTMENT_COLLECTION},
         { name: TASKS_NAMES.INSERT_JOBS_TO_CMS },
-        { name: TASKS_NAMES.INSERT_JOBS_DESCRIPTIONS_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 },
@@ -36,7 +36,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
     },
@@ -61,10 +61,10 @@ const TASKS = {
       shouldSkipCheck:()=>false,
       estimatedDurationSec:20
     },
-    [TASKS_NAMES.INSERT_JOBS_DESCRIPTIONS_TO_CMS]: {
-      name: TASKS_NAMES.INSERT_JOBS_DESCRIPTIONS_TO_CMS,
+    [TASKS_NAMES.INSERT_JOBS_DESCRIPTIONS_LOCATION_APPLY_URL_TO_CMS]: {
+      name: TASKS_NAMES.INSERT_JOBS_DESCRIPTIONS_LOCATION_APPLY_URL_TO_CMS,
       getIdentifier:()=> "SHOULD_NEVER_SKIP",
-      process:saveJobsDescriptionsAndLocationToCMS,
+      process:saveJobsDescriptionsAndLocationApplyUrlToCMS,
       shouldSkipCheck:()=>false,
       estimatedDurationSec:20
     },

package/backend/data.js

@@ -59,7 +59,7 @@ async function saveDataJobsToCMS() {
 
 }
 
-async function saveJobsDescriptionsAndLocationToCMS() {
+async function saveJobsDescriptionsAndLocationApplyUrlToCMS() {
     
    console.log('🚀 Starting job descriptions update process for ALL jobs using pagination...');
     
@@ -99,11 +99,13 @@ async function saveJobsDescriptionsAndLocationToCMS() {
                             //   console.log(`    Fetching description for: ${job.title} (${job._id})`);
                             const jobDetails = await fetchJobDescription(job._id);
                             const jobLocation = fetchJobLocation(jobDetails)
+                            const applyLink = jobDetails.actions.applyOnWeb.url;
                             
                             const updatedJob = {
                                 ...job,
                                 locationAddress: jobLocation,
-                                jobDescription: jobDetails.jobAd.sections
+                                jobDescription: jobDetails.jobAd.sections,
+                                applyLink: applyLink
                             };
                             await wixData.update("Jobs", updatedJob);
                             // console.log(`    ✅ Updated description for: ${job.title}`);
@@ -170,6 +172,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 +182,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,6 +195,7 @@ 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);
 
@@ -198,16 +203,9 @@ async function aggregateJobsByFieldToCMS({ field, collection }) {
                 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
             };
         });
     }
@@ -236,7 +234,8 @@ async function aggregateJobsByFieldToCMS({ field, collection }) {
 
 async function getJobsWithNoDescriptions() {
     
-    let jobswithoutdescriptionsQuery = await wixData.query("Jobs").limit(1000).isEmpty("jobDescription").find(); // with 900 as the limit, 429 error won't happen
+   // let jobswithoutdescriptionsQuery = await wixData.query("Jobs").limit(1000).isEmpty("jobDescription").find(); // with 900 as the limit, 429 error won't happen
+   let jobswithoutdescriptionsQuery = await wixData.query("Jobs").limit(1000).isEmpty("applyLink").find(); // with 900 as the limit, 429 error won't happen
     return jobswithoutdescriptionsQuery;
 }
 
@@ -318,7 +317,6 @@ function fetchJobLocation(jobDetails) {
 }
 
 
-
 function getSmartToken() {
   const elevatedGetSecretValue = auth.elevate(secrets.getSecretValue);
   return elevatedGetSecretValue("x-smarttoken")
@@ -333,7 +331,7 @@ function getSmartToken() {
 
 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');
+    await createCollectionIfMissing(COLLECTIONS.API_KEY, COLLECTIONS_FIELDS.API_KEY);
     console.log("Getting the smart token");
     const token = await getSmartToken();
     console.log("token is :  ", token);
@@ -348,7 +346,7 @@ async function createApiKeyCollectionAndFillIt() {
 
 module.exports = {
     saveDataJobsToCMS,
-    saveJobsDescriptionsAndLocationToCMS,
+    saveJobsDescriptionsAndLocationApplyUrlToCMS,
     aggregateJobsByFieldToCMS,
     referenceJobsToField,
     createApiKeyCollectionAndFillIt,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sr-npm",
-  "version": "1.7.35",
+  "version": "1.7.37",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -17,7 +17,7 @@
   },
   "homepage": "https://github.com/psdevteamenterprise/sr-npm#readme",
   "dependencies": {
-    "@hisense-staging/velo-npm": "1.7.251",
+    "@hisense-staging/velo-npm": "1.7.249",
     "@wix/data": "^1.0.211",
     "@wix/essentials": "^0.1.24",
     "@wix/secrets": "1.0.53"