sr-npm 1.7.534 → 1.7.537

package/backend/collectionConsts.js

@@ -5,6 +5,8 @@ const COLLECTIONS = {
     TEMPLATE_TYPE: 'templateType',
     SECRET_MANAGER_MIRROR: 'SecretManagerMirror',
     BRANDS: 'Brands',
+    CUSTOM_VALUES:'CustomValues',
+    CUSTOM_FIELDS:'CustomFields',
 }
 const JOBS_COLLECTION_FIELDS = {
   LOCATION: 'location',

package/backend/data.js

@@ -1,7 +1,7 @@
 const { items: wixData } = require('@wix/data');
 const { fetchPositionsFromSRAPI, fetchJobDescription } = require('./fetchPositionsFromSRAPI');
 const { createCollectionIfMissing } = require('@hisense-staging/velo-npm/backend');
-const { COLLECTIONS, COLLECTIONS_FIELDS,JOBS_COLLECTION_FIELDS,TEMPLATE_TYPE,TOKEN_NAME } = require('./collectionConsts');
+const { COLLECTIONS, COLLECTIONS_FIELDS,JOBS_COLLECTION_FIELDS,TEMPLATE_TYPE,TOKEN_NAME,CUSTOM_VALUES_COLLECTION_FIELDS,CUSTOM_FIELDS_COLLECTION_FIELDS } = require('./collectionConsts');
 const { chunkedBulkOperation, countJobsPerGivenField, fillCityLocationAndLocationAddress ,prepareToSaveArray,normalizeString} = require('./utils');
 const { getAllPositions } = require('./queries');
 const { retrieveSecretVal, getTokenFromCMS } = require('./secretsData');
@@ -52,21 +52,29 @@ function validateSingleDesiredBrand(desiredBrand) {
     throw new Error("Desired brand must be a single brand");
   }
 }
-function getCustomFieldsAndValuesFromPosition(position,customFields) {
+function getCustomFieldsAndValuesFromPosition(position,customFieldsLabels,customFieldsValues) {
   const customFieldsArray = Array.isArray(position?.customField) ? position.customField : [];
   for (const field of customFieldsArray) {
     if(field.fieldLabel==="Country" || field.fieldLabel==="Department") continue; //country and department are not custom fields, they are already in the job object
     const label = field.fieldLabel==="Brands" ? "brand" : field.fieldLabel
-    const key = normalizeString(label);
-    const value = field.valueLabel
-    customFields[key] ? customFields[key].add(value) : customFields[key]=new Set([value])
+    const fieldId=field.fieldId
+    const fieldLabel = normalizeString(label);
+    const valueId=field.valueId
+    const valueLabel = field.valueLabel
+    customFieldsLabels[fieldId] = fieldLabel
+    // Build nested dictionary: fieldId -> { valueId: valueLabel }
+    if (!customFieldsValues[fieldId]) {
+      customFieldsValues[fieldId] = {};
+    }
+    customFieldsValues[fieldId][valueId] = valueLabel;
   }
   
 }
 async function saveJobsDataToCMS() {
   const positions = await fetchPositionsFromSRAPI();
   const sourcePositions = await filterBasedOnBrand(positions);
-  const customFields = {}
+  const customFieldsLabels = {}
+  const customFieldsValues = {}
   // bulk insert to jobs collection without descriptions first
   const jobsData = sourcePositions.map(position => {
     const basicJob = {
@@ -92,10 +100,13 @@ async function saveJobsDataToCMS() {
       brand: getBrand(position.customField),
       jobDescription: null, // Will be filled later
     };
-    getCustomFieldsAndValuesFromPosition(position,customFields);
+    getCustomFieldsAndValuesFromPosition(position,customFieldsLabels,customFieldsValues);
     return basicJob;
   });
-  console.log("customFields: ", customFields);
+  console.log("customFieldsLabels: ", customFieldsLabels);
+  console.log("customFieldsValues: ", customFieldsValues);
+  populateCustomFieldsCollection(customFieldsLabels);
+  populateCustomValuesCollection(customFieldsValues);
   // Sort jobs by title (ascending, case-insensitive, numeric-aware)
   jobsData.sort((a, b) => {
     const titleA = a.title || '';
@@ -134,6 +145,26 @@ async function saveJobsDataToCMS() {
   console.log(`✓ All chunks processed. Total jobs saved: ${totalSaved}/${jobsData.length}`);
 }
 
+function populateCustomFieldsCollection(customFields) {
+  for(const ID of Object.keys(customFields)){
+    wixData.save(COLLECTIONS.CUSTOM_FIELDS, {
+      title: customFields[ID],
+      _id: ID,
+    });
+  }
+}
+function populateCustomValuesCollection(customFieldsValues) {
+  for (const fieldId of Object.keys(customFieldsValues)) {
+    const valuesMap = customFieldsValues[fieldId] || {};
+    for (const valueId of Object.keys(valuesMap)) {
+      wixData.save(COLLECTIONS.CUSTOM_VALUES, {
+        _id: valueId,
+        title: valuesMap[valueId],
+        customField: fieldId, // reference to CustomFields collection (displays the label)
+      });
+    }
+  }
+}
 async function saveJobsDescriptionsAndLocationApplyUrlToCMS() {
   console.log('🚀 Starting job descriptions update process for ALL jobs');
 
@@ -291,6 +322,7 @@ async function referenceJobsToField({ referenceField, sourceCollection, jobField
     return rest;
   });
 
+  
   // Bulk update in chunks of 1000
   const chunkSize = 1000;
   await chunkedBulkOperation({
@@ -336,13 +368,13 @@ function fetchJobLocation(jobDetails) {
 async function createCollections() {
   console.log("Creating collections");
   await Promise.all(
-  [createCollectionIfMissing(COLLECTIONS.JOBS, JOBS_COLLECTION_FIELDS.JOBS,{ insert: 'ADMIN', update: 'ADMIN', remove: 'ADMIN', read: 'ANYONE' }),
+  [createCollectionIfMissing(COLLECTIONS.JOBS, COLLECTIONS_FIELDS.JOBS,{ insert: 'ADMIN', update: 'ADMIN', remove: 'ADMIN', read: 'ANYONE' }),
   createCollectionIfMissing(COLLECTIONS.CITIES, COLLECTIONS_FIELDS.CITIES),
   createCollectionIfMissing(COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT, COLLECTIONS_FIELDS.AMOUNT_OF_JOBS_PER_DEPARTMENT),
   createCollectionIfMissing(COLLECTIONS.SECRET_MANAGER_MIRROR, COLLECTIONS_FIELDS.SECRET_MANAGER_MIRROR),
   createCollectionIfMissing(COLLECTIONS.BRANDS, COLLECTIONS_FIELDS.BRANDS),
-  createCollectionIfMissing(COLLECTIONS.CUSTOM_VALUES, CUSTOM_VALUES_COLLECTION_FIELDS.CUSTOM_VALUES),
-  createCollectionIfMissing(COLLECTIONS.CUSTOM_FIELDS, CUSTOM_FIELDS_COLLECTION_FIELDS.CUSTOM_FIELDS)
+  createCollectionIfMissing(COLLECTIONS.CUSTOM_VALUES, COLLECTIONS_FIELDS.CUSTOM_VALUES),
+  createCollectionIfMissing(COLLECTIONS.CUSTOM_FIELDS, COLLECTIONS_FIELDS.CUSTOM_FIELDS)
 ]);
   console.log("finished creating Collections");
 }
@@ -362,13 +394,14 @@ async function referenceJobs() {
   await referenceJobsToField({ referenceField: JOBS_COLLECTION_FIELDS.DEPARTMENT_REF, sourceCollection: COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT, jobField: JOBS_COLLECTION_FIELDS.DEPARTMENT });
   await referenceJobsToField({ referenceField: JOBS_COLLECTION_FIELDS.CITY, sourceCollection: COLLECTIONS.CITIES, jobField: JOBS_COLLECTION_FIELDS.CITY_TEXT });
   await referenceJobsToField({ referenceField: JOBS_COLLECTION_FIELDS.BRAND_REF, sourceCollection: COLLECTIONS.BRANDS, jobField: JOBS_COLLECTION_FIELDS.BRAND });
+  await referenceJobsToField({referenceField:JOBS_COLLECTION_FIELDS.CUSTOM_VALUES,sourceCollection:COLLECTIONS.CUSTOM_VALUES,jobField:JOBS_COLLECTION_FIELDS.CUSTOM_VALUES} )
   console.log("finished referencing jobs");
 }
 
 async function syncJobsFast() {
   console.log("Syncing jobs fast");
   await createCollections();
-  // await clearCollections();
+  await clearCollections();
   // await fillSecretManagerMirror();
   console.log("saving jobs data to CMS");
   await saveJobsDataToCMS();
@@ -387,7 +420,9 @@ async function clearCollections() {
     wixData.truncate(COLLECTIONS.CITIES),
     wixData.truncate(COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT),
     wixData.truncate(COLLECTIONS.JOBS),
-    wixData.truncate(COLLECTIONS.BRANDS)
+    wixData.truncate(COLLECTIONS.BRANDS),
+    wixData.truncate(COLLECTIONS.CUSTOM_VALUES),
+    wixData.truncate(COLLECTIONS.CUSTOM_FIELDS),
   ]);
   console.log("cleared collections successfully");
 }

package/package.json

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