@chevre/domain 21.20.0-alpha.2 → 21.20.0-alpha.20

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially/factory.d.ts

@@ -0,0 +1,11 @@
+import * as factory from '../../../../factory';
+declare function createNextSendOrderTasks(params: {
+    order: Pick<factory.order.IOrder, 'confirmationNumber' | 'project' | 'typeOf' | 'seller' | 'orderNumber' | 'price' | 'priceCurrency' | 'orderDate' | 'customer' | 'id'> & {
+        acceptedOffers: {
+            limit: number;
+            page: number;
+        };
+        orderStatus: factory.orderStatus.OrderProcessing | factory.orderStatus.OrderInTransit;
+    };
+}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
+export { createNextSendOrderTasks };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially/factory.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createNextSendOrderTasks = void 0;
+const factory = require("../../../../factory");
+const order_1 = require("../../../../factory/order");
+function createNextSendOrderTasks(params) {
+    const now = new Date();
+    const taskAttributes = [];
+    const maskedCustomer = (0, order_1.createMaskedCustomer)({ customer: params.order.customer }, { noProfile: true });
+    const simpleOrder = {
+        typeOf: params.order.typeOf,
+        seller: {
+            id: params.order.seller.id,
+            typeOf: params.order.seller.typeOf,
+            name: params.order.seller.name
+        },
+        // mask
+        customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
+        orderNumber: params.order.orderNumber,
+        price: params.order.price,
+        priceCurrency: params.order.priceCurrency,
+        orderDate: params.order.orderDate
+    };
+    const sendOrderObject = Object.assign(Object.assign({}, simpleOrder), { acceptedOffers: {
+            limit: params.order.acceptedOffers.limit,
+            page: params.order.acceptedOffers.page + 1
+        } });
+    const sendOrderTaskData = {
+        project: params.order.project,
+        object: Object.assign(Object.assign({}, sendOrderObject), { confirmationNumber: params.order.confirmationNumber, previousOrderStatus: params.order.orderStatus })
+    };
+    const sendOrderTask = {
+        project: params.order.project,
+        name: factory.taskName.SendOrder,
+        status: factory.taskStatus.Ready,
+        runsAt: now,
+        remainingNumberOfTries: 10,
+        numberOfTried: 0,
+        executionResults: [],
+        data: sendOrderTaskData
+    };
+    taskAttributes.push(sendOrderTask);
+    return taskAttributes;
+}
+exports.createNextSendOrderTasks = createNextSendOrderTasks;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially.d.ts

@@ -0,0 +1,14 @@
+import type { MongoRepository as TaskRepo } from '../../../repo/task';
+import * as factory from '../../../factory';
+declare function onOrderDeliveredPartially(params: {
+    order: Pick<factory.order.IOrder, 'confirmationNumber' | 'project' | 'typeOf' | 'seller' | 'orderNumber' | 'price' | 'priceCurrency' | 'orderDate' | 'customer' | 'id'> & {
+        acceptedOffers: {
+            limit: number;
+            page: number;
+        };
+        orderStatus: factory.orderStatus.OrderProcessing | factory.orderStatus.OrderInTransit;
+    };
+}): (repos: {
+    task: TaskRepo;
+}) => Promise<void>;
+export { onOrderDeliveredPartially };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially.js

@@ -0,0 +1,37 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.onOrderDeliveredPartially = void 0;
+/**
+ * 注文ステータス変更時処理
+ */
+const createDebug = require("debug");
+const factory = require("../../../factory");
+const factory_1 = require("./onOrderDeliveredPartially/factory");
+const debug = createDebug('chevre-domain:service:order');
+// type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf' | 'potentialActions'>;
+function onOrderDeliveredPartially(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
+        let tasks = [];
+        switch (params.order.orderStatus) {
+            case factory.orderStatus.OrderInTransit:
+            case factory.orderStatus.OrderProcessing:
+                // 次の配送タスクを作成
+                tasks = (0, factory_1.createNextSendOrderTasks)({ order: params.order });
+                break;
+            default:
+                throw new factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
+        }
+        yield repos.task.saveMany(tasks, { emitImmediately: true });
+    });
+}
+exports.onOrderDeliveredPartially = onOrderDeliveredPartially;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderInTransit.d.ts

@@ -0,0 +1,10 @@
+import type { MongoRepository as TaskRepo } from '../../../repo/task';
+import * as factory from '../../../factory';
+declare function onOrderInTransit(params: {
+    order: Omit<factory.order.IOrder, 'orderStatus'> & {
+        orderStatus: factory.orderStatus.OrderProcessing | factory.orderStatus.OrderInTransit;
+    };
+}): (repos: {
+    task: TaskRepo;
+}) => Promise<void>;
+export { onOrderInTransit };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderInTransit.js

@@ -0,0 +1,86 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.onOrderInTransit = void 0;
+/**
+ * 注文処理時処理
+ */
+const createDebug = require("debug");
+const factory = require("../../../factory");
+const order_1 = require("../../../factory/order");
+const settings_1 = require("../../../settings");
+// import {
+//     IExternalOrder
+// } from './onOrderProcessing/factory';
+const debug = createDebug('chevre-domain:service:order');
+// type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'typeOf' | 'potentialActions'>;
+function onOrderInTransit(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
+        // let tasks: factory.task.IAttributes<factory.taskName>[] = [];
+        // await repos.task.saveMany(tasks, { emitImmediately: true });
+        switch (params.order.orderStatus) {
+            case factory.orderStatus.OrderInTransit:
+            case factory.orderStatus.OrderProcessing:
+                // 冗長なsendOrderタスク作成を回避(2023-08-25~)
+                yield createSendOrderTransactionTaskIfNotExist({
+                    order: params.order
+                    // potentialActions: params.placeOrderTransaction?.potentialActions?.order?.potentialActions
+                })(repos);
+                break;
+            default:
+        }
+    });
+}
+exports.onOrderInTransit = onOrderInTransit;
+function createSendOrderTransactionTaskIfNotExist(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const now = new Date();
+        const maskedCustomer = (0, order_1.createMaskedCustomer)({ customer: params.order.customer }, { noProfile: true });
+        const simpleOrder = {
+            typeOf: params.order.typeOf,
+            seller: {
+                id: params.order.seller.id,
+                typeOf: params.order.seller.typeOf,
+                name: params.order.seller.name
+            },
+            // mask
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
+            orderNumber: params.order.orderNumber,
+            price: params.order.price,
+            priceCurrency: params.order.priceCurrency,
+            orderDate: params.order.orderDate
+        };
+        const sendOrderObject = Object.assign(Object.assign({}, simpleOrder), { acceptedOffers: {
+                limit: settings_1.DELIVER_ORDER_LIMIT,
+                page: 1 // page1から配送
+            } });
+        const sendOrderTaskData = {
+            project: params.order.project,
+            object: Object.assign(Object.assign({}, sendOrderObject), { confirmationNumber: params.order.confirmationNumber, previousOrderStatus: params.order.orderStatus })
+        };
+        const taskIdentifier = `${sendOrderTaskData.project.id}:${factory.taskName.SendOrder}:${sendOrderTaskData.object.typeOf}:${sendOrderTaskData.object.orderNumber}`;
+        const sendOrderTask = {
+            identifier: taskIdentifier,
+            project: params.order.project,
+            name: factory.taskName.SendOrder,
+            status: factory.taskStatus.Ready,
+            runsAt: now,
+            remainingNumberOfTries: 10,
+            numberOfTried: 0,
+            executionResults: [],
+            data: sendOrderTaskData
+        };
+        debug('processing createSendOrderTaskIfNotExist...', sendOrderTask);
+        // await repos.task.createSendOrderTaskIfNotExist(sendOrderTask, { emitImmediately: true });
+        yield repos.task.createIfNotExistByIdentifier(sendOrderTask, { emitImmediately: true });
+    });
+}

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.js

@@ -14,8 +14,10 @@ exports.onOrderProcessing = void 0;
  * 注文処理時処理
  */
 const createDebug = require("debug");
+const util = require("util");
 const factory = require("../../../factory");
 const order_1 = require("../../../factory/order");
+const settings_1 = require("../../../settings");
 const factory_1 = require("./onOrderProcessing/factory");
 const debug = createDebug('chevre-domain:service:order');
 const USE_CONFIRM_REGISTER_SERVICE_TRANSACTION = process.env.USE_CONFIRM_REGISTER_SERVICE_TRANSACTION === '1';
@@ -53,11 +55,13 @@ function onOrderProcessing(params) {
             case factory.orderStatus.OrderProcessing:
                 // 冗長なconfirmReserveTransactionタスク作成を回避(2023-08-25~)
                 yield createConfirmReserveTransactionTasksIfNotExist(params.order, simpleOrder)(repos);
-                // 冗長なsendOrderタスク作成を回避(2023-08-25~)
-                yield createSendOrderTransactionTaskIfNotExist({
-                    object: params.order,
-                    potentialActions: (_c = (_b = (_a = params.placeOrderTransaction) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.potentialActions
-                })(repos);
+                if (settings_1.USE_SEND_ORDER_ON_ORDER_PROCESSING) {
+                    // 冗長なsendOrderタスク作成を回避(2023-08-25~)
+                    yield createSendOrderTransactionTaskIfNotExist({
+                        object: params.order,
+                        potentialActions: (_c = (_b = (_a = params.placeOrderTransaction) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.potentialActions
+                    })(repos);
+                }
                 yield createGivePointAwardTaskIfNotExist({
                     potentialActions: (_f = (_e = (_d = params.placeOrderTransaction) === null || _d === void 0 ? void 0 : _d.potentialActions) === null || _e === void 0 ? void 0 : _e.order) === null || _f === void 0 ? void 0 : _f.potentialActions
                 })(repos);
@@ -67,14 +71,10 @@ function onOrderProcessing(params) {
     });
 }
 exports.onOrderProcessing = onOrderProcessing;
-// const COA_TASK_DELAY_IN_SECONDS = 0;
 function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const taskRunsAt = new Date();
         const taskRunsAt4coa = new Date();
-        // const taskRunsAt4coa = moment(order.orderDate)
-        //     .add(COA_TASK_DELAY_IN_SECONDS, 'seconds')
-        //     .toDate();
         const confirmObjects = [
             ...(0, factory_1.createConfirmReservationActionObject4ChevreByOrder)({ order }),
             ...(0, factory_1.createConfirmReservationActionObject4COAByOrder)({ order })
@@ -93,7 +93,9 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder) {
                         : factory.service.webAPI.Identifier.Chevre
                 }
             };
+            const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', data.project.id, factory.taskName.ConfirmReserveTransaction, data.purpose.typeOf, data.purpose.orderNumber, data.object.typeOf, data.object.transactionNumber);
             const confirmReserveTransactionTask = {
+                identifier: taskIdentifier,
                 project: order.project,
                 name: factory.taskName.ConfirmReserveTransaction,
                 status: factory.taskStatus.Ready,
@@ -103,7 +105,8 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder) {
                 executionResults: [],
                 data
             };
-            yield repos.task.createConfirmReserveTransactionTaskIfNotExist(confirmReserveTransactionTask, { emitImmediately: true });
+            // await repos.task.createConfirmReserveTransactionTaskIfNotExist(confirmReserveTransactionTask, { emitImmediately: true });
+            yield repos.task.createIfNotExistByIdentifier(confirmReserveTransactionTask, { emitImmediately: true });
         })));
     });
 }
@@ -167,9 +170,11 @@ function createSendOrderTransactionTaskIfNotExist(params) {
         if (sendOrderByTransaction !== undefined) {
             const sendOrderTaskData = {
                 project: sendOrderByTransaction.project,
-                object: Object.assign(Object.assign({}, sendOrderByTransaction.object), { confirmationNumber: params.object.confirmationNumber })
+                object: Object.assign(Object.assign({}, sendOrderByTransaction.object), { confirmationNumber: params.object.confirmationNumber, previousOrderStatus: factory.orderStatus.OrderProcessing })
             };
+            const taskIdentifier = `${sendOrderTaskData.project.id}:${factory.taskName.SendOrder}:${sendOrderTaskData.object.typeOf}:${sendOrderTaskData.object.orderNumber}`;
             const sendOrderTask = {
+                identifier: taskIdentifier,
                 project: sendOrderByTransaction.project,
                 name: factory.taskName.SendOrder,
                 status: factory.taskStatus.Ready,
@@ -179,7 +184,8 @@ function createSendOrderTransactionTaskIfNotExist(params) {
                 executionResults: [],
                 data: sendOrderTaskData
             };
-            yield repos.task.createSendOrderTaskIfNotExist(sendOrderTask, { emitImmediately: true });
+            // await repos.task.createSendOrderTaskIfNotExist(sendOrderTask, { emitImmediately: true });
+            yield repos.task.createIfNotExistByIdentifier(sendOrderTask, { emitImmediately: true });
         }
     });
 }

package/lib/chevre/service/order/onOrderStatusChanged.d.ts

@@ -3,7 +3,9 @@
  */
 import { onOrderCancelled } from './onOrderStatusChanged/onOrderCancelled';
 import { onOrderDelivered } from './onOrderStatusChanged/onOrderDelivered';
+import { onOrderDeliveredPartially } from './onOrderStatusChanged/onOrderDeliveredPartially';
+import { onOrderInTransit } from './onOrderStatusChanged/onOrderInTransit';
 import { onOrderPaymentDue } from './onOrderStatusChanged/onOrderPaymentDue';
 import { IExternalOrder, onOrderProcessing } from './onOrderStatusChanged/onOrderProcessing';
 import { onOrderReturned } from './onOrderStatusChanged/onOrderReturned';
-export { IExternalOrder, onOrderCancelled, onOrderDelivered, onOrderPaymentDue, onOrderProcessing, onOrderReturned };
+export { IExternalOrder, onOrderCancelled, onOrderDelivered, onOrderDeliveredPartially, onOrderInTransit, onOrderPaymentDue, onOrderProcessing, onOrderReturned };

package/lib/chevre/service/order/onOrderStatusChanged.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onOrderReturned = exports.onOrderProcessing = exports.onOrderPaymentDue = exports.onOrderDelivered = exports.onOrderCancelled = void 0;
+exports.onOrderReturned = exports.onOrderProcessing = exports.onOrderPaymentDue = exports.onOrderInTransit = exports.onOrderDeliveredPartially = exports.onOrderDelivered = exports.onOrderCancelled = void 0;
 /**
  * 注文ステータス変更時処理
  */
@@ -8,6 +8,10 @@ const onOrderCancelled_1 = require("./onOrderStatusChanged/onOrderCancelled");
 Object.defineProperty(exports, "onOrderCancelled", { enumerable: true, get: function () { return onOrderCancelled_1.onOrderCancelled; } });
 const onOrderDelivered_1 = require("./onOrderStatusChanged/onOrderDelivered");
 Object.defineProperty(exports, "onOrderDelivered", { enumerable: true, get: function () { return onOrderDelivered_1.onOrderDelivered; } });
+const onOrderDeliveredPartially_1 = require("./onOrderStatusChanged/onOrderDeliveredPartially");
+Object.defineProperty(exports, "onOrderDeliveredPartially", { enumerable: true, get: function () { return onOrderDeliveredPartially_1.onOrderDeliveredPartially; } });
+const onOrderInTransit_1 = require("./onOrderStatusChanged/onOrderInTransit");
+Object.defineProperty(exports, "onOrderInTransit", { enumerable: true, get: function () { return onOrderInTransit_1.onOrderInTransit; } });
 const onOrderPaymentDue_1 = require("./onOrderStatusChanged/onOrderPaymentDue");
 Object.defineProperty(exports, "onOrderPaymentDue", { enumerable: true, get: function () { return onOrderPaymentDue_1.onOrderPaymentDue; } });
 const onOrderProcessing_1 = require("./onOrderStatusChanged/onOrderProcessing");

package/lib/chevre/service/order/placeOrder.d.ts

@@ -2,6 +2,7 @@ import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOf
 import type { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
+import type { MongoRepository as OrderInTransactionRepo } from '../../repo/orderInTransaction';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
 import { IExternalOrder } from './onOrderStatusChanged';
@@ -39,6 +40,7 @@ declare function placeOrder(params: {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     order: OrderRepo;
+    orderInTransaction: OrderInTransactionRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
 }) => Promise<{

package/lib/chevre/service/order/placeOrder.js

@@ -159,7 +159,7 @@ function placeOrderWithoutTransaction(params) {
             }
             throw error;
         }
-        yield repos.action.complete({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
+        yield repos.action.completeWithVoid({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
         // 経理レポートを保管は外部注文の場合保留(2023-12-08~)
         // await createAccountingReportIfNotExist(order)({ accountingReport: repos.accountingReport });
     });
@@ -168,7 +168,6 @@ exports.placeOrderWithoutTransaction = placeOrderWithoutTransaction;
 /**
  * 注文を作成する
  */
-// tslint:disable-next-line:max-func-body-length
 function placeOrder(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
@@ -182,6 +181,10 @@ function placeOrder(params) {
             confirmationNumber: params.object.confirmationNumber,
             orderNumber: params.object.orderNumber
         })({ transaction: repos.transaction });
+        // USE_ORDER_PAYMENT_DUE_ON_PLACED設定を廃止したので、必ずOrderPaymentDueのはず(2024-01-10~)
+        if (order.orderStatus !== factory.orderStatus.OrderPaymentDue) {
+            throw new factory.errors.ServiceUnavailable(`orderStatus must be ${factory.orderStatus.OrderPaymentDue}`);
+        }
         const maskedCustomer = (0, order_1.createMaskedCustomer)(order, { noProfile: true });
         const simpleOrder = {
             typeOf: order.typeOf,
@@ -224,6 +227,8 @@ function placeOrder(params) {
         if (completedActions.length === 0) {
             const action = yield repos.action.start(orderActionAttributes);
             try {
+                // orderInTransactionを考慮(2024-01-14~)
+                yield repos.orderInTransaction.placeOrder(order);
                 yield repos.order.createIfNotExist(order);
             }
             catch (error) {
@@ -235,7 +240,7 @@ function placeOrder(params) {
                 }
                 throw error;
             }
-            yield repos.action.complete({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
+            yield repos.action.completeWithVoid({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
         }
         if (params.useOnOrderStatusChanged) {
             // 経理レポートを保管
@@ -259,27 +264,26 @@ function placeOrder(params) {
                 })({
                     task: repos.task
                 });
-            }
-            else if (order.orderStatus === factory.orderStatus.OrderProcessing) {
-                // OrderPaymentDueをスキップしてOrderProcessingから開始する場合(2023-08-23~)
-                // OrderPaymentDueに対する処理をまず強制的に実行する(2023-08-24~)
-                yield (0, onOrderStatusChanged_1.onOrderPaymentDue)({
-                    order: {
-                        paymentMethods: order.paymentMethods,
-                        project: order.project,
-                        orderNumber: order.orderNumber,
-                        confirmationNumber: order.confirmationNumber,
-                        customer: order.customer,
-                        orderDate: order.orderDate,
-                        seller: order.seller,
-                        typeOf: order.typeOf,
-                        price: order.price,
-                        priceCurrency: order.priceCurrency,
-                        orderStatus: factory.orderStatus.OrderPaymentDue
-                    }
-                })({
-                    task: repos.task
-                });
+                // } else if (order.orderStatus === factory.orderStatus.OrderProcessing) {
+                //     // OrderPaymentDueをスキップしてOrderProcessingから開始する場合(2023-08-23~)
+                //     // OrderPaymentDueに対する処理をまず強制的に実行する(2023-08-24~)
+                //     await onOrderPaymentDue({
+                //         order: {
+                //             paymentMethods: order.paymentMethods,
+                //             project: order.project,
+                //             orderNumber: order.orderNumber,
+                //             confirmationNumber: order.confirmationNumber,
+                //             customer: order.customer,
+                //             orderDate: order.orderDate,
+                //             seller: order.seller,
+                //             typeOf: order.typeOf,
+                //             price: order.price,
+                //             priceCurrency: order.priceCurrency,
+                //             orderStatus: factory.orderStatus.OrderPaymentDue
+                //         }
+                //     })({
+                //         task: repos.task
+                //     });
             }
             else {
                 throw new factory.errors.NotImplemented(`placing an order on the status '${order.orderStatus}' not implemented`);
@@ -295,11 +299,6 @@ function placeOrder(params) {
                 })(repos);
             }
         }
-        // onOrderStatusChangedへ移行(2023-08-17~)
-        // await onPlaceOrder({
-        //     object: order,
-        //     potentialActions: params.potentialActions
-        // })(repos);
         return { order };
     });
 }

package/lib/chevre/service/order/returnOrder.js

@@ -26,15 +26,24 @@ function returnOrder(params) {
             ? params.object.dateReturned
             : new Date();
         const returner = params.agent;
-        let order = yield repos.order.findByOrderNumber({
+        const order = yield repos.order.findByOrderNumber({
             orderNumber,
             project: { id: params.project.id },
             inclusion: [
                 'project', 'typeOf', 'orderNumber', 'dateReturned', 'id',
-                'customer', 'returner', 'seller', 'price', 'priceCurrency', 'orderDate'
+                'customer', 'returner', 'seller', 'price', 'priceCurrency', 'orderDate', 'orderStatus'
             ],
             exclusion: []
         });
+        // 注文ステータス検証(2024-01-10~)
+        switch (order.orderStatus) {
+            case factory.orderStatus.OrderDelivered:
+            case factory.orderStatus.OrderReturned:
+                break;
+            default:
+                // OrderDeliveredへの処理が進行中と考えられるので、ひとまず失敗させてリトライに期待
+                throw new factory.errors.Argument('object.orderNumber', `orderStatus not returnable: ${order.orderStatus}`);
+        }
         // 返品取引検索
         const returnOrderTransactions = yield repos.transaction.search({
             limit: 1,
@@ -72,7 +81,7 @@ function returnOrder(params) {
             typeOf: factory.actionType.ReturnAction
         };
         let returnedOwnershipInfos = [];
-        // アクション開始
+        let returnedOrder;
         const action = yield repos.action.start(returnOrderActionAttributes);
         try {
             returnedOwnershipInfos = yield processReturnOrder(order, dateReturned)({
@@ -80,7 +89,7 @@ function returnOrder(params) {
                 ownershipInfo: repos.ownershipInfo
             });
             // 注文ステータス変更
-            order = yield repos.order.returnOrder({
+            returnedOrder = yield repos.order.returnOrder({
                 project: { id: order.project.id },
                 orderNumber,
                 dateReturned,
@@ -98,21 +107,21 @@ function returnOrder(params) {
             throw error;
         }
         const result = returnedOwnershipInfos;
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
         if (params.useOnOrderStatusChanged) {
             yield (0, onOrderStatusChanged_1.onOrderReturned)({
                 order: {
-                    project: order.project,
-                    typeOf: order.typeOf,
-                    orderNumber: order.orderNumber,
-                    dateReturned: order.dateReturned,
-                    id: order.id,
-                    customer: order.customer,
-                    returner: order.returner,
-                    seller: order.seller,
-                    price: order.price,
-                    priceCurrency: order.priceCurrency,
-                    orderDate: order.orderDate,
+                    project: returnedOrder.project,
+                    typeOf: returnedOrder.typeOf,
+                    orderNumber: returnedOrder.orderNumber,
+                    dateReturned: returnedOrder.dateReturned,
+                    id: returnedOrder.id,
+                    customer: returnedOrder.customer,
+                    returner: returnedOrder.returner,
+                    seller: returnedOrder.seller,
+                    price: returnedOrder.price,
+                    priceCurrency: returnedOrder.priceCurrency,
+                    orderDate: returnedOrder.orderDate,
                     orderStatus: factory.orderStatus.OrderReturned
                 },
                 returnOrderTransaction

package/lib/chevre/service/order/sendOrder.d.ts

@@ -24,6 +24,11 @@ declare function sendOrder(params: {
     object: {
         confirmationNumber: string;
         orderNumber: string;
+        previousOrderStatus: factory.orderStatus.OrderProcessing | factory.orderStatus.OrderInTransit;
+        acceptedOffers: {
+            limit: number;
+            page: number;
+        };
     };
     useOnOrderStatusChanged: boolean;
 }): ISendOperation<void>;