@escapenavigator/services 1.10.113 → 1.10.115

package/dist/api/cashboxes-api/query.d.ts

@@ -1,8 +1,8 @@
-import { CashboxRO } from '@escapenavigator/types/dist/cashbox/cashbox.ro';
+import { CashboxLightRO } from '@escapenavigator/types/dist/cashbox/cashbox-light.ro';
 import { ApiMethodDeclaration } from '..';
 type ParamsData = {
-    etag?: number | null;
+    etag?: string | null;
 };
-type ResponseData = CashboxRO[];
+type ResponseData = CashboxLightRO[];
 export declare const query: ApiMethodDeclaration<ParamsData, ResponseData>;
 export {};

package/dist/api/locations-api/query.d.ts

@@ -1,8 +1,8 @@
-import { LocationRO } from '@escapenavigator/types/dist/location/location.ro';
+import { LocationLightRO } from '@escapenavigator/types/dist/location/location-light.ro';
 import { ApiMethodDeclaration } from '..';
 type ParamsData = {
-    etag?: number | null;
+    etag?: string | null;
 };
-type ResponseData = LocationRO[];
+type ResponseData = LocationLightRO[];
 export declare const query: ApiMethodDeclaration<ParamsData, ResponseData>;
 export {};

package/dist/api/orders-api/fast-stat.d.ts

@@ -1,12 +1,21 @@
 import { QueryDto } from '@escapenavigator/types/dist/shared/query.dto';
 import { ApiMethodDeclaration } from '..';
 type ParamsData = QueryDto;
+/**
+ * Бэк отдаёт уже сконвертированные в number значения (`paginateLight`
+ * / `fastStat` в `OrderService` приводят `getRawOne()`-строки к
+ * `Number(... ) || 0`) + эффективное окно после клампа 30 дней.
+ * Поле `addonsTotal` убрано: UI его не показывает и подзапрос-агрегат
+ * по `order-upsellings` мог материализоваться полностью на жирных
+ * профилях — см. `packages/api/docs/optimization/08-order-fast-stat.md`.
+ */
 type ResponseData = {
     total: number;
     happendAmountTotal: number;
     happend: number;
     cancelled: number;
-    addonsTotal: number;
+    periodFrom: string;
+    periodTo: string;
 };
 export declare const fastStat: ApiMethodDeclaration<ParamsData, ResponseData>;
 export {};

package/dist/api/orders-api/index.d.ts

@@ -14,6 +14,7 @@ import { getMetadata } from './metadata/get-metadata';
 import { query } from './query';
 import { queryAggregatorOrders } from './query-aggregator-orders';
 import { queryAgregaotrOrder } from './query-agregator-orders';
+import { queryLight } from './query-light';
 import { remove } from './remove';
 import { deleteTransaction } from './transactions/delete-transaction';
 import { recoverTransaction } from './transactions/recover-transaction';
@@ -67,6 +68,7 @@ type ApiDeclaration = {
     resendEmail: typeof resendEmail;
     getOne: typeof getOne;
     query: typeof query;
+    queryLight: typeof queryLight;
     updateSlot: typeof updateSlot;
     update: typeof update;
     cancel: typeof cancel;

package/dist/api/orders-api/index.js

@@ -17,6 +17,7 @@ var get_metadata_1 = require("./metadata/get-metadata");
 var query_1 = require("./query");
 var query_aggregator_orders_1 = require("./query-aggregator-orders");
 var query_agregator_orders_1 = require("./query-agregator-orders");
+var query_light_1 = require("./query-light");
 var remove_1 = require("./remove");
 var delete_transaction_1 = require("./transactions/delete-transaction");
 var recover_transaction_1 = require("./transactions/recover-transaction");
@@ -71,6 +72,7 @@ exports.ordersApiDeclaration = {
     getCancelPreview: get_cancel_preview_1.getCancelPreview,
     update: update_1.update,
     query: query_1.query,
+    queryLight: query_light_1.queryLight,
     getOne: get_one_1.getOne,
     updateSlot: update_slot_1.updateSlot,
     resendEmail: resend_email_1.resendEmail,

package/dist/api/orders-api/query-light.d.ts

@@ -0,0 +1,8 @@
+import { OrderLightRO } from '@escapenavigator/types/dist/order/order-light.ro';
+import { QueryDto } from '@escapenavigator/types/dist/shared/query.dto';
+import { QueryRO } from '@escapenavigator/types/dist/shared/query.ro';
+import { ApiMethodDeclaration } from '..';
+type ParamsData = QueryDto;
+type ResponseData = QueryRO<OrderLightRO>;
+export declare const queryLight: ApiMethodDeclaration<ParamsData, ResponseData>;
+export {};

package/dist/api/orders-api/query-light.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.queryLight = void 0;
+var queryLight = function (params) { return ({
+    url: '/orders/light',
+    method: 'GET',
+    params: params,
+}); };
+exports.queryLight = queryLight;

package/dist/api/questrooms-api/query.d.ts

@@ -1,8 +1,8 @@
-import { QuestroomRO } from '@escapenavigator/types/dist/questroom/questroom.ro';
+import { QuestroomLightRO } from '@escapenavigator/types/dist/questroom/questroom-light.ro';
 import { ApiMethodDeclaration } from '..';
 type ParamsData = {
-    lastUpdate?: number | null;
+    etag?: string | null;
 };
-type ResponseData = QuestroomRO[];
+type ResponseData = QuestroomLightRO[];
 export declare const query: ApiMethodDeclaration<ParamsData, ResponseData>;
 export {};

package/dist/api/roles-api/query.d.ts

@@ -1,8 +1,8 @@
-import { RoleRO } from '@escapenavigator/types/dist/role/role.ro';
+import { RoleLightRO } from '@escapenavigator/types/dist/role/role-light.ro';
 import { ApiMethodDeclaration } from '..';
 type ParamsData = {
-    etag?: number | null;
+    etag?: string | null;
 };
-type ResponseData = RoleRO[];
+type ResponseData = RoleLightRO[];
 export declare const query: ApiMethodDeclaration<ParamsData, ResponseData>;
 export {};

package/dist/api/tariffs-api/query.d.ts

@@ -1,8 +1,8 @@
-import { TariffRO } from '@escapenavigator/types/dist/tariff/tariff.ro';
+import { TariffLightRO } from '@escapenavigator/types/dist/tariff/tariff-light.ro';
 import { ApiMethodDeclaration } from '..';
 type ParamsData = {
-    etag?: number | null;
+    etag?: string | null;
 };
-type ResponseData = TariffRO[];
+type ResponseData = TariffLightRO[];
 export declare const query: ApiMethodDeclaration<ParamsData, ResponseData>;
 export {};

package/dist/api/users-api/query.d.ts

@@ -1,8 +1,8 @@
-import { UserRO } from '@escapenavigator/types/dist/user/crud/user.ro';
+import { UserLightRO } from '@escapenavigator/types/dist/user/crud/user-light.ro';
 import { ApiMethodDeclaration } from '..';
 type ParamsData = {
-    etag?: number | null;
+    etag?: string | null;
 };
-type ResponseData = UserRO[];
+type ResponseData = UserLightRO[];
 export declare const query: ApiMethodDeclaration<ParamsData, ResponseData>;
 export {};

package/dist/hooks/use-api-method/index.js

@@ -51,6 +51,17 @@ var useApiMethod = function (_a) {
     var mounted = (0, react_1.useRef)(false);
     var source = (0, react_1.useRef)(null);
     var _c = (0, react_1.useReducer)((api_2.apiReducer), api_2.initialState), state = _c[0], dispatch = _c[1];
+    // КРИТИЧНО: коллбэки держим в ref, а не в deps useCallback. Иначе
+    // call-site вроде `useApiMethod({ api, successCallback: () => ... })`
+    // создаёт новую ссылку на колбэк каждый рендер → fetch меняет ссылку →
+    // консьюмер с useEffect([fetch]) попадает в бесконечный цикл
+    // (см. ERR_INSUFFICIENT_RESOURCES в проде на auth/login-questrooms).
+    // Ref всегда указывает на актуальную версию колбэка, при этом fetch —
+    // стабильная ссылка, безопасная для использования в deps хуков.
+    var successCallbackRef = (0, react_1.useRef)(successCallback);
+    var errorCallbackRef = (0, react_1.useRef)(errorCallback);
+    successCallbackRef.current = successCallback;
+    errorCallbackRef.current = errorCallback;
     var fetch = (0, react_1.useCallback)(function (params) { return __awaiter(void 0, void 0, void 0, function () {
         var response, error_1, err;
         var _a;
@@ -68,8 +79,8 @@ var useApiMethod = function (_a) {
                         })];
                 case 2:
                     response = _b.sent();
-                    if (successCallback)
-                        successCallback(response, params);
+                    if (successCallbackRef.current)
+                        successCallbackRef.current(response, params);
                     dispatch((0, api_1.fetchSuccess)(response));
                     return [2 /*return*/, response];
                 case 3:
@@ -79,15 +90,15 @@ var useApiMethod = function (_a) {
                     if (!mounted.current)
                         return [2 /*return*/, null];
                     err = (0, get_service_error_1.getServiceError)(error_1);
-                    if (errorCallback)
-                        errorCallback(err);
+                    if (errorCallbackRef.current)
+                        errorCallbackRef.current(err);
                     dispatch((0, api_1.fetchFailure)(err));
                     // eslint-disable-next-line @typescript-eslint/no-throw-literal
                     throw err;
                 case 4: return [2 /*return*/];
             }
         });
-    }); }, [api, successCallback, errorCallback]);
+    }); }, [api]);
     (0, react_1.useEffect)(function () {
         mounted.current = true;
         return function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@escapenavigator/services",
-  "version": "1.10.113",
+  "version": "1.10.115",
   "publishConfig": {
     "access": "public"
   },
@@ -12,10 +12,10 @@
   "scripts": {
     "build": "rm -rf dist && tsc --project tsconfig.json"
   },
-  "gitHead": "d7810efb079eb481e21a23cb94e39be6c55f62d5",
+  "gitHead": "1224f2af8858d8339e46d67041b7cbbce5dc7920",
   "dependencies": {
-    "@escapenavigator/types": "^1.10.104",
-    "@escapenavigator/utils": "^1.10.108",
+    "@escapenavigator/types": "^1.10.106",
+    "@escapenavigator/utils": "^1.10.110",
     "axios": "^0.21.4",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",