@chevre/domain 21.20.0-alpha.8 → 21.20.0

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,10 +2,11 @@ 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';
 import * as factory from '../../factory';
+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

@@ -8,25 +8,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.placeOrderWithoutTransaction = exports.placeOrder = void 0;
+const createDebug = require("debug");
 const moment = require("moment");
+const factory = require("../../factory");
 const order_1 = require("../../factory/order");
-const createAccountingReportIfNotExist_1 = require("./createAccountingReportIfNotExist");
+const settings_1 = require("../../settings");
 const onAssetTransactionStatusChanged_1 = require("./onAssetTransactionStatusChanged");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
-const factory = require("../../factory");
+const debug = createDebug('chevre-domain:service:order');
 function createOrder(params) {
     // 必要な属性についてDate型に変換(でないと検索クエリを効率的に使えない)
     const acceptedOffers = (Array.isArray(params.acceptedOffers))
@@ -100,7 +91,8 @@ function createOrderFromBody(params) {
                     orderNumbers: [orderNumber]
                 }
             },
-            inclusion: ['id', 'potentialActions', 'project', 'typeOf', 'result'],
+            // inclusion: ['id', 'potentialActions', 'project', 'typeOf', 'result'],
+            inclusion: ['id', 'project', 'typeOf', 'result'],
             exclusion: []
         });
         const placeOrderTransactionWithResult = placeOrderTransactions.shift();
@@ -112,8 +104,8 @@ function createOrderFromBody(params) {
             throw new factory.errors.NotFound('transaction.result.order');
         }
         order = createOrder(orderByTransaction);
-        const { result } = placeOrderTransactionWithResult, placeOrderTransaction = __rest(placeOrderTransactionWithResult, ["result"]);
-        return { order, placeOrderTransaction };
+        // const { result, ...placeOrderTransaction } = placeOrderTransactionWithResult;
+        return { order, placeOrderTransaction: placeOrderTransactionWithResult };
     });
 }
 /**
@@ -159,20 +151,120 @@ function placeOrderWithoutTransaction(params) {
             }
             throw error;
         }
-        yield repos.action.complete({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
-        // 経理レポートを保管は外部注文の場合保留(2023-12-08~)
-        // await createAccountingReportIfNotExist(order)({ accountingReport: repos.accountingReport });
+        yield repos.action.completeWithVoid({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
     });
 }
 exports.placeOrderWithoutTransaction = placeOrderWithoutTransaction;
+function voidAcceptedOfferIfNecessary(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        // 取引に保管された承認アクション以外のアクションについて、オファーを除外する
+        const authorizeActionsAsResult = (_a = params.purpose.result) === null || _a === void 0 ? void 0 : _a.authorizeActions;
+        if (Array.isArray(authorizeActionsAsResult) && authorizeActionsAsResult.length > 0) {
+            const completedAuthorizeActionIds = authorizeActionsAsResult.map(({ id }) => id);
+            debug(completedAuthorizeActionIds.length, 'completedAuthorizeActionIds found from transaction', params.purpose.id);
+            // const authorizeActions = <Pick<IAuthorizeEventServiceOfferAction, 'object'>[]>
+            //     await repos.action.search(
+            //         {
+            //             typeOf: factory.actionType.AuthorizeAction,
+            //             purpose: {
+            //                 typeOf: { $in: [factory.transactionType.PlaceOrder] },
+            //                 id: { $in: [params.purpose.id] }
+            //             },
+            //             object: { typeOf: { $eq: factory.action.authorize.offer.eventService.ObjectType.SeatReservation } },
+            //             id: { $nin: completedAuthorizeActionIds }
+            //         },
+            //         ['object'],
+            //         []
+            //     );
+            const authorizeActionsWithInstrument = yield repos.action.search({
+                typeOf: factory.actionType.AuthorizeAction,
+                purpose: {
+                    typeOf: { $in: [factory.transactionType.PlaceOrder] },
+                    id: { $in: [params.purpose.id] }
+                },
+                object: {
+                    typeOf: {
+                        $in: [
+                            factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
+                            factory.offerType.Offer
+                        ]
+                    }
+                },
+                id: { $in: completedAuthorizeActionIds }
+            }, ['instrument'], []);
+            const serialNumbersMustBeIn = authorizeActionsWithInstrument
+                .filter(({ instrument }) => typeof instrument.transactionNumber === 'string')
+                .map(({ instrument }) => String(instrument.transactionNumber));
+            debug('voidAcceptedOfferBySerialNumber processing...', params.object.orderNumber, 'serialNumbersMustBeIn:', serialNumbersMustBeIn);
+            const voidAcceptedOfferBySerialNumberResult = yield repos.orderInTransaction.voidAcceptedOfferBySerialNumber({
+                orderNumber: params.object.orderNumber,
+                acceptedOffers: { serialNumber: { $nin: serialNumbersMustBeIn } }
+            });
+            debug('voidAcceptedOfferBySerialNumber processed.', params.object.orderNumber, 'voidAcceptedOfferBySerialNumberResult:', voidAcceptedOfferBySerialNumberResult);
+            // await voidAcceptedOffer({
+            //     authorizeActions,
+            //     authorizeActionsWithInstrument,
+            //     orderNumber: params.object.orderNumber
+            // })(repos);
+        }
+    });
+}
+function verifyAcceptedOffers(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const { order } = params;
+        const orderInTransaction = (yield repos.orderInTransaction.searchByOrderNumber({
+            orderNumber: { $eq: order.orderNumber }
+        })).shift();
+        if (orderInTransaction !== undefined) {
+            debug('verifying acceptedOffers...', order.orderNumber);
+            const acceptedOffersLengthMatched = orderInTransaction.acceptedOffers.length === order.acceptedOffers.length;
+            debug('acceptedOffers.length matched?', acceptedOffersLengthMatched);
+            if (!acceptedOffersLengthMatched) {
+                throw new factory.errors.ServiceUnavailable('acceptedOffers.length not matched');
+            }
+            const reservationIdsByOrderInTransation = orderInTransaction.acceptedOffers.map((offer) => {
+                return (offer.itemOffered.typeOf === factory.reservationType.EventReservation)
+                    ? offer.itemOffered.id
+                    : '';
+            });
+            const reservationIdsByOrder = order.acceptedOffers.map((offer) => {
+                return (offer.itemOffered.typeOf === factory.reservationType.EventReservation)
+                    ? offer.itemOffered.id
+                    : '';
+            });
+            debug('reservationIdsByOrderInTransation:', reservationIdsByOrderInTransation);
+            debug('reservationIdsByOrder:', reservationIdsByOrder);
+            const offerIdsByOrderInTransation = [...new Set(orderInTransaction.acceptedOffers.map((offer) => {
+                    return String(offer.id);
+                }))];
+            const offerIdsByOrder = [...new Set(order.acceptedOffers.map((offer) => {
+                    return String(offer.id);
+                }))];
+            debug('offerIdsByOrderInTransation:', offerIdsByOrderInTransation);
+            debug('offerIdsByOrder:', offerIdsByOrder);
+            const reservationIdsMatched = reservationIdsByOrderInTransation.length === reservationIdsByOrder.length
+                && reservationIdsByOrderInTransation.every((reservationId) => reservationIdsByOrder.includes(reservationId));
+            debug('reservationIds matched?', reservationIdsMatched);
+            const offerIdsMatched = offerIdsByOrderInTransation.length === offerIdsByOrder.length
+                && offerIdsByOrderInTransation.every((offerId) => offerIdsByOrder.includes(offerId));
+            debug('offerIds matched?', offerIdsMatched);
+            if (!reservationIdsMatched) {
+                throw new factory.errors.ServiceUnavailable('reservationIds not matched');
+            }
+            if (!offerIdsMatched) {
+                throw new factory.errors.ServiceUnavailable('offerIds not matched');
+            }
+        }
+    });
+}
 /**
  * 注文を作成する
  */
-// 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* () {
-        var _a;
+        var _a, _b, _c;
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
             throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
@@ -182,6 +274,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,7 +320,23 @@ function placeOrder(params) {
         if (completedActions.length === 0) {
             const action = yield repos.action.start(orderActionAttributes);
             try {
-                yield repos.order.createIfNotExist(order);
+                // 冗長なオファーを除外する(念のため)
+                yield voidAcceptedOfferIfNecessary({
+                    object: { orderNumber: order.orderNumber },
+                    purpose: placeOrderTransaction
+                })(repos);
+                // acceptedOffersの内容検証(開発)
+                if (settings_1.USE_ACCEPTED_OFFERS_AS_TRANSACTION_RESULT) {
+                    if (settings_1.USE_VERIFY_ACCEPTED_OFFERS) {
+                        yield verifyAcceptedOffers({ order })(repos);
+                    }
+                }
+                const ignoreAccpetedOffersFromResult = ((_c = (_b = placeOrderTransaction.result) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.ignoreAccpetedOffersFromResult) === true;
+                // orderInTransactionを考慮(2024-01-14~)
+                yield repos.orderInTransaction.placeOrder(order, { ignoreAccpetedOffersFromResult });
+                if (!ignoreAccpetedOffersFromResult) {
+                    yield repos.order.createIfNotExist(order);
+                }
             }
             catch (error) {
                 try {
@@ -235,11 +347,12 @@ 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) {
             // 経理レポートを保管
-            yield (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)(order)({ accountingReport: repos.accountingReport });
+            // CreateAccountingReportへ移行(2024-02-02~)
+            // await createAccountingReportIfNotExist(order)({ accountingReport: repos.accountingReport });
             // PaymentDueであればonOrderStatusChangedを実行(2023-08-23~)
             if (order.orderStatus === factory.orderStatus.OrderPaymentDue) {
                 yield (0, onOrderStatusChanged_1.onOrderPaymentDue)({
@@ -259,27 +372,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 +407,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.OrderInTransit;
+        acceptedOffers: {
+            limit: number;
+            page: number;
+        };
     };
     useOnOrderStatusChanged: boolean;
 }): ISendOperation<void>;

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

@@ -10,21 +10,35 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendOrder = void 0;
+const createDebug = require("debug");
 const order_1 = require("../../factory/order");
 const factory_1 = require("../delivery/factory");
 const findPlaceOrderTransaction_1 = require("./findPlaceOrderTransaction");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory = require("../../factory");
+const debug = createDebug('chevre-domain:service:order');
 /**
  * 注文を配送する
  */
 function sendOrder(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b, _c;
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
             throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
+        if (typeof ((_a = params.object.acceptedOffers) === null || _a === void 0 ? void 0 : _a.limit) !== 'number') {
+            throw new factory.errors.Argument('object.acceptedOffers.limit', 'must be number');
+        }
+        if (typeof ((_b = params.object.acceptedOffers) === null || _b === void 0 ? void 0 : _b.page) !== 'number') {
+            throw new factory.errors.Argument('object.acceptedOffers.page', 'must be number');
+        }
+        if (params.object.acceptedOffers.limit <= 0) {
+            throw new factory.errors.Argument('object.acceptedOffers.limit', 'must be greater than 1');
+        }
+        if (params.object.acceptedOffers.page <= 0) {
+            throw new factory.errors.Argument('object.acceptedOffers.page', 'must be greater than 1');
+        }
         try {
             const orderNumber = params.object.orderNumber;
             const confirmationNumber = params.object.confirmationNumber;
@@ -62,35 +76,45 @@ function sendOrder(params) {
                 priceCurrency: order.priceCurrency,
                 orderDate: order.orderDate
             };
+            const { limit, page } = params.object.acceptedOffers;
+            const sendOrderObject = Object.assign(Object.assign({}, simpleOrder), { acceptedOffers: { limit, page } });
             const sendOrderActionAttributes = {
-                agent: (typeof ((_a = params.agent) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? params.agent : order.project,
-                object: simpleOrder,
-                potentialActions: {
-                // sendEmailMessage: undefined
-                },
+                agent: (typeof ((_c = params.agent) === null || _c === void 0 ? void 0 : _c.typeOf) === 'string') ? params.agent : order.project,
+                object: sendOrderObject,
+                potentialActions: {},
                 project: order.project,
                 recipient: { id: order.customer.id, typeOf: order.customer.typeOf },
                 typeOf: factory.actionType.SendAction
             };
             const action = yield repos.action.start(sendOrderActionAttributes);
             let ownershipInfos;
+            let allOffersDelivered = false;
+            let acceptedOffers;
             try {
-                // 所有権作成
-                ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
-                    order: Object.assign(Object.assign({}, order), { acceptedOffers: yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
-                            orderNumber: { $eq: order.orderNumber },
-                            project: { id: { $eq: order.project.id } }
-                        }) })
+                const searchSlicedAcceptedOffersResult = yield repos.acceptedOffer.searchSlicedAcceptedOffersByOrderNumber({
+                    $slice: [limit * (page - 1), limit],
+                    orderNumber: { $eq: order.orderNumber },
+                    project: { id: { $eq: order.project.id } }
                 });
+                acceptedOffers = searchSlicedAcceptedOffersResult.acceptedOffers;
+                debug('delivering...', order.orderNumber, acceptedOffers.map((offer) => `${offer.itemOffered.id}`), params.object.acceptedOffers);
+                // 所有権作成
+                ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({ order: Object.assign(Object.assign({}, order), { acceptedOffers }) });
                 ownershipInfos = yield Promise.all(ownershipInfos.map((ownershipInfo) => __awaiter(this, void 0, void 0, function* () {
                     return repos.ownershipInfo.createIfNotExistByIdentifier(ownershipInfo);
                 })));
-                order = yield repos.order.changeStatus({
-                    project: { id: order.project.id },
-                    orderNumber,
-                    orderStatus: factory.orderStatus.OrderDelivered,
-                    previousOrderStatus: factory.orderStatus.OrderProcessing
-                });
+                const deliveredCount = limit * page;
+                debug(deliveredCount, 'delivered.', order.orderNumber, params.object.acceptedOffers);
+                // if (deliveredCount >= numAcceptedOffers) {
+                if (acceptedOffers.length === 0) {
+                    order = yield repos.order.changeStatus({
+                        project: { id: order.project.id },
+                        orderNumber,
+                        orderStatus: factory.orderStatus.OrderDelivered,
+                        previousOrderStatus: params.object.previousOrderStatus
+                    });
+                    allOffersDelivered = true;
+                }
             }
             catch (error) {
                 try {
@@ -102,22 +126,32 @@ function sendOrder(params) {
                 throw error;
             }
             const result = ownershipInfos;
-            yield repos.action.complete({ typeOf: sendOrderActionAttributes.typeOf, id: action.id, result: result });
+            yield repos.action.completeWithVoid({ typeOf: sendOrderActionAttributes.typeOf, id: action.id, result: result });
+            debug('allOffersDelivered?:', allOffersDelivered, order.orderNumber);
             if (params.useOnOrderStatusChanged) {
-                yield (0, onOrderStatusChanged_1.onOrderDelivered)({
-                    order: {
-                        id: order.id,
-                        customer: order.customer,
-                        orderDate: order.orderDate,
-                        orderNumber: order.orderNumber,
-                        project: order.project,
-                        typeOf: order.typeOf,
-                        orderStatus: factory.orderStatus.OrderDelivered
-                    },
-                    placeOrderTransaction
-                })({
-                    task: repos.task
-                });
+                if (allOffersDelivered) {
+                    yield (0, onOrderStatusChanged_1.onOrderDelivered)({
+                        order: {
+                            id: order.id,
+                            customer: order.customer,
+                            orderDate: order.orderDate,
+                            orderNumber: order.orderNumber,
+                            project: order.project,
+                            typeOf: order.typeOf,
+                            orderStatus: factory.orderStatus.OrderDelivered
+                        },
+                        placeOrderTransaction
+                    })({
+                        task: repos.task
+                    });
+                }
+                else {
+                    yield (0, onOrderStatusChanged_1.onOrderDeliveredPartially)({
+                        order: Object.assign(Object.assign({}, order), { acceptedOffers: params.object.acceptedOffers, orderStatus: params.object.previousOrderStatus, deliveredAcceptedOffers: acceptedOffers })
+                    })({
+                        task: repos.task
+                    });
+                }
             }
         }
         catch (error) {

package/lib/chevre/service/payment/any/onPaid.js

@@ -38,7 +38,7 @@ function onPaid(payAction) {
                     name: factory.taskName.TriggerWebhook,
                     status: factory.taskStatus.Ready,
                     runsAt: now,
-                    remainingNumberOfTries: 10,
+                    remainingNumberOfTries: 30,
                     numberOfTried: 0,
                     executionResults: [],
                     data: Object.assign(Object.assign({}, a), { object: aciton4inform })

package/lib/chevre/service/payment/any/onPaymentStatusChanged/onPaid.d.ts

@@ -1,6 +1,8 @@
 import type { MongoRepository as AccountingReportRepo } from '../../../../repo/accountingReport';
 import * as factory from '../../../../factory';
 export type IOptimizedPayAction = factory.report.accountingReport.IOptimizedPayAction;
-export declare function onPaid(params: IOptimizedPayAction): (repos: {
+export declare function onPaid(params: IOptimizedPayAction, project: {
+    id: string;
+}): (repos: {
     accountingReport: AccountingReportRepo;
 }) => Promise<void>;