@escapenavigator/utils 1.10.105 → 1.10.107

package/dist/get-full-name.d.ts

@@ -1,5 +1,6 @@
 export declare const getFullName: (row: {
     id: number;
-    name: string;
-    surname: string;
+    name?: string;
+    patronymic?: string;
+    surname?: string;
 }) => string;

package/dist/get-full-name.js

@@ -4,9 +4,10 @@ exports.getFullName = void 0;
 const getFullName = (row) => {
     if (!row)
         return 'Deleted';
-    const { name, surname, id } = row;
-    if (name || surname)
-        return `${name || ''} ${surname || ''}`.trim();
+    const { name, patronymic, surname, id, } = row;
+    if (name || patronymic || surname) {
+        return `${name || ''} ${patronymic || ''} ${surname || ''}`.replace(/\s+/g, ' ').trim();
+    }
     return `Client №${id}`;
 };
 exports.getFullName = getFullName;

package/dist/index.d.ts

@@ -13,3 +13,4 @@ export * from './tz-date';
 export * from './validate-by-dto';
 export * from './convert-hhmm-to-minutes';
 export * from './convert-minutes-to-hhmm';
+export * from './get-full-name';

package/dist/index.js

@@ -29,3 +29,4 @@ __exportStar(require("./tz-date"), exports);
 __exportStar(require("./validate-by-dto"), exports);
 __exportStar(require("./convert-hhmm-to-minutes"), exports);
 __exportStar(require("./convert-minutes-to-hhmm"), exports);
+__exportStar(require("./get-full-name"), exports);

package/dist/serialize-slot.d.ts

@@ -2,10 +2,31 @@ import { OrderRO } from '@escapenavigator/types/dist/order/order.ro';
 import { SlotRO } from '@escapenavigator/types/dist/slot/slot.ro';
 type Props = {
     slot: any;
-    order?: OrderRO & {
+    orders?: Array<OrderRO & {
         workers: any[];
-    };
+    }>;
 };
-export declare const serializeSlotOrderData: (order: Props['order']) => SlotRO['order'];
-export declare const serializeSlot: ({ slot, order }: Props) => SlotRO;
+export declare const serializeSlotOrderData: (order: OrderRO & {
+    workers: any[];
+}) => SlotRO['orders'][number];
+/**
+ * Serializes the internal slot model into the public `SlotRO`.
+ *
+ * The list response no longer carries `durations` or `variations`. For flex
+ * slots top-level fields (status/end/tariff/availability) reflect the minimum
+ * duration, which is what the slot service has already pre-computed via
+ * `groupSlotsWithDurationsAndVariations`.
+ *
+ * Consumers that need the full duration/variation set should call the
+ * `/openapi/slots/details` endpoint on demand.
+ */
+export declare const serializeSlot: ({ slot, orders }: Props) => SlotRO;
+/**
+ * Legacy serializer that emits the old `variations[]` + `variationKind` shape.
+ *
+ * Kept only for legacy aggregator endpoints where the public response contract
+ * cannot be changed (now-escape, ru aggregators). Prefer `serializeSlot` for
+ * everything else.
+ */
+export declare const serializeSlotLegacy: ({ slot, orders }: Props) => any;
 export {};

package/dist/serialize-slot.js

@@ -1,17 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serializeSlot = exports.serializeSlotOrderData = void 0;
+exports.serializeSlotLegacy = exports.serializeSlot = exports.serializeSlotOrderData = void 0;
 const defailt_rule_1 = require("@escapenavigator/types/dist/slot-rule/defailt-rule");
 const get_full_name_1 = require("./get-full-name");
+const buildRuleSummary = (rule) => {
+    const { prepayment, prepaymentType, title, minHoursForBooking, minHoursForFreeCanceling, cancelationRule, tax, minHoursForFullFine, cancelationAmount, } = rule || defailt_rule_1.defaultRule;
+    return {
+        prepayment,
+        tax,
+        minHoursForFullFine,
+        cancelationAmount,
+        prepaymentType,
+        title,
+        minHoursForBooking,
+        minHoursForFreeCanceling,
+        cancelationRule,
+    };
+};
+const computeDurationMinutes = (start, end, fallback) => {
+    if (typeof fallback === 'number')
+        return fallback;
+    if (!start || !end)
+        return 0;
+    return (Math.max(0, new Date(`1970-01-01T${end}`).getTime() - new Date(`1970-01-01T${start}`).getTime()) / 60000);
+};
 const serializeSlotOrderData = (order) => order && {
     id: order.id,
     players: order.players,
     children: order.children,
-    hasDiscounts: !!order.discounts?.length,
-    hasComments: !!order.messages?.length || !!order.comment,
-    hasCertificateApplies: !!order.certificates?.length,
-    hasPenalties: !!order.penalties?.length,
-    hasUpsellings: !!order.upsellings?.length,
     utcDate: order.utcDate,
     moderatorId: order.moderatorId,
     confirmed: order.confirmed,
@@ -21,36 +37,94 @@ const serializeSlotOrderData = (order) => order && {
     otherParticipantsIds: order.workers?.map(({ userId }) => userId) || [],
     code: order.code,
     clientName: (0, get_full_name_1.getFullName)(order.client),
+    hold: order.hold,
+    expiration: order.expiration,
 };
 exports.serializeSlotOrderData = serializeSlotOrderData;
-const serializeSlot = ({ slot, order }) => {
-    const { prepayment, prepaymentType, title, minHoursForBooking, minHoursForFreeCanceling, cancelationRule, tax, minHoursForFullFine, cancelationAmount, } = slot.rule || defailt_rule_1.defaultRule;
+/**
+ * Serializes the internal slot model into the public `SlotRO`.
+ *
+ * The list response no longer carries `durations` or `variations`. For flex
+ * slots top-level fields (status/end/tariff/availability) reflect the minimum
+ * duration, which is what the slot service has already pre-computed via
+ * `groupSlotsWithDurationsAndVariations`.
+ *
+ * Consumers that need the full duration/variation set should call the
+ * `/openapi/slots/details` endpoint on demand.
+ */
+const serializeSlot = ({ slot, orders = [] }) => ({
+    id: slot.id,
+    questroomId: slot.questroomId,
+    old: slot.old,
+    date: slot.date,
+    start: slot.start,
+    tariffId: slot.tariffId,
+    ruleId: slot.ruleId,
+    end: slot.end,
+    tariff: slot.tariff?.price || slot.tariff || {},
+    status: slot.status,
+    discount: slot.discount ?? 0,
+    onlyPhone: slot.onlyPhone ?? false,
+    forceOnlineBooking: slot.forceOnlineBooking ?? false,
+    breakReason: slot.breakReason ?? null,
+    availableTeams: slot.availableTeams ?? null,
+    numSeatsAvailable: slot.numSeatsAvailable ?? slot.availablePlayers ?? 0,
+    rule: slot.rule ? buildRuleSummary(slot.rule) : undefined,
+    orders: orders.map((order) => (0, exports.serializeSlotOrderData)(order)),
+});
+exports.serializeSlot = serializeSlot;
+/**
+ * Legacy serializer that emits the old `variations[]` + `variationKind` shape.
+ *
+ * Kept only for legacy aggregator endpoints where the public response contract
+ * cannot be changed (now-escape, ru aggregators). Prefer `serializeSlot` for
+ * everything else.
+ */
+const serializeSlotLegacy = ({ slot, orders = [] }) => {
+    const baseVariation = slot.variations?.[0] || slot;
+    const normalizedVariations = (slot.variations || [baseVariation]).map((variation) => {
+        const duration = computeDurationMinutes(slot.start, variation.end, variation.duration);
+        return {
+            id: variation.id,
+            tariffId: variation.tariffId,
+            ruleId: variation.ruleId,
+            variationKind: variation.variationKind,
+            end: variation.end,
+            duration,
+            tariff: variation.tariff?.price || variation.tariff || {},
+            status: variation.status,
+            discount: variation.discount || 0,
+            onlyPhone: !!variation.onlyPhone,
+            breakReason: variation.breakReason || null,
+            forceOnlineBooking: !!variation.forceOnlineBooking,
+            availableTeams: variation.availableTeams ?? null,
+            numSeatsAvailable: variation.availablePlayers ?? variation.numSeatsAvailable ?? 0,
+            rule: buildRuleSummary(variation.rule || slot.rule),
+        };
+    });
+    const primaryVariation = normalizedVariations.find((variation) => variation.status === 'free')
+        || normalizedVariations.find((variation) => variation.status === 'call')
+        || normalizedVariations[0];
     return {
         id: slot.id,
         questroomId: slot.questroomId,
-        hold: slot.hold,
         old: slot.old,
         date: slot.date,
-        discount: slot.discount,
-        onlyPhone: slot.onlyPhone,
-        status: slot.status,
         start: slot.start,
-        end: slot.end,
-        tariff: slot.tariff?.price,
-        breakReason: slot.breakReason,
-        forceOnlineBooking: slot.forceOnlineBooking,
-        rule: {
-            prepayment,
-            tax,
-            minHoursForFullFine,
-            cancelationAmount,
-            prepaymentType,
-            title,
-            minHoursForBooking,
-            minHoursForFreeCanceling,
-            cancelationRule,
-        },
-        order: (0, exports.serializeSlotOrderData)(order),
+        defaultVariationId: slot.defaultVariationId ?? slot.tariffId,
+        variationIds: slot.variationIds || (slot.tariffId != null ? [slot.tariffId] : []),
+        variations: normalizedVariations,
+        end: slot.end || primaryVariation?.end,
+        tariff: primaryVariation?.tariff,
+        status: primaryVariation?.status,
+        discount: primaryVariation?.discount,
+        onlyPhone: primaryVariation?.onlyPhone,
+        forceOnlineBooking: primaryVariation?.forceOnlineBooking,
+        breakReason: primaryVariation?.breakReason,
+        availableTeams: primaryVariation?.availableTeams,
+        numSeatsAvailable: primaryVariation?.numSeatsAvailable,
+        rule: primaryVariation?.rule,
+        orders: orders.map((order) => (0, exports.serializeSlotOrderData)(order)),
     };
 };
-exports.serializeSlot = serializeSlot;
+exports.serializeSlotLegacy = serializeSlotLegacy;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@escapenavigator/utils",
-  "version": "1.10.105",
+  "version": "1.10.107",
   "publishConfig": {
     "access": "public"
   },
@@ -14,7 +14,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@escapenavigator/types": "^1.10.101",
+    "@escapenavigator/types": "^1.10.103",
     "axios": "^0.21.4",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
@@ -47,5 +47,5 @@
     "utility-types": "^3.10.0",
     "uuid": "^8.3.2"
   },
-  "gitHead": "ed7be71b51074fef0f397a620a7b06edee3f5d54"
+  "gitHead": "0e41f6e541edd14685f9dd242e17207d1b8f6660"
 }