@chevre/domain 21.37.0-alpha.8 → 21.37.0

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

@@ -0,0 +1,168 @@
+"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.processOrder = void 0;
+/**
+ * 注文処理時処理
+ */
+const createDebug = require("debug");
+const util = require("util");
+const factory = require("../../../../factory");
+const settings_1 = require("../../../../settings");
+const factory_1 = require("./factory");
+const debug = createDebug('chevre-domain:service:order');
+function processOrder(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const simpleOrder = {
+            typeOf: params.order.typeOf,
+            // seller: {
+            //     id: params.order.seller.id,
+            //     typeOf: params.order.seller.typeOf,
+            //     name: params.order.seller.name
+            // }, // 廃止(2024-03-06~)
+            // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
+            orderNumber: params.order.orderNumber,
+            // price: params.order.price,
+            // priceCurrency: params.order.priceCurrency,
+            orderDate: params.order.orderDate
+        };
+        if (params.order.itemOfferedTypeOf === factory.actionType.MoneyTransfer) {
+            yield createConfirmMoneyTransferTasksIfNotExist(params.order, simpleOrder)(repos);
+        }
+        else if (params.order.itemOfferedTypeOf === factory.reservationType.BusReservation
+            || params.order.itemOfferedTypeOf === factory.reservationType.EventReservation) {
+            // 冗長なconfirmReserveTransactionタスク作成を回避(2023-08-25~)
+            yield createConfirmReserveTransactionTasksIfNotExist(params.order, simpleOrder, params.options)(repos);
+        }
+        else if (params.order.itemOfferedTypeOf === factory.permit.PermitType.Permit) {
+            yield createConfirmRegisterServiceTasksIfNotExist(params.order, simpleOrder)(repos);
+        }
+    });
+}
+exports.processOrder = processOrder;
+function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder, options) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const taskRunsAt = new Date();
+        const taskRunsAt4coa = new Date();
+        let confirmObjects;
+        if (order.offeredThroughIdentifier === factory.service.webAPI.Identifier.COA) {
+            confirmObjects = (0, factory_1.createConfirmReservationActionObject4COAByOrder)({ order });
+        }
+        else {
+            confirmObjects = (0, factory_1.createConfirmReservationActionObject4ChevreByOrder)({ order });
+        }
+        yield Promise.all(confirmObjects.map((confirmObject) => __awaiter(this, void 0, void 0, function* () {
+            const data = {
+                project: order.project,
+                typeOf: factory.actionType.ConfirmAction,
+                object: confirmObject,
+                agent: order.project,
+                purpose: simpleOrder
+                // instrument廃止(2024-03-13~)
+                // instrument: {
+                //     typeOf: 'WebAPI',
+                //     identifier: (confirmObject.typeOf === factory.assetTransactionType.COAReserveTransaction)
+                //         ? factory.service.webAPI.Identifier.COA
+                //         : 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,
+                runsAt: (confirmObject.typeOf === factory.assetTransactionType.COAReserveTransaction) ? taskRunsAt4coa : taskRunsAt,
+                remainingNumberOfTries: settings_1.NUM_TRY_CONFIRM_RESERVE_TRANSACTION,
+                numberOfTried: 0,
+                executionResults: [],
+                data
+            };
+            yield repos.task.createIfNotExistByIdentifier(confirmReserveTransactionTask, { emitImmediately: true });
+            if (options.force === true) {
+                const existingTask = yield repos.task.findByIdentifier({
+                    identifier: taskIdentifier,
+                    name: confirmReserveTransactionTask.name,
+                    project: { id: confirmReserveTransactionTask.project.id }
+                });
+                if (typeof (existingTask === null || existingTask === void 0 ? void 0 : existingTask.id) === 'string') {
+                    const retryResult = yield repos.task.retryForciblyIfAborted({
+                        id: existingTask.id,
+                        remainingNumberOfTries: settings_1.NUM_TRY_CONFIRM_RESERVE_TRANSACTION
+                    });
+                    debug('retryResult:', retryResult, 'taskIdentifier:', taskIdentifier);
+                }
+            }
+        })));
+    });
+}
+function createConfirmMoneyTransferTasksIfNotExist(order, simpleOrder) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const taskRunsAt = new Date();
+        yield Promise.all(order.serialNumbers.map((moneyTransferTransactionNumber) => __awaiter(this, void 0, void 0, function* () {
+            const data = {
+                project: order.project,
+                typeOf: factory.actionType.ConfirmAction,
+                object: {
+                    // pendingTransaction: { id: '' }, // 空文字であれば、transactionNumberで処理される
+                    transactionNumber: moneyTransferTransactionNumber,
+                    typeOf: factory.assetTransactionType.MoneyTransfer
+                },
+                agent: order.project,
+                purpose: simpleOrder
+            };
+            const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', data.project.id, factory.taskName.ConfirmMoneyTransfer, data.purpose.typeOf, simpleOrder.orderNumber, data.object.typeOf, data.object.transactionNumber);
+            const confirmMoneyTransferTransactionTask = {
+                identifier: taskIdentifier,
+                project: order.project,
+                name: factory.taskName.ConfirmMoneyTransfer,
+                status: factory.taskStatus.Ready,
+                runsAt: taskRunsAt,
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data
+            };
+            yield repos.task.createIfNotExistByIdentifier(confirmMoneyTransferTransactionTask, { emitImmediately: true });
+        })));
+    });
+}
+function createConfirmRegisterServiceTasksIfNotExist(order, simpleOrder) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const taskRunsAt = new Date();
+        yield Promise.all(order.serialNumbers.map((registerServiceTransactionNumber) => __awaiter(this, void 0, void 0, function* () {
+            const data = {
+                project: order.project,
+                typeOf: factory.actionType.ConfirmAction,
+                object: {
+                    endDate: order.orderDate,
+                    transactionNumber: registerServiceTransactionNumber,
+                    typeOf: factory.assetTransactionType.RegisterService
+                },
+                agent: order.project,
+                purpose: simpleOrder
+            };
+            const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', data.project.id, factory.taskName.ConfirmRegisterService, data.purpose.typeOf, simpleOrder.orderNumber, data.object.typeOf, data.object.transactionNumber);
+            const confirmRegisterServiceTask = {
+                identifier: taskIdentifier,
+                project: order.project,
+                name: factory.taskName.ConfirmRegisterService,
+                status: factory.taskStatus.Ready,
+                runsAt: taskRunsAt,
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data
+            };
+            yield repos.task.createIfNotExistByIdentifier(confirmRegisterServiceTask, { emitImmediately: true });
+        })));
+    });
+}

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

@@ -1,11 +1,10 @@
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
-import { IExternalOrder } from './onOrderProcessing/factory';
+import { IExternalOrder, IProcessingOrder } from './onOrderProcessing/factory';
+import { processOrder } from './onOrderProcessing/processOrder';
 type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'typeOf' | 'potentialActions'>;
 declare function onOrderProcessing(params: {
-    order: Omit<factory.order.IOrder, 'orderStatus'> & {
-        orderStatus: factory.orderStatus.OrderProcessing;
-        numAcceptedOffers: number;
+    order: IProcessingOrder & {
         itemOfferedTypeOf: factory.order.IItemOffered['typeOf'];
         serialNumbers: string[];
         offeredThroughIdentifier?: factory.service.webAPI.Identifier;
@@ -14,4 +13,4 @@ declare function onOrderProcessing(params: {
 }): (repos: {
     task: TaskRepo;
 }) => Promise<void>;
-export { IExternalOrder, onOrderProcessing };
+export { IExternalOrder, onOrderProcessing, processOrder };

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

@@ -9,16 +9,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onOrderProcessing = void 0;
+exports.processOrder = exports.onOrderProcessing = void 0;
 /**
  * 注文処理時処理
  */
 const createDebug = require("debug");
-const util = require("util");
 const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
 const createSendEmailMessageTaskIfNotExist_1 = require("./onOrderProcessing/createSendEmailMessageTaskIfNotExist");
 const factory_1 = require("./onOrderProcessing/factory");
+const processOrder_1 = require("./onOrderProcessing/processOrder");
+Object.defineProperty(exports, "processOrder", { enumerable: true, get: function () { return processOrder_1.processOrder; } });
 const debug = createDebug('chevre-domain:service:order');
 function onOrderProcessing(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
@@ -27,20 +28,6 @@ function onOrderProcessing(params) {
         let tasks = [];
         const sendEmailMessageByOrderPotentialActions = (_f = (_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) === null || _f === void 0 ? void 0 : _f.sendEmailMessage;
         const sendEmailMessageByOnOrderProcessing = (_k = (_j = (_h = (_g = params.placeOrderTransaction) === null || _g === void 0 ? void 0 : _g.potentialActions) === null || _h === void 0 ? void 0 : _h.order) === null || _j === void 0 ? void 0 : _j.onOrderProcessing) === null || _k === void 0 ? void 0 : _k.sendEmailMessage;
-        // const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
-        const simpleOrder = {
-            typeOf: params.order.typeOf,
-            // seller: {
-            //     id: params.order.seller.id,
-            //     typeOf: params.order.seller.typeOf,
-            //     name: params.order.seller.name
-            // }, // 廃止(2024-03-06~)
-            // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
-            orderNumber: params.order.orderNumber,
-            // price: params.order.price,
-            // priceCurrency: params.order.priceCurrency,
-            orderDate: params.order.orderDate
-        };
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderProcessing:
                 tasks = [
@@ -54,21 +41,7 @@ function onOrderProcessing(params) {
         yield repos.task.saveMany(tasks, { emitImmediately: true });
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderProcessing:
-                if (params.order.itemOfferedTypeOf === factory.actionType.MoneyTransfer) {
-                    yield createConfirmMoneyTransferTasksIfNotExist(params.order, simpleOrder)(repos);
-                }
-                else if (params.order.itemOfferedTypeOf === factory.reservationType.BusReservation
-                    || params.order.itemOfferedTypeOf === factory.reservationType.EventReservation) {
-                    // 冗長なconfirmReserveTransactionタスク作成を回避(2023-08-25~)
-                    yield createConfirmReserveTransactionTasksIfNotExist(params.order, simpleOrder)(repos);
-                }
-                else if (params.order.itemOfferedTypeOf === factory.permit.PermitType.Permit) {
-                    yield createConfirmRegisterServiceTasksIfNotExist(params.order, simpleOrder)(repos);
-                }
-                // 完全廃止(2024-03-12~)
-                // await createGivePointAwardTaskIfNotExist({
-                //     potentialActions: params.placeOrderTransaction?.potentialActions?.order?.potentialActions
-                // })(repos);
+                yield (0, processOrder_1.processOrder)({ order: params.order, options: { force: false } })(repos);
                 // OrderProcessingにおけるEメール送信に対応(2024-01-17~)
                 yield (0, createSendEmailMessageTaskIfNotExist_1.createSendEmailMessageTaskIfNotExist)({
                     sendEmailMessage: [
@@ -83,107 +56,3 @@ function onOrderProcessing(params) {
     });
 }
 exports.onOrderProcessing = onOrderProcessing;
-function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const taskRunsAt = new Date();
-        const taskRunsAt4coa = new Date();
-        let confirmObjects;
-        if (order.offeredThroughIdentifier === factory.service.webAPI.Identifier.COA) {
-            confirmObjects = (0, factory_1.createConfirmReservationActionObject4COAByOrder)({ order });
-        }
-        else {
-            confirmObjects = (0, factory_1.createConfirmReservationActionObject4ChevreByOrder)({ order });
-        }
-        yield Promise.all(confirmObjects.map((confirmObject) => __awaiter(this, void 0, void 0, function* () {
-            const data = {
-                project: order.project,
-                typeOf: factory.actionType.ConfirmAction,
-                object: confirmObject,
-                agent: order.project,
-                purpose: simpleOrder
-                // instrument廃止(2024-03-13~)
-                // instrument: {
-                //     typeOf: 'WebAPI',
-                //     identifier: (confirmObject.typeOf === factory.assetTransactionType.COAReserveTransaction)
-                //         ? factory.service.webAPI.Identifier.COA
-                //         : 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,
-                runsAt: (confirmObject.typeOf === factory.assetTransactionType.COAReserveTransaction) ? taskRunsAt4coa : taskRunsAt,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data
-            };
-            yield repos.task.createIfNotExistByIdentifier(confirmReserveTransactionTask, { emitImmediately: true });
-        })));
-    });
-}
-function createConfirmMoneyTransferTasksIfNotExist(order, simpleOrder) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const taskRunsAt = new Date();
-        yield Promise.all(order.serialNumbers.map((moneyTransferTransactionNumber) => __awaiter(this, void 0, void 0, function* () {
-            const data = {
-                project: order.project,
-                typeOf: factory.actionType.ConfirmAction,
-                object: {
-                    // pendingTransaction: { id: '' }, // 空文字であれば、transactionNumberで処理される
-                    transactionNumber: moneyTransferTransactionNumber,
-                    typeOf: factory.assetTransactionType.MoneyTransfer
-                },
-                agent: order.project,
-                purpose: simpleOrder
-            };
-            const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', data.project.id, factory.taskName.ConfirmMoneyTransfer, data.purpose.typeOf, simpleOrder.orderNumber, data.object.typeOf, data.object.transactionNumber);
-            const confirmMoneyTransferTransactionTask = {
-                identifier: taskIdentifier,
-                project: order.project,
-                name: factory.taskName.ConfirmMoneyTransfer,
-                status: factory.taskStatus.Ready,
-                runsAt: taskRunsAt,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data
-            };
-            yield repos.task.createIfNotExistByIdentifier(confirmMoneyTransferTransactionTask, { emitImmediately: true });
-        })));
-    });
-}
-function createConfirmRegisterServiceTasksIfNotExist(order, simpleOrder) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const taskRunsAt = new Date();
-        yield Promise.all(order.serialNumbers.map((registerServiceTransactionNumber) => __awaiter(this, void 0, void 0, function* () {
-            const data = {
-                project: order.project,
-                typeOf: factory.actionType.ConfirmAction,
-                object: {
-                    endDate: order.orderDate,
-                    transactionNumber: registerServiceTransactionNumber,
-                    typeOf: factory.assetTransactionType.RegisterService
-                },
-                agent: order.project,
-                purpose: simpleOrder
-            };
-            const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', data.project.id, factory.taskName.ConfirmRegisterService, data.purpose.typeOf, simpleOrder.orderNumber, data.object.typeOf, data.object.transactionNumber);
-            const confirmRegisterServiceTask = {
-                identifier: taskIdentifier,
-                project: order.project,
-                name: factory.taskName.ConfirmRegisterService,
-                status: factory.taskStatus.Ready,
-                runsAt: taskRunsAt,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data
-            };
-            yield repos.task.createIfNotExistByIdentifier(confirmRegisterServiceTask, { emitImmediately: true });
-        })));
-    });
-}

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

@@ -6,6 +6,6 @@ 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 { IExternalOrder, onOrderProcessing, processOrder } from './onOrderStatusChanged/onOrderProcessing';
 import { onOrderReturned } from './onOrderStatusChanged/onOrderReturned';
-export { IExternalOrder, onOrderCancelled, onOrderDelivered, onOrderDeliveredPartially, onOrderInTransit, onOrderPaymentDue, onOrderProcessing, onOrderReturned };
+export { IExternalOrder, onOrderCancelled, onOrderDelivered, onOrderDeliveredPartially, onOrderInTransit, onOrderPaymentDue, onOrderProcessing, onOrderReturned, processOrder };

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.onOrderInTransit = exports.onOrderDeliveredPartially = exports.onOrderDelivered = exports.onOrderCancelled = void 0;
+exports.processOrder = exports.onOrderReturned = exports.onOrderProcessing = exports.onOrderPaymentDue = exports.onOrderInTransit = exports.onOrderDeliveredPartially = exports.onOrderDelivered = exports.onOrderCancelled = void 0;
 /**
  * 注文ステータス変更時処理
  */
@@ -16,5 +16,6 @@ const onOrderPaymentDue_1 = require("./onOrderStatusChanged/onOrderPaymentDue");
 Object.defineProperty(exports, "onOrderPaymentDue", { enumerable: true, get: function () { return onOrderPaymentDue_1.onOrderPaymentDue; } });
 const onOrderProcessing_1 = require("./onOrderStatusChanged/onOrderProcessing");
 Object.defineProperty(exports, "onOrderProcessing", { enumerable: true, get: function () { return onOrderProcessing_1.onOrderProcessing; } });
+Object.defineProperty(exports, "processOrder", { enumerable: true, get: function () { return onOrderProcessing_1.processOrder; } });
 const onOrderReturned_1 = require("./onOrderStatusChanged/onOrderReturned");
 Object.defineProperty(exports, "onOrderReturned", { enumerable: true, get: function () { return onOrderReturned_1.onOrderReturned; } });

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

@@ -4,10 +4,10 @@
 import { confirmPayTransaction } from './order/confirmPayTransaction';
 import { deleteOrder } from './order/deleteOrder';
 import { onAssetTransactionStatusChanged, paymentDue2Processing } from './order/onAssetTransactionStatusChanged';
-import { onOrderProcessing } from './order/onOrderStatusChanged';
+import { onOrderProcessing, processOrder } from './order/onOrderStatusChanged';
 import { onOrderUpdated } from './order/onOrderUpdated';
 import { payOrder } from './order/payOrder';
 import { placeOrder } from './order/placeOrder';
 import { placeOrderWithoutTransaction } from './order/placeOrderWithoutTransaction';
 import { sendOrder } from './order/sendOrder';
-export { confirmPayTransaction, deleteOrder, onAssetTransactionStatusChanged, onOrderProcessing, onOrderUpdated, paymentDue2Processing, payOrder, placeOrder, placeOrderWithoutTransaction, sendOrder };
+export { confirmPayTransaction, deleteOrder, onAssetTransactionStatusChanged, onOrderProcessing, onOrderUpdated, paymentDue2Processing, payOrder, placeOrder, placeOrderWithoutTransaction, processOrder, sendOrder };

package/lib/chevre/service/order.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendOrder = exports.placeOrderWithoutTransaction = exports.placeOrder = exports.payOrder = exports.paymentDue2Processing = exports.onOrderUpdated = exports.onOrderProcessing = exports.onAssetTransactionStatusChanged = exports.deleteOrder = exports.confirmPayTransaction = void 0;
+exports.sendOrder = exports.processOrder = exports.placeOrderWithoutTransaction = exports.placeOrder = exports.payOrder = exports.paymentDue2Processing = exports.onOrderUpdated = exports.onOrderProcessing = exports.onAssetTransactionStatusChanged = exports.deleteOrder = exports.confirmPayTransaction = void 0;
 /**
  * 注文サービス
  */
@@ -13,6 +13,7 @@ Object.defineProperty(exports, "onAssetTransactionStatusChanged", { enumerable:
 Object.defineProperty(exports, "paymentDue2Processing", { enumerable: true, get: function () { return onAssetTransactionStatusChanged_1.paymentDue2Processing; } });
 const onOrderStatusChanged_1 = require("./order/onOrderStatusChanged");
 Object.defineProperty(exports, "onOrderProcessing", { enumerable: true, get: function () { return onOrderStatusChanged_1.onOrderProcessing; } });
+Object.defineProperty(exports, "processOrder", { enumerable: true, get: function () { return onOrderStatusChanged_1.processOrder; } });
 const onOrderUpdated_1 = require("./order/onOrderUpdated");
 Object.defineProperty(exports, "onOrderUpdated", { enumerable: true, get: function () { return onOrderUpdated_1.onOrderUpdated; } });
 const payOrder_1 = require("./order/payOrder");

package/lib/chevre/service/transaction/moneyTransfer.d.ts

@@ -2,6 +2,7 @@ import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../repo/code';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
+import type { PassportRepo } from '../../repo/passport';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
 import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { MongoRepository as SellerRepo } from '../../repo/seller';
@@ -9,11 +10,12 @@ import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { TicketRepo } from '../../repo/ticket';
 import type { IStartedTransaction, MongoRepository as TransactionRepo } from '../../repo/transaction';
 import type { RedisRepository as TransactionNumberRepo } from '../../repo/transactionNumber';
-import { IPassportValidator as IWaiterPassportValidator, moneyTransfer as MoneyTransferFactory } from '../../factory/transaction';
+import { moneyTransfer as MoneyTransferFactory } from '../../factory/transaction';
 export interface IStartOperationRepos {
     action: ActionRepo;
     authorization: AuthorizationRepo;
     order: OrderRepo;
+    passport: PassportRepo;
     product: ProductRepo;
     project: ProjectRepo;
     seller: SellerRepo;
@@ -31,7 +33,6 @@ export type IConfirmOperation<T> = (repos: {
     action: ActionRepo;
     transaction: TransactionRepo;
 }) => Promise<T>;
-export type IPassportValidator = IWaiterPassportValidator;
 export type IStartParams = MoneyTransferFactory.IStartParams;
 /**
  * 取引開始

package/lib/chevre/service/transaction/moneyTransfer.js

@@ -19,7 +19,6 @@ const order_1 = require("../../factory/order");
 const factory_1 = require("./moneyTransfer/exportTasks/factory");
 const factory_2 = require("./moneyTransfer/factory");
 const potentialActions_1 = require("./moneyTransfer/potentialActions");
-const validation_1 = require("./validation");
 const MoneyTransferAssetTransactionService = require("../assetTransaction/moneyTransfer");
 const CodeService = require("../code");
 /**
@@ -28,7 +27,7 @@ const CodeService = require("../code");
  */
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const { passport } = yield (0, validation_1.validateWaiterPassport)(params);
+        const { passport } = yield repos.passport.validatePassportTokenIfExist(params);
         const sellers = yield repos.seller.search({
             limit: 1,
             page: 1,

package/lib/chevre/service/transaction/placeOrderInProgress/start/factory.d.ts

@@ -0,0 +1,10 @@
+import * as factory from '../../../../factory';
+declare const AGENT_IDENTIFIER_NAME_PASSPORT = "passport";
+type IVerifiedPassport = factory.waiter.passport.IPassport & {
+    /**
+     * 許可証識別子(2024-07-06~)
+     */
+    identifier: string;
+};
+declare function createStartParams(params: factory.transaction.placeOrder.IStartParamsWithoutDetail, expiresInSeconds: number, passport: IVerifiedPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project' | 'additionalProperty'>, broker?: factory.order.IBroker, customerType?: string, memeberOfPayload?: factory.transaction.placeOrder.IMemberOfPayload): factory.transaction.placeOrder.IStartParams;
+export { AGENT_IDENTIFIER_NAME_PASSPORT, createStartParams };

package/lib/chevre/service/transaction/placeOrderInProgress/start/factory.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createStartParams = exports.AGENT_IDENTIFIER_NAME_PASSPORT = void 0;
+const factory = require("../../../../factory");
+const AGENT_IDENTIFIER_NAME_PASSPORT = 'passport';
+exports.AGENT_IDENTIFIER_NAME_PASSPORT = AGENT_IDENTIFIER_NAME_PASSPORT;
+function createStartParams(params, expiresInSeconds, passport, seller, broker, customerType, memeberOfPayload) {
+    var _a, _b, _c, _d;
+    let clientUser;
+    let instrument;
+    if (typeof ((_a = params.object.clientUser) === null || _a === void 0 ? void 0 : _a.client_id) === 'string') {
+        const { sub, token_use, iss, exp, iat, version, jti, client_id, username, aud, typ } = params.object.clientUser;
+        clientUser = { sub, token_use, iss, exp, iat, version, jti, client_id, username, aud, typ };
+        instrument = { id: client_id, typeOf: factory.creativeWorkType.WebApplication };
+    }
+    const transactionObject = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (typeof (passport === null || passport === void 0 ? void 0 : passport.scope) === 'string') ? { passport } : undefined), (typeof (clientUser === null || clientUser === void 0 ? void 0 : clientUser.client_id) === 'string') ? { clientUser } : undefined), (typeof ((_b = params.object) === null || _b === void 0 ? void 0 : _b.name) === 'string') ? { name: (_c = params.object) === null || _c === void 0 ? void 0 : _c.name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker: broker } : undefined), (typeof ((_d = params.object.customer) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string') ? { customer: params.object.customer } : undefined), (typeof customerType === 'string') ? { customerType } : undefined);
+    if (typeof seller.id !== 'string') {
+        throw new factory.errors.NotFound('seller.id');
+    }
+    if (typeof expiresInSeconds !== 'number') {
+        throw new factory.errors.ArgumentNull('expiresInSeconds');
+    }
+    const agentIdentifier = [
+        ...(Array.isArray(params.agent.identifier)) ? params.agent.identifier : [],
+        // add passport(2024-07-05~)
+        ...(typeof (passport === null || passport === void 0 ? void 0 : passport.identifier) === 'string') ? [{ name: AGENT_IDENTIFIER_NAME_PASSPORT, value: passport.identifier }] : []
+    ];
+    const agent = Object.assign(Object.assign(Object.assign({}, params.agent), (memeberOfPayload !== undefined) ? { memeberOfPayload } : undefined), { identifier: agentIdentifier });
+    return Object.assign({ project: { typeOf: seller.project.typeOf, id: seller.project.id }, typeOf: factory.transactionType.PlaceOrder, agent, seller: {
+            id: seller.id,
+            name: seller.name,
+            typeOf: seller.typeOf,
+            additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : [] // 追加特性を追加(2023-08-08~)
+        }, object: transactionObject, expiresInSeconds }, (typeof (instrument === null || instrument === void 0 ? void 0 : instrument.id) === 'string') ? { instrument } : undefined);
+}
+exports.createStartParams = createStartParams;

package/lib/chevre/service/transaction/placeOrderInProgress/start.d.ts

@@ -1,18 +1,23 @@
 import type { MongoRepository as MemberRepo } from '../../../repo/member';
+import type { PassportRepo } from '../../../repo/passport';
 import type { MongoRepository as ProjectMakesOfferRepo } from '../../../repo/projectMakesOffer';
 import type { MongoRepository as SellerRepo } from '../../../repo/seller';
 import type { IStartedTransaction, MongoRepository as TransactionRepo } from '../../../repo/transaction';
 import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
 interface IStartOperationRepos {
     member: MemberRepo;
+    passport: PassportRepo;
     projectMakesOffer: ProjectMakesOfferRepo;
     seller: SellerRepo;
     transaction: TransactionRepo;
 }
 type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
 type IStartParams = PlaceOrderFactory.IStartParams;
+interface IStartOptions {
+    lockPassport: boolean;
+}
 /**
  * 取引開始
  */
-declare function start(params: IStartParams): IStartOperation<IStartedTransaction>;
+declare function start(params: IStartParams, options: IStartOptions): IStartOperation<IStartedTransaction>;
 export { start };

package/lib/chevre/service/transaction/placeOrderInProgress/start.js

@@ -10,18 +10,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.start = void 0;
-const errorHandler_1 = require("../../../errorHandler");
 const factory = require("../../../factory");
-const validation_1 = require("../validation");
-const factory_1 = require("./factory");
+const factory_1 = require("./start/factory");
 const validateStartRequest_1 = require("./validation/validateStartRequest");
 /**
  * 取引開始
  */
-function start(params) {
+function start(params, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const { passport, customerType } = yield (0, validation_1.validateWaiterPassport)(params);
+        const { passport, customerType } = yield repos.passport.validatePassportTokenIfExist(params);
         const { memeberOfPayload, sellerMakesOffer, seller } = yield (0, validateStartRequest_1.validateStartRequest)(Object.assign(Object.assign(Object.assign({ project: { id: params.project.id }, seller: { id: params.seller.id } }, (typeof (passport === null || passport === void 0 ? void 0 : passport.scope) === 'string') ? { customerType } : undefined), (params.object.clientUser !== undefined) ? { clientUser: params.object.clientUser } : undefined), (typeof params.agent.memberOfToken === 'string') ? { memberOfToken: params.agent.memberOfToken } : undefined))(repos);
         const expiresInSeconds = (_a = sellerMakesOffer.eligibleTransactionDuration) === null || _a === void 0 ? void 0 : _a.maxValue;
         if (typeof expiresInSeconds !== 'number') {
@@ -30,14 +28,30 @@ function start(params) {
         // 取引ファクトリーで新しい進行中取引オブジェクトを作成
         const startParams = (0, factory_1.createStartParams)(params, expiresInSeconds, passport, seller, params.broker, customerType, memeberOfPayload);
         let transaction;
-        try {
-            transaction = yield repos.transaction.start(startParams);
-        }
-        catch (error) {
-            if (yield (0, errorHandler_1.isMongoError)(error)) {
-                // no op
+        // lock passport(2024-07-05~)
+        if (options.lockPassport && passport !== undefined) {
+            try {
+                yield repos.passport.lock(passport);
+            }
+            catch (error) {
+                // in case already locked
+                const alreadyStartedTransaction = (yield repos.transaction.search({
+                    limit: 1, page: 1,
+                    typeOf: factory.transactionType.PlaceOrder,
+                    project: { id: { $eq: startParams.project.id } },
+                    agent: { identifiers: [{ name: factory_1.AGENT_IDENTIFIER_NAME_PASSPORT, value: passport.identifier }] },
+                    inclusion: ['expires', 'startDate', 'status']
+                })).shift();
+                if (alreadyStartedTransaction !== undefined) {
+                    transaction = alreadyStartedTransaction;
+                }
+                else {
+                    throw error;
+                }
             }
-            throw error;
+        }
+        if (transaction === undefined) {
+            transaction = yield repos.transaction.start(startParams);
         }
         return transaction;
     });

package/lib/chevre/service/validation/validateOrder.js

@@ -13,7 +13,7 @@ exports.validateOrder = void 0;
 // import * as createDebug from 'debug';
 const moment = require("moment");
 const factory = require("../../factory");
-const factory_1 = require("../offer/event/factory");
+const factory_1 = require("../offer/event/authorize/factory");
 const factory_2 = require("../offer/product/factory");
 const validateMovieTicket_1 = require("../transaction/placeOrderInProgress/validation/validateMovieTicket");
 // const debug = createDebug('chevre-domain:service:validation');

package/lib/chevre/settings.d.ts

@@ -4,6 +4,7 @@ export declare const TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS: number;
 export declare const MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS: number;
 export declare const ABORTED_TASKS_WITHOUT_REPORT: string[];
 export declare const MAX_NUM_CREDIT_CARD_PAYMENT_METHOD: number;
+export declare const NUM_TRY_CONFIRM_RESERVE_TRANSACTION: number;
 /**
  * 取引保管期間(Confirmed)
  */