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

package/lib/chevre/service/assetTransaction/reserve.js

@@ -386,21 +386,62 @@ function createReservations4transactionObject(params) {
                 }
             }
             // 指定されたアドオンがオファーに存在すれば、アドオンの単価仕様作成
-            let acceptedAddOns = [];
+            const acceptedAddOns = [];
             let availableAddOns;
-            const acceptedAddOnParams = acceptedOffer.addOn;
-            if (Array.isArray(acceptedAddOnParams) && acceptedAddOnParams.length > 0) {
+            const acceptedAddOnsParams = acceptedOffer.addOn;
+            if (Array.isArray(acceptedAddOnsParams) && acceptedAddOnsParams.length > 0) {
                 // アドオンオファー検索(2023-03-02~)
                 availableAddOns = yield searchAvailableAddOns({
-                    ids: acceptedAddOnParams.map((acceptedAddOn) => String(acceptedAddOn.id)),
+                    ids: acceptedAddOnsParams.map((acceptedAddOn) => String(acceptedAddOn.id)),
                     project: { id: params.transaction.project.id },
                     ticketOffer,
                     availableAtOrFrom: params.availableAtOrFrom
                 })(repos);
             }
-            // availableAddOns = <factory.product.ITicketAddOn[] | undefined>ticketOffer.addOn;
-            if (Array.isArray(availableAddOns) && Array.isArray(acceptedAddOnParams)) {
-                acceptedAddOns = availableAddOns.filter((availableAddOn) => acceptedAddOnParams.some((acceptedAddOn) => availableAddOn.id === acceptedAddOn.id));
+            if (Array.isArray(availableAddOns) && Array.isArray(acceptedAddOnsParams)) {
+                acceptedAddOnsParams.forEach((acceptedAddOnParams) => {
+                    var _a, _b, _c;
+                    const availableAddOn = availableAddOns === null || availableAddOns === void 0 ? void 0 : availableAddOns.find((addOn) => addOn.id === acceptedAddOnParams.id);
+                    if (availableAddOn !== undefined) {
+                        // acceptedAddOnsの重複を避ける(単価オファーIDに対して)
+                        if (!acceptedAddOns.some((addOn) => addOn.id === availableAddOn.id)) {
+                            const availableAddOnReferenceQuantityValue = availableAddOn.priceSpecification.referenceQuantity.value;
+                            if (typeof availableAddOnReferenceQuantityValue !== 'number') {
+                                throw new factory.errors.NotImplemented('addOn.priceSpecification.referenceQuantity.value must be number');
+                            }
+                            // 受入数量はデフォルトで単価オファーの基準数量
+                            let referenceQuantityValueAccepted = availableAddOnReferenceQuantityValue;
+                            // 数量指定を検証(2023-08-31~)
+                            const specifiedReferencedQuantityValue = (_b = (_a = acceptedAddOnParams.priceSpecification) === null || _a === void 0 ? void 0 : _a.referenceQuantity) === null || _b === void 0 ? void 0 : _b.value;
+                            if (typeof specifiedReferencedQuantityValue === 'number') {
+                                if (specifiedReferencedQuantityValue < 1) {
+                                    throw new factory.errors.Argument('addOn.priceSpecification.referenceQuantity.value must be > 0');
+                                }
+                                // 数量が適用単位要件を満たしていなければエラー
+                                if (specifiedReferencedQuantityValue % availableAddOnReferenceQuantityValue !== 0) {
+                                    throw new factory.errors.Argument('addOn.priceSpecification.referenceQuantity.value', `Offer ${availableAddOn.id} requires reference quantity value ${specifiedReferencedQuantityValue}`);
+                                }
+                                // 基準数量上書き
+                                referenceQuantityValueAccepted = specifiedReferencedQuantityValue;
+                            }
+                            const priceAccepted = availableAddOn.priceSpecification.price *
+                                (referenceQuantityValueAccepted / availableAddOnReferenceQuantityValue);
+                            const accountsReceivableAccepted = (typeof ((_c = availableAddOn.priceSpecification.accounting) === null || _c === void 0 ? void 0 : _c.accountsReceivable) === 'number')
+                                ? availableAddOn.priceSpecification.accounting.accountsReceivable *
+                                    (referenceQuantityValueAccepted / availableAddOnReferenceQuantityValue)
+                                : undefined;
+                            const acceptedAddOn = Object.assign(Object.assign({}, availableAddOn), { priceSpecification: Object.assign(Object.assign(Object.assign({}, availableAddOn.priceSpecification), (typeof accountsReceivableAccepted === 'number')
+                                    ? {
+                                        accounting: Object.assign(Object.assign({}, availableAddOn.priceSpecification.accounting), { accountsReceivable: accountsReceivableAccepted, typeOf: 'Accounting' })
+                                    }
+                                    : undefined), { price: priceAccepted, referenceQuantity: Object.assign(Object.assign({}, availableAddOn.priceSpecification.referenceQuantity), { value: referenceQuantityValueAccepted }) }) });
+                            acceptedAddOns.push(acceptedAddOn);
+                        }
+                    }
+                });
+                // acceptedAddOns = availableAddOns.filter(
+                //     (availableAddOn) => acceptedAddOnsParams.some((acceptedAddOn) => availableAddOn.id === acceptedAddOn.id)
+                // );
             }
             const subReservation = (_j = (_h = acceptedOffer.itemOffered) === null || _h === void 0 ? void 0 : _h.serviceOutput) === null || _j === void 0 ? void 0 : _j.subReservation;
             const reservationId = `${reservationNumber}-${reservationIndex}`;
@@ -530,31 +571,64 @@ function validateProgramMembershipUsed(params) {
             if (typeof issuedThroughId !== 'string' || issuedThroughId.length === 0) {
                 throw new factory.errors.ArgumentNull('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
             }
-            // requestedProgramMembershipUsedの発行サービスIDから外部連携設定を取得する
-            const permitService = yield createPermitService({ issuedThrough: { id: issuedThroughId } })(repos);
-            // メンバーシップの存在確認
-            const serviceOutput = yield permitService.findByIdentifier({
-                project: { id: params.project.id },
-                identifier: programMembershipUsedIdentifier,
-                issuedThrough: { typeOf: factory.product.ProductType.MembershipService }
-            });
-            // 有効期間のチェック
-            if (serviceOutput.validFrom === undefined || serviceOutput.validFrom === null
-                || serviceOutput.validUntil === undefined || serviceOutput.validUntil === null) {
-                throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'not valid programMembership');
-            }
-            if (moment(serviceOutput.validFrom)
-                .isAfter(moment(now))
-                || moment(serviceOutput.validUntil)
-                    .isBefore(moment(now))) {
-                throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'unavailable programMembership');
+            const permitIssuedThrough = yield repos.product.findById({ id: issuedThroughId }, ['_id', 'typeOf', 'project', 'serviceType', 'serviceOutput'], []);
+            switch (permitIssuedThrough.typeOf) {
+                // 発行サービスがCreditCardのケースに対応(2023-09-01~)
+                case factory.service.paymentService.PaymentServiceType.CreditCard:
+                    // 決済サービスのserviceOutputにPermitが存在すれば、設定されたメンバーシップ区分のPermitをprogramMembershipUsedとして適用する
+                    let issuedThroughServiceType;
+                    if (Array.isArray(permitIssuedThrough.serviceOutput)) {
+                        const serviceOutputAsPermit = permitIssuedThrough.serviceOutput.find((output) => output.typeOf === factory.permit.PermitType.Permit);
+                        if ((serviceOutputAsPermit === null || serviceOutputAsPermit === void 0 ? void 0 : serviceOutputAsPermit.typeOf) === factory.permit.PermitType.Permit) {
+                            issuedThroughServiceType = serviceOutputAsPermit.issuedThrough.serviceType;
+                        }
+                    }
+                    if ((issuedThroughServiceType === null || issuedThroughServiceType === void 0 ? void 0 : issuedThroughServiceType.typeOf) === 'CategoryCode') {
+                        programMembershipUsed = {
+                            project: permitIssuedThrough.project,
+                            typeOf: factory.permit.PermitType.Permit,
+                            identifier: programMembershipUsedIdentifier,
+                            issuedThrough: {
+                                id: permitIssuedThrough.id,
+                                serviceType: issuedThroughServiceType,
+                                typeOf: permitIssuedThrough.typeOf
+                            }
+                        };
+                    }
+                    else {
+                        throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'issuedThrough has no serviceOutput as Permit');
+                    }
+                    break;
+                case factory.product.ProductType.MembershipService:
+                    // requestedProgramMembershipUsedの発行サービスIDから外部連携設定を取得する
+                    const permitService = yield createPermitService({ issuedThrough: { id: issuedThroughId } })(repos);
+                    // メンバーシップの存在確認
+                    const serviceOutput = yield permitService.findByIdentifier({
+                        project: { id: params.project.id },
+                        identifier: programMembershipUsedIdentifier,
+                        issuedThrough: { typeOf: factory.product.ProductType.MembershipService }
+                    });
+                    // 有効期間のチェック
+                    if (serviceOutput.validFrom === undefined || serviceOutput.validFrom === null
+                        || serviceOutput.validUntil === undefined || serviceOutput.validUntil === null) {
+                        throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'not valid programMembership');
+                    }
+                    if (moment(serviceOutput.validFrom)
+                        .isAfter(moment(now))
+                        || moment(serviceOutput.validUntil)
+                            .isBefore(moment(now))) {
+                        throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'unavailable programMembership');
+                    }
+                    programMembershipUsed = {
+                        project: serviceOutput.project,
+                        typeOf: serviceOutput.typeOf,
+                        identifier: serviceOutput.identifier,
+                        issuedThrough: serviceOutput.issuedThrough
+                    };
+                    break;
+                default:
+                    throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', `${permitIssuedThrough.typeOf} not implemented`);
             }
-            programMembershipUsed = {
-                project: serviceOutput.project,
-                typeOf: serviceOutput.typeOf,
-                identifier: serviceOutput.identifier,
-                issuedThrough: serviceOutput.issuedThrough
-            };
         }
         return programMembershipUsed;
     });

package/lib/chevre/service/delivery.js

@@ -29,6 +29,23 @@ const accountTransactionIdentifier_1 = require("../factory/accountTransactionIde
  */
 function givePointAward(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // 入金識別子が存在する場合、冪等性の確保(2023-08-24~)
+        const pendingTransactionIdentifier = params.object.identifier;
+        if (typeof pendingTransactionIdentifier === 'string' && pendingTransactionIdentifier.length > 0) {
+            // すでにConfirmedのMoneyTransfer取引が存在すれば何もしない
+            const assetTransactions = yield repos.assetTransaction.search({
+                limit: 1,
+                project: { id: { $eq: params.project.id } },
+                typeOf: factory.assetTransactionType.MoneyTransfer,
+                statuses: [factory.transactionStatusType.Confirmed],
+                object: {
+                    pendingTransaction: { identifier: { $eq: pendingTransactionIdentifier } }
+                }
+            }, ['_id']);
+            if (assetTransactions.length > 0) {
+                return;
+            }
+        }
         // アクション開始
         const action = yield repos.action.start(params);
         try {

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

@@ -188,6 +188,7 @@ function validateObjectWithoutDetail(params) {
         var _a, _b, _c, _d;
         const objectWithoutDetail = params.object;
         if (Array.isArray(objectWithoutDetail.acceptedOffer)) {
+            const validatedAcceptedOffersWithoutDetail = [];
             for (let acceptedOffer of objectWithoutDetail.acceptedOffer) {
                 let programMembershipUsed = (_b = (_a = acceptedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.programMembershipUsed;
                 // トークン化されたメンバーシップがリクエストされた場合、実メンバーシップ情報へ変換する
@@ -214,7 +215,9 @@ function validateObjectWithoutDetail(params) {
                     };
                     acceptedOffer = Object.assign(Object.assign({}, acceptedOffer), { itemOffered: Object.assign(Object.assign({}, acceptedOffer.itemOffered), { serviceOutput: Object.assign(Object.assign({}, (_d = acceptedOffer.itemOffered) === null || _d === void 0 ? void 0 : _d.serviceOutput), { typeOf: factory.reservationType.EventReservation, programMembershipUsed }) }) });
                 }
+                validatedAcceptedOffersWithoutDetail.push(acceptedOffer);
             }
+            objectWithoutDetail.acceptedOffer = validatedAcceptedOffersWithoutDetail;
         }
         return objectWithoutDetail;
     });
@@ -298,44 +301,40 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
             transaction: params.transaction
         });
         const acceptedAppliesToMovieTicket = (_a = offerWithoutDetail.priceSpecification) === null || _a === void 0 ? void 0 : _a.appliesToMovieTicket;
-        // let movieTicketIdentifire: string | undefined;
-        // if (Array.isArray(acceptedAppliesToMovieTicket)) {
-        //     // throw new factory.errors.NotImplemented('multiple appliesToMovieTicket not implemented');
-        //     // no op
-        // } else if (typeof acceptedAppliesToMovieTicket?.identifier === 'string') {
-        //     movieTicketIdentifire = acceptedAppliesToMovieTicket.identifier;
-        // }
         // 承認アクションオブジェクトのacceptedOfferにappliesToMovieTicketを連携する(2022-08-02~)
         const priceSpecification = Object.assign(Object.assign({}, offer.priceSpecification), (Array.isArray(acceptedAppliesToMovieTicket) || typeof (acceptedAppliesToMovieTicket === null || acceptedAppliesToMovieTicket === void 0 ? void 0 : acceptedAppliesToMovieTicket.identifier) === 'string')
             ? { appliesToMovieTicket: acceptedAppliesToMovieTicket }
             : undefined);
+        const acceptedAddOns = (Array.isArray(offerWithoutDetail.addOn))
+            ? offerWithoutDetail.addOn.map((acceptedAddOnOffer) => {
+                var _a, _b;
+                if (typeof acceptedAddOnOffer.id !== 'string' || acceptedAddOnOffer.id.length === 0) {
+                    throw new factory.errors.ArgumentNull('object.acceptedOffer.addOn.id');
+                }
+                const addOnOfferReferenceQuantityValue = (_b = (_a = acceptedAddOnOffer.priceSpecification) === null || _a === void 0 ? void 0 : _a.referenceQuantity) === null || _b === void 0 ? void 0 : _b.value;
+                return Object.assign({ 
+                    // typeOf: <factory.offerType.Offer>factory.offerType.Offer,
+                    id: acceptedAddOnOffer.id }, (typeof addOnOfferReferenceQuantityValue === 'number')
+                    ? { priceSpecification: { referenceQuantity: { value: addOnOfferReferenceQuantityValue } } }
+                    : undefined);
+            })
+            : [];
         const acceptedOffer = {
             // オファーの中身を最適化する(必要最低限の情報のみに)
             id: String(offer.id),
             identifier: offer.identifier,
             priceSpecification,
-            // project: offer.project,
             typeOf: offer.typeOf,
             priceCurrency: offer.priceCurrency,
             itemOffered: Object.assign({ typeOf: factory.product.ProductType.EventService, serviceOutput: (offerWithoutDetail.itemOffered !== undefined && offerWithoutDetail.itemOffered !== null)
                     ? offerWithoutDetail.itemOffered.serviceOutput
                     : undefined }, (pointAward !== undefined) ? { pointAward } : undefined),
-            addOn: (Array.isArray(offerWithoutDetail.addOn))
-                ? offerWithoutDetail.addOn.map((a) => {
-                    return {
-                        typeOf: factory.offerType.Offer,
-                        id: String(a.id),
-                        priceCurrency: offer.priceCurrency
-                    };
-                })
-                : [],
+            addOn: acceptedAddOns,
             // 追加属性をマージ
             additionalProperty: [
                 ...(Array.isArray(offerWithoutDetail.additionalProperty)) ? offerWithoutDetail.additionalProperty : [],
                 ...(Array.isArray(offer.additionalProperty)) ? offer.additionalProperty : []
             ]
-            // movieTicketIdentifireの不要を確認後に廃止(2022-09-09以降)(2022-11-02+)
-            // ...(typeof movieTicketIdentifire === 'string') ? { movieTicketIdentifire } : undefined
         };
         let offeredThrough = (_b = params.event.offers) === null || _b === void 0 ? void 0 : _b.offeredThrough;
         if (typeof (offeredThrough === null || offeredThrough === void 0 ? void 0 : offeredThrough.typeOf) !== 'string') {

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

@@ -299,6 +299,7 @@ function createReservation(params) {
     }
     return reservationItem;
 }
+// tslint:disable-next-line:max-func-body-length
 function coaTicket2offer(params) {
     var _a, _b;
     // 適用通貨区分
@@ -322,7 +323,6 @@ function coaTicket2offer(params) {
             }]
         : undefined;
     const unitPriceSpec = {
-        // project: { typeOf: factory.organizationType.Project, id: params.project.id },
         typeOf: factory.priceSpecificationType.UnitPriceSpecification,
         price: 0,
         priceCurrency: factory.priceCurrency.JPY,
@@ -332,15 +332,15 @@ function coaTicket2offer(params) {
             unitCode: factory.unitCode.C62,
             value: 1
         }
-        // appliesToMovieTicket?: {};
     };
     const identifier = (0, util_1.format)('%s-%s-%s', factory.service.webAPI.Identifier.COA, params.theaterCode, params.ticketResult.ticketCode);
-    return Object.assign(Object.assign(Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY, id: '', identifier: identifier, name: {
-            ja: params.ticketResult.ticketName,
-            en: (typeof params.ticketResult.ticketNameEng === 'string')
-                ? params.ticketResult.ticketNameEng
-                : ''
-        }, description: {
+    const offerName = {
+        ja: params.ticketResult.ticketName,
+        en: (typeof params.ticketResult.ticketNameEng === 'string')
+            ? params.ticketResult.ticketNameEng
+            : ''
+    };
+    return Object.assign(Object.assign(Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY, id: '', identifier: identifier, name: offerName, description: {
             ja: '',
             en: ''
         }, alternateName: {

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

@@ -1,6 +1,7 @@
 import * as COA from '@motionpicture/coa-service';
 import { MongoRepository as CategoryCodeRepo } from '../../../repo/categoryCode';
 import { MongoRepository as OfferRepo } from '../../../repo/offer';
+import { MongoRepository as TaskRepo } from '../../../repo/task';
 export declare function importFromCOA(params: {
     project: {
         id: string;
@@ -9,6 +10,7 @@ export declare function importFromCOA(params: {
 }): (repos: {
     categoryCode: CategoryCodeRepo;
     offer: OfferRepo;
+    task: TaskRepo;
     masterService: COA.service.Master;
 }) => Promise<void>;
 /**

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

@@ -35,8 +35,8 @@ function searchTicketOffersByItemOffered(params) {
             onlyValid: params.onlyValid === true,
             // Mongoのpagingを利用するオプション(2023-02-21~)
             limit: params.limit,
-            page: params.page,
-            sort: false
+            page: params.page
+            // sort: false // 完全廃止(2023-09-04~)
         });
         return { availableOffers: offers, sortedOfferIds };
     });

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

@@ -26,6 +26,7 @@ exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
  */
 function voidTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
         const transaction = yield repos.transaction.findById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id,
@@ -46,8 +47,12 @@ function voidTransaction(params) {
                 throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
             // 確定取引に対応(2023-05-07~)
             case factory.transactionStatusType.Confirmed:
-                // アクションステータスを検証する
-                authorizeActions = authorizeActions.filter((a) => a.actionStatus !== factory.actionStatusType.CompletedActionStatus);
+                // OrderCancelledを考慮(2023-08-30~)
+                const orderCancelled = ((_b = (_a = params.purpose.result) === null || _a === void 0 ? void 0 : _a.order) === null || _b === void 0 ? void 0 : _b.orderStatus) === factory.orderStatus.OrderCancelled;
+                if (!orderCancelled) {
+                    // 取り消すべきアクションに絞る
+                    authorizeActions = authorizeActions.filter((a) => a.actionStatus !== factory.actionStatusType.CompletedActionStatus);
+                }
                 break;
             default:
             // no op

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

@@ -29,7 +29,7 @@ function searchProductOffers(params) {
             excludeAppliesToMovieTicket: false,
             limit: params.limit,
             page: params.page,
-            sort: false,
+            // sort: false, // 完全廃止(2023-09-04~)
             onlyValid: params.onlyValid === true,
             availableAtOrFrom: params.availableAt
         });

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

@@ -1,7 +1,6 @@
 import * as factory from '../../factory';
 import { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import { MongoRepository as ActionRepo } from '../../repo/action';
-import { RedisRepository as RegisterServiceInProgressRepo } from '../../repo/action/registerServiceInProgress';
 import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import { MongoRepository as EventRepo } from '../../repo/event';
 import { MongoRepository as OrderRepo } from '../../repo/order';
@@ -21,6 +20,5 @@ declare function confirmPayTransaction(data: factory.task.IData<factory.taskName
     seller: SellerRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
-    registerServiceInProgress: RegisterServiceInProgressRepo;
 }) => Promise<void>;
 export { confirmPayTransaction };

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

@@ -12,16 +12,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirmPayTransaction = void 0;
 const factory = require("../../factory");
 const PayTransactionService = require("../assetTransaction/pay");
-const payOrder_1 = require("../order/payOrder");
 function confirmPayTransaction(data) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
         // アクション開始
         const action = yield repos.action.start(data);
         try {
             for (const confirmingTransaction of data.object) {
-                yield PayTransactionService.confirm({
-                    transactionNumber: confirmingTransaction.transactionNumber,
-                    potentialActions: {
+                yield PayTransactionService.confirm(Object.assign({ transactionNumber: confirmingTransaction.transactionNumber, potentialActions: {
                         pay: {
                             purpose: {
                                 typeOf: data.purpose.typeOf,
@@ -29,8 +27,9 @@ function confirmPayTransaction(data) {
                                 orderNumber: data.purpose.orderNumber
                             }
                         }
-                    }
-                })({
+                    } }, (typeof ((_b = (_a = confirmingTransaction.object) === null || _a === void 0 ? void 0 : _a.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
+                    ? { object: { paymentMethod: { identifier: confirmingTransaction.object.paymentMethod.identifier } } }
+                    : undefined))({
                     action: repos.action,
                     accountingReport: repos.accountingReport,
                     assetTransaction: repos.assetTransaction,
@@ -59,50 +58,40 @@ function confirmPayTransaction(data) {
         yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
         // processOrder連携(2023-08-23~)
         yield onConfirmed(data)({
-            assetTransaction: repos.assetTransaction,
-            order: repos.order,
-            registerActionInProgress: repos.registerServiceInProgress,
-            task: repos.task,
-            transaction: repos.transaction
+            task: repos.task
         });
     });
 }
 exports.confirmPayTransaction = confirmPayTransaction;
 function onConfirmed(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
         if (params.processOrder === true) {
-            // 注文のpaymentMethodIdを取得
-            const order = yield repos.order.findByOrderNumber({
-                orderNumber: params.purpose.orderNumber,
-                project: { id: params.project.id },
-                inclusion: ['paymentMethods'],
-                exclusion: []
-            });
-            // PayTransactionのステータス検証
-            let allPayTransactionConfirmed = false;
-            const paymentMethodIds = order.paymentMethods.filter((invoice) => typeof invoice.paymentMethodId === 'string' && invoice.paymentMethodId.length > 0)
-                .map((invoice) => invoice.paymentMethodId);
-            if (paymentMethodIds.length > 0) {
-                const referencedPayTransactions = yield repos.assetTransaction.search({
-                    project: { id: { $eq: params.project.id } },
-                    typeOf: factory.assetTransactionType.Pay,
-                    transactionNumber: { $in: paymentMethodIds }
-                }, ['status']);
-                allPayTransactionConfirmed =
-                    referencedPayTransactions.every((payTransation) => payTransation.status === factory.transactionStatusType.Confirmed);
-            }
-            else {
-                allPayTransactionConfirmed = true;
-            }
-            if (allPayTransactionConfirmed) {
-                yield (0, payOrder_1.payOrder)({
-                    project: { id: params.project.id },
-                    object: {
+            for (const confirmingTransaction of params.object) {
+                // タスク冪等作成
+                const onAssetTransactionStatusChangedTaskData = {
+                    project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                    object: Object.assign({ typeOf: factory.assetTransactionType.Pay, transactionNumber: confirmingTransaction.transactionNumber, status: factory.transactionStatusType.Confirmed }, (typeof ((_b = (_a = confirmingTransaction.object) === null || _a === void 0 ? void 0 : _a.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
+                        ? { object: { paymentMethod: { identifier: confirmingTransaction.object.paymentMethod.identifier } } }
+                        : undefined),
+                    purpose: {
                         confirmationNumber: params.purpose.confirmationNumber,
-                        orderNumber: params.purpose.orderNumber
+                        orderNumber: params.purpose.orderNumber,
+                        typeOf: 'Order'
                     },
                     useOnOrderStatusChanged: params.useOnOrderStatusChanged === true
-                })(repos);
+                };
+                const onAssetTransactionStatusChangedTask = {
+                    project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                    name: factory.taskName.OnAssetTransactionStatusChanged,
+                    status: factory.taskStatus.Ready,
+                    runsAt: new Date(),
+                    remainingNumberOfTries: 10,
+                    numberOfTried: 0,
+                    executionResults: [],
+                    data: onAssetTransactionStatusChangedTaskData
+                };
+                yield repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask, { emitImmediately: true });
             }
         }
     });

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

@@ -0,0 +1,27 @@
+import { RedisRepository as RegisterServiceInProgressRepo } from '../../repo/action/registerServiceInProgress';
+import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
+import { MongoRepository as OrderRepo } from '../../repo/order';
+import { MongoRepository as TaskRepo } from '../../repo/task';
+import { MongoRepository as TransactionRepo } from '../../repo/transaction';
+import * as factory from '../../factory';
+declare function onAssetTransactionStatusChanged(params: factory.task.IData<factory.taskName.OnAssetTransactionStatusChanged>): (repos: {
+    assetTransaction: AssetTransactionRepo;
+    order: OrderRepo;
+    registerActionInProgress: RegisterServiceInProgressRepo;
+    task: TaskRepo;
+    transaction: TransactionRepo;
+}) => Promise<void>;
+declare function paymentDue2Processing(params: {
+    project: {
+        id: string;
+    };
+    confirmationNumber: string;
+    orderNumber: string;
+    useOnOrderStatusChanged: boolean;
+}): (repos: {
+    order: OrderRepo;
+    registerActionInProgress: RegisterServiceInProgressRepo;
+    task: TaskRepo;
+    transaction: TransactionRepo;
+}) => Promise<void>;
+export { onAssetTransactionStatusChanged, paymentDue2Processing };