@saltcorn/reservable 0.3.0 → 0.3.2

package/common.js

@@ -1,3 +1,5 @@
+const Table = require("@saltcorn/data/models/table");
+
 const gcd = function (a, b) {
   if (!b) {
     return a;
@@ -27,6 +29,7 @@ const get_available_slots = async ({
   services,
   start_field,
   duration_field,
+  expand_entities,
 }) => {
   const from = new Date(date);
   from.setHours(0, 0, 0, 0);
@@ -38,6 +41,19 @@ const get_available_slots = async ({
     q[reservable_entity_key] = entity_wanted;
   //console.log(JSON.stringify({ date, q }, null, 2));
   const taken_slots = await table.getRows(q);
+  let ents = [];
+  let entTable;
+  let entityTablePK;
+  const available_entity_slots = {};
+  if (reservable_entity_key && !entity_wanted && expand_entities) {
+    const entKey = table.getField(reservable_entity_key);
+    entTable = Table.findOne(entKey.reftable_name);
+    ents = await entTable.getRows();
+    entityTablePK = entTable.pk_name;
+    ents.forEach((e) => {
+      available_entity_slots[e[entityTablePK]] = [];
+    });
+  }
 
   // figure out regular availability for this day
   const dayOfWeek = [
@@ -56,10 +72,13 @@ const get_available_slots = async ({
   );
 
   const available_slots = [];
-  const durGCD = gcdArr(services.map((s) => s.duration));
+  const durGCD = gcdArr([60, ...services.map((s) => s.duration)]);
   relevant_availabilities.forEach(({ from, to }) => {
     for (let i = (from * 60) / durGCD; i < (to * 60) / durGCD; i++) {
       available_slots[i] = true;
+      ents.forEach((e) => {
+        available_entity_slots[e[entityTablePK]][i] = true;
+      });
     }
   });
   //console.log({ taken_slots });
@@ -75,9 +94,20 @@ const get_available_slots = async ({
     const to = from + slot[duration_field];
     for (let i = from / durGCD; i < to / durGCD; i++) {
       available_slots[i] = false;
+      ents.forEach((e) => {
+        available_entity_slots[e[entityTablePK]][i] = false;
+      });
     }
   });
-  return { available_slots, from, durGCD, taken_slots };
+  return {
+    available_slots,
+    available_entity_slots,
+    from,
+    durGCD,
+    taken_slots,
+    entities: ents,
+    entityTablePK,
+  };
 };
 
 module.exports = { get_available_slots, range };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/reservable",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Reservable resources",
   "main": "index.js",
   "dependencies": {

package/table-provider.js

@@ -164,7 +164,7 @@ module.exports = {
     }
     return [
       {
-        name: "reserve_ident",
+        name: "id",
         type: "String",
         primary_key: true,
         is_unique: true,
@@ -196,7 +196,7 @@ module.exports = {
         name: "service",
         label: "Service",
         type: "String",
-        attributes: { options: cfg.services.map((s) => s.title) },
+        attributes: { options: cfg.services.map((s) => s.title).join(",") },
       },
       {
         name: "service_duration",
@@ -220,28 +220,42 @@ module.exports = {
   get_table: (cfg) => {
     return {
       disableFiltering: true,
-      getRows: async (where, opts) => {
+      getRows: async (where0, opts) => {
+        const where = { ...where0 };
         const table = Table.findOne({ name: cfg.table_name });
-        const date = !where?.start_day
+        let date = !where?.start_day
           ? new Date()
           : where?.start_day.constructor.name === "PlainDate"
           ? where.start_day.toDate()
           : new Date(where?.start_day);
-
+        if (typeof where?.id === "string") {
+          const service = where?.id.split("//")[1];
+          if (service) where.service = service;
+          date = new Date(where?.id.split("//")[0]);
+        }
         const services = where?.service
           ? cfg.services.filter((s) => s.title === where.service)
           : cfg.services;
-        const { available_slots, from, durGCD, taken_slots } =
-          await get_available_slots({
-            table,
-            date,
-            availability: cfg.availability,
-            entity_wanted: where?.entity || undefined,
-            reservable_entity_key: cfg.reservable_entity_key,
-            start_field: cfg.start_field,
-            duration_field: cfg.duration_field,
-            services,
-          });
+        const expand_entities = !where?.entity && cfg.reservable_entity_key;
+        const {
+          available_slots,
+          from,
+          durGCD,
+          taken_slots,
+          available_entity_slots,
+          entities,
+          entityTablePK,
+        } = await get_available_slots({
+          table,
+          date,
+          availability: cfg.availability,
+          entity_wanted: where?.entity || undefined,
+          reservable_entity_key: cfg.reservable_entity_key,
+          start_field: cfg.start_field,
+          duration_field: cfg.duration_field,
+          services,
+          expand_entities,
+        });
         const minSlot = Math.min(...Object.keys(available_slots));
         const maxSlot = Math.max(...Object.keys(available_slots));
         const service_availabilities = services.map((service, serviceIx) => {
@@ -258,17 +272,21 @@ module.exports = {
             date1.setSeconds(0);
             date1.setMilliseconds(0);
             if (date1 > new Date())
-              if (range(nslots, i).every((j) => available_slots[j])) {
-                availabilities.push({
-                  date: date1,
-                  available: true,
+              if (expand_entities)
+                entities.forEach((e) => {
+                  availabilities.push({
+                    date: date1,
+                    available: range(nslots, i).every(
+                      (j) => available_entity_slots[e[entityTablePK]][j]
+                    ),
+                    entity: e[entityTablePK],
+                  });
                 });
-              } else {
+              else
                 availabilities.push({
                   date: date1,
-                  available: false,
+                  available: range(nslots, i).every((j) => available_slots[j]),
                 });
-              }
           }
           //console.log({ availabilities, service });
           return { availabilities, service, serviceIx };
@@ -278,20 +296,26 @@ module.exports = {
           .map(({ availabilities, service, serviceIx }) =>
             availabilities
               .filter((a) => a.available)
-              .map(({ date }) => {
+              .map(({ date, entity }) => {
                 return {
-                  reserve_ident: `${date.toISOString()}//${service.title}`,
+                  id: `${date.toISOString()}//${service.title}`,
                   service: service.title,
                   service_duration: service.duration,
                   start_day: new PlainDate(date),
                   start_date: date,
                   start_hour: date.getHours(),
                   start_minute: date.getMinutes(),
+                  ...(where?.entity
+                    ? { entity: where.entity }
+                    : entity
+                    ? { entity }
+                    : {}),
                 };
               })
           )
           .flat();
-        return rows;
+        if (where?.id) return rows.filter((r) => r.id === where.id);
+        else return rows;
       },
     };
   },