@escapenavigator/types 2.1.21 → 2.1.23

package/dist/user/fine/create-user-fine.dto.d.ts

@@ -1,4 +1,6 @@
+import { UserFineKind } from './user-fine-kind';
 export declare class CreateUserFineDto {
+    kind: UserFineKind;
     reason: string;
     period: string;
     amount: number;

package/dist/user/fine/create-user-fine.dto.js

@@ -13,9 +13,15 @@ exports.CreateUserFineDto = void 0;
 const class_transformer_1 = require("class-transformer");
 const class_validator_1 = require("class-validator");
 const is_not_blank_1 = require("../../shared/is-not-blank");
+const user_fine_kind_1 = require("./user-fine-kind");
 class CreateUserFineDto {
 }
 exports.CreateUserFineDto = CreateUserFineDto;
+__decorate([
+    (0, class_validator_1.IsEnum)(user_fine_kind_1.UserFineKind),
+    (0, class_transformer_1.Expose)(),
+    __metadata("design:type", String)
+], CreateUserFineDto.prototype, "kind", void 0);
 __decorate([
     (0, is_not_blank_1.IsNotBlank)(),
     (0, class_transformer_1.Expose)(),
@@ -28,6 +34,8 @@ __decorate([
 ], CreateUserFineDto.prototype, "period", void 0);
 __decorate([
     (0, class_validator_1.IsNumber)(),
+    (0, class_validator_1.Min)(-2147483648),
+    (0, class_validator_1.Max)(2147483647),
     (0, class_transformer_1.Expose)(),
     __metadata("design:type", Number)
 ], CreateUserFineDto.prototype, "amount", void 0);

package/dist/user/fine/user-fine-kind.d.ts

@@ -0,0 +1,29 @@
+export declare enum UserFineKind {
+    BONUS = "bonus",
+    FINE = "fine",
+    COMPENSATION = "compensation",
+    DEDUCTION = "deduction"
+}
+export declare const USER_FINE_KIND_LABEL: Record<UserFineKind, string>;
+export type UserFineTotals = {
+    bonus: number;
+    fines: number;
+    compensation: number;
+    deduction: number;
+};
+/**
+ * Старые строки без kind: плюс — бонус, минус — штраф.
+ * Явный kind важнее знака, чтобы вычет не попадал в штрафы.
+ */
+export declare const resolveUserFineKind: (kind: string | null | undefined, amount: number) => UserFineKind;
+export declare const isUserFineCredit: (kind: UserFineKind) => boolean;
+/** Плюс у бонуса и компенсации, минус у штрафа и вычета. */
+export declare const signedUserFineAmount: (kind: string | null | undefined, amount: number) => number;
+export declare const emptyUserFineTotals: () => UserFineTotals;
+/** fines и deduction — модули, как раньше хранился показатель «штрафы». */
+export declare const addUserFine: (totals: UserFineTotals, kind: string | null | undefined, amount: number) => void;
+/**
+ * Корректировка к выплате. При нулевых компенсации и вычете
+ * совпадает с прежним `bonus - fines`.
+ */
+export declare const userFineAdjustmentNet: (totals: Partial<UserFineTotals> | null | undefined) => number;

package/dist/user/fine/user-fine-kind.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.userFineAdjustmentNet = exports.addUserFine = exports.emptyUserFineTotals = exports.signedUserFineAmount = exports.isUserFineCredit = exports.resolveUserFineKind = exports.USER_FINE_KIND_LABEL = exports.UserFineKind = void 0;
+var UserFineKind;
+(function (UserFineKind) {
+    UserFineKind["BONUS"] = "bonus";
+    UserFineKind["FINE"] = "fine";
+    UserFineKind["COMPENSATION"] = "compensation";
+    UserFineKind["DEDUCTION"] = "deduction";
+})(UserFineKind || (exports.UserFineKind = UserFineKind = {}));
+exports.USER_FINE_KIND_LABEL = {
+    [UserFineKind.BONUS]: 'Бонус',
+    [UserFineKind.FINE]: 'Штраф',
+    [UserFineKind.COMPENSATION]: 'Компенсация',
+    [UserFineKind.DEDUCTION]: 'Вычет',
+};
+const KINDS = new Set(Object.values(UserFineKind));
+/**
+ * Старые строки без kind: плюс — бонус, минус — штраф.
+ * Явный kind важнее знака, чтобы вычет не попадал в штрафы.
+ */
+const resolveUserFineKind = (kind, amount) => {
+    if (kind && KINDS.has(kind))
+        return kind;
+    return amount < 0 ? UserFineKind.FINE : UserFineKind.BONUS;
+};
+exports.resolveUserFineKind = resolveUserFineKind;
+const isUserFineCredit = (kind) => kind === UserFineKind.BONUS || kind === UserFineKind.COMPENSATION;
+exports.isUserFineCredit = isUserFineCredit;
+/** Плюс у бонуса и компенсации, минус у штрафа и вычета. */
+const signedUserFineAmount = (kind, amount) => {
+    const resolved = (0, exports.resolveUserFineKind)(kind, amount);
+    const abs = Math.abs(Number(amount) || 0);
+    return (0, exports.isUserFineCredit)(resolved) ? abs : -abs;
+};
+exports.signedUserFineAmount = signedUserFineAmount;
+const emptyUserFineTotals = () => ({
+    bonus: 0,
+    fines: 0,
+    compensation: 0,
+    deduction: 0,
+});
+exports.emptyUserFineTotals = emptyUserFineTotals;
+/** fines и deduction — модули, как раньше хранился показатель «штрафы». */
+const addUserFine = (totals, kind, amount) => {
+    const resolved = (0, exports.resolveUserFineKind)(kind, amount);
+    const abs = Math.abs(Number(amount) || 0);
+    if (resolved === UserFineKind.FINE)
+        totals.fines += abs;
+    else if (resolved === UserFineKind.COMPENSATION)
+        totals.compensation += abs;
+    else if (resolved === UserFineKind.DEDUCTION)
+        totals.deduction += abs;
+    else
+        totals.bonus += abs;
+};
+exports.addUserFine = addUserFine;
+/**
+ * Корректировка к выплате. При нулевых компенсации и вычете
+ * совпадает с прежним `bonus - fines`.
+ */
+const userFineAdjustmentNet = (totals) => ((totals === null || totals === void 0 ? void 0 : totals.bonus) || 0) +
+    ((totals === null || totals === void 0 ? void 0 : totals.compensation) || 0) -
+    ((totals === null || totals === void 0 ? void 0 : totals.fines) || 0) -
+    ((totals === null || totals === void 0 ? void 0 : totals.deduction) || 0);
+exports.userFineAdjustmentNet = userFineAdjustmentNet;

package/dist/user/fine/user-fine.ro.d.ts

@@ -1,10 +1,12 @@
 import { RO } from '../../shared/ro-class';
+import { UserFineKind } from './user-fine-kind';
 declare class User {
     name: string;
     surname: string;
     photo?: string;
 }
 export declare class UserFineRO extends RO {
+    kind?: UserFineKind | null;
     reason: string;
     period: string;
     amount: number;

package/dist/user/fine/user-fine.ro.js

@@ -13,6 +13,7 @@ exports.UserFineRO = void 0;
 /* eslint-disable max-classes-per-file */
 const class_transformer_1 = require("class-transformer");
 const ro_class_1 = require("../../shared/ro-class");
+const user_fine_kind_1 = require("./user-fine-kind");
 class User {
 }
 __decorate([
@@ -30,6 +31,10 @@ __decorate([
 class UserFineRO extends ro_class_1.RO {
 }
 exports.UserFineRO = UserFineRO;
+__decorate([
+    (0, class_transformer_1.Expose)(),
+    __metadata("design:type", String)
+], UserFineRO.prototype, "kind", void 0);
 __decorate([
     (0, class_transformer_1.Expose)(),
     __metadata("design:type", String)

package/dist/user/reports/user-monthly-report.ro.d.ts

@@ -19,4 +19,15 @@ export type UserMonthlyReportRO = {
     payed: number;
     fines: number;
     bonus: number;
+    /** Модуль компенсаций. Нет у старых ответов — считать нулём. */
+    compensation?: number;
+    /** Модуль вычетов. Нет у старых ответов — считать нулём. */
+    deduction?: number;
+    /** Строки месяца признания: тип, сумма со знаком и причина. */
+    adjustments?: Array<{
+        id: number;
+        kind: string;
+        amount: number;
+        reason: string;
+    }>;
 };

package/dist/widget/create-widget.dto.d.ts

@@ -17,6 +17,12 @@ export declare class CreateWidgetDto {
     snapPixelId?: string;
     gaCoversationId?: string;
     gaCoversationLabel?: string;
+    /**
+     * Переопределение счётчика Метрики профиля. Пустая строка сбрасывает
+     * оверрайд (виджет берёт номер с профиля). Поле, которого нет в теле
+     * запроса, не трогаем.
+     */
+    ymCounterId?: string | null;
     consentMode?: WidgetConsentModeEnum;
     daysAhead?: number;
     buttonTooltipText?: string;

package/dist/widget/create-widget.dto.js

@@ -115,6 +115,21 @@ __decorate([
     (0, class_transformer_1.Expose)(),
     __metadata("design:type", String)
 ], CreateWidgetDto.prototype, "gaCoversationLabel", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_transformer_1.Transform)(({ value }) => {
+        if (value === undefined)
+            return undefined;
+        if (value == null)
+            return null;
+        const trimmed = String(value).trim();
+        return trimmed || null;
+    }),
+    (0, class_validator_1.ValidateIf)((_, value) => value != null && value !== ''),
+    (0, class_validator_1.Matches)(/^\d{1,20}$/),
+    (0, class_transformer_1.Expose)(),
+    __metadata("design:type", String)
+], CreateWidgetDto.prototype, "ymCounterId", void 0);
 __decorate([
     (0, class_validator_1.IsOptional)(),
     (0, class_validator_1.IsEnum)(widget_consent_mode_enum_1.WidgetConsentModeEnum),

package/dist/widget/widget.ro.d.ts

@@ -13,6 +13,7 @@ export type WidgetRO = {
     fbPixelId?: string;
     tiktokPixelId?: string;
     snapPixelId?: string;
+    ymCounterId?: string | null;
     consentMode?: WidgetConsentModeEnum;
     allLocations?: boolean;
     locations: Array<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@escapenavigator/types",
-  "version": "2.1.21",
+  "version": "2.1.23",
   "publishConfig": {
     "access": "public"
   },
@@ -23,7 +23,7 @@
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.5.5"
   },
-  "gitHead": "8d42b9923fac07fd9cf39ce45a3ba1ba34e4ea8d",
+  "gitHead": "533e344e432372b89b80d81c0ce35bc27463b677",
   "devDependencies": {
     "@types/validator": "13.0.0",
     "typescript": "^5.6"

package/dist/questroom/update-questroom-integration.dto.d.ts

@@ -1,6 +0,0 @@
-export declare class UpdateQuestroomIntegrationDto {
-    key?: string;
-    getRequest?: string;
-    postRequest?: string;
-    priceRequest?: string;
-}