@chevre/domain 21.35.0-alpha.8 → 21.35.0

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

@@ -6,22 +6,6 @@ import type { MongoRepository as OrderInTransactionRepo } from '../../repo/order
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
 import * as factory from '../../factory';
-import { IExternalOrder } from './onOrderStatusChanged';
-/**
- * 注文取引なしに注文を作成する
- */
-declare function placeOrderWithoutTransaction(params: {
-    agent?: factory.action.trade.order.IAgent;
-    project: {
-        id: string;
-    };
-    object: IExternalOrder;
-}): (repos: {
-    accountingReport: AccountingReportRepo;
-    action: ActionRepo;
-    order: OrderRepo;
-    task: TaskRepo;
-}) => Promise<void>;
 /**
  * 注文を作成する
  */
@@ -46,4 +30,4 @@ declare function placeOrder(params: {
 }) => Promise<{
     order: factory.transaction.placeOrder.IOrderAsResult;
 }>;
-export { placeOrder, placeOrderWithoutTransaction };
+export { placeOrder };

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

@@ -9,141 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.placeOrderWithoutTransaction = exports.placeOrder = void 0;
-const createDebug = require("debug");
+exports.placeOrder = void 0;
 const factory = require("../../factory");
 const onAssetTransactionStatusChanged_1 = require("./onAssetTransactionStatusChanged");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
-const factory_1 = require("./placeOrder/factory");
-const debug = createDebug('chevre-domain:service:order');
-function createPlacingOrderFromExistingTransaction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const confirmationNumber = String(params.confirmationNumber);
-        const orderNumber = params.orderNumber;
-        let order;
-        const placeOrderTransactions = yield repos.transaction.search({
-            limit: 1,
-            page: 1,
-            project: { id: { $eq: params.project.id } },
-            typeOf: factory.transactionType.PlaceOrder,
-            statuses: [factory.transactionStatusType.Confirmed],
-            result: {
-                order: {
-                    confirmationNumber: { $eq: confirmationNumber },
-                    orderNumbers: [orderNumber]
-                }
-            },
-            inclusion: ['project', 'typeOf', 'result', 'object', 'seller'] // potentialActionsは必要なし(2024-01-19~)
-        });
-        const placeOrderTransactionWithResult = placeOrderTransactions.shift();
-        if (placeOrderTransactionWithResult === undefined) {
-            throw new factory.errors.NotFound(factory.transactionType.PlaceOrder);
-        }
-        let authorizePaymentActions = [];
-        const authorizeActionsAsResult = (_a = placeOrderTransactionWithResult.result) === null || _a === void 0 ? void 0 : _a.authorizeActions;
-        if (Array.isArray(authorizeActionsAsResult) && authorizeActionsAsResult.length > 0) {
-            const completedAuthorizeActionIds = authorizeActionsAsResult.map(({ id }) => id);
-            if (completedAuthorizeActionIds.length > 0) {
-                authorizePaymentActions = yield repos.action.search({
-                    typeOf: factory.actionType.AuthorizeAction,
-                    purpose: {
-                        typeOf: { $in: [factory.transactionType.PlaceOrder] },
-                        id: { $in: [placeOrderTransactionWithResult.id] }
-                    },
-                    object: { typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment } },
-                    id: { $in: completedAuthorizeActionIds }
-                }, ['result'], []);
-                debug('createPlacingOrderFromExistingTransaction: authorizePaymentActions found:', JSON.stringify(authorizePaymentActions));
-            }
-        }
-        order = (0, factory_1.createPlacingOrder)({ transaction: placeOrderTransactionWithResult, authorizePaymentActions });
-        return { order, placeOrderTransaction: placeOrderTransactionWithResult };
-    });
-}
-/**
- * 注文取引なしに注文を作成する
- */
-function placeOrderWithoutTransaction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const order = params.object;
-        const simpleOrder = {
-            typeOf: order.typeOf,
-            // seller: {
-            //     id: order.seller.id,
-            //     typeOf: order.seller.typeOf,
-            //     name: order.seller.name
-            // }, // 廃止(2024-03-06~)
-            // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
-            orderNumber: order.orderNumber,
-            price: order.price,
-            priceCurrency: order.priceCurrency,
-            orderDate: order.orderDate
-        };
-        const orderActionAttributes = {
-            agent: (typeof ((_a = params.agent) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? params.agent : order.project,
-            object: simpleOrder,
-            potentialActions: {},
-            project: order.project,
-            // purpose: { typeOf: placeOrderTransaction.typeOf, id: placeOrderTransaction.id },
-            typeOf: factory.actionType.OrderAction
-        };
-        const action = yield repos.action.start(orderActionAttributes);
-        try {
-            yield repos.order.createIfNotExist(Object.assign(Object.assign({}, order), { 
-                // discounts: [], // 廃止(2024-04-16~)
-                acceptedOffers: [] }));
-        }
-        catch (error) {
-            try {
-                yield repos.action.giveUp({ typeOf: orderActionAttributes.typeOf, id: action.id, error });
-            }
-            catch (__) {
-                // 失敗したら仕方ない
-            }
-            throw error;
-        }
-        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 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);
-        }
-    });
-}
+const createPlacingOrderFromExistingTransaction_1 = require("./placeOrder/createPlacingOrderFromExistingTransaction");
+const voidAcceptedOfferIfNecessary_1 = require("./placeOrder/voidAcceptedOfferIfNecessary");
 /**
  * 注文を作成する
  */
@@ -155,19 +26,15 @@ function placeOrder(params) {
             throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
         // 注文番号から取引と注文をfixする
-        const { order, placeOrderTransaction } = yield createPlacingOrderFromExistingTransaction({
+        const { order, placeOrderTransaction, serialNumbers } = yield (0, createPlacingOrderFromExistingTransaction_1.createPlacingOrderFromExistingTransaction)({
             project: { id: params.project.id },
             confirmationNumber: params.object.confirmationNumber,
             orderNumber: params.object.orderNumber
-        })({
-            action: repos.action,
-            transaction: repos.transaction
-        });
+        })(repos);
         // 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 = createMaskedCustomer(order, { noProfile: true });
         const simpleOrder = {
             typeOf: order.typeOf,
             // seller: {
@@ -198,9 +65,7 @@ function placeOrder(params) {
             page: 1,
             actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
             typeOf: { $eq: orderActionAttributes.typeOf },
-            object: {
-                orderNumber: { $in: [orderActionAttributes.object.orderNumber] }
-            },
+            object: { orderNumber: { $in: [orderActionAttributes.object.orderNumber] } },
             purpose: {
                 id: { $in: [orderActionPurpose.id] },
                 typeOf: { $in: [orderActionPurpose.typeOf] }
@@ -210,22 +75,12 @@ function placeOrder(params) {
             const action = yield repos.action.start(orderActionAttributes);
             try {
                 // 冗長なオファーを除外する(念のため)
-                yield voidAcceptedOfferIfNecessary({
+                yield (0, voidAcceptedOfferIfNecessary_1.voidAcceptedOfferIfNecessary)({
                     object: { orderNumber: order.orderNumber },
-                    purpose: placeOrderTransaction
+                    // purpose: placeOrderTransaction,
+                    serialNumbers
                 })(repos);
-                // acceptedOffersの内容検証(開発)
-                // if (USE_ACCEPTED_OFFERS_AS_TRANSACTION_RESULT) {
-                //     if (USE_VERIFY_ACCEPTED_OFFERS) {
-                //         await verifyAcceptedOffers({ order })(repos);
-                //     }
-                // }
-                // const ignoreAccpetedOffersFromResult = placeOrderTransaction.result?.options?.ignoreAccpetedOffersFromResult === true;
-                // orderInTransactionを考慮(2024-01-14~)
                 yield repos.orderInTransaction.placeOrder(order);
-                // if (!ignoreAccpetedOffersFromResult) {
-                //     await repos.order.createIfNotExist(order);
-                // }
             }
             catch (error) {
                 try {
@@ -239,9 +94,7 @@ function placeOrder(params) {
             yield repos.action.completeWithVoid({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
         }
         if (params.useOnOrderStatusChanged) {
-            // 経理レポートを保管
-            // CreateAccountingReportへ移行(2024-02-02~)
-            // await createAccountingReportIfNotExist(order)({ accountingReport: repos.accountingReport });
+            // 経理レポートを保管->CreateAccountingReportへ移行(2024-02-02~)
             // PaymentDueであればonOrderStatusChangedを実行(2023-08-23~)
             if (order.orderStatus === factory.orderStatus.OrderPaymentDue) {
                 yield (0, onOrderStatusChanged_1.onOrderPaymentDue)({
@@ -250,7 +103,6 @@ function placeOrder(params) {
                         project: placeOrderTransaction.project,
                         orderNumber: order.orderNumber,
                         confirmationNumber: order.confirmationNumber,
-                        // customer: order.customer,
                         orderDate: order.orderDate,
                         seller: order.seller,
                         typeOf: order.typeOf,
@@ -261,26 +113,6 @@ function placeOrder(params) {
                 })({
                     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`);

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

@@ -0,0 +1,22 @@
+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 TaskRepo } from '../../repo/task';
+import * as factory from '../../factory';
+import { IExternalOrder } from './onOrderStatusChanged';
+/**
+ * 注文取引なしに注文を作成する
+ */
+declare function placeOrderWithoutTransaction(params: {
+    agent?: factory.action.trade.order.IAgent;
+    project: {
+        id: string;
+    };
+    object: IExternalOrder;
+}): (repos: {
+    accountingReport: AccountingReportRepo;
+    action: ActionRepo;
+    order: OrderRepo;
+    task: TaskRepo;
+}) => Promise<void>;
+export { placeOrderWithoutTransaction };

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

@@ -0,0 +1,60 @@
+"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.placeOrderWithoutTransaction = void 0;
+const factory = require("../../factory");
+/**
+ * 注文取引なしに注文を作成する
+ */
+function placeOrderWithoutTransaction(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const order = params.object;
+        const simpleOrder = {
+            typeOf: order.typeOf,
+            // seller: {
+            //     id: order.seller.id,
+            //     typeOf: order.seller.typeOf,
+            //     name: order.seller.name
+            // }, // 廃止(2024-03-06~)
+            // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
+            orderNumber: order.orderNumber,
+            price: order.price,
+            priceCurrency: order.priceCurrency,
+            orderDate: order.orderDate
+        };
+        const orderActionAttributes = {
+            agent: (typeof ((_a = params.agent) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? params.agent : order.project,
+            object: simpleOrder,
+            potentialActions: {},
+            project: order.project,
+            // purpose: { typeOf: placeOrderTransaction.typeOf, id: placeOrderTransaction.id },
+            typeOf: factory.actionType.OrderAction
+        };
+        const action = yield repos.action.start(orderActionAttributes);
+        try {
+            yield repos.order.createIfNotExist(Object.assign(Object.assign({}, order), { 
+                // discounts: [], // 廃止(2024-04-16~)
+                acceptedOffers: [] }));
+        }
+        catch (error) {
+            try {
+                yield repos.action.giveUp({ typeOf: orderActionAttributes.typeOf, id: action.id, error });
+            }
+            catch (__) {
+                // 失敗したら仕方ない
+            }
+            throw error;
+        }
+        yield repos.action.completeWithVoid({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
+    });
+}
+exports.placeOrderWithoutTransaction = placeOrderWithoutTransaction;

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

@@ -81,7 +81,7 @@ function sendOrder(params) {
             const sendOrderActionAttributes = {
                 agent: (typeof ((_c = params.agent) === null || _c === void 0 ? void 0 : _c.typeOf) === 'string') ? params.agent : order.project,
                 object: sendOrderObject,
-                potentialActions: {},
+                // potentialActions: {},
                 project: order.project,
                 recipient: { id: order.customer.id, typeOf: order.customer.typeOf },
                 typeOf: factory.actionType.SendAction

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

@@ -7,6 +7,7 @@ import { onAssetTransactionStatusChanged, paymentDue2Processing } from './order/
 import { onOrderProcessing } from './order/onOrderStatusChanged';
 import { onOrderUpdated } from './order/onOrderUpdated';
 import { payOrder } from './order/payOrder';
-import { placeOrder, placeOrderWithoutTransaction } from './order/placeOrder';
+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 };

package/lib/chevre/service/order.js

@@ -19,6 +19,7 @@ const payOrder_1 = require("./order/payOrder");
 Object.defineProperty(exports, "payOrder", { enumerable: true, get: function () { return payOrder_1.payOrder; } });
 const placeOrder_1 = require("./order/placeOrder");
 Object.defineProperty(exports, "placeOrder", { enumerable: true, get: function () { return placeOrder_1.placeOrder; } });
-Object.defineProperty(exports, "placeOrderWithoutTransaction", { enumerable: true, get: function () { return placeOrder_1.placeOrderWithoutTransaction; } });
+const placeOrderWithoutTransaction_1 = require("./order/placeOrderWithoutTransaction");
+Object.defineProperty(exports, "placeOrderWithoutTransaction", { enumerable: true, get: function () { return placeOrderWithoutTransaction_1.placeOrderWithoutTransaction; } });
 const sendOrder_1 = require("./order/sendOrder");
 Object.defineProperty(exports, "sendOrder", { enumerable: true, get: function () { return sendOrder_1.sendOrder; } });

package/lib/chevre/service/payment/any/factory.d.ts

@@ -12,7 +12,7 @@ export interface IOnPaymentStatusChangedRefundAction {
 export type IOnPaymentStatusChangedParams = IOnPaymentStatusChangedPayAction | IOnPaymentStatusChangedRefundAction;
 export declare function creatPayTransactionStartParams(params: {
     accountId?: string;
-    object: factory.action.authorize.paymentMethod.any.IObject;
+    object: factory.action.authorize.paymentMethod.any.IObjectIncludingPaymentMethodDetails;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'expires' | 'seller' | 'project'>;
     transactionNumber: string;
@@ -26,7 +26,7 @@ export declare function creatPayTransactionStartParams(params: {
 }): factory.assetTransaction.pay.IStartParamsWithoutDetail;
 export declare function createMovieTicket(params: factory.action.trade.pay.IMovieTicket): factory.action.trade.pay.IMovieTicket;
 export declare function createAuthorizeResult(params: {
-    object: factory.action.authorize.paymentMethod.any.IObject;
+    object: factory.action.authorize.paymentMethod.any.IObjectIncludingPaymentMethodDetails;
     payTransaction: factory.assetTransaction.pay.ITransaction;
 }): factory.action.authorize.paymentMethod.any.IResultAsInvoice[];
 /**

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

@@ -289,6 +289,14 @@ function publishPaymentUrl(params) {
     });
 }
 exports.publishPaymentUrl = publishPaymentUrl;
+/**
+ * 承認アクションオブジェクトから冗長な属性を排除する
+ */
+function minimizeObjectIncludingPaymentMethodDetails(authorizeObjectIncludingPaymentMethodDetails) {
+    const { accountId, paymentMethodId, typeOf } = authorizeObjectIncludingPaymentMethodDetails;
+    return { authorizeObject: { accountId, paymentMethodId, typeOf } }; // optimize(2024-06-26~)
+    // return { authorizeObject: authorizeObjectIncludingPaymentMethodDetails };
+}
 /**
  * 決済承認
  */
@@ -345,7 +353,8 @@ function authorize(params) {
         }
         const movieTickets = (Array.isArray(params.object.movieTickets)) ? params.object.movieTickets.map(factory_1.createMovieTicket) : undefined;
         const { accountId } = yield fixAccountIdIfPossible({ object: params.object, project: { id: transaction.project.id } })(repos);
-        const authorizeObject = Object.assign(Object.assign(Object.assign(Object.assign({}, params.object), { accountId, paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment }), (creditCard !== undefined) ? { creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined);
+        const authorizeObjectIncludingPaymentMethodDetails = Object.assign(Object.assign(Object.assign(Object.assign({}, params.object), { accountId, paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment }), (creditCard !== undefined) ? { creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined);
+        const { authorizeObject } = minimizeObjectIncludingPaymentMethodDetails(authorizeObjectIncludingPaymentMethodDetails);
         // 承認アクションを開始する
         const taskId = (_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id;
         const actionAttributes = Object.assign({ project: transaction.project, typeOf: factory.actionType.AuthorizeAction, object: authorizeObject, agent: {
@@ -368,14 +377,14 @@ function authorize(params) {
         try {
             const startParams = (0, factory_1.creatPayTransactionStartParams)({
                 accountId,
-                object: authorizeObject,
+                object: authorizeObjectIncludingPaymentMethodDetails,
                 paymentServiceType,
                 transaction: transaction,
                 transactionNumber: transactionNumber,
                 location: params.location,
                 order: Object.assign({}, (typeof confirmationNumber === 'string') ? { confirmationNumber } : undefined)
             });
-            payTransaction = yield PayTransactionService.start(startParams, Object.assign({ useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet, executor: (typeof taskId === 'string') ? { id: taskId } : {} }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined))(repos);
+            payTransaction = yield PayTransactionService.start(startParams, Object.assign({ useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet, executor: (typeof taskId === 'string') ? { id: taskId } : {}, purpose: { id: transaction.id } }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined))(repos);
         }
         catch (error) {
             try {
@@ -409,7 +418,7 @@ function authorize(params) {
                 throw error;
             }
         }
-        const result = (0, factory_1.createAuthorizeResult)({ payTransaction, object: authorizeObject });
+        const result = (0, factory_1.createAuthorizeResult)({ payTransaction, object: authorizeObjectIncludingPaymentMethodDetails });
         yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         return { id: action.id };
     });

package/lib/chevre/service/payment/movieTicket/authorize.d.ts

@@ -26,6 +26,12 @@ declare function authorize(params: factory.assetTransaction.pay.IStartParamsWith
          */
         id?: string;
     };
+    purpose: {
+        /**
+         * placeOrder ID
+         */
+        id?: string;
+    };
 }): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;

package/lib/chevre/service/payment/movieTicket/authorize.js

@@ -26,7 +26,7 @@ function authorize(params, transaction, paymentServiceId, useCheckByIdentifierIf
         let accountsReceivablesByServiceType = [];
         try {
             // MovieTicket決済の場合、認証
-            const validateMovieTicketResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId, useCheckByIdentifierIfNotYet)(repos);
+            const validateMovieTicketResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId, useCheckByIdentifierIfNotYet, options.purpose)(repos);
             accountsReceivablesByServiceType = validateMovieTicketResult.accountsReceivablesByServiceType;
             const paymentMethod = transaction.object.paymentMethod;
             const paymentMethodType = String(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.identifier);

package/lib/chevre/service/payment/movieTicket/checkMovieTicket.js

@@ -21,11 +21,11 @@ function checkMovieTicket(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f;
         // 不要な属性がリクエストに含まれているのでmovieTicketsを最適化(2024-03-15~)
-        let movieTickets = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.movieTickets;
-        if (!Array.isArray(movieTickets)) {
+        const movieTicketsBeforeOptimize = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.movieTickets;
+        if (!Array.isArray(movieTicketsBeforeOptimize)) {
             throw new factory.errors.Argument('object.movieTickets must be an array');
         }
-        movieTickets = movieTickets.map(({ accessCode, category, identifier, serviceOutput }) => {
+        const movieTickets = movieTicketsBeforeOptimize.map(({ accessCode, category, identifier, serviceOutput }) => {
             return {
                 accessCode, category, identifier,
                 serviceOutput: { reservationFor: serviceOutput.reservationFor } // 最適化(2024-03-15~)

package/lib/chevre/service/payment/movieTicket/validation.d.ts

@@ -1,15 +1,22 @@
-import * as factory from '../../../factory';
 import type { MongoRepository as ActionRepo } from '../../../repo/action';
 import type { MongoRepository as EventRepo } from '../../../repo/event';
 import type { MongoRepository as PaymentServiceRepo } from '../../../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
-export declare function validateMovieTicket(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, useCheckByIdentifierIfNotYet: boolean): (repos: {
+import type { MongoRepository as TaskRepo } from '../../../repo/task';
+import * as factory from '../../../factory';
+export declare function validateMovieTicket(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, useCheckByIdentifierIfNotYet: boolean, purpose: {
+    /**
+     * placeOrder ID
+     */
+    id?: string;
+}): (repos: {
     action: ActionRepo;
     event: EventRepo;
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
+    task: TaskRepo;
 }) => Promise<{
     accountsReceivablesByServiceType: factory.assetTransaction.pay.IAccountsReceivableByServiceType[];
 }>;

package/lib/chevre/service/payment/movieTicket/validation.js

@@ -12,9 +12,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateMovieTicket = void 0;
 const createDebug = require("debug");
 const factory = require("../../../factory");
+const taskIdentifier_1 = require("../../../factory/taskIdentifier");
+const settings_1 = require("../../../settings");
 const processPurchaseNumberAuth_1 = require("./processPurchaseNumberAuth");
 const debug = createDebug('chevre-domain:service:payment');
-function validateMovieTicket(params, paymentServiceId, useCheckByIdentifierIfNotYet) {
+function validateMovieTicket(params, paymentServiceId, useCheckByIdentifierIfNotYet, purpose) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
@@ -79,7 +81,8 @@ function validateMovieTicket(params, paymentServiceId, useCheckByIdentifierIfNot
             seller: { id: sellerId },
             screeningEvent: screeningEvent,
             paymentServiceId,
-            useCheckByIdentifierIfNotYet
+            useCheckByIdentifierIfNotYet,
+            purpose
         })(repos);
         const accountsReceivablesByServiceType = [];
         // 券種ごとに枚数が足りているか
@@ -114,13 +117,31 @@ function checkByIdentifierIfNotYet(params) {
         let checkResult;
         if (params.useCheckByIdentifierIfNotYet === true) {
             // すでにCheckActionが存在すれば認証しない(2023-06-06~)
-            const alreadyCheckedAction = (yield repos.action.search({
-                limit: 1,
-                page: 1,
-                sort: { startDate: factory.sortType.Descending },
-                typeOf: { $eq: factory.actionType.CheckAction },
-                actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
-                object: {
+            let alreadyCheckedAction;
+            // search from checkMovieTicketTask(2024-06-26~)
+            const placeOrderId = params.purpose.id;
+            if (typeof placeOrderId === 'string') {
+                if (settings_1.USE_EXPERIMENTAL_FEATURE) {
+                    const taskIdentifier = (0, taskIdentifier_1.createCheckMovieTicketTaskIdentifier)({
+                        project: { id: params.screeningEvent.project.id },
+                        purpose: { id: placeOrderId },
+                        object: {
+                            id: params.paymentServiceId,
+                            movieTicket: {
+                                identifier: params.movieTicketIdentifier,
+                                serviceOutput: { reservationFor: { id: params.screeningEvent.id } }
+                            }
+                        }
+                    });
+                    const existingCheckMovieTicketTask = yield repos.task.findByIdentifier({
+                        project: { id: params.screeningEvent.project.id },
+                        name: factory.taskName.CheckMovieTicket,
+                        identifier: taskIdentifier
+                    });
+                    debug('existingCheckMovieTicketTask:', JSON.stringify(existingCheckMovieTicketTask), 'placeOrderId:', placeOrderId);
+                }
+            }
+            alreadyCheckedAction = (yield repos.action.search(Object.assign({ limit: 1, page: 1, sort: { startDate: factory.sortType.Descending }, typeOf: { $eq: factory.actionType.CheckAction }, actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] }, object: {
                     typeOf: { $eq: factory.service.paymentService.PaymentServiceType.MovieTicket },
                     id: { $eq: params.paymentServiceId },
                     movieTickets: {
@@ -129,8 +150,8 @@ function checkByIdentifierIfNotYet(params) {
                             reservationFor: { id: { $eq: params.screeningEvent.id } } // 指定のイベントにおいて
                         }
                     }
-                }
-            }, ['_id'], [])).shift();
+                } }, (typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined), ['_id'], [])).shift();
+            debug('alreadyCheckedAction:', JSON.stringify(alreadyCheckedAction), 'placeOrderId:', placeOrderId);
             if (alreadyCheckedAction !== undefined) {
                 const recipe = yield repos.action.findRecipeByAction({
                     project: { id: params.screeningEvent.project.id },

package/lib/chevre/service/task/confirmReserveTransaction.js

@@ -134,14 +134,14 @@ function confirmReserveTransaction(params, options) {
         // let updReserveResult: COA.factory.reserve.IUpdReserveResult | undefined;
         let recipe;
         switch (params.object.typeOf) {
-            case 'COAReserveTransaction':
+            case factory.assetTransactionType.COAReserveTransaction:
                 // 最適化されたタスクに対応するため、ここでIObject4COAを注文から生成する(2024-01-24~)
                 const order = yield fixOrderAsPurpose({
                     project: { id: params.project.id },
                     purpose: params.purpose
                 })(repos);
                 const updReserveArgs = createConfirmObject4COAByOrder({ order, reservationNumber: params.object.transactionNumber });
-                const object4coa = Object.assign(Object.assign({}, updReserveArgs), { transactionNumber: params.object.transactionNumber, typeOf: 'COAReserveTransaction' });
+                const object4coa = Object.assign(Object.assign({}, updReserveArgs), { transactionNumber: params.object.transactionNumber, typeOf: factory.assetTransactionType.COAReserveTransaction });
                 confirmActionObject = object4coa;
                 recipe = (0, factory_1.processConfirmCOAReserveResult2recipe)({
                     processConfirmCOAReserveResult: { updReserveArgs: object4coa },
@@ -159,7 +159,7 @@ function confirmReserveTransaction(params, options) {
         try {
             const object = confirmActionAttributes.object;
             switch (object.typeOf) {
-                case 'COAReserveTransaction':
+                case factory.assetTransactionType.COAReserveTransaction:
                     // COA本予約
                     const processConfirmCOAReserveResult = yield COAReserveService.confirm({
                         project: { id: confirmActionAttributes.project.id },

package/lib/chevre/service/task/returnPayTransaction.d.ts

@@ -1,6 +1,6 @@
-import type { IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
 import * as factory from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.IData<factory.taskName.ReturnPayTransaction>): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.ITask<factory.taskName.ReturnPayTransaction>, IExecutableTaskKeys>): IOperationExecute<ICallResult>;