tripstorekrabi-shared 1.25.8 → 1.25.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tripstorekrabi-shared",
-  "version": "1.25.8",
+  "version": "1.25.9",
   "description": "Shared library for Trip Store Krabi",
   "author": "Stefan Sommer <tonprince@gmail.com>",
   "repository": {

package/product.js

@@ -2,55 +2,99 @@ import { calculateProductSellingPrice, countMinPeople } from "./price.js";
 
 const MATCH_HTML_REGEXP = /(<([^>]+)>)/ig;
 
+function toIsoDateString(val) {
+  if (!val) return null;
+  if (typeof val.toDate === 'function') return val.toDate().toISOString();
+  if (val instanceof Date) return val.toISOString();
+  if (typeof val === 'string') return val;
+  return null;
+}
+
+function stripHTML(html) {
+  if (!html) return '';
+  return String(html).replace(MATCH_HTML_REGEXP, '');
+}
+
 export function buildIndex(id, product) {
-  const lightweightRevisions = (product.pricing?.revisions || []).map(rev => ({
+  if (!product) return null;
+
+  const lightweightRevisions = (product.pricing?.revisions || []).map((rev) => ({
     id: rev.id,
-    startDate: rev.startDate.toDate(),
-    promotion: rev.promotion ? {
-      startDate: rev.promotion.startDate.toDate(),
-      endDate: rev.promotion.endDate.toDate()
-    } : null
+    startDate: toIsoDateString(rev.startDate),
+    promotion: rev.promotion
+      ? {
+        startDate: toIsoDateString(rev.promotion.startDate),
+        endDate: toIsoDateString(rev.promotion.endDate)
+      }
+      : null
   }));
 
+  const minPeople = countMinPeople(product.pricing);
+  const rawPrice =
+    minPeople > 0
+      ? calculateProductSellingPrice(
+        { adults: minPeople, children: 0, infants: 0 },
+        product.pricing
+      ) / minPeople
+      : 0;
+
+  const safeIntPrice = isNaN(rawPrice) || !isFinite(rawPrice) ? 0 : Math.round(rawPrice);
+
   let document = {
     id,
-    title: product.title,
-    subtitle: product.subtitle,
-    summary: product.summary,
-    description: product.description.map((item) => stripHTML(item)).join(" "),
-    heroPhoto: product.heroPhoto,
-    operator: product.operator.default.name,
-    url: product.url,
-    price: calculateProductSellingPrice({ adults: countMinPeople(product.pricing), children: 0, infants: 0 }, product.pricing) / countMinPeople(product.pricing),
-    priceType: product.pricing.type,
-    availability: product.availability,
-    live: product.live,
+    title: String(product.title || '').trim(),
+    subtitle: String(product.subtitle || '').trim(),
+    summary: String(product.summary || '').trim(),
+    description: Array.isArray(product.description)
+      ? product.description.map((item) => stripHTML(item)).join(' ')
+      : stripHTML(product.description || ''),
+    heroPhoto: product.heroPhoto || '',
+    operator: String(
+      product.operator?.default?.name || product.operator?.name || product.operator || 'General'
+    ).trim(),
+    url: product.url || '',
+    price: safeIntPrice,
+    priceType: product.pricing?.type || 'per_person',
+    availability: product.availability || 'available',
+    live: Boolean(product.live),
+    totalPassengers: Math.max(0, Math.round(Number(product.totalPassengers || 0))),
     revisions: JSON.stringify(lightweightRevisions)
   };
 
   if (product.shortName) {
-    document.shortName = product.shortName;
+    document.shortName = String(product.shortName).trim();
   }
 
-  if (product.destinations) {
+  if (Array.isArray(product.destinations) && product.destinations.length > 0) {
     document.destinations = product.destinations;
+  } else if (product.destination) {
+    document.destinations = [product.destination];
   }
-  if (product.tags) {
+
+  if (Array.isArray(product.tags)) {
     document.tags = product.tags;
+  } else {
+    document.tags = [];
   }
 
   if (product.from && product.to) {
     document.from = product.from;
-    document.to = product.to
-    document.start = [product.waypoints[0].latLng.lat, product.waypoints[0].latLng.lng];
-    document.end = [product.waypoints[product.waypoints.length - 1].latLng.lat, product.waypoints[product.waypoints.length - 1].latLng.lng];
+    document.to = product.to;
+
+    if (Array.isArray(product.waypoints) && product.waypoints.length > 0) {
+      const startWp = product.waypoints[0]?.latLng;
+      const endWp = product.waypoints[product.waypoints.length - 1]?.latLng;
+
+      if (startWp && typeof startWp.lat === 'number' && typeof startWp.lng === 'number') {
+        document.start = [startWp.lat, startWp.lng];
+      }
+      if (endWp && typeof endWp.lat === 'number' && typeof endWp.lng === 'number') {
+        document.end = [endWp.lat, endWp.lng];
+      }
+    }
   }
 
-  document.type = product.from ? "transfer" : "activity";
+  document.type = product.from ? 'transfer' : 'activity';
 
   return document;
-}
-
-function stripHTML(html) {
-  return html.replace(MATCH_HTML_REGEXP, "");
 }