sr-npm 1.7.1320 → 1.7.1321

package/backend/data.js

@@ -114,7 +114,7 @@ function getCustomFieldsAndValuesFromPosition(position, customFieldsLabels, cust
   }
 }
 
-async function saveJobsDataToCMS() {
+async function retrieveJobsData() {
   const positions = await fetchPositionsFromSRAPI();
   const sourcePositions = await filterBasedOnBrand(positions);
   const customFieldsLabels = {}
@@ -165,11 +165,9 @@ async function saveJobsDataToCMS() {
   });
 
   if (siteconfig.customFields==="true") {
-    console.log("populating custom fields collection");
+    
     await populateCustomFieldsCollection(customFieldsLabels,templateType);
-    console.log("populating custom values collection");
     await populateCustomValuesCollection(customFieldsValues);
-    console.log("populated custom fields and values collections successfully");
   }
 
   // Sort jobs by title (ascending, case-insensitive, numeric-aware)
@@ -178,34 +176,6 @@ async function saveJobsDataToCMS() {
     const titleB = b.title || '';
     return titleA.localeCompare(titleB, undefined, { sensitivity: 'base', numeric: true });
   });
-
-  // const chunkSize = 1000;
-  // let totalSaved = 0;
-  // const totalChunks = Math.ceil(jobsData.length / chunkSize);
-
-  // console.log(
-  //   `Processing ${jobsData.length} jobs in ${totalChunks} chunks of max ${chunkSize} items each`
-  // );
-  
-  // await chunkedBulkOperation({
-  //   items: jobsData,
-  //   chunkSize,
-  //   processChunk: async (chunk, chunkNumber) => {
-  //     console.log(`Saving chunk ${chunkNumber}/${totalChunks}: ${chunk.length} jobs`);
-  //     try {
-  //       const result = await wixData.bulkSave(COLLECTIONS.JOBS, chunk);
-  //       const saved = result.inserted + result.updated || chunk.length;
-  //       totalSaved += saved;
-  //       console.log(
-  //         `✓ Chunk ${chunkNumber} saved successfully. Inserted: ${result.inserted}, Updated: ${result.updated}`
-  //       );
-  //     } catch (error) {
-  //       console.error(`✗ Error saving chunk ${chunkNumber}:`, error);
-  //       throw error;
-  //     }
-  //   },
-  // });
-  // console.log(`✓ All chunks processed. Total jobs saved: ${totalSaved}/${jobsData.length}`);
   return jobsData;
 }
 
@@ -246,45 +216,14 @@ async function populateCustomValuesCollection(customFieldsValues) {
   await wixData.bulkSave(COLLECTIONS.CUSTOM_VALUES, valuesToinsert);
 }
 
-async function saveJobsDescriptionsAndLocationApplyUrlReferencesToCMS(jobsWithNoDescriptions) {
+async function retrieveJobsDescriptionsAndLocationApplyUrlReferences(jobsWithNoDescriptions) {
   console.log('🚀 Starting job descriptions update process for ALL jobs');
   console.log("jobsWithNoDescriptions: ",jobsWithNoDescriptions);
 
   try {
-   // let jobsWithNoDescriptions = await getJobsWithNoDescriptions();
-
-    // if (siteconfig.customFields==="true") {
-    //   let customValues = await getAllCustomValues();
-
-    //   console.log("inserting jobs references to custom values collection");
-    //   console.log("customValues: ",customValues)
-    //   console.log("customValues.items: ",customValues.items)
-
-    //   for (const value of customValues.items) {
-    //     await insertJobsReference(value._id, value.valueId);
-    //   }
-    //   console.log("inserted jobs references to custom values collection successfully");
-    // }
   
-    // let totalUpdated = 0;
-    // let totalFailed = 0;
-    // let totalProcessed = 0;
-
-    // console.log(
-    //   `Total jobs in database without descriptions:  ${jobsWithNoDescriptions?.length}`
-    // );
-
-    // if (jobsWithNoDescriptions.length === 0) {
-    //   console.log('No jobs found in database');
-    //   return { success: true, message: 'No jobs found' };
-    // }
-
-
-   // const API_CHUNK_SIZE = 80;
-    //const pageChunks = Math.ceil(jobsWithNoDescriptions.items.length / API_CHUNK_SIZE);
     const richContentConverterToken = await getTokenFromCMS(TOKEN_NAME.RICH_CONTENT_CONVERTER_TOKEN);
 
-    console.log("before promise all")
     const jobsWithDescriptions=await Promise.all(jobsWithNoDescriptions.map( async job => {
       const jobDetails =  await fetchJobDescription(job._id);
             const richContentDescription= await htmlRichContentConverter(jobDetails.jobAd.sections,richContentConverterToken);
@@ -302,58 +241,6 @@ async function saveJobsDescriptionsAndLocationApplyUrlReferencesToCMS(jobsWithNo
     console.log("jobsWithDescriptions: after map ",jobsWithDescriptions);
     return {success: true, updatedJobs: jobsWithDescriptions};
 
-    // await chunkedBulkOperation({
-    //   items: jobsWithNoDescriptions.items,
-    //   chunkSize: API_CHUNK_SIZE,
-    //   processChunk: async (chunk, chunkNumber) => {
-    //     console.log(`  Processing API chunk ${chunkNumber}/${pageChunks} (${chunk.length} jobs)`);
-    //     const chunkPromises = chunk.map(async job => {
-    //       try {
-    //         const jobDetails = await fetchJobDescription(job._id);
-    //         const richContentDescription=await htmlRichContentConverter(jobDetails.jobAd.sections,richContentConverterToken);
-    //         const jobLocation = fetchJobLocation(jobDetails);
-    //         const {applyLink , referFriendLink} = fetchApplyAndReferFriendLink(jobDetails);
-    //         const updatedJob = {
-    //           ...job,
-    //           locationAddress: jobLocation,
-    //           jobDescription: richContentDescription,
-    //           applyLink: applyLink,
-    //           referFriendLink: referFriendLink,
-    //         };
-    //         await wixData.update(COLLECTIONS.JOBS, updatedJob);
-    //         return { success: true, jobId: job._id, title: job.title };
-    //       } catch (error) {
-    //         console.error(`    ❌ Failed to update ${job.title} (${job._id}):`, error);
-    //         return { success: false, jobId: job._id, title: job.title, error: error.message };
-    //       }
-    //     });
-    //     const chunkResults = await Promise.all(chunkPromises);
-    //     const chunkSuccesses = chunkResults.filter(r => r.success).length;
-    //     const chunkFailures = chunkResults.filter(r => !r.success).length;
-    //     totalUpdated += chunkSuccesses;
-    //     totalFailed += chunkFailures;
-    //     totalProcessed += chunk.length;
-    //     console.log(
-    //       `  API chunk ${chunkNumber} completed: ${chunkSuccesses} success, ${chunkFailures} failed`
-    //     );
-    //   },
-    // });
-
-
-
-    // console.log(`\n✅ Finished updating ALL job descriptions`);
-    // console.log(`📊 Final Results:`);
-    // console.log(`   Total jobs processed: ${totalProcessed}`);
-    // console.log(`   Total updated: ${totalUpdated}`);
-    // console.log(`   Total failed: ${totalFailed}`);
-
-    // return {
-    //   success: true,
-    //   totalProcessed: totalProcessed,
-    //   totalUpdated: totalUpdated,
-    //   totalFailed: totalFailed,
-    //   message: `Successfully updated ${totalUpdated} job descriptions out of ${totalProcessed} total jobs`,
-    // };
   } catch (error) {
     console.error('❌ Error in updateJobDescriptions:', error);
     throw error;
@@ -398,14 +285,7 @@ async function getAllCustomValues() {
   return customValuesQuery;
 }
 
-async function getJobsWithNoDescriptions() {
-  let jobswithoutdescriptionsQuery = await wixData
-    .query(COLLECTIONS.JOBS)
-    .limit(1000)
-    .isEmpty('jobDescription')
-    .find();
-  return jobswithoutdescriptionsQuery;
-}
+
 
 /**
  * @param {Object} params
@@ -530,23 +410,46 @@ async function syncJobsFast() {
   try{
   console.log("Syncing jobs fast");
   await createCollections();
-   await clearCollections();
+  await clearCollections();
   await fillSecretManagerMirror();
 
-  console.log("saving jobs data to CMS");//change comment
-  const jobsData = await saveJobsDataToCMS(); //change name
+  console.log("retrieving jobs data from SR API");
+  const jobsData = await retrieveJobsData();
   console.log("jobsData inside syncJobsFast: ",jobsData);
-  console.log("saved jobs data to CMS successfully");//change comment
+  console.log("retrieved jobs data from SR API successfully");
   
-  console.log("saving jobs descriptions and location apply url to CMS");//change comment
-  const status=await saveJobsDescriptionsAndLocationApplyUrlReferencesToCMS(jobsData);
+  console.log("retrieving jobs descriptions and location apply url from SR API");
+  const status=await retrieveJobsDescriptionsAndLocationApplyUrlReferences(jobsData);
 
   console.log("status inside syncJobsFast: ",status);
   if(status.success){
     await wixData.truncate(COLLECTIONS.JOBS)
-    //await clearCollections();
     const updatedJobs=status.updatedJobs;
-    const chunkSize = 1000;
+    console.log("updatedJobs inside syncJobsFast: ",updatedJobs);
+    await saveJobsToCMS(updatedJobs);
+    console.log("saved jobs to CMS successfully");
+    
+  if (siteconfig.customFields==="true") {
+    await insertJobsReferencesToCustomValuesCollection();
+  }
+  }
+  console.log("saved jobs data, descriptions and location apply url to CMS successfully");
+
+  await aggregateJobs();
+  await referenceJobs();
+
+  console.log("syncing jobs fast finished successfully");
+
+  }
+  catch (error) {
+    error.message="Error syncing jobs: "+error.message;
+    throw error;
+  }
+  
+}
+
+async function saveJobsToCMS(updatedJobs) {
+  const chunkSize = 1000;
   let totalSaved = 0;
   const totalChunks = Math.ceil(updatedJobs.length / chunkSize);
 
@@ -573,40 +476,18 @@ async function syncJobsFast() {
     },
   });
   console.log(`✓ All chunks processed. Total jobs saved: ${totalSaved}/${updatedJobs.length}`);
-  if (siteconfig.customFields==="true") {
-console.log("inserting jobs references to custom values collection");
+}
 
-    //put this inside function
-    //------------------------------------------------------------------------------------------------
-    let customValues = await getAllCustomValues();
+async function insertJobsReferencesToCustomValuesCollection() {
+  console.log("inserting jobs references to custom values collection");
 
-    console.log("inserting jobs references to custom values collection");
-    console.log("customValues: ",customValues)
-    console.log("customValues.items: ",customValues.items)
+    let customValues = await getAllCustomValues();
 
     for (const value of customValues.items) {
       await insertJobsReference(value._id, value.valueId);
     }
     console.log("inserted jobs references to custom values collection successfully");
-  }
-  //------------------------------------------------------------------------------------------------
-  }
-  console.log("saved jobs descriptions and location apply url to CMS successfully");//change comment
-
-  await aggregateJobs();
-  await referenceJobs();
-
-  console.log("syncing jobs fast finished successfully");
-
-  }
-  catch (error) {
-    error.message="Error syncing jobs: "+error.message;
-    throw error;
-  }
-  
 }
-
-
 async function clearCollections() {
   console.log("clearing collections");
   if(siteconfig===undefined) {
@@ -615,7 +496,6 @@ async function clearCollections() {
   await Promise.all([
     wixData.truncate(COLLECTIONS.CITIES),
     wixData.truncate(COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT),
-    //wixData.truncate(COLLECTIONS.JOBS),
     wixData.truncate(COLLECTIONS.BRANDS),
     siteconfig.customFields==="true" ? wixData.truncate(COLLECTIONS.CUSTOM_VALUES) : null,
     siteconfig.customFields==="true" ? wixData.truncate(COLLECTIONS.CUSTOM_FIELDS) : null,
@@ -666,8 +546,8 @@ module.exports = {
   referenceJobs,
   aggregateJobs,
   createCollections,
-  saveJobsDataToCMS,
-  saveJobsDescriptionsAndLocationApplyUrlReferencesToCMS,
+  saveJobsDataToCMS: retrieveJobsData,
+  saveJobsDescriptionsAndLocationApplyUrlReferencesToCMS: retrieveJobsDescriptionsAndLocationApplyUrlReferences,
   aggregateJobsByFieldToCMS,
   referenceJobsToField,
   fillSecretManagerMirror,

package/package.json

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