@escapenavigator/utils 1.6.31 → 1.6.33

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

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

package/dist/get-full-name.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFullName = void 0;
+const getFullName = ({ id, name, surname }) => {
+    if (name || surname)
+        return `${name || ''} ${surname || ''}`.trim();
+    return `Client №${id}`;
+};
+exports.getFullName = getFullName;

package/dist/get-order-cancelation-state/index.js

@@ -24,7 +24,6 @@ var FineDescriptions;
 const isCancelationAllowed = ({ date, minHoursForFreeCanceling = 0, }) => (0, differenceInHours_1.default)(new Date(date), new Date()) > minHoursForFreeCanceling;
 exports.isCancelationAllowed = isCancelationAllowed;
 function getOrderCancelationState({ cancelationReason, cancelationRule, transactions, date, returnCertificates, certificates, minHoursForFreeCanceling, total, payed, minimalPrice, }) {
-    var _a;
     /**
      * В срок ли отменяется игра. Если в срок, то мы отменяем все промокоды и сертификаты, учитываем сумму возврата только с транзакций
      */
@@ -37,7 +36,7 @@ function getOrderCancelationState({ cancelationReason, cancelationRule, transact
     const receivedTransactions = getReceivedTransactions(transactions);
     const receivedTransactionsAmount = receivedTransactions.reduce((acc, tr) => acc + tr.amount, 0);
     const autoReturtAvailable = receivedTransactions.length === 1 &&
-        ((_a = receivedTransactions[0]) === null || _a === void 0 ? void 0 : _a.type) !== transaction_type_enum_1.TransactionTypeEnum.INSIDE;
+        receivedTransactions[0]?.type !== transaction_type_enum_1.TransactionTypeEnum.INSIDE;
     const orderPayment = returnCertificates
         ? payed - certificates.reduce((acc, c) => acc + c.nominal, 0)
         : payed;

package/dist/serialize-slot.d.ts

@@ -4,7 +4,6 @@ declare type Props = {
     slot: any;
     order?: OrderRO;
 };
-export declare const getClientName: (client: any) => any;
 export declare const serializeSlotOrderData: (order: Props['order']) => SlotRO['order'];
 export declare const serializeSlot: ({ slot, order }: Props) => SlotRO;
 export {};

package/dist/serialize-slot.js

@@ -1,39 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serializeSlot = exports.serializeSlotOrderData = exports.getClientName = void 0;
+exports.serializeSlot = exports.serializeSlotOrderData = void 0;
 const defailt_rule_1 = require("@escapenavigator/types/dist/slot-rule/defailt-rule");
-const getClientName = (client) => {
-    var _a;
-    if (!client.name && client.surname)
-        return client.surname;
-    if (client.name && !client.surname)
-        return client.name;
-    if (client.name && client.surname)
-        return `${(_a = client.name) === null || _a === void 0 ? void 0 : _a.charAt(0)}. ${client.surname}`;
-    return client.email;
-};
-exports.getClientName = getClientName;
-const serializeSlotOrderData = (order) => {
-    var _a, _b, _c, _d, _e;
-    return order && {
-        id: order.id,
-        players: order.players,
-        hasDiscounts: !!((_a = order.discounts) === null || _a === void 0 ? void 0 : _a.length),
-        hasComments: !!((_b = order.messages) === null || _b === void 0 ? void 0 : _b.length) || !!order.comment,
-        hasCertificateApplies: !!((_c = order.certificates) === null || _c === void 0 ? void 0 : _c.length),
-        hasPenalties: !!((_d = order.penalties) === null || _d === void 0 ? void 0 : _d.length),
-        hasUpsellings: !!((_e = order.upsellings) === null || _e === void 0 ? void 0 : _e.length),
-        utcDate: order.utcDate,
-        moderatorId: order.moderatorId,
-        total: order.total,
-        payed: order.payed,
-        code: order.code,
-        clientName: (0, exports.getClientName)(order.client),
-    };
+const get_full_name_1 = require("./get-full-name");
+const serializeSlotOrderData = (order) => order && {
+    id: order.id,
+    players: order.players,
+    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,
+    total: order.total,
+    payed: order.payed,
+    code: order.code,
+    clientName: (0, get_full_name_1.getFullName)(order.client),
 };
 exports.serializeSlotOrderData = serializeSlotOrderData;
 const serializeSlot = ({ slot, order }) => {
-    var _a;
     const { prepayment, prepaymentType, title, minHoursForBooking, minHoursForFreeCanceling, cancelationRule, } = slot.rule || defailt_rule_1.defaultRule;
     return {
         id: slot.id,
@@ -44,7 +30,7 @@ const serializeSlot = ({ slot, order }) => {
         status: slot.status,
         start: slot.start,
         end: slot.end,
-        tariff: (_a = slot.tariff) === null || _a === void 0 ? void 0 : _a.price,
+        tariff: slot.tariff?.price,
         breakReason: slot.breakReason,
         rule: {
             prepayment,

package/dist/transform-text.d.ts

@@ -0,0 +1 @@
+export declare const transformText: (text: string, obj: Record<string, string>) => string;

package/dist/transform-text.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transformText = void 0;
+const transformText = (text, obj) => {
+    let res = text || '';
+    Object.entries(obj).forEach(([key, value]) => {
+        res = res.replace(new RegExp(`{${key}}`, 'g'), value);
+    });
+    return res;
+};
+exports.transformText = transformText;

package/dist/validate-by-dto.js

@@ -7,7 +7,7 @@ function validateByDto(t) {
         const errors = (0, class_validator_1.validateSync)(typeof data === 'object' ? data : {});
         console.log({ formErrors: errors });
         return Object.fromEntries(errors.map(({ property, constraints }) => {
-            const err = (constraints === null || constraints === void 0 ? void 0 : constraints.IsNotEmpty) || Object.values(constraints)[0];
+            const err = constraints?.IsNotEmpty || Object.values(constraints)[0];
             const errorText = err.substr(err.indexOf(' ') + 1);
             return [property, `${t(`validationErrors:${errorText}`)}`];
         }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@escapenavigator/utils",
-  "version": "1.6.31",
+  "version": "1.6.33",
   "publishConfig": {
     "access": "public"
   },
@@ -14,7 +14,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@escapenavigator/types": "^1.6.31",
+    "@escapenavigator/types": "^1.6.33",
     "axios": "^0.21.4",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.1",
@@ -55,5 +55,5 @@
       "node_modules"
     ]
   },
-  "gitHead": "4859034b57cf39cebaf1f64716e73f63712dd4b6"
+  "gitHead": "7de12c85f7fc6e70f76a7433eb7fcbe1bf85d6a2"
 }