@chevre/domain 21.8.0-alpha.2 → 21.8.0-alpha.21

package/lib/chevre/repo/task.js

@@ -31,7 +31,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
         const andConditions = [];
         const idEq = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$eq;
         if (typeof idEq === 'string') {
@@ -115,32 +115,21 @@ class MongoRepository {
         }
         const objectIdEq = (_k = (_j = (_h = params.data) === null || _h === void 0 ? void 0 : _h.object) === null || _j === void 0 ? void 0 : _j.id) === null || _k === void 0 ? void 0 : _k.$eq;
         if (typeof objectIdEq === 'string') {
-            andConditions.push({
-                'data.object.id': {
-                    $exists: true,
-                    $eq: objectIdEq
-                }
-            });
+            andConditions.push({ 'data.object.id': { $exists: true, $eq: objectIdEq } });
         }
-        const objectTransactionNumberEq = (_o = (_m = (_l = params.data) === null || _l === void 0 ? void 0 : _l.object) === null || _m === void 0 ? void 0 : _m.transactionNumber) === null || _o === void 0 ? void 0 : _o.$eq;
+        const objectOrderNumberEq = (_o = (_m = (_l = params.data) === null || _l === void 0 ? void 0 : _l.object) === null || _m === void 0 ? void 0 : _m.orderNumber) === null || _o === void 0 ? void 0 : _o.$eq;
+        if (typeof objectOrderNumberEq === 'string') {
+            andConditions.push({ 'data.object.orderNumber': { $exists: true, $eq: objectOrderNumberEq } });
+        }
+        const objectTransactionNumberEq = (_r = (_q = (_p = params.data) === null || _p === void 0 ? void 0 : _p.object) === null || _q === void 0 ? void 0 : _q.transactionNumber) === null || _r === void 0 ? void 0 : _r.$eq;
         if (typeof objectTransactionNumberEq === 'string') {
-            andConditions.push({
-                'data.object.transactionNumber': {
-                    $exists: true,
-                    $eq: objectTransactionNumberEq
-                }
-            });
+            andConditions.push({ 'data.object.transactionNumber': { $exists: true, $eq: objectTransactionNumberEq } });
         }
-        const objectPurposeIdEq = (_r = (_q = (_p = params.data) === null || _p === void 0 ? void 0 : _p.purpose) === null || _q === void 0 ? void 0 : _q.id) === null || _r === void 0 ? void 0 : _r.$eq;
+        const objectPurposeIdEq = (_u = (_t = (_s = params.data) === null || _s === void 0 ? void 0 : _s.purpose) === null || _t === void 0 ? void 0 : _t.id) === null || _u === void 0 ? void 0 : _u.$eq;
         if (typeof objectPurposeIdEq === 'string') {
-            andConditions.push({
-                'data.purpose.id': {
-                    $exists: true,
-                    $eq: objectPurposeIdEq
-                }
-            });
+            andConditions.push({ 'data.purpose.id': { $exists: true, $eq: objectPurposeIdEq } });
         }
-        const objectPurposeOrderNumberEq = (_u = (_t = (_s = params.data) === null || _s === void 0 ? void 0 : _s.purpose) === null || _t === void 0 ? void 0 : _t.orderNumber) === null || _u === void 0 ? void 0 : _u.$eq;
+        const objectPurposeOrderNumberEq = (_x = (_w = (_v = params.data) === null || _v === void 0 ? void 0 : _v.purpose) === null || _w === void 0 ? void 0 : _w.orderNumber) === null || _x === void 0 ? void 0 : _x.$eq;
         if (typeof objectPurposeOrderNumberEq === 'string') {
             andConditions.push({
                 'data.purpose.orderNumber': {
@@ -230,6 +219,103 @@ class MongoRepository {
             }
         });
     }
+    createConfirmReserveTransactionTaskIfNotExist(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const createdTask = yield this.taskModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                name: { $eq: params.name },
+                'data.object.transactionNumber': {
+                    $exists: true,
+                    $eq: String(params.data.object.transactionNumber)
+                },
+                'data.purpose.orderNumber': {
+                    $exists: true,
+                    $eq: String(params.data.purpose.orderNumber)
+                }
+            }, { $setOnInsert: params }, { new: true, upsert: true })
+                .select({ _id: 1 })
+                .exec();
+            if (options.emitImmediately) {
+                task_2.taskEventEmitter.emitTaskStatusChanged({
+                    id: createdTask.id,
+                    name: params.name,
+                    status: factory.taskStatus.Ready
+                });
+            }
+        });
+    }
+    createOnAssetTransactionStatusChangedTaskIfNotExist(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const createdTask = yield this.taskModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                name: { $eq: params.name },
+                'data.object.transactionNumber': {
+                    $exists: true,
+                    $eq: String(params.data.object.transactionNumber)
+                },
+                'data.purpose.orderNumber': {
+                    $exists: true,
+                    $eq: String(params.data.purpose.orderNumber)
+                }
+            }, { $setOnInsert: params }, { new: true, upsert: true })
+                .select({ _id: 1 })
+                .exec();
+            if (options.emitImmediately) {
+                task_2.taskEventEmitter.emitTaskStatusChanged({
+                    id: createdTask.id,
+                    name: params.name,
+                    status: factory.taskStatus.Ready
+                });
+            }
+        });
+    }
+    createSendOrderTaskIfNotExist(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const createdTask = yield this.taskModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                name: { $eq: params.name },
+                'data.object.orderNumber': {
+                    $exists: true,
+                    $eq: String(params.data.object.orderNumber)
+                }
+            }, { $setOnInsert: params }, { new: true, upsert: true })
+                .select({ _id: 1 })
+                .exec();
+            if (options.emitImmediately) {
+                task_2.taskEventEmitter.emitTaskStatusChanged({
+                    id: createdTask.id,
+                    name: params.name,
+                    status: factory.taskStatus.Ready
+                });
+            }
+        });
+    }
+    // public async createOnOrderPaymentCompletedTaskIfNotExist(
+    //     params: factory.task.IAttributes<factory.taskName.OnOrderPaymentCompleted>,
+    //     options: IOptionOnCreate
+    // ): Promise<void> {
+    //     const createdTask = await this.taskModel.findOneAndUpdate(
+    //         {
+    //             'project.id': { $eq: params.project.id },
+    //             name: { $eq: params.name },
+    //             'data.object.orderNumber': {
+    //                 $exists: true,
+    //                 $eq: String(params.data.object.orderNumber)
+    //             }
+    //         },
+    //         { $setOnInsert: params },
+    //         { new: true, upsert: true }
+    //     )
+    //         .select({ _id: 1 })
+    //         .exec();
+    //     if (options.emitImmediately) {
+    //         taskEventEmitter.emitTaskStatusChanged({
+    //             id: createdTask.id,
+    //             name: params.name,
+    //             status: factory.taskStatus.Ready
+    //         });
+    //     }
+    // }
     executeById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.taskModel.findOneAndUpdate({

package/lib/chevre/service/assetTransaction/pay/account/validation.js

@@ -15,9 +15,9 @@ function validateAccount(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
         // 引き出し口座の存在を確認する
-        const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.typeOf;
+        const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;
         if (typeof paymentMethodType !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
+            throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         const accountNumber = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.accountId;
         if (typeof accountNumber !== 'string') {

package/lib/chevre/service/assetTransaction/pay/factory.js

@@ -15,9 +15,9 @@ function createStartParams(params) {
     const paymentMethodType = (params.paymentService !== undefined)
         // FaceToFace以外は、プロダクトから決済方法タイプを自動取得
         ? (_a = params.paymentService.serviceType) === null || _a === void 0 ? void 0 : _a.codeValue
-        : (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.typeOf;
+        : (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
     if (typeof paymentMethodType !== 'string') {
-        throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
+        throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
     }
     let totalPaymentDue;
     switch (params.paymentServiceType) {
@@ -85,7 +85,9 @@ function createStartParams(params) {
             ? params.object.paymentMethod.name
             : paymentMethodType, 
         // MonetaryAmount対応(2023-08-14~)
-        amount: (settings_1.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT) ? paymentMethodAmount : params.amount, paymentMethodId: params.transactionNumber, typeOf: paymentMethodType }, (typeof ((_t = params.object.paymentMethod) === null || _t === void 0 ? void 0 : _t.description) === 'string')
+        amount: (settings_1.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT) ? paymentMethodAmount : params.amount, 
+        // paymentMethodId: params.transactionNumber, // object.paymentMethodIdへ完全移行(2023-08-30~)
+        identifier: paymentMethodType }, (typeof ((_t = params.object.paymentMethod) === null || _t === void 0 ? void 0 : _t.description) === 'string')
         ? { description: (_u = params.object.paymentMethod) === null || _u === void 0 ? void 0 : _u.description }
         : undefined), (totalPaymentDue !== undefined)
         ? { totalPaymentDue: totalPaymentDue }

package/lib/chevre/service/assetTransaction/pay/potentialActions.js

@@ -33,9 +33,9 @@ function createPayObject(params) {
     var _a;
     const transaction = params.transaction;
     const paymentMethod = transaction.object.paymentMethod;
-    const paymentMethodType = String(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.typeOf);
+    const paymentMethodType = String(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.identifier);
     const additionalProperty = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.additionalProperty;
-    const paymentMethodId = (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.paymentMethodId) === 'string') ? paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.paymentMethodId : transaction.id;
+    const paymentMethodId = transaction.object.paymentMethodId;
     const paymentMethodName = (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.name) === 'string') ? paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.name : paymentMethodType;
     // MonetaryAmount対応(2023-08-13~)
     const paymentMethodAmountValue = (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.amount) === 'number')
@@ -139,7 +139,7 @@ function createPayObjectServiceOutput(params) {
             // }
             break;
         case factory.service.paymentService.PaymentServiceType.MovieTicket:
-            const paymentMethodType = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.typeOf;
+            const paymentMethodType = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.identifier;
             const movieTickets = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets;
             if (Array.isArray(movieTickets)) {
                 paymentServiceOutput = movieTickets.map((movieTicket) => {

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

@@ -12,8 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchGMOTrade = exports.exportTasksById = exports.cancel = exports.confirm = exports.start = exports.check = exports.invalidatePaymentUrl = exports.publishPaymentUrl = void 0;
 const moment = require("moment");
 const factory = require("../../factory");
-const settings_1 = require("../../settings");
-const payment_1 = require("../payment");
 const CreditCardPayment = require("../payment/creditCard");
 const MovieTicketPayment = require("../payment/movieTicket");
 const PaymentCardPayment = require("../payment/paymentCard");
@@ -205,7 +203,7 @@ function fixPaymentService(params) {
 }
 function validateSeller(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const sellerId = (_a = params.recipient) === null || _a === void 0 ? void 0 : _a.id;
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
@@ -219,14 +217,26 @@ function validateSeller(params) {
         if (seller === undefined) {
             throw new factory.errors.NotFound(factory.organizationType.Corporation);
         }
-        const paymentMethodType = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.typeOf;
+        const paymentMethodType = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
         if (typeof paymentMethodType !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
+            throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
-        // 販売者の対応決済方法かどうか確認
-        const paymentAccepted = (_c = seller.paymentAccepted) === null || _c === void 0 ? void 0 : _c.some((a) => a.paymentMethodType === paymentMethodType);
-        if (paymentAccepted !== true) {
-            throw new factory.errors.Argument('object.paymentMethod.typeOf', `payment not accepted`);
+        // FaceToFaceの場合、決済方法区分未指定に対応(2023-08-29~)
+        if (params.object.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
+            if (paymentMethodType.length > 0) {
+                // 販売者の対応決済方法かどうか確認
+                const paymentAccepted = (_c = seller.paymentAccepted) === null || _c === void 0 ? void 0 : _c.some((a) => a.paymentMethodType === paymentMethodType);
+                if (paymentAccepted !== true) {
+                    throw new factory.errors.Argument('object.paymentMethod.identifier', `payment not accepted`);
+                }
+            }
+        }
+        else {
+            // 販売者の対応決済方法かどうか確認
+            const paymentAccepted = (_d = seller.paymentAccepted) === null || _d === void 0 ? void 0 : _d.some((a) => a.paymentMethodType === paymentMethodType);
+            if (paymentAccepted !== true) {
+                throw new factory.errors.Argument('object.paymentMethod.identifier', `payment not accepted`);
+            }
         }
     });
 }
@@ -301,6 +311,7 @@ function saveAuthorizeResult(params) {
  */
 function confirm(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
         let transaction;
         // 取引存在確認
         if (typeof params.id === 'string') {
@@ -318,29 +329,24 @@ function confirm(params) {
         else {
             throw new factory.errors.ArgumentNull('Transaction ID or Transaction Number');
         }
+        let overwritingPaymentMethodIdentifier;
+        if (transaction.object.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
+            const specifiedPaymentMethodIdentifire = (_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
+            if (typeof specifiedPaymentMethodIdentifire === 'string' && specifiedPaymentMethodIdentifire.length > 0) {
+                overwritingPaymentMethodIdentifier = specifiedPaymentMethodIdentifire;
+                transaction.object.paymentMethod.identifier = overwritingPaymentMethodIdentifier;
+                // transaction.object.paymentMethod.typeOf = overwritingPaymentMethodIdentifier;
+            }
+        }
         const order = yield fixOrderAsPurpose(params, transaction)(repos);
         const potentialActions = (0, potentialActions_1.createPotentialActions)({
             transaction: transaction,
             potentialActions: params.potentialActions,
             order
         });
-        yield repos.assetTransaction.confirm({
-            typeOf: factory.assetTransactionType.Pay,
-            id: transaction.id,
-            result: {},
-            // sync対応(2023-01-14~)
-            potentialActions: (settings_1.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING)
-                ? { pay: [] }
-                : potentialActions
-        });
-        // sync対応(2023-01-14~)
-        if (settings_1.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING) {
-            if (Array.isArray(potentialActions.pay)) {
-                for (const payAction of potentialActions.pay) {
-                    yield (0, payment_1.pay)(payAction)(repos);
-                }
-            }
-        }
+        yield repos.assetTransaction.confirm(Object.assign({ typeOf: factory.assetTransactionType.Pay, id: transaction.id, result: {}, potentialActions: potentialActions }, (typeof overwritingPaymentMethodIdentifier === 'string')
+            ? { object: { paymentMethod: { identifier: overwritingPaymentMethodIdentifier } } }
+            : undefined));
     });
 }
 exports.confirm = confirm;
@@ -373,23 +379,11 @@ function fixOrderAsPurpose(params, transaction) {
  */
 function cancel(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.assetTransaction.cancel({
+        yield repos.assetTransaction.cancel({
             typeOf: factory.assetTransactionType.Pay,
             id: params.id,
             transactionNumber: params.transactionNumber
         });
-        // sync対応(2023-01-14~)
-        if (settings_1.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING) {
-            const payTransactionAsObject = {
-                project: transaction.project,
-                typeOf: transaction.typeOf,
-                id: transaction.id,
-                transactionNumber: transaction.transactionNumber,
-                object: transaction.object,
-                recipient: transaction.recipient
-            };
-            yield (0, payment_1.voidPayment)({ object: payTransactionAsObject })(repos);
-        }
     });
 }
 exports.cancel = cancel;
@@ -404,6 +398,9 @@ function exportTasksById(params) {
             id: params.id
         });
         const potentialActions = transaction.potentialActions;
+        if (transaction.status === factory.transactionStatusType.InProgress) {
+            throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
+        }
         const taskAttributes = [];
         // タスク実行日時バッファの指定があれば調整
         let taskRunsAt = new Date();
@@ -430,6 +427,31 @@ function exportTasksById(params) {
             executionResults: [],
             data: { object: payTransactionAsObject }
         };
+        // OnAssetTransactionStatusChangedを追加(2023-08-30~)
+        const onAssetTransactionStatusChangedTaskData = {
+            project: transaction.project,
+            object: {
+                typeOf: factory.assetTransactionType.Pay,
+                transactionNumber: transaction.transactionNumber,
+                status: transaction.status
+            },
+            purpose: {
+                confirmationNumber: '',
+                orderNumber: '',
+                typeOf: 'Order'
+            },
+            useOnOrderStatusChanged: true
+        };
+        const onAssetTransactionStatusChangedTask = {
+            project: transaction.project,
+            name: factory.taskName.OnAssetTransactionStatusChanged,
+            status: factory.taskStatus.Ready,
+            runsAt: taskRunsAt,
+            remainingNumberOfTries: 10,
+            numberOfTried: 0,
+            executionResults: [],
+            data: onAssetTransactionStatusChangedTaskData
+        };
         switch (transaction.status) {
             case factory.transactionStatusType.Confirmed:
                 const payActions = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.pay;
@@ -450,13 +472,10 @@ function exportTasksById(params) {
                 }
                 break;
             case factory.transactionStatusType.Canceled:
-                // sync対応(2023-01-14~)
-                if (!settings_1.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING) {
-                    taskAttributes.push(voidPaymentTasks);
-                }
+                taskAttributes.push(voidPaymentTasks, onAssetTransactionStatusChangedTask);
                 break;
             case factory.transactionStatusType.Expired:
-                taskAttributes.push(voidPaymentTasks);
+                taskAttributes.push(voidPaymentTasks, onAssetTransactionStatusChangedTask);
                 break;
             default:
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
@@ -482,9 +501,9 @@ function searchGMOTrade(params) {
         //     throw new factory.errors.Argument('transactionNumber', 'must be confirmed');
         // }
         // CreditCard系統の決済方法タイプは動的
-        const paymentMethodType = (_a = assetTransaction.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.typeOf;
+        const paymentMethodType = (_a = assetTransaction.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;
         if (typeof paymentMethodType !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
+            throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         const paymentServiceId = String(assetTransaction.object.id);
         const availableChannel = yield repos.product.findAvailableChannel({

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}`;

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/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/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 };