sr-npm 1.7.475 → 1.7.477

package/backend/collectionConsts.js

@@ -4,6 +4,7 @@ const COLLECTIONS = {
     JOBS: 'Jobs',
     TEMPLATE_TYPE: 'templateType',
     SECRET_MANAGER_MIRROR: 'SecretManagerMirror',
+    BRANDS: 'Brands',
 }
 const JOBS_COLLECTION_FIELDS = {
   LOCATION: 'location',
@@ -20,12 +21,17 @@ const JOBS_COLLECTION_FIELDS = {
   IMAGE: 'image',
   APPLY_LINK: 'applyLink',
   REFER_FRIEND_LINK: 'referFriendLink',
+  BRAND: 'brand',
+  BRAND_REF: 'brandRef',
 }
 const AMOUNT_OF_JOBS_PER_DEPARTMENT_COLLECTION_FIELDS = {
   TITLE: 'title',
   COUNT: 'count',
   IMAGE: 'image',
 }
+const BRANDS_COLLECTION_FIELDS = {
+  BRAND: 'brand',
+}
 const CITIES_COLLECTION_FIELDS = {
   TITLE: 'title',
   CITY: 'city',
@@ -57,9 +63,11 @@ const COLLECTIONS_FIELDS = {
         {key:'jobDescription', type: 'OBJECT'},  
         {key:'cityText', type: 'TEXT'},
         {key:'applyLink', type: 'URL'},
-        {key:'referFriendLink', type: 'URL'},         
+        {key:'referFriendLink', type: 'URL'},     
+        {key:'brand', type: 'TEXT'},    
         {key:'departmentref', type: 'REFERENCE', typeMetadata: { reference: { referencedCollectionId: COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT } } },
         {key:'city', type: 'REFERENCE', typeMetadata: { reference: { referencedCollectionId: COLLECTIONS.CITIES } } },
+        {key:'brandRef', type: 'REFERENCE', typeMetadata: { reference: { referencedCollectionId: COLLECTIONS.BRANDS } } },
         { key: 'image', type: 'IMAGE' },
     ],  
     TEMPLATE_TYPE: [
@@ -69,6 +77,9 @@ const COLLECTIONS_FIELDS = {
       {key:'tokenName', type: 'TEXT'},
       {key:'tokenValue', type: 'TEXT'},
     ],
+    BRANDS: [
+      {key:'brand', type: 'TEXT'},
+    ],
   };
 
   const TEMPLATE_TYPE = {
@@ -89,6 +100,7 @@ const COLLECTIONS_FIELDS = {
     JOBS_COLLECTION_FIELDS,
     AMOUNT_OF_JOBS_PER_DEPARTMENT_COLLECTION_FIELDS,
     CITIES_COLLECTION_FIELDS,
+    BRANDS_COLLECTION_FIELDS,
     TEMPLATE_TYPE,
     TOKEN_NAME,
 };

package/backend/data.js

@@ -2,10 +2,17 @@ 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 { chunkedBulkOperation, countJobsPerGivenField, fillCityLocationAndLocationAddress ,prepareToSaveArray,normalizeCityName} = require('./utils');
+const { chunkedBulkOperation, countJobsPerGivenField, fillCityLocationAndLocationAddress ,prepareToSaveArray,normalizeString} = require('./utils');
 const { getAllPositions } = require('./queries');
 const { getCompanyId, getSmartToken } = require('./secretsData');
 
+function getBrand(customField) {
+  const brand = customField.find(field => field.fieldLabel === 'Brands')?.valueLabel;
+  console.log("brand: ", brand);
+  console.log("normalizeString(brand): ", normalizeString(brand));
+  return brand ? normalizeString(brand) : '';
+}
+
 function validatePosition(position) {
   if (!position.id) {
     throw new Error('Position id is required');
@@ -30,7 +37,7 @@ async function saveJobsDataToCMS() {
       _id: position.id,
       title: position.name || '',
       department: position.department?.label || 'Other',
-      cityText: normalizeCityName(position.location?.city),
+      cityText: normalizeString(position.location?.city).trim(),
       location: position.location && Object.keys(position.location).length > 0
         ? position.location
         : {
@@ -46,6 +53,7 @@ async function saveJobsDataToCMS() {
       country: position.location?.country || '',
       remote: position.location?.remote || false,
       language: position.language?.label || '',
+      brand: getBrand(position.customField),
       jobDescription: null, // Will be filled later
     };
     return basicJob;
@@ -294,7 +302,8 @@ async function createCollections() {
   [createCollectionIfMissing(COLLECTIONS.JOBS, JOBS_COLLECTION_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.SECRET_MANAGER_MIRROR, COLLECTIONS_FIELDS.SECRET_MANAGER_MIRROR),
+  createCollectionIfMissing(COLLECTIONS.BRANDS, COLLECTIONS_FIELDS.BRANDS)
 ]);
   console.log("finished creating Collections");
 }
@@ -303,7 +312,8 @@ async function aggregateJobs() {
   console.log("Aggregating jobs");
   await Promise.all([
     aggregateJobsByFieldToCMS({ field: JOBS_COLLECTION_FIELDS.DEPARTMENT, collection: COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT }),
-    aggregateJobsByFieldToCMS({ field: JOBS_COLLECTION_FIELDS.CITY_TEXT, collection: COLLECTIONS.CITIES })
+    aggregateJobsByFieldToCMS({ field: JOBS_COLLECTION_FIELDS.CITY_TEXT, collection: COLLECTIONS.CITIES }),
+    aggregateJobsByFieldToCMS({ field: JOBS_COLLECTION_FIELDS.BRAND, collection: COLLECTIONS.BRANDS })
   ]);
   console.log("finished aggregating jobs");
 }
@@ -312,6 +322,7 @@ async function referenceJobs() {
   console.log("Reference jobs");
   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 });
   console.log("finished referencing jobs");
 }
 

package/backend/utils.js

@@ -35,7 +35,7 @@ function prepareToSaveArray(jobsPerField, cityLocations, field,citylocationAddre
     return Object.entries(jobsPerField).map(([value, amount]) => {
       const loc = cityLocations[value] || {};
       const locAddress = citylocationAddress[value] || {};
-      value = normalizeCityName(value);
+      value = normalizeString(value).trim();
       return {
         title: value,
         _id: value.replace(/\s+/g, ''),
@@ -48,29 +48,22 @@ function prepareToSaveArray(jobsPerField, cityLocations, field,citylocationAddre
   } else {
     return Object.entries(jobsPerField).map(([value, amount]) => ({
       title: value,
-      _id: sanitizeId(value),
+      _id: normalizeString(value).replace(/&/g, 'and'),
       count: amount,
     }));
   }
 }
 
-function normalizeCityName(city) {
-  if (!city) return city;
-  // Remove accents/diacritics, trim whitespace
-  return city
+function normalizeString(str) {
+  if (!str) return str;
+  // Remove accents/diacritics, keep spaces, trim whitespace
+  return str
     .normalize('NFD')
     .replace(/\p{Diacritic}/gu, '')
-    .trim();
+    .replace(/[^A-Za-z0-9-\s]/g, '');
 }
 
-function sanitizeId(input) {
-  if (!input) return '';
-  const withoutDiacritics = String(input)
-    .normalize('NFD')
-    .replace(/\p{Diacritic}/gu, '');
-  const withAnd = withoutDiacritics.replace(/&/g, 'and');
-  return withAnd.replace(/[^A-Za-z0-9-]/g, '');
-}
+
 
 module.exports = {
   chunkedBulkOperation,
@@ -78,6 +71,6 @@ module.exports = {
   countJobsPerGivenField,
   fillCityLocationAndLocationAddress,
   prepareToSaveArray,
-  normalizeCityName,
-  sanitizeId,
+  normalizeString,
+  
 };

package/package.json

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