sr-npm 1.0.11 → 1.0.13

package/backend/fetchPositionsFromSRAPI.js

@@ -1,17 +1,17 @@
-import { fetch } from 'wix-fetch';
-
+const { fetch } = require('wix-fetch');
+const { items: wixData } = require('@wix/data');
+const { COLLECTIONS } = require('./collectionConsts');
+const secretsData = require('./secretsData');
 async function makeSmartRecruitersRequest(path) {
-  // const baseUrl = 'https://api.smartrecruiters.com'; // PROD
-  const baseUrl = 'https://aoxley54.wixstudio.com/external-template/_functions'; // TEST
-    const fullUrl = `${baseUrl}${path}`;
-    //console.log(`Making request to: ${fullUrl}`);
+   const baseUrl = 'https://api.smartrecruiters.com';
+  const fullUrl = `${baseUrl}${path}`;
+  
   try {
     const response = await fetch(fullUrl, {
       method: 'GET',
       headers: {
         'Accept-Language': 'en',
         'accept': 'application/json',
-        'x-smarttoken': 'DCRA1-1d30ea5fe9be42d9b9ae94ff933ebef5',
         'Cookie': 'AWSALB=GYltFw3fLKortMxHR5vIOT1CuUROyhWNIX/qL8ZnPl1/8mhOcnIsBKYslzmNJPEzSy/jvNbO+6tXpH8yqcpQJagYt57MhbKlLqTSzoNq1G/w7TjOxPGR3UTdXW0d; AWSALBCORS=GYltFw3fLKortMxHR5vIOT1CuUROyhWNIX/qL8ZnPl1/8mhOcnIsBKYslzmNJPEzSy/jvNbO+6tXpH8yqcpQJagYt57MhbKlLqTSzoNq1G/w7TjOxPGR3UTdXW0d'
       }
     });
@@ -28,70 +28,60 @@ async function makeSmartRecruitersRequest(path) {
   }
 }
 
-export async function fetchPositionsFromSRAPI() {
+async function fetchPositionsFromSRAPI() {
   let allPositions = [];
   let totalFound = 0;
-  let nextPageId = null; // Start with no page ID for the first request
-  let pageCount = 0;
+  let page = 0;
   const MAX_PAGES = 30 // Safety limit to prevent infinite loops
-
+  const companyId = await getCompanyIdFromCMS();
   console.log('Starting to fetch all positions with pagination...');
+  let offset=0;
 
   do {
     try {
-      pageCount++;
-      
+      page++;
+
       // Build the API path - first request has no page parameter, subsequent use nextPageId
-      let apiPath = '/jobs?limit=50';
-      if (nextPageId) {
-        apiPath += `&nextPageId=${nextPageId}`;
-      }
+      const apiPath = `/v1/companies/${companyId}/postings?offset=${offset}`;
       
-      console.log(`Fetching page ${pageCount} with path: ${apiPath}`);
+      console.log(`Fetching page ${page} with path: ${apiPath}`);
       const response = await makeSmartRecruitersRequest(apiPath);
       
       // Add positions from this page to our collection
       if (response.content && Array.isArray(response.content)) {
         allPositions = allPositions.concat(response.content);
-        console.log(`Page ${pageCount}: Found ${response.content.length} positions`);
+        console.log(`Page ${page}: Found ${response.content.length} positions`);
       }
-      
+
       // Update total count from first response
-      if (pageCount === 1) {
+      if (page === 1) {
         totalFound = response.totalFound || 0;
         console.log(`Total positions available: ${totalFound}`);
       }
-      
-      // Get the nextPageId for the next iteration
-      nextPageId = response.nextPageId && response.nextPageId !== "" ? response.nextPageId : null;
-      
-      if (nextPageId) {
-        console.log(`Next page ID: ${nextPageId}`);
-      } else {
-        console.log('No more pages to fetch');
-      }
-      
+
+     offset+=100;
+     
     } catch (error) {
-      console.error(`Error fetching page ${pageCount}:`, error);
+      console.error(`Error fetching page ${page}:`, error);
       throw error;
     }
-    
+
     // Safety check to prevent infinite loops
-    if (pageCount >= MAX_PAGES) {
+    if (page >= MAX_PAGES) {
       console.warn(`Reached maximum page limit of ${MAX_PAGES}. Stopping pagination.`);
       break;
     }
-  } while (nextPageId); // Continue while there's a nextPageId
+  } while (offset<totalFound); // Continue while there's a nextPageId
 
   console.log(`Finished fetching all pages. Total positions collected: ${allPositions.length}`);
 
   // Return response in the same format as before, but with all positions
-  const result =  {
+  const result = {
     totalFound: totalFound,
     offset: 0,
     limit: allPositions.length,
-    nextPageId: "", // Always empty since we've fetched everything
-    content: allPositions
+    nextPageId: '', // Always empty since we've fetched everything
+    content: allPositions,
   };
 
   const amountOfUniqueJobs = new Set(allPositions.map(job => job.id)).size;
@@ -104,6 +94,23 @@ export async function fetchPositionsFromSRAPI() {
   return result;
 }
 
-export async function fetchJobDescription(jobId) {
-  return await makeSmartRecruitersRequest(`/jobs/${jobId}`);
+async function fetchJobDescription(jobId) {
+  const companyId = await getCompanyIdFromCMS();
+  return await makeSmartRecruitersRequest(`/v1/companies/${companyId}/postings/${jobId}`);
 }
+
+async function getCompanyIdFromCMS() {
+  const result = await wixData.query(COLLECTIONS.COMPANY_ID).limit(1).find();
+  if (result.items.length > 0) {
+      return result.items[0].companyId; 
+  } else {
+      throw new Error('[getCompanyIdFromCMS], No companyId found');
+  }
+}
+
+
+module.exports = {
+  fetchPositionsFromSRAPI,
+  fetchJobDescription,
+  getCompanyIdFromCMS
+};

package/backend/index.js

@@ -1,5 +1,6 @@
 module.exports = {
-    ...require('./utils'),
-    ...require('./queries'),
-  };
-  
+  ...require('./utils'),
+  ...require('./queries'),
+  ...require('./fetchPositionsFromSRAPI'),
+  ...require('./consts'),
+};

package/backend/queries.js

@@ -1,23 +1,24 @@
-const { COLLECTIONS } = require('./consts');
-const { items } = require('@wix/data');
+const { COLLECTIONS } = require('./collectionConsts');
+const { items: wixData } = require('@wix/data');
 
 
 async function getAllPositions() {
-    const query = items.query(COLLECTIONS.JOBS);
-    const results = await query.find();
-    return results.items;
-   
+  return wixData
+    .query(COLLECTIONS.JOBS)
+    .limit(1000)
+    .find()
+    .then(result => result.items);
 }
 
 async function getPositionsByField(field, value) {
-    const query = items.query(COLLECTIONS.JOBS)
-        .eq(field, value);
-    const results = await query.find();
-    return results.items;
+  return wixData
+    .query(COLLECTIONS.JOBS)
+    .eq(field, value)
+    .find()
+    .then(result => result.items);
 }
 
-
 module.exports = {
-    getAllPositions,
-    getPositionsByField,
-};
+  getAllPositions,
+  getPositionsByField,
+};

package/backend/secretsData.js

@@ -0,0 +1,14 @@
+const { secrets } = require("@wix/secrets");
+const { auth } = require('@wix/essentials');
+
+const getSecretValue = auth.elevate(secrets.getSecretValue);
+  
+  function getCompanyId() {
+    return getSecretValue("companyID")
+      .then((secret) => {
+        return secret;
+      })
+  }
+  module.exports = {
+    getCompanyId
+  };

package/backend/utils.js

@@ -1,6 +1,83 @@
 async function chunkedBulkOperation({ items, chunkSize, processChunk }) {
-    for (let i = 0; i < items.length; i += chunkSize) {
-        const chunk = items.slice(i, i + chunkSize);
-        await processChunk(chunk, Math.floor(i / chunkSize) + 1);
+  for (let i = 0; i < items.length; i += chunkSize) {
+    const chunk = items.slice(i, i + chunkSize);
+    await processChunk(chunk, Math.floor(i / chunkSize) + 1);
+  }
+}
+
+async function delay(ms) {
+  await new Promise(resolve => setTimeout(resolve, ms));
+}
+
+function countJobsPerGivenField(jobs, field,jobsPerField) {
+  for (const job of jobs) {
+    if (!job[field]) {
+      console.warn(`Job ${job._id} missing required field '${field}' - continue`);
+      continue;
     }
-}
+    else{
+      jobsPerField[job[field]] = (jobsPerField[job[field]] || 0) + 1;
+    }
+  }
+}
+
+function fillCityLocationAndLocationAddress(jobs, cityLocations,citylocationAddress) {
+  for (const job of jobs) {
+    if (!cityLocations[job.cityText] && !citylocationAddress[job.cityText]) {
+      cityLocations[job.cityText] = job.location;
+      citylocationAddress[job.cityText] = job.locationAddress;
+    }
+  }
+}
+
+function prepareToSaveArray(jobsPerField, cityLocations, field,citylocationAddress) {
+  if (field === 'cityText') {
+    return Object.entries(jobsPerField).map(([value, amount]) => {
+      const loc = cityLocations[value] || {};
+      const locAddress = citylocationAddress[value] || {};
+      value = normalizeCityName(value);
+      return {
+        title: value,
+        _id: value.replace(/\s+/g, ''),
+        count: amount,
+        locationAddress: locAddress,
+        country: loc.country,
+        city: loc.city,
+    };
+    });
+  } else {
+    return Object.entries(jobsPerField).map(([value, amount]) => ({
+      title: value,
+      _id: sanitizeId(value),
+      count: amount,
+    }));
+  }
+}
+
+function normalizeCityName(city) {
+  if (!city) return city;
+  // Remove accents/diacritics, trim whitespace
+  return city
+    .normalize('NFD')
+    .replace(/\p{Diacritic}/gu, '')
+    .trim();
+}
+
+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,
+  delay,
+  countJobsPerGivenField,
+  fillCityLocationAndLocationAddress,
+  prepareToSaveArray,
+  normalizeCityName,
+  sanitizeId,
+};

package/index.js

@@ -1,6 +1,5 @@
 module.exports = {
-    ...require('./public'),
-    ...require('./pages'),
-    ...require('./backend'),
-  };
-  
+  ...require('./public'),
+  ...require('./pages'),
+  ...require('./backend'),
+};

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "sr-npm",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "jest"
   },
   "repository": {
     "type": "git",
@@ -17,6 +17,17 @@
   },
   "homepage": "https://github.com/psdevteamenterprise/sr-npm#readme",
   "dependencies": {
-    "@hisense-staging/velo-npm": "1.7.249"
+    "@hisense-staging/velo-npm": "3.0.19",
+    "@wix/data": "^1.0.211",
+    "@wix/essentials": "^0.1.24",
+    "@wix/secrets": "^1.0.53",
+    "@wix/site-location": "^1.0.0",
+    "@wix/site-window": "^1.0.0",
+    "axios": "^1.11.0",
+    "jest": "^30.0.5",
+    "tests-utils": "^1.0.7"
+  },
+  "devDependencies": {
+    "prettier": "^3.6.2"
   }
 }