@chevre/domain 26.0.0-alpha.4 → 26.0.0-alpha.41

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

@@ -16,19 +16,17 @@ function createInformTasks(order, returnOrderAction, setting) {
     //     informObject = createOrder4inform(order);
     // }
     if (Array.isArray(informOrder) && informOrder.length > 0) {
-        let recipientId = '';
-        recipientId = order.customer.id;
-        if (typeof order.returner?.id === 'string') {
-            recipientId = order.returner.id;
-        }
+        // let recipientId = '';
+        // recipientId = order.customer.id;
+        // if (typeof order.returner?.id === 'string') {
+        //     recipientId = order.returner.id;
+        // }
         informOrder.forEach((informOrderParams) => {
             if (typeof informOrderParams.recipient?.url === 'string') {
                 const informActionAttributes = {
                     about: { orderNumber: order.orderNumber, typeOf: factory_1.factory.order.OrderType.Order },
                     object: informObject,
                     recipient: {
-                        // url: informOrderParams.recipient.url, // discontinue(2025-02-13~)
-                        id: recipientId,
                         name: informOrderParams.recipient?.name,
                         typeOf: factory_1.factory.creativeWorkType.WebApplication
                     },
@@ -125,8 +123,6 @@ function createOnOrderReturnedTasksByTransaction(params) {
         const simpleOrder = {
             typeOf: params.order.typeOf,
             orderNumber: params.order.orderNumber,
-            // price: params.order.price,
-            // priceCurrency: params.order.priceCurrency,
             orderDate: params.order.orderDate
         };
         sendEmailMessageAttributes.forEach((s) => {
@@ -135,8 +131,6 @@ function createOnOrderReturnedTasksByTransaction(params) {
                 typeOf: factory_1.factory.actionType.SendAction,
                 object: s.object,
                 agent: params.order.project,
-                recipient: { typeOf: params.order.customer.typeOf, id: params.order.customer.id },
-                // potentialActions: {}, // discontinue(2024-06-25~)
                 purpose: simpleOrder
             };
             const sendEmailMessageTask = {

package/lib/chevre/service/order/onOrderUpdated/factory.js

@@ -10,15 +10,12 @@ setting) {
     const informTasks = [];
     const order4inform = creteOrder4inform(order);
     if (Array.isArray(informOrder) && informOrder.length > 0) {
-        const recipientId = '';
         informOrder.forEach((informOrderParams) => {
             if (typeof informOrderParams.recipient?.url === 'string') {
                 const informActionAttributes = {
                     about: { orderNumber: order4inform.orderNumber, typeOf: factory_1.factory.order.OrderType.Order },
                     object: order4inform,
                     recipient: {
-                        // url: informOrderParams.recipient.url, // discontinue(2025-02-13~)
-                        id: recipientId,
                         name: informOrderParams.recipient?.name,
                         typeOf: factory_1.factory.creativeWorkType.WebApplication
                     },

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

@@ -1,7 +1,6 @@
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { ActionRepo } from '../../repo/action';
 import type { OrderRepo } from '../../repo/order';
-import type { OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import type { ReturnOrderRepo } from '../../repo/transaction/returnOrder';
@@ -20,7 +19,6 @@ declare function returnOrder(params: {
     acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     order: OrderRepo;
-    ownershipInfo: OwnershipInfoRepo;
     setting: SettingRepo;
     task: TaskRepo;
     returnOrder: ReturnOrderRepo;

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

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.returnOrder = returnOrder;
 const debug_1 = __importDefault(require("debug"));
-// import { createMaskedCustomer } from '../../factory/order';
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory_1 = require("../../factory");
 const debug = (0, debug_1.default)('chevre-domain:service:order');
@@ -19,9 +18,7 @@ function createReturnPolicy(params) {
     };
 }
 function returnOrder(params) {
-    return async (repos
-    // settings: Settings
-    ) => {
+    return async (repos) => {
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
             throw new factory_1.factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
@@ -81,14 +78,15 @@ function returnOrder(params) {
             recipient,
             typeOf: factory_1.factory.actionType.ReturnAction
         };
-        let returnedOwnershipInfos;
+        const returnedOwnershipInfos = [];
         let returnedOrder;
         const action = await repos.action.start(returnOrderActionAttributes);
         try {
-            returnedOwnershipInfos = await processReturnOrder(order, dateReturned)({
-                acceptedOffer: repos.acceptedOffer,
-                ownershipInfo: repos.ownershipInfo
-            });
+            // ひとまず所有権管理を廃止するため、所有権返却処理は不要(2026-08-10)
+            // returnedOwnershipInfos = await processReturnOrder(order, dateReturned)({
+            //     acceptedOffer: repos.acceptedOffer,
+            //     ownershipInfo: repos.ownershipInfo
+            // });
             // 注文ステータス変更
             returnedOrder = await repos.order.returnOrder({
                 project: { id: order.project.id },
@@ -130,37 +128,7 @@ function returnOrder(params) {
                     ...returnOrderActionAttributes,
                     id: action.id
                 }
-            })(repos
-            // settings
-            );
-        }
-    };
-}
-function processReturnOrder(order, dateReturned) {
-    return async (repos) => {
-        const returnedOwnershipInfos = [];
-        // 所有権の所有期間変更
-        // 注文オファーリポジトリから所有権識別子を検索する(2023-12-07~)
-        const ownershipInfos = await repos.acceptedOffer.aggreateOwnershipInfosByOrder({ orderNumber: { $eq: order.orderNumber } });
-        if (Array.isArray(ownershipInfos)) {
-            await Promise.all(ownershipInfos.map(async (ownershipInfo) => {
-                const ownershipInfoReturned = await repos.ownershipInfo.findByIdentifierAndUpdateOwnedThrough({
-                    project: { id: order.project.id },
-                    identifier: String(ownershipInfo.identifier),
-                    ownedThrough: dateReturned
-                })
-                    .then((ownershipInfoByDB) => {
-                    // 存在しない場合は識別子のみ保管(customer.typeOfによって存在しないこともありうる)
-                    if (ownershipInfoByDB === undefined) {
-                        return ownershipInfo;
-                    }
-                    else {
-                        return ownershipInfoByDB;
-                    }
-                });
-                returnedOwnershipInfos.push(ownershipInfoReturned);
-            }));
+            })(repos);
         }
-        return returnedOwnershipInfos;
     };
 }

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

@@ -1,19 +1,17 @@
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
-import type { ActionRepo } from '../../repo/action';
+import type { SendOrderActionRepo } from '../../repo/action/sendOrder';
 import type { OrderRepo } from '../../repo/order';
-import type { OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
-import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import { factory } from '../../factory';
 interface ISendOrderRepos {
     acceptedOffer: AcceptedOfferRepo;
-    action: ActionRepo;
+    actions: {
+        sendOrder: SendOrderActionRepo;
+    };
     order: OrderRepo;
-    ownershipInfo: OwnershipInfoRepo;
     setting: SettingRepo;
     task: TaskRepo;
-    placeOrder: PlaceOrderRepo;
 }
 type ISendOperation<T> = (repos: ISendOrderRepos) => Promise<T>;
 /**

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

@@ -1,46 +1,32 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendOrder = sendOrder;
-const debug_1 = __importDefault(require("debug"));
-// import { createMaskedCustomer } from '../../factory/order';
-const factory_1 = require("../delivery/factory");
-// import { findPlaceOrderTransaction } from './findPlaceOrderTransaction';
+// import { createOwnershipInfosFromOrder } from '../delivery/factory';
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
-const factory_2 = require("../../factory");
-const debug = (0, debug_1.default)('chevre-domain:service:order');
+const factory_1 = require("../../factory");
 /**
  * 注文を配送する
  */
 function sendOrder(params) {
-    return async (repos
-    // settings: Settings
-    ) => {
+    return async (repos) => {
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
-            throw new factory_2.factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
+            throw new factory_1.factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
         if (typeof params.object.acceptedOffers?.limit !== 'number') {
-            throw new factory_2.factory.errors.Argument('object.acceptedOffers.limit', 'must be number');
+            throw new factory_1.factory.errors.Argument('object.acceptedOffers.limit', 'must be number');
         }
         if (typeof params.object.acceptedOffers?.page !== 'number') {
-            throw new factory_2.factory.errors.Argument('object.acceptedOffers.page', 'must be number');
+            throw new factory_1.factory.errors.Argument('object.acceptedOffers.page', 'must be number');
         }
         if (params.object.acceptedOffers.limit <= 0) {
-            throw new factory_2.factory.errors.Argument('object.acceptedOffers.limit', 'must be greater than 1');
+            throw new factory_1.factory.errors.Argument('object.acceptedOffers.limit', 'must be greater than 1');
         }
         if (params.object.acceptedOffers.page <= 0) {
-            throw new factory_2.factory.errors.Argument('object.acceptedOffers.page', 'must be greater than 1');
+            throw new factory_1.factory.errors.Argument('object.acceptedOffers.page', 'must be greater than 1');
         }
         try {
             const orderNumber = params.object.orderNumber;
             const confirmationNumber = params.object.confirmationNumber;
-            // const placeOrderTransaction = await findPlaceOrderTransaction({
-            //     project: { id: params.project.id },
-            //     confirmationNumber,
-            //     orderNumber
-            // })(repos);
             // 注文取得
             let order = await repos.order.projectFieldsByOrderNumber({
                 orderNumber,
@@ -49,24 +35,16 @@ function sendOrder(params) {
             });
             // プロジェクト条件検証
             if (order.project.id !== params.project.id) {
-                throw new factory_2.factory.errors.NotFound('Order');
+                throw new factory_1.factory.errors.NotFound('Order');
             }
             // 確認番号検証
             if (order.confirmationNumber !== confirmationNumber) {
-                throw new factory_2.factory.errors.NotFound('Order');
+                throw new factory_1.factory.errors.NotFound('Order');
             }
             // const maskedCustomer = createMaskedCustomer(order, { noProfile: true });
             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 { limit, page } = params.object.acceptedOffers;
@@ -77,24 +55,21 @@ function sendOrder(params) {
             const sendOrderActionAttributes = {
                 agent: (typeof params.agent?.typeOf === 'string') ? params.agent : order.project,
                 object: sendOrderObject,
-                // potentialActions: {},
                 project: order.project,
-                recipient: { id: order.customer.id, typeOf: order.customer.typeOf },
-                typeOf: factory_2.factory.actionType.SendAction
+                typeOf: factory_1.factory.actionType.SendAction
             };
-            const action = await repos.action.start(sendOrderActionAttributes);
-            let creatingOwnershipInfos = [];
-            let createdOwnershipInfos = [];
+            const action = await repos.actions.sendOrder.start(sendOrderActionAttributes);
             let allOffersDelivered = false;
             let acceptedOffers;
-            // 所有権生成を最小化(2024-03-01~)
-            let createOwnerships = false;
-            switch (order.customer.typeOf) {
-                case factory_2.factory.personType.Person:
-                    createOwnerships = true; // Personのみに限定(2026-03-15~)
-                    break;
-                default:
-            }
+            // 所有権管理はひとまず廃止(2026-08-10~)
+            // // 所有権生成を最小化(2024-03-01~)
+            // let createOwnerships = false;
+            // switch (order.customer.typeOf) {
+            //     case factory.personType.Person:
+            //         createOwnerships = true; // Personのみに限定(2026-03-15~)
+            //         break;
+            //     default:
+            // }
             try {
                 const offerIndexBase = (limit * (page - 1));
                 const searchSlicedAcceptedOffersResult = await repos.acceptedOffer.searchSlicedAcceptedOffersByOrderNumber({
@@ -103,30 +78,14 @@ function sendOrder(params) {
                     project: { id: { $eq: order.project.id } }
                 });
                 acceptedOffers = searchSlicedAcceptedOffersResult.acceptedOffers;
-                debug('delivering...', order.orderNumber, params.object.acceptedOffers, 'offerIndexBase:', offerIndexBase);
-                // 所有権作成
-                if (createOwnerships) {
-                    creatingOwnershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
-                        order: { ...order, acceptedOffers },
-                        offerIndexBase
-                    });
-                    createdOwnershipInfos = await Promise.all(creatingOwnershipInfos.map(async (creatingOwnershipInfo) => {
-                        const { id } = await repos.ownershipInfo.createIfNotExistByIdentifier(creatingOwnershipInfo);
-                        return {
-                            id,
-                            ...(typeof creatingOwnershipInfo.identifier === 'string')
-                                ? { identifier: creatingOwnershipInfo.identifier }
-                                : undefined
-                        };
-                    }));
-                }
-                // const deliveredCount = limit * page;
-                // debug(deliveredCount, 'delivered.', order.orderNumber, params.object.acceptedOffers);
+                // 所有権管理はひとまず廃止(2026-08-10~)
+                // if (createOwnerships) {
+                // }
                 if (acceptedOffers.length === 0) {
                     order = await repos.order.changeStatus({
                         project: { id: order.project.id },
                         orderNumber,
-                        orderStatus: factory_2.factory.orderStatus.OrderDelivered,
+                        orderStatus: factory_1.factory.orderStatus.OrderDelivered,
                         previousOrderStatus: params.object.previousOrderStatus
                     });
                     allOffersDelivered = true;
@@ -134,16 +93,15 @@ function sendOrder(params) {
             }
             catch (error) {
                 try {
-                    await repos.action.giveUp({ typeOf: sendOrderActionAttributes.typeOf, id: action.id, error });
+                    await repos.actions.sendOrder.giveUp({ typeOf: sendOrderActionAttributes.typeOf, id: action.id, error });
                 }
                 catch (_) {
                     // no op
                 }
                 throw error;
             }
-            const result = createdOwnershipInfos;
-            await repos.action.completeWithVoid({ typeOf: sendOrderActionAttributes.typeOf, id: action.id, result: result });
-            debug('allOffersDelivered?:', allOffersDelivered, order.orderNumber);
+            const result = [];
+            await repos.actions.sendOrder.completeWithVoid({ typeOf: sendOrderActionAttributes.typeOf, id: action.id, result: result });
             if (params.useOnOrderStatusChanged) {
                 if (allOffersDelivered) {
                     await (0, onOrderStatusChanged_1.onOrderDelivered)({
@@ -154,7 +112,7 @@ function sendOrder(params) {
                             orderNumber: order.orderNumber,
                             project: order.project,
                             typeOf: order.typeOf,
-                            orderStatus: factory_2.factory.orderStatus.OrderDelivered,
+                            orderStatus: factory_1.factory.orderStatus.OrderDelivered,
                             price: order.price,
                             priceCurrency: order.priceCurrency
                         }
@@ -180,7 +138,7 @@ function sendOrder(params) {
                 project: { id: params.project.id },
                 inclusion: ['orderStatus']
             });
-            if (currentOrder?.orderStatus === factory_2.factory.orderStatus.OrderReturned) {
+            if (currentOrder?.orderStatus === factory_1.factory.orderStatus.OrderReturned) {
                 throwsError = false;
             }
             if (throwsError) {

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

@@ -1,7 +1,6 @@
 import { factory } from '../../../factory';
 import type { AcceptPayActionRepo } from '../../../repo/action/acceptPay';
 import type { AsyncActionRepo } from '../../../repo/asyncAction';
-import type { TaskRepo } from '../../../repo/task';
 interface IFindAcceptActionResult {
     /**
      * アクションID
@@ -39,11 +38,8 @@ declare function findAcceptAction(params: {
          */
         id: string;
     };
-}, options: {
-    useAsyncAction: boolean;
 }): (repos: {
     acceptPayAction: AcceptPayActionRepo;
     asyncAction: AsyncActionRepo;
-    task: TaskRepo;
 }) => Promise<IFindAcceptActionResult>;
 export { findAcceptAction, };

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

@@ -2,27 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findAcceptAction = findAcceptAction;
 const factory_1 = require("../../../factory");
-function findAcceptAction(params, options) {
+function findAcceptAction(params) {
     return async (repos) => {
         // 非同期アクションに対応(2026-07-28~)
-        const { useAsyncAction } = options;
-        let task;
-        if (useAsyncAction) {
-            // まず非同期アクションを参照
-            task = await repos.asyncAction.findAsyncActionById({
-                id: { $eq: params.sameAs.id },
-                project: { id: { $eq: params.project.id } },
-                name: factory_1.factory.taskName.PublishPaymentUrl
-            }, ['status', 'executionResults']);
-        }
-        // 非同期アクションが存在しなければタスクを参照
-        if (task === undefined) {
-            task = await repos.task.findTaskById({
-                id: { $eq: params.sameAs.id },
-                project: { id: { $eq: params.project.id } },
-                name: factory_1.factory.taskName.PublishPaymentUrl
-            }, ['status', 'executionResults']);
-        }
+        // let task: Pick<factory.task.publishPaymentUrl.ITask, 'id' | 'status' | 'executionResults'> | undefined;
+        // まず非同期アクションを参照
+        const task = await repos.asyncAction.findAsyncActionById({
+            id: { $eq: params.sameAs.id },
+            project: { id: { $eq: params.project.id } },
+            name: factory_1.factory.taskName.PublishPaymentUrl
+        }, ['status', 'executionResults']);
+        // // 非同期アクションが存在しなければタスクを参照
+        // if (task === undefined) {
+        //     task = await repos.task.findTaskById(
+        //         {
+        //             id: { $eq: params.sameAs.id },
+        //             project: { id: { $eq: params.project.id } },
+        //             name: factory.taskName.PublishPaymentUrl
+        //         },
+        //         ['status', 'executionResults']
+        //     );
+        // }
         if (task === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.taskName.PublishPaymentUrl);
         }

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

@@ -1,7 +1,6 @@
 import { factory } from '../../../factory';
 import type { AuthorizePaymentMethodActionRepo } from '../../../repo/action/authorizePaymentMethod';
 import type { AsyncActionRepo } from '../../../repo/asyncAction';
-import type { TaskRepo } from '../../../repo/task';
 interface IFindAuthorizeActionResult {
     /**
      * アクションID
@@ -22,7 +21,6 @@ interface IFindAuthorizeActionResult {
 interface IFindAuthorizeActionRepos {
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
     asyncAction: AsyncActionRepo;
-    task: TaskRepo;
 }
 declare function findAuthorizeAction(params: {
     project: {
@@ -40,7 +38,5 @@ declare function findAuthorizeAction(params: {
          */
         id: string;
     };
-}, options: {
-    useAsyncAction: boolean;
 }): (repos: IFindAuthorizeActionRepos) => Promise<IFindAuthorizeActionResult>;
 export { IFindAuthorizeActionRepos, findAuthorizeAction, };

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

@@ -2,27 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findAuthorizeAction = findAuthorizeAction;
 const factory_1 = require("../../../factory");
-function findAuthorizeAction(params, options) {
+function findAuthorizeAction(params) {
     return async (repos) => {
         // 非同期アクションに対応(2026-07-28~)
-        const { useAsyncAction } = options;
-        let task;
-        if (useAsyncAction) {
-            // まず非同期アクションを参照
-            task = await repos.asyncAction.findAsyncActionById({
-                id: { $eq: params.sameAs.id },
-                project: { id: { $eq: params.project.id } },
-                name: factory_1.factory.taskName.AuthorizePayment
-            }, ['status', 'executionResults']);
-        }
-        // 非同期アクションが存在しなければタスクを参照
-        if (task === undefined) {
-            task = await repos.task.findTaskById({
-                id: { $eq: params.sameAs.id },
-                project: { id: { $eq: params.project.id } },
-                name: factory_1.factory.taskName.AuthorizePayment
-            }, ['status', 'executionResults']);
-        }
+        // let task: Pick<factory.task.authorizePayment.ITask, 'id' | 'status' | 'executionResults'> | undefined;
+        // まず非同期アクションを参照
+        const task = await repos.asyncAction.findAsyncActionById({
+            id: { $eq: params.sameAs.id },
+            project: { id: { $eq: params.project.id } },
+            name: factory_1.factory.taskName.AuthorizePayment
+        }, ['status', 'executionResults']);
+        // // 非同期アクションが存在しなければタスクを参照
+        // if (task === undefined) {
+        //     task = await repos.task.findTaskById(
+        //         {
+        //             id: { $eq: params.sameAs.id },
+        //             project: { id: { $eq: params.project.id } },
+        //             name: factory.taskName.AuthorizePayment
+        //         },
+        //         ['status', 'executionResults']
+        //     );
+        // }
         if (task === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.taskName.AuthorizePayment);
         }

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

@@ -1,11 +1,9 @@
 import { factory } from '../../../factory';
 import type { CheckMovieTicketActionRepo, IMinimizedPurchaseNumberAuthResult } from '../../../repo/action/checkMovieTicket';
 import type { AsyncActionRepo } from '../../../repo/asyncAction';
-import type { TaskRepo } from '../../../repo/task';
 interface IFindCheckActionRepos {
     checkMovieTicketAction: CheckMovieTicketActionRepo;
     asyncAction: AsyncActionRepo;
-    task: TaskRepo;
 }
 interface IFindCheckActionResult {
     /**
@@ -43,7 +41,5 @@ declare function findCheckAction(params: {
          */
         id: string;
     };
-}, options: {
-    useAsyncAction: boolean;
 }): (repos: IFindCheckActionRepos) => Promise<IFindCheckActionResult>;
 export { IFindCheckActionRepos, findCheckAction, };

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

@@ -2,27 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findCheckAction = findCheckAction;
 const factory_1 = require("../../../factory");
-function findCheckAction(params, options) {
+function findCheckAction(params) {
     return async (repos) => {
         // 非同期アクションに対応(2026-07-28~)
-        const { useAsyncAction } = options;
-        let task;
-        if (useAsyncAction) {
-            // まず非同期アクションを参照
-            task = await repos.asyncAction.findAsyncActionById({
-                id: { $eq: params.sameAs.id },
-                project: { id: { $eq: params.project.id } },
-                name: factory_1.factory.taskName.CheckMovieTicket
-            }, ['status', 'executionResults']);
-        }
-        // 非同期アクションが存在しなければタスクを参照
-        if (task === undefined) {
-            task = await repos.task.findTaskById({
-                id: { $eq: params.sameAs.id },
-                project: { id: { $eq: params.project.id } },
-                name: factory_1.factory.taskName.CheckMovieTicket
-            }, ['status', 'executionResults']);
-        }
+        // let task: Pick<factory.task.checkMovieTicket.ITask, 'id' | 'status' | 'executionResults'> | undefined;
+        // まず非同期アクションを参照
+        const task = await repos.asyncAction.findAsyncActionById({
+            id: { $eq: params.sameAs.id },
+            project: { id: { $eq: params.project.id } },
+            name: factory_1.factory.taskName.CheckMovieTicket
+        }, ['status', 'executionResults']);
+        // // 非同期アクションが存在しなければタスクを参照
+        // if (task === undefined) {
+        //     task = await repos.task.findTaskById(
+        //         {
+        //             id: { $eq: params.sameAs.id },
+        //             project: { id: { $eq: params.project.id } },
+        //             name: factory.taskName.CheckMovieTicket
+        //         },
+        //         ['status', 'executionResults']
+        //     );
+        // }
         if (task === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.taskName.CheckMovieTicket);
         }

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

@@ -109,7 +109,7 @@ function processVoidPayTransaction(params) {
                 // 取引が存在すれば中止
                 const transactionNumber = action.object.paymentMethodId;
                 if (typeof transactionNumber === 'string' && transactionNumber.length > 0) {
-                    const payTransaction = (await repos.assetTransaction.search({
+                    const payTransaction = (await repos.assetTransaction.findAssetTransactionsByTypeOf({
                         limit: 1,
                         page: 1,
                         project: { id: { $eq: action.project.id } },

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

@@ -60,7 +60,5 @@ declare function publishPaymentUrl(params: {
      */
     identifier?: string;
     instrument: factory.action.trade.pay.IAcceptedPaymentMethodOfferAsInstrument[];
-}, options: {
-    savePaymentMethodIdInTransaction: boolean;
 }): IPublishPaymentUrlOperation<Pick<PayTransactionService.IPublishPaymentUrlResult, 'paymentMethodId' | 'paymentUrl'>>;
 export { IPublishPaymentUrlRepos, publishPaymentUrl };

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

@@ -41,7 +41,7 @@ const factory_2 = require("./factory");
 /**
  * 外部決済ロケーションを発行する
  */
-function publishPaymentUrl(params, options) {
+function publishPaymentUrl(params) {
     return async (repos, settings) => {
         const { paymentServiceType, purpose, project } = params;
         if (purpose.typeOf !== factory_1.factory.transactionType.PlaceOrder) {
@@ -107,7 +107,7 @@ function publishPaymentUrl(params, options) {
             await repos.orderInTransaction.savePaymentMethodId({
                 id: transaction.id,
                 paymentMethod: { paymentMethodId: result.paymentMethodId }
-            }, options);
+            });
             return {
                 paymentMethodId: result.paymentMethodId,
                 paymentUrl: result.paymentUrl