tripstorekrabi-shared 1.25.7 → 1.25.9

package/availability.js

@@ -13,14 +13,15 @@ dayjs.extend(isSameOrAfter);
 dayjs.extend(utc);
 dayjs.extend(timezone);
 
-const WEEKDAYS = new Array(7);
-WEEKDAYS[0] = "Sunday";
-WEEKDAYS[1] = "Monday";
-WEEKDAYS[2] = "Tuesday";
-WEEKDAYS[3] = "Wednesday";
-WEEKDAYS[4] = "Thursday";
-WEEKDAYS[5] = "Friday";
-WEEKDAYS[6] = "Saturday";
+const WEEKDAYS = [
+  "Sunday",
+  "Monday",
+  "Tuesday",
+  "Wednesday",
+  "Thursday",
+  "Friday",
+  "Saturday"
+];
 
 export const INACTIVE = "inactive";
 export const SINGLE_DATES = "singleDates";
@@ -28,9 +29,9 @@ export const BLOCKOUT = "blockout";
 export const SCHEDULE_MODES = [INACTIVE, SINGLE_DATES, BLOCKOUT];
 
 export function isAvailable(availability, date, schedule, options = {}) {
-  let available = availability.available;
+  let available = Boolean(availability?.available);
 
-  if (available && options.viatorApi === true && (!availability.br?.connectedToApi || !availability.br?.available)) {
+  if (available && options.viatorApi === true && (availability.viatorConnections ?? []).length === 0) {
     return false;
   }
 
@@ -40,7 +41,7 @@ export function isAvailable(availability, date, schedule, options = {}) {
 
   if (available) {
     if (schedule) {
-      let scheduleObject = findSchedule(availability, schedule);
+      const scheduleObject = findSchedule(availability, schedule);
       if (scheduleObject) {
         available = checkAvailability(date, scheduleObject);
       } else {
@@ -48,33 +49,33 @@ export function isAvailable(availability, date, schedule, options = {}) {
       }
     } else if (availability.schedules) {
       available = Object.values(availability.schedules).every(
-        (schedule) => checkAvailability(date, schedule)
+        (sched) => checkAvailability(date, sched)
       );
     } else if (availability.openingHours) {
       available = Object.values(availability.openingHours).every(
-        (schedule) => checkAvailability(date, schedule)
+        (sched) => checkAvailability(date, sched)
       );
     }
   }
 
   if (available) {
-    date = dayjs(date, "DD.MM.YYYY");
-    let today = dayjs().startOf('day');
-    available = date.isSameOrAfter(today);
+    const checkDate = dayjs(date, "DD.MM.YYYY");
+    const today = dayjs().startOf('day');
+    available = checkDate.isSameOrAfter(today);
   }
 
   return available;
 }
 
 function checkAvailability(date, schedule) {
-  let mode = schedule.mode;
+  const mode = schedule?.mode;
 
   switch (mode) {
     case INACTIVE: {
       return false;
     }
     case SINGLE_DATES: {
-      return schedule.singleDates.includes(date);
+      return Array.isArray(schedule.singleDates) && schedule.singleDates.includes(date);
     }
     case BLOCKOUT: {
       let available = true;
@@ -83,17 +84,17 @@ function checkAvailability(date, schedule) {
         available = !schedule.blockoutDates.includes(date);
       }
       if (available && schedule.blockoutPeriods) {
-        let day = dayjs(date, "DD.MM.YYYY");
-        let year = day.year();
+        const day = dayjs(date, "DD.MM.YYYY");
+        const year = day.year();
         available = !schedule.blockoutPeriods.some((period) => {
-          let start = dayjs(`${period.start}.${year}`, "DD.MM.YYYY");
-          let end = dayjs(`${period.end}.${year}`, "DD.MM.YYYY");
+          const start = dayjs(`${period.start}.${year}`, "DD.MM.YYYY");
+          const end = dayjs(`${period.end}.${year}`, "DD.MM.YYYY");
           return day.isBetween(start, end, 'day', '[]');
         });
       }
 
       if (available && schedule.weekDays) {
-        let weekDay = WEEKDAYS[dayjs(date, "DD.MM.YYYY").day()];
+        const weekDay = WEEKDAYS[dayjs(date, "DD.MM.YYYY").day()];
         available = schedule.weekDays.includes(weekDay);
       }
 
@@ -106,9 +107,9 @@ function checkAvailability(date, schedule) {
 }
 
 export function getSchedules(availability) {
-  if (availability.schedules) {
+  if (availability?.schedules) {
     return Object.keys(availability.schedules).sort();
-  } else if (availability.openingHours) {
+  } else if (availability?.openingHours) {
     return Object.keys(availability.openingHours).sort();
   } else {
     return [];
@@ -116,64 +117,68 @@ export function getSchedules(availability) {
 }
 
 export function findSchedule(availability, schedule) {
-  if (availability.schedules) {
-    return availability.schedules[schedule] ?? Object.entries(availability.schedules)[0];
-  } else if (availability.openingHours) {
-    return availability.openingHours[schedule] ?? Object.entries(availability.openingHours)[0];
+  if (availability?.schedules) {
+    return availability.schedules[schedule] ?? Object.entries(availability.schedules)[0]?.[1];
+  } else if (availability?.openingHours) {
+    return availability.openingHours[schedule] ?? Object.entries(availability.openingHours)[0]?.[1];
   }
 }
 
 export function getAvailabilityLabel(availability, schedule) {
-  if (!availability.available) {
+  if (!availability?.available) {
     return "Not available";
-  } else {
-    let scheduleObject = findSchedule(availability, schedule);
-
-    if (scheduleObject.mode === INACTIVE) {
-      return "Not available";
-    } else if (scheduleObject.mode === SINGLE_DATES) {
-      return "Available on selected dates";
-    } else if (scheduleObject.mode === BLOCKOUT) {
-      if (scheduleObject.blockoutPeriods && scheduleObject.blockoutPeriods.length > 0) {
-        let starts = [];
-        let ends = [];
-        let startPeriod = scheduleObject.blockoutPeriods[0];
-        let year = dayjs().year();
-        scheduleObject.blockoutPeriods.forEach((period, i) => {
-          starts.push(dayjs(`${period.end}.${year}`, "DD.MM.YYYY").add(1, 'day'));
-          if (i + 1 < scheduleObject.blockoutPeriods.length) {
-            ends.push(dayjs(`${scheduleObject.blockoutPeriods[i + 1].start}.${year}`, "DD.MM.YYYY").subtract(1, 'day'));
-          }
-        });
-        ends.push(dayjs(`${startPeriod.start}.${year + 1}`, "DD.MM.YYYY").subtract(1, 'day'));
+  }
 
-        let availability = [];
-        starts.forEach((start, i) => {
-          if (ends[i].diff(start, "month") > 1) {
-            availability.push(start.format("MMM") + " - " + ends[i].format("MMM"));
-          }
-        });
+  const scheduleObject = findSchedule(availability, schedule);
 
-        return availability.join(", ");
-      } else if (scheduleObject.weekDays) {
-        return scheduleObject.weekDays.map((item) => item.substring(0, 3)).join(", ");
-      } else {
-        return "Daily";
-      }
+  if (!scheduleObject || scheduleObject.mode === INACTIVE) {
+    return "Not available";
+  } else if (scheduleObject.mode === SINGLE_DATES) {
+    return "Available on selected dates";
+  } else if (scheduleObject.mode === BLOCKOUT) {
+    if (scheduleObject.blockoutPeriods && scheduleObject.blockoutPeriods.length > 0) {
+      const starts = [];
+      const ends = [];
+      const startPeriod = scheduleObject.blockoutPeriods[0];
+      const year = dayjs().year();
+
+      scheduleObject.blockoutPeriods.forEach((period, i) => {
+        starts.push(dayjs(`${period.end}.${year}`, "DD.MM.YYYY").add(1, 'day'));
+        if (i + 1 < scheduleObject.blockoutPeriods.length) {
+          ends.push(dayjs(`${scheduleObject.blockoutPeriods[i + 1].start}.${year}`, "DD.MM.YYYY").subtract(1, 'day'));
+        }
+      });
+      ends.push(dayjs(`${startPeriod.start}.${year + 1}`, "DD.MM.YYYY").subtract(1, 'day'));
+
+      const availabilityLabels = [];
+      starts.forEach((start, i) => {
+        if (ends[i].diff(start, "month") > 1) {
+          availabilityLabels.push(start.format("MMM") + " - " + ends[i].format("MMM"));
+        }
+      });
+
+      return availabilityLabels.join(", ");
+    } else if (scheduleObject.weekDays) {
+      return scheduleObject.weekDays.map((item) => item.substring(0, 3)).join(", ");
+    } else {
+      return "Daily";
     }
   }
+
+  return "Available";
 }
 
 export function isLastMinuteDate(dateValue, cutoffTime) {
-  let date = dayjs(dateValue, "DD.MM.YYYY").tz("Asia/Bangkok");
-  let now = dayjs().tz("Asia/Bangkok");
+  const date = dayjs(dateValue, "DD.MM.YYYY").tz("Asia/Bangkok");
+  const now = dayjs().tz("Asia/Bangkok");
 
   return now.add(cutoffTime, "hour").isSameOrAfter(date, "day");
 }
 
 export function isPastDate(dateValue, schedule) {
-  let date = dayjs(dateValue + " " + schedule, "DD.MM.YYYY HH:mm").tz("Asia/Bangkok");
-  let now = dayjs().tz("Asia/Bangkok");
+  const startTime = (schedule || "00:00").split(" - ")[0].slice(0, 5);
+  const date = dayjs(`${dateValue} ${startTime}`, "DD.MM.YYYY HH:mm").tz("Asia/Bangkok");
+  const now = dayjs().tz("Asia/Bangkok");
 
   return date.isSameOrBefore(now);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tripstorekrabi-shared",
-  "version": "1.25.7",
+  "version": "1.25.9",
   "description": "Shared library for Trip Store Krabi",
   "author": "Stefan Sommer <tonprince@gmail.com>",
   "repository": {
@@ -18,9 +18,9 @@
   },
   "dependencies": {
     "dayjs": "^1.11.23",
-    "libphonenumber-js": "^1.13.12",
+    "libphonenumber-js": "^1.13.14",
     "nanoid": "^6.0.1",
-    "firebase-admin": "^14.3.0"
+    "firebase-admin": "^14.5.0"
   },
   "scripts": {
     "deploy": "npm publish"

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, "");
 }