@floristcloud/api-lib 1.2.28 → 1.2.29

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

@@ -1,6 +1,6 @@
 "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({
@@ -24,3 +24,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/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/commands/order/group/merge-orders.command.ts

@@ -27,3 +27,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/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.29",
     "description": "",
     "main": "./build/index.js",
     "scripts": {