@floristcloud/api-lib 1.2.28 → 1.2.30

package/build/commands/auth/index.js

@@ -17,6 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./register-user.command"), exports);
 __exportStar(require("./reset-password-by-user.command"), exports);
 __exportStar(require("./reset-password-by-admin.command"), exports);
+__exportStar(require("./reset-login-attempts-by-admin.command"), exports);
 __exportStar(require("./login-user.command"), exports);
 __exportStar(require("./list-mobile-buyer-tenants.command"), exports);
 __exportStar(require("./reset-password-by-token.command"), exports);

package/build/commands/auth/reset-login-attempts-by-admin.command.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ResetLoginAttemptsByAdminContractCommand = void 0;
+const zod_1 = require("zod");
+const ResetLoginAttemptsByAdminRequestSchema = zod_1.z.object({});
+const ResetLoginAttemptsByAdminResponseSchema = zod_1.z.object({
+    message: zod_1.z.string().optional(),
+});
+var ResetLoginAttemptsByAdminContractCommand;
+(function (ResetLoginAttemptsByAdminContractCommand) {
+    ResetLoginAttemptsByAdminContractCommand.RequestSchema = ResetLoginAttemptsByAdminRequestSchema;
+    ResetLoginAttemptsByAdminContractCommand.ResponseSchema = ResetLoginAttemptsByAdminResponseSchema;
+})(ResetLoginAttemptsByAdminContractCommand || (exports.ResetLoginAttemptsByAdminContractCommand = ResetLoginAttemptsByAdminContractCommand = {}));

package/build/commands/order/group/merge-orders.command.js

@@ -1,10 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MergeOrdersContractCommand = exports.MergeOrdersGroupAnalysisResponseSchema = void 0;
+exports.MergeOrdersExecuteContractCommand = exports.MergeOrdersContractCommand = exports.MergeOrdersGroupAnalysisResponseSchema = void 0;
 const zod_1 = require("zod");
 const schemas_1 = require("../../../schemas");
-const MergeOrdersRequestSchema = zod_1.z.object({
+const MergeOrdersRequestSchema = zod_1.z
+    .object({
     orderUUIDList: zod_1.z.array(zod_1.z.string().uuid()).min(2),
+    targetOrderUUID: zod_1.z.string().uuid().optional(),
+})
+    .refine(data => !data.targetOrderUUID || data.orderUUIDList.includes(data.targetOrderUUID), {
+    message: 'targetOrderUUID must be present in orderUUIDList',
+    path: ['targetOrderUUID'],
 });
 exports.MergeOrdersGroupAnalysisResponseSchema = zod_1.z.object({
     clientUUID: zod_1.z.string(),
@@ -24,3 +30,28 @@ var MergeOrdersContractCommand;
     MergeOrdersContractCommand.RequestSchema = MergeOrdersRequestSchema;
     MergeOrdersContractCommand.ResponseSchema = MergeOrdersAnalyzeResponseSchema;
 })(MergeOrdersContractCommand || (exports.MergeOrdersContractCommand = MergeOrdersContractCommand = {}));
+// Группы, не прошедшие merge, перечисляются в `failedGroups` с per-group причиной — UI рендерит
+// «Заказы клиента X не объединены: <message>».
+const MergeOrdersExecuteFailedGroupSchema = zod_1.z.object({
+    clientUUID: zod_1.z.string(),
+    branchUUID: zod_1.z.string().nullable(),
+    targetOrderUUID: zod_1.z.string().nullable(),
+    sourceOrdersUUIDs: zod_1.z.array(zod_1.z.string()),
+    errorCode: zod_1.z.string(),
+    errorMessage: zod_1.z.string(),
+});
+const MergeOrdersExecuteResponseSchema = zod_1.z.object({
+    message: zod_1.z.string().optional(),
+    data: zod_1.z.object({
+        success: zod_1.z.boolean(),
+        successCount: zod_1.z.number().int().nonnegative(),
+        totalCount: zod_1.z.number().int().nonnegative(),
+        failedGroups: zod_1.z.array(MergeOrdersExecuteFailedGroupSchema),
+    }),
+});
+var MergeOrdersExecuteContractCommand;
+(function (MergeOrdersExecuteContractCommand) {
+    MergeOrdersExecuteContractCommand.RequestSchema = MergeOrdersRequestSchema;
+    MergeOrdersExecuteContractCommand.ResponseSchema = MergeOrdersExecuteResponseSchema;
+    MergeOrdersExecuteContractCommand.FailedGroupSchema = MergeOrdersExecuteFailedGroupSchema;
+})(MergeOrdersExecuteContractCommand || (exports.MergeOrdersExecuteContractCommand = MergeOrdersExecuteContractCommand = {}));

package/build/commands/order/group/split-group-order.command.js

@@ -6,12 +6,20 @@ const schemas_1 = require("../../../schemas");
 const SplitGroupOrderRequestSchema = zod_1.z.object({
     orderUUIDList: zod_1.z.array(zod_1.z.string()),
 });
+// Источники, которые не удалось разделить, попадают в `failures` с per-source причиной.
+const SplitGroupOrderFailureSchema = zod_1.z.object({
+    sourceOrderUUID: zod_1.z.string(),
+    errorCode: zod_1.z.string(),
+    errorMessage: zod_1.z.string(),
+});
 const SplitGroupOrderResponseSchema = zod_1.z.object({
     message: zod_1.z.string().optional(),
     data: schemas_1.OrderSchema.array(),
+    failures: zod_1.z.array(SplitGroupOrderFailureSchema).optional(),
 });
 var SplitGroupOrderContractCommand;
 (function (SplitGroupOrderContractCommand) {
     SplitGroupOrderContractCommand.RequestSchema = SplitGroupOrderRequestSchema;
     SplitGroupOrderContractCommand.ResponseSchema = SplitGroupOrderResponseSchema;
+    SplitGroupOrderContractCommand.FailureSchema = SplitGroupOrderFailureSchema;
 })(SplitGroupOrderContractCommand || (exports.SplitGroupOrderContractCommand = SplitGroupOrderContractCommand = {}));

package/build/constant/error.js

@@ -110,6 +110,7 @@ exports.ERRORS = {
     ALREADY_REGISTERED: { code: 'A001', message: 'User already exists', httpCode: 409 },
     INVALID_USER_TYPE: { code: 'A018', message: 'Invalid user type', httpCode: 400 },
     TOO_MANY_REQUESTS: { code: 'A019', message: 'Too many requests', httpCode: 429 },
+    ERROR_WHILE_RESET_LOGIN_ATTEMPTS: { code: 'A020', message: 'Failed to reset login attempts', httpCode: 500 },
     //DOMAIN
     DOMAIN_LIST_FETCH_FAILED: { code: 'D001', message: 'Error when retrieving a domain list', httpCode: 500 },
     DOMAIN_FETCH_FAILED: { code: 'D002', message: 'Error when retrieving a domain', httpCode: 500 },

package/build/enum/action-log-type.enum.js

@@ -10,6 +10,7 @@ var ActionLogTypeEnum;
     ActionLogTypeEnum["DELETE_ORDER_ITEM"] = "DELETE_ORDER_ITEM";
     ActionLogTypeEnum["UPDATE_ORDER_ITEM"] = "UPDATE_ORDER_ITEM";
     ActionLogTypeEnum["MOVE_ORDER_ITEM"] = "MOVE_ORDER_ITEM";
+    ActionLogTypeEnum["MERGE_ORDER"] = "MERGE_ORDER";
     ActionLogTypeEnum["ADD_PAYMENT"] = "ADD_PAYMENT";
     ActionLogTypeEnum["DELETE_PAYMENT"] = "DELETE_PAYMENT";
     ActionLogTypeEnum["CREATE_PREORDER"] = "CREATE_PREORDER";

package/build/enum/index.js

@@ -23,6 +23,7 @@ __exportStar(require("./order-type.enum"), exports);
 __exportStar(require("./order-status.enum"), exports);
 __exportStar(require("./order-restricted-status-list"), exports);
 __exportStar(require("./order-balance-status-list"), exports);
+__exportStar(require("./order-merge-allowed-status-list"), exports);
 __exportStar(require("./transaction-type.enum"), exports);
 __exportStar(require("./consignment-import-schema-relation-entity-property.enum"), exports);
 __exportStar(require("./consignment-import-errors.enum"), exports);

package/build/enum/order-merge-allowed-status-list.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OrderMergeAllowedStatusList = void 0;
+const order_status_enum_1 = require("./order-status.enum");
+exports.OrderMergeAllowedStatusList = [
+    order_status_enum_1.OrderStatusEnum.NEW,
+    order_status_enum_1.OrderStatusEnum.UNDER_REVIEW,
+    order_status_enum_1.OrderStatusEnum.ACCEPTED,
+    order_status_enum_1.OrderStatusEnum.IMPORTED,
+    order_status_enum_1.OrderStatusEnum.TEMPLATE,
+];

package/build/schemas/client/client.schema.js

@@ -46,6 +46,7 @@ exports.ClientExtendedSchema = exports.ClientSchema.merge(zod_1.z.object({
     responsibleUser: user_schema_1.UserSchema.nullable(),
     clientMarkingList: client_marking_schema_1.ClientMarkingSchema.array().optional(),
     hasOverdueDebt: zod_1.z.boolean().nullable().optional(),
+    isLoginBlocked: zod_1.z.boolean(),
 }));
 exports.ClientExtendedListSchema = zod_1.z.object({
     clientList: exports.ClientExtendedSchema.array(),

package/commands/auth/index.ts

@@ -1,6 +1,7 @@
 export * from './register-user.command';
 export * from './reset-password-by-user.command';
 export * from './reset-password-by-admin.command';
+export * from './reset-login-attempts-by-admin.command';
 export * from './login-user.command';
 export * from './list-mobile-buyer-tenants.command';
 export * from './reset-password-by-token.command';

package/commands/auth/reset-login-attempts-by-admin.command.ts

@@ -0,0 +1,15 @@
+import { z } from 'zod';
+
+const ResetLoginAttemptsByAdminRequestSchema = z.object({});
+
+const ResetLoginAttemptsByAdminResponseSchema = z.object({
+    message: z.string().optional(),
+});
+
+export namespace ResetLoginAttemptsByAdminContractCommand {
+    export const RequestSchema = ResetLoginAttemptsByAdminRequestSchema;
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseSchema = ResetLoginAttemptsByAdminResponseSchema;
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/order/group/merge-orders.command.ts

@@ -1,9 +1,15 @@
 import { z } from 'zod';
 import { ErrorMessageSchema } from '../../../schemas';
 
-const MergeOrdersRequestSchema = z.object({
-    orderUUIDList: z.array(z.string().uuid()).min(2),
-});
+const MergeOrdersRequestSchema = z
+    .object({
+        orderUUIDList: z.array(z.string().uuid()).min(2),
+        targetOrderUUID: z.string().uuid().optional(),
+    })
+    .refine(data => !data.targetOrderUUID || data.orderUUIDList.includes(data.targetOrderUUID), {
+        message: 'targetOrderUUID must be present in orderUUIDList',
+        path: ['targetOrderUUID'],
+    });
 
 export const MergeOrdersGroupAnalysisResponseSchema = z.object({
     clientUUID: z.string(),
@@ -27,3 +33,35 @@ export namespace MergeOrdersContractCommand {
     export const ResponseSchema = MergeOrdersAnalyzeResponseSchema;
     export type Response = z.infer<typeof ResponseSchema>;
 }
+
+// Группы, не прошедшие merge, перечисляются в `failedGroups` с per-group причиной — UI рендерит
+// «Заказы клиента X не объединены: <message>».
+const MergeOrdersExecuteFailedGroupSchema = z.object({
+    clientUUID: z.string(),
+    branchUUID: z.string().nullable(),
+    targetOrderUUID: z.string().nullable(),
+    sourceOrdersUUIDs: z.array(z.string()),
+    errorCode: z.string(),
+    errorMessage: z.string(),
+});
+
+const MergeOrdersExecuteResponseSchema = z.object({
+    message: z.string().optional(),
+    data: z.object({
+        success: z.boolean(),
+        successCount: z.number().int().nonnegative(),
+        totalCount: z.number().int().nonnegative(),
+        failedGroups: z.array(MergeOrdersExecuteFailedGroupSchema),
+    }),
+});
+
+export namespace MergeOrdersExecuteContractCommand {
+    export const RequestSchema = MergeOrdersRequestSchema;
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseSchema = MergeOrdersExecuteResponseSchema;
+    export type Response = z.infer<typeof ResponseSchema>;
+
+    export const FailedGroupSchema = MergeOrdersExecuteFailedGroupSchema;
+    export type FailedGroup = z.infer<typeof FailedGroupSchema>;
+}

package/commands/order/group/split-group-order.command.ts

@@ -5,9 +5,17 @@ const SplitGroupOrderRequestSchema = z.object({
     orderUUIDList: z.array(z.string()),
 });
 
+// Источники, которые не удалось разделить, попадают в `failures` с per-source причиной.
+const SplitGroupOrderFailureSchema = z.object({
+    sourceOrderUUID: z.string(),
+    errorCode: z.string(),
+    errorMessage: z.string(),
+});
+
 const SplitGroupOrderResponseSchema = z.object({
     message: z.string().optional(),
     data: OrderSchema.array(),
+    failures: z.array(SplitGroupOrderFailureSchema).optional(),
 });
 
 export namespace SplitGroupOrderContractCommand {
@@ -16,4 +24,7 @@ export namespace SplitGroupOrderContractCommand {
 
     export const ResponseSchema = SplitGroupOrderResponseSchema;
     export type Response = z.infer<typeof ResponseSchema>;
+
+    export const FailureSchema = SplitGroupOrderFailureSchema;
+    export type Failure = z.infer<typeof FailureSchema>;
 }

package/constant/error.ts

@@ -114,6 +114,7 @@ export const ERRORS = {
     ALREADY_REGISTERED: { code: 'A001', message: 'User already exists', httpCode: 409 },
     INVALID_USER_TYPE: { code: 'A018', message: 'Invalid user type', httpCode: 400 },
     TOO_MANY_REQUESTS: { code: 'A019', message: 'Too many requests', httpCode: 429 },
+    ERROR_WHILE_RESET_LOGIN_ATTEMPTS: { code: 'A020', message: 'Failed to reset login attempts', httpCode: 500 },
 
     //DOMAIN
     DOMAIN_LIST_FETCH_FAILED: { code: 'D001', message: 'Error when retrieving a domain list', httpCode: 500 },

package/enum/action-log-type.enum.ts

@@ -6,6 +6,7 @@ export enum ActionLogTypeEnum {
     DELETE_ORDER_ITEM = 'DELETE_ORDER_ITEM',
     UPDATE_ORDER_ITEM = 'UPDATE_ORDER_ITEM',
     MOVE_ORDER_ITEM = 'MOVE_ORDER_ITEM',
+    MERGE_ORDER = 'MERGE_ORDER',
     ADD_PAYMENT = 'ADD_PAYMENT',
     DELETE_PAYMENT = 'DELETE_PAYMENT',
     CREATE_PREORDER = 'CREATE_PREORDER',

package/enum/index.ts

@@ -7,6 +7,7 @@ export * from './order-type.enum';
 export * from './order-status.enum';
 export * from './order-restricted-status-list';
 export * from './order-balance-status-list';
+export * from './order-merge-allowed-status-list';
 export * from './transaction-type.enum';
 export * from './consignment-import-schema-relation-entity-property.enum';
 export * from './consignment-import-errors.enum';

package/enum/order-merge-allowed-status-list.ts

@@ -0,0 +1,9 @@
+import { OrderStatusEnum } from './order-status.enum';
+
+export const OrderMergeAllowedStatusList: OrderStatusEnum[] = [
+    OrderStatusEnum.NEW,
+    OrderStatusEnum.UNDER_REVIEW,
+    OrderStatusEnum.ACCEPTED,
+    OrderStatusEnum.IMPORTED,
+    OrderStatusEnum.TEMPLATE,
+];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@floristcloud/api-lib",
-    "version": "1.2.28",
+    "version": "1.2.30",
     "description": "",
     "main": "./build/index.js",
     "scripts": {

package/schemas/client/client.schema.ts

@@ -49,6 +49,7 @@ export const ClientExtendedSchema = ClientSchema.merge(
         responsibleUser: UserSchema.nullable(),
         clientMarkingList: ClientMarkingSchema.array().optional(),
         hasOverdueDebt: z.boolean().nullable().optional(),
+        isLoginBlocked: z.boolean(),
     }),
 );