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

package/lib/chevre/service/offer/any.js

@@ -0,0 +1,55 @@
+"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.voidAcceptedOffer = exports.acceptOffer = void 0;
+const createDebug = require("debug");
+const factory = require("../../factory");
+const placeOrderInProgress_1 = require("../transaction/placeOrderInProgress");
+const debug = createDebug('chevre-domain:service:offer');
+function acceptOffer(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const now = new Date();
+        const orderNumber = yield (0, placeOrderInProgress_1.publishOrderNumberIfNotExist)({
+            project: { id: params.project.id },
+            id: params.purpose.id,
+            object: { orderDate: now }
+        })(repos);
+        yield repos.orderInTransaction.acceptOffer({
+            orderNumber,
+            project: { id: params.project.id, typeOf: factory.organizationType.Project },
+            acceptedOffers: params.acceptedOffers
+        });
+    });
+}
+exports.acceptOffer = acceptOffer;
+function voidAcceptedOffer(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const { authorizeActions, orderNumber } = params;
+        let reservationNumbers = [];
+        authorizeActions.forEach((authorizeAction) => {
+            var _a;
+            const reserveTransactionNumberByAction = (_a = authorizeAction.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.transactionNumber;
+            if (typeof reserveTransactionNumberByAction === 'string') {
+                reservationNumbers.push(reserveTransactionNumberByAction);
+            }
+        });
+        reservationNumbers = [...new Set(reservationNumbers)];
+        debug('removing acceptedOffers from PlaceOrder...', orderNumber, reservationNumbers);
+        if (reservationNumbers.length > 0) {
+            const result = yield repos.orderInTransaction.voidAcceptedOfferByReservationNumber({
+                orderNumber,
+                acceptedOffers: { reservationNumber: { $in: reservationNumbers } }
+            });
+            debug('acceptedOffers removed from PlaceOrder.', result);
+        }
+    });
+}
+exports.voidAcceptedOffer = voidAcceptedOffer;

package/lib/chevre/service/offer/event/authorize.d.ts

@@ -5,6 +5,8 @@ import type { MongoRepository as EventRepo } from '../../../repo/event';
 import type { MongoRepository as OfferRepo } from '../../../repo/offer';
 import type { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
 import type { MongoRepository as OfferCatalogItemRepo } from '../../../repo/offerCatalogItem';
+import type { MongoRepository as OrderInTransactionRepo } from '../../../repo/orderInTransaction';
+import type { RedisRepository as OrderNumberRepo } from '../../../repo/orderNumber';
 import type { MongoRepository as PaymentServiceRepo } from '../../../repo/paymentService';
 import type { MongoRepository as PlaceRepo } from '../../../repo/place';
 import type { MongoRepository as PriceSpecificationRepo } from '../../../repo/priceSpecification';
@@ -27,6 +29,8 @@ interface IAuthorizeRepos {
     offerCatalog: OfferCatalogRepo;
     offerCatalogItem: OfferCatalogItemRepo;
     offerRateLimit: OfferRateLimitRepo;
+    orderInTransaction: OrderInTransactionRepo;
+    orderNumber: OrderNumberRepo;
     paymentService: PaymentServiceRepo;
     place: PlaceRepo;
     priceSpecification: PriceSpecificationRepo;
@@ -69,5 +73,8 @@ declare function authorize(params: {
      * オファーID指定なしに座席をおさえる場合true
      */
     noOfferSpecified: boolean;
+    options: {
+        useCreateOrderOnOfferAccepted: boolean;
+    };
 }): IAuthorizeOperation<IAuthorizeOfferAction>;
 export { authorize };

package/lib/chevre/service/offer/event/authorize.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authorize = void 0;
 const factory = require("../../../factory");
+const any_1 = require("../any");
 const defaultOffer_1 = require("./defaultOffer");
 const processStartReserve4chevre_1 = require("./processStartReserve4chevre");
 const searchEventTicketOffers_1 = require("./searchEventTicketOffers");
@@ -73,6 +74,16 @@ function authorize(params) {
                         stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd
                     })(repos);
                     acceptedOffers4result = processStartReserveResult.acceptedOffers4result;
+                    // add orderInTransaction(2024-01-15~)
+                    if (!noOfferSpecified) {
+                        if (params.options.useCreateOrderOnOfferAccepted) {
+                            yield (0, any_1.acceptOffer)({
+                                project: transaction.project,
+                                purpose: { id: transaction.id },
+                                acceptedOffers: acceptedOffers4result
+                            })(repos);
+                        }
+                    }
                     break;
                 default:
                     throw new factory.errors.Argument('Event', `Unknown booking service '${bookingServiceIdentifire}'`);

package/lib/chevre/service/offer/event/cancel.d.ts

@@ -1,6 +1,7 @@
 import * as factory from '../../../factory';
 import type { MongoRepository as ActionRepo } from '../../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../../repo/assetTransaction';
+import type { MongoRepository as OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { MongoRepository as ReservationRepo } from '../../../repo/reservation';
 import type { StockHolderRepository as StockHolderRepo } from '../../../repo/stockHolder';
@@ -11,6 +12,7 @@ interface ICancelRepos {
     assetTransaction: AssetTransactionRepo;
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
+    orderInTransaction: OrderInTransactionRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
     transaction: TransactionRepo;

package/lib/chevre/service/offer/event/cancel.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.cancel = void 0;
 const factory = require("../../../factory");
 const ReserveTransactionService = require("../../assetTransaction/reserve");
+const any_1 = require("../any");
 /**
  * イベントオファー承認取消(apiから実行)
  * 特定の承認アクションについて処理する
@@ -28,12 +29,22 @@ function cancel(params) {
         }
         // MongoDBでcompleteステータスであるにも関わらず、Chevreでは削除されている、というのが最悪の状況
         // それだけは回避するためにMongoDBを先に変更
-        const action = yield repos.action.cancel({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
+        yield repos.action.cancelWithVoid({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
+        const action = yield repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
         switch (action.instrument.identifier) {
             case factory.service.webAPI.Identifier.COA:
                 // 実質使用する予定なしなので廃止(2022-05-12~)
                 throw new factory.errors.NotImplemented(`booking service '${action.instrument.identifier}' not implemented`);
             default:
+                // add orderInTransaction(2024-01-15~)
+                // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
+                const orderNumberByTransaction = transaction.object.orderNumber;
+                if (typeof orderNumberByTransaction === 'string') {
+                    yield (0, any_1.voidAcceptedOffer)({
+                        authorizeActions: [action],
+                        orderNumber: orderNumberByTransaction
+                    })(repos);
+                }
                 const transactionNumber = (_a = action.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.transactionNumber;
                 if (typeof transactionNumber === 'string') {
                     // すでに取消済であったとしても、すべて取消処理(actionStatusに関係なく)

package/lib/chevre/service/offer/event/voidTransaction.d.ts

@@ -1,6 +1,7 @@
 import * as factory from '../../../factory';
 import type { MongoRepository as ActionRepo } from '../../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../../repo/assetTransaction';
+import type { MongoRepository as OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { MongoRepository as ReservationRepo } from '../../../repo/reservation';
 import type { StockHolderRepository as StockHolderRepo } from '../../../repo/stockHolder';
@@ -12,6 +13,7 @@ interface IVoidTransactionRepos {
     assetTransaction: AssetTransactionRepo;
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
+    orderInTransaction: OrderInTransactionRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
     transaction: TransactionRepo;

package/lib/chevre/service/offer/event/voidTransaction.js

@@ -15,6 +15,7 @@ const http_status_1 = require("http-status");
 const credentials_1 = require("../../../credentials");
 const factory = require("../../../factory");
 const ReserveTransactionService = require("../../assetTransaction/reserve");
+const any_1 = require("../any");
 const coaAuthClient = new COA.auth.RefreshToken({
     endpoint: credentials_1.credentials.coa.endpoint,
     refreshToken: credentials_1.credentials.coa.refreshToken
@@ -30,7 +31,7 @@ function voidTransaction(params) {
         const transaction = yield repos.transaction.findById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id,
-            inclusion: ['_id', 'typeOf', 'status']
+            inclusion: ['_id', 'typeOf', 'status', 'object.orderNumber']
         });
         // 興行オファー承認アクション検索
         let authorizeActions = yield repos.action.searchByPurpose({
@@ -41,9 +42,6 @@ function voidTransaction(params) {
             },
             object: { typeOf: { $eq: factory.action.authorize.offer.eventService.ObjectType.SeatReservation } }
         });
-        // .then((actions) => actions
-        //     .filter((a) => a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation)
-        // );
         switch (transaction.status) {
             case factory.transactionStatusType.InProgress:
                 throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
@@ -59,8 +57,17 @@ function voidTransaction(params) {
             default:
             // no op
         }
+        // add orderInTransaction(2024-01-15~)
+        // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
+        const orderNumberByTransaction = transaction.object.orderNumber;
+        if (typeof orderNumberByTransaction === 'string') {
+            yield (0, any_1.voidAcceptedOffer)({
+                authorizeActions,
+                orderNumber: orderNumberByTransaction
+            })(repos);
+        }
         yield Promise.all(authorizeActions.map((action) => __awaiter(this, void 0, void 0, function* () {
-            yield repos.action.cancel({ typeOf: action.typeOf, id: action.id });
+            yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
             switch (action.instrument.identifier) {
                 case exports.WebAPIIdentifier.COA:
                     yield processVoidTransaction4coa({

package/lib/chevre/service/offer/eventServiceByCOA.js

@@ -143,13 +143,13 @@ function cancel(params) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
         // 取引内のアクションかどうか確認
-        let action = yield repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
+        const action = yield repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
         if (action.purpose.typeOf !== transaction.typeOf || action.purpose.id !== transaction.id) {
             throw new factory.errors.Argument('Transaction', 'Action not found in the transaction');
         }
         // MongoDBでcompleteステータスであるにも関わらず、COAでは削除されている、というのが最悪の状況
         // それだけは回避するためにMongoDBを先に変更
-        action = yield repos.action.cancel({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
+        yield repos.action.cancelWithVoid({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
         let cancelResult;
         const actionResult = action.result;
         if ((actionResult === null || actionResult === void 0 ? void 0 : actionResult.requestBody) !== undefined && actionResult.responseBody !== undefined) {

package/lib/chevre/service/offer/moneyTransfer/authorize.d.ts

@@ -24,5 +24,10 @@ export declare function authorize(params: {
     };
     object: factory.action.authorize.offer.moneyTransfer.IObject;
     purpose: factory.action.authorize.offer.moneyTransfer.IPurpose;
-}): IAuthorizeOperation<factory.action.authorize.offer.moneyTransfer.IAction>;
+}): IAuthorizeOperation<{
+    /**
+     * 承認アクションID
+     */
+    id: string;
+}>;
 export {};

package/lib/chevre/service/offer/moneyTransfer/authorize.js

@@ -64,7 +64,8 @@ function authorize(params) {
             requestBody: requestBody,
             responseBody: responseBody
         };
-        return repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+        return { id: action.id };
     });
 }
 exports.authorize = authorize;

package/lib/chevre/service/offer/moneyTransfer/returnMoneyTransfer.js

@@ -74,7 +74,7 @@ function returnMoneyTransfer(params) {
             throw error;
         }
         const actionResult = {};
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
     });
 }
 exports.returnMoneyTransfer = returnMoneyTransfer;

package/lib/chevre/service/offer/moneyTransfer/settleTransaction.js

@@ -27,7 +27,7 @@ function settleTransaction(params) {
             throw error;
         }
         const actionResult = {};
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
     });
 }
 exports.settleTransaction = settleTransaction;

package/lib/chevre/service/offer/moneyTransfer/voidTransaction.js

@@ -45,7 +45,7 @@ function voidTransaction(params) {
         }
         yield Promise.all(authorizeActions.map((action) => __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            yield repos.action.cancel({ typeOf: action.typeOf, id: action.id });
+            yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
             const pendingTransactionTransactionNumber = (_b = (_a = action.object.itemOffered.object) === null || _a === void 0 ? void 0 : _a.pendingTransaction) === null || _b === void 0 ? void 0 : _b.transactionNumber;
             if (typeof pendingTransactionTransactionNumber === 'string') {
                 // 取引が存在すれば中止

package/lib/chevre/service/offer/product.js

@@ -247,7 +247,7 @@ function voidTransaction(params) {
                 //     purpose: params.purpose
                 // })(repos);
             }
-            yield repos.action.cancel({ typeOf: action.typeOf, id: action.id });
+            yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
             yield processVoidRegisterServiceTransaction({
                 action,
                 project: params.project

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

@@ -36,7 +36,7 @@ function confirmPayTransaction(data) {
                     assetTransaction: repos.assetTransaction,
                     event: repos.event,
                     order: repos.order,
-                    project: repos.project,
+                    // project: repos.project,
                     task: repos.task
                 });
             }
@@ -52,7 +52,7 @@ function confirmPayTransaction(data) {
         }
         // アクション完了
         const actionResult = {};
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
         // processOrder連携(2023-08-23~)
         yield onConfirmed(data)({
             task: repos.task
@@ -74,7 +74,7 @@ function onConfirmed(params) {
                     purpose: {
                         confirmationNumber: params.purpose.confirmationNumber,
                         orderNumber: params.purpose.orderNumber,
-                        typeOf: 'Order'
+                        typeOf: factory.order.OrderType.Order
                     },
                     useOnOrderStatusChanged: params.useOnOrderStatusChanged === true
                 };

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

@@ -24,4 +24,14 @@ declare function paymentDue2Processing(params: {
     task: TaskRepo;
     transaction: TransactionRepo;
 }) => Promise<void>;
-export { onAssetTransactionStatusChanged, paymentDue2Processing };
+declare function processing2inTransit(params: {
+    project: {
+        id: string;
+    };
+    orderNumber: string;
+    useOnOrderStatusChanged: boolean;
+}): (repos: {
+    order: OrderRepo;
+    task: TaskRepo;
+}) => Promise<void>;
+export { onAssetTransactionStatusChanged, paymentDue2Processing, processing2inTransit };

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

@@ -9,10 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.paymentDue2Processing = exports.onAssetTransactionStatusChanged = void 0;
+exports.processing2inTransit = exports.paymentDue2Processing = exports.onAssetTransactionStatusChanged = void 0;
 const findPlaceOrderTransaction_1 = require("./findPlaceOrderTransaction");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory = require("../../factory");
+const settings_1 = require("../../settings");
+// tslint:disable-next-line:max-func-body-length
 function onAssetTransactionStatusChanged(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e;
@@ -21,10 +23,10 @@ function onAssetTransactionStatusChanged(params) {
         }
         switch (params.object.status) {
             case factory.transactionStatusType.Confirmed:
+                const orderNumber = (_a = params.purpose) === null || _a === void 0 ? void 0 : _a.orderNumber;
+                const confirmationNumber = (_b = params.purpose) === null || _b === void 0 ? void 0 : _b.confirmationNumber;
                 switch (params.object.typeOf) {
                     case factory.assetTransactionType.Pay:
-                        const orderNumber = (_a = params.purpose) === null || _a === void 0 ? void 0 : _a.orderNumber;
-                        const confirmationNumber = (_b = params.purpose) === null || _b === void 0 ? void 0 : _b.confirmationNumber;
                         // 確定時の決済方法区分指定(2023-08-29~)
                         const specifiedPaymentMethodIdentifire = (_e = (_d = (_c = params.object) === null || _c === void 0 ? void 0 : _c.object) === null || _d === void 0 ? void 0 : _d.paymentMethod) === null || _e === void 0 ? void 0 : _e.identifier;
                         if (typeof specifiedPaymentMethodIdentifire === 'string' && specifiedPaymentMethodIdentifire.length > 0) {
@@ -48,6 +50,34 @@ function onAssetTransactionStatusChanged(params) {
                             }
                         }
                         break;
+                    case 'COAReserveTransaction':
+                        if (typeof orderNumber === 'string' && typeof confirmationNumber === 'string') {
+                            // 基本的に1注文に1予約番号なのでdeliverable = true
+                            const deliverable = true;
+                            if (deliverable) {
+                                yield processing2inTransit({
+                                    project: { id: params.project.id },
+                                    // confirmationNumber,
+                                    orderNumber,
+                                    useOnOrderStatusChanged: params.useOnOrderStatusChanged
+                                })(repos);
+                            }
+                        }
+                        break;
+                    case factory.assetTransactionType.Reserve:
+                        if (typeof orderNumber === 'string' && typeof confirmationNumber === 'string') {
+                            // ReserveTransactionのステータス検証
+                            const deliverable = yield isDeliverable({ project: { id: params.project.id }, orderNumber })(repos);
+                            if (deliverable) {
+                                yield processing2inTransit({
+                                    project: { id: params.project.id },
+                                    // confirmationNumber,
+                                    orderNumber,
+                                    useOnOrderStatusChanged: params.useOnOrderStatusChanged
+                                })(repos);
+                            }
+                        }
+                        break;
                     default:
                     // no op
                 }
@@ -150,14 +180,15 @@ function paymentDue2Processing(params) {
         }
         catch (error) {
             let throwsError = true;
-            // すでにステータスが煤でいた場合、OrderPaymentDue->OrderProcessingの処理自体は成功しているので、後処理を続行する
+            // すでにステータスが進行していた場合、OrderPaymentDue->OrderProcessingの処理自体は成功しているので、後処理を続行する
             order = yield repos.order.findByOrderNumber({
                 orderNumber: params.orderNumber,
                 project: { id: params.project.id },
                 inclusion: [],
                 exclusion: ['acceptedOffers']
             });
-            if (order.orderStatus === factory.orderStatus.OrderDelivered
+            if (order.orderStatus === factory.orderStatus.OrderInTransit
+                || order.orderStatus === factory.orderStatus.OrderDelivered
                 || order.orderStatus === factory.orderStatus.OrderReturned) {
                 throwsError = false;
             }
@@ -230,3 +261,80 @@ function cancelOrderIfExist(params) {
         }
     });
 }
+function isDeliverable(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // 注文のreservationNumberを取得
+        const reservationNumbers = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.itemOffered.reservationNumber');
+        // ReserveTransactionのステータス検証
+        let allReserveTransactionConfirmed = false;
+        if (reservationNumbers.length > 0) {
+            // console.log('is deliverable?...', params.orderNumber, reservationNumbers);
+            const referencedReserveTransactions = yield repos.assetTransaction.search({
+                project: { id: { $eq: params.project.id } },
+                typeOf: factory.assetTransactionType.Reserve,
+                transactionNumber: { $in: reservationNumbers }
+            }, ['status']);
+            // console.log('referencedReserveTransactions:', referencedReserveTransactions);
+            allReserveTransactionConfirmed =
+                referencedReserveTransactions.length === reservationNumbers.length
+                    && referencedReserveTransactions.every(({ status }) => status === factory.transactionStatusType.Confirmed);
+        }
+        else {
+            allReserveTransactionConfirmed = true;
+        }
+        return allReserveTransactionConfirmed;
+    });
+}
+function processing2inTransit(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // const placeOrderTransaction = await findPlaceOrderTransaction({
+        //     project: { id: params.project.id },
+        //     confirmationNumber: params.confirmationNumber,
+        //     orderNumber: params.orderNumber
+        // })({ transaction: repos.transaction });
+        let order = yield repos.order.findByOrderNumber({
+            orderNumber: params.orderNumber,
+            project: { id: params.project.id },
+            inclusion: [],
+            exclusion: ['acceptedOffers']
+        });
+        try {
+            if (settings_1.USE_ORDER_IN_TRANSIT) {
+                order = yield repos.order.changeStatus({
+                    project: { id: order.project.id },
+                    orderNumber: params.orderNumber,
+                    orderStatus: factory.orderStatus.OrderInTransit,
+                    previousOrderStatus: factory.orderStatus.OrderProcessing
+                });
+            }
+        }
+        catch (error) {
+            let throwsError = true;
+            // すでにステータスが進行していた場合、OrderProcessing->OrderInTransitの処理自体は成功しているので、後処理を続行する
+            order = yield repos.order.findByOrderNumber({
+                orderNumber: params.orderNumber,
+                project: { id: params.project.id },
+                inclusion: [],
+                exclusion: ['acceptedOffers']
+            });
+            if (order.orderStatus === factory.orderStatus.OrderDelivered
+                || order.orderStatus === factory.orderStatus.OrderReturned) {
+                throwsError = false;
+            }
+            if (throwsError) {
+                throw error;
+            }
+        }
+        if (params.useOnOrderStatusChanged) {
+            yield (0, onOrderStatusChanged_1.onOrderInTransit)({
+                order: Object.assign(Object.assign({}, order), { orderStatus: (settings_1.USE_ORDER_IN_TRANSIT)
+                        ? factory.orderStatus.OrderInTransit
+                        : factory.orderStatus.OrderProcessing })
+                // placeOrderTransaction
+            })({
+                task: repos.task
+            });
+        }
+    });
+}
+exports.processing2inTransit = processing2inTransit;

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

@@ -86,25 +86,24 @@ function createOnOrderSentTasksByTransaction(params) {
                 };
             }));
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (Array.isArray(potentialActions.sendEmailMessage)) {
-            potentialActions.sendEmailMessage.forEach((s) => {
-                const sendEmailMessageTask = {
-                    project: s.project,
-                    name: factory.taskName.SendEmailMessage,
-                    status: factory.taskStatus.Ready,
-                    runsAt: now,
-                    remainingNumberOfTries: 3,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: {
-                        actionAttributes: s
-                    }
-                };
-                taskAttributes.push(sendEmailMessageTask);
-            });
-        }
+        // createSendEmailMessageTaskIfNotExistへ移行(2024-01-12~)
+        // if (Array.isArray(potentialActions.sendEmailMessage)) {
+        //     potentialActions.sendEmailMessage.forEach((s) => {
+        //         const sendEmailMessageTask: factory.task.IAttributes<factory.taskName.SendEmailMessage> = {
+        //             project: s.project,
+        //             name: factory.taskName.SendEmailMessage,
+        //             status: factory.taskStatus.Ready,
+        //             runsAt: now, // なるはやで実行
+        //             remainingNumberOfTries: 3,
+        //             numberOfTried: 0,
+        //             executionResults: [],
+        //             data: {
+        //                 actionAttributes: s
+        //             }
+        //         };
+        //         taskAttributes.push(sendEmailMessageTask);
+        //     });
+        // }
     }
     return taskAttributes;
 }

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

@@ -14,6 +14,7 @@ exports.onOrderDelivered = void 0;
  * 注文ステータス変更時処理
  */
 const createDebug = require("debug");
+const util = require("util");
 const factory = require("../../../factory");
 const factory_1 = require("./onOrderDelivered/factory");
 const debug = createDebug('chevre-domain:service:order');
@@ -22,43 +23,55 @@ function onOrderDelivered(params) {
         var _a, _b, _c, _d, _e;
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks = [];
+        const sendOrderPotentialActions = (_e = (_d = (_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) === null || _d === void 0 ? void 0 : _d.sendOrder) === null || _e === void 0 ? void 0 : _e.potentialActions;
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderDelivered:
                 tasks = [
                     ...(0, factory_1.createInformTasks)(params.order),
-                    // 取引のpotentialActionsを適用(2023-08-17~)
                     ...(0, factory_1.createOnOrderSentTasksByTransaction)({
-                        potentialActions: (_e = (_d = (_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) === null || _d === void 0 ? void 0 : _d.sendOrder) === null || _e === void 0 ? void 0 : _e.potentialActions
+                        potentialActions: sendOrderPotentialActions
                     })
                 ];
-                // プロダクト登録プロセスロック解除
-                try {
-                    const placeOrderTransaction = params.placeOrderTransaction;
-                    if (typeof (placeOrderTransaction === null || placeOrderTransaction === void 0 ? void 0 : placeOrderTransaction.id) === 'string') {
-                        // 廃止(2023-12-07~)
-                        // プロダクト登録プロセスロック解除(orderからproductIdを抽出する)
-                        // const productIds4unlock = params.order.acceptedOffers
-                        //     .filter((o) => o.itemOffered.typeOf === factory.permit.PermitType.Permit
-                        //         && typeof o.itemOffered.issuedThrough?.id === 'string'
-                        //         && o.itemOffered.issuedThrough.id.length > 0)
-                        //     .map((o) => String((<factory.order.IPermit>o.itemOffered).issuedThrough?.id));
-                        // await Promise.all(productIds4unlock.map(async (productId) => {
-                        //     await processUnlockRegisterMembershipService({
-                        //         agent: { id: String(params.order.customer.id) },
-                        //         product: { id: productId },
-                        //         purpose: { typeOf: placeOrderTransaction.typeOf, id: placeOrderTransaction.id }
-                        //     })(repos);
-                        // }));
-                    }
-                }
-                catch (error) {
-                    throw error;
-                }
                 break;
             default:
                 throw new factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
         }
         yield repos.task.saveMany(tasks, { emitImmediately: true });
+        switch (params.order.orderStatus) {
+            case factory.orderStatus.OrderDelivered:
+                yield createSendEmailMessageTaskIfNotExist({
+                    potentialActions: sendOrderPotentialActions
+                })(repos);
+                break;
+            default:
+                throw new factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
+        }
     });
 }
 exports.onOrderDelivered = onOrderDelivered;
+function createSendEmailMessageTaskIfNotExist(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const sendEmailMessageActions = (_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.sendEmailMessage;
+        const now = new Date();
+        if (Array.isArray(sendEmailMessageActions)) {
+            yield Promise.all(sendEmailMessageActions.map((sendEmailMessageAction, index) => __awaiter(this, void 0, void 0, function* () {
+                const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', sendEmailMessageAction.project.id, factory.taskName.SendEmailMessage, sendEmailMessageAction.purpose.typeOf, sendEmailMessageAction.purpose.orderNumber, factory.orderStatus.OrderDelivered, index);
+                const sendEmailMessageTask = {
+                    identifier: taskIdentifier,
+                    project: sendEmailMessageAction.project,
+                    name: factory.taskName.SendEmailMessage,
+                    status: factory.taskStatus.Ready,
+                    runsAt: now,
+                    remainingNumberOfTries: 10,
+                    numberOfTried: 0,
+                    executionResults: [],
+                    data: {
+                        actionAttributes: sendEmailMessageAction
+                    }
+                };
+                yield repos.task.createIfNotExistByIdentifier(sendEmailMessageTask, { emitImmediately: true });
+            })));
+        }
+    });
+}