@chevre/domain 21.8.0-alpha.6 → 21.8.0-alpha.60

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/refund/factory.js

@@ -6,7 +6,7 @@ exports.createStartParams = void 0;
  */
 const factory = require("../../../factory");
 function createStartParams(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.typeOf;
     if (typeof paymentMethodType !== 'string') {
         throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
@@ -23,7 +23,13 @@ function createStartParams(params) {
     let refundFee;
     if (((_g = params.paymentService) === null || _g === void 0 ? void 0 : _g.typeOf) === factory.service.paymentService.PaymentServiceType.CreditCard) {
         // カード通貨区分の存在する決済サービスを考慮(2023-08-09~)
-        const paymentServiceOutputAmountCurrency = (_k = (_j = (_h = params.paymentService.serviceOutput) === null || _h === void 0 ? void 0 : _h.paymentMethod) === null || _j === void 0 ? void 0 : _j.amount) === null || _k === void 0 ? void 0 : _k.currency;
+        const invoiceAsServiceOutput = (Array.isArray(params.paymentService.serviceOutput))
+            ? params.paymentService.serviceOutput.find((output) => output.typeOf === 'Invoice')
+            : params.paymentService.serviceOutput;
+        let paymentServiceOutputAmountCurrency;
+        if ((invoiceAsServiceOutput === null || invoiceAsServiceOutput === void 0 ? void 0 : invoiceAsServiceOutput.typeOf) === 'Invoice') {
+            paymentServiceOutputAmountCurrency = (_j = (_h = invoiceAsServiceOutput === null || invoiceAsServiceOutput === void 0 ? void 0 : invoiceAsServiceOutput.paymentMethod) === null || _h === void 0 ? void 0 : _h.amount) === null || _j === void 0 ? void 0 : _j.currency;
+        }
         if (typeof paymentServiceOutputAmountCurrency !== 'string') {
             if (typeof params.object.refundFee === 'number') {
                 refundFee = params.object.refundFee;

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

@@ -94,7 +94,8 @@ function createTransactionObject(params) {
             ids: params.acceptedOffers.map((o) => o.id),
             itemOffered: { id: String(params.product.id) },
             onlyValid: true,
-            addSortIndex: false
+            addSortIndex: false,
+            useOffersAsPrimaryForcible: false
         })(repos);
         const transactionObject = [];
         for (const acceptedOffer of params.acceptedOffers) {

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

@@ -120,7 +120,8 @@ function addReservations(params) {
                 store: { id: (_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id },
                 onlyValid: true,
                 addSortIndex: false,
-                validateOfferRateLimit: true
+                validateOfferRateLimit: true,
+                useOffersAsPrimaryForcible: false
             })(repos);
             ticketOffers = searchEventTicketOffersResult.ticketOffers;
             availableOffers = searchEventTicketOffersResult.unitPriceOffers;
@@ -181,7 +182,7 @@ function addReservations(params) {
         //     await repos.reservation.createMany({ reservationFor, reservations: objectSubReservations });
         // }
         // ストックホルダー処理(stockHolderで残席数を集計しているので必要)
-        yield onReservationsCreated({ event })(repos);
+        yield onReservationsCreated({ event, transaction: { transactionNumber: transaction.transactionNumber } })(repos);
         return { transaction, objectSubReservations, issuedThrough };
     });
 }
@@ -386,21 +387,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}`;
@@ -435,7 +477,7 @@ function searchAvailableAddOns(params) {
         if (Array.isArray(params.ticketOffer.addOn)) {
             const addOnProductIds = [...new Set(params.ticketOffer.addOn.map((o) => String(o.itemOffered.id)))];
             for (const addOnProductId of addOnProductIds) {
-                const { offers, product } = yield OfferService.product.search(Object.assign({ ids: params.ids, project: { id: params.project.id }, itemOffered: { id: addOnProductId }, onlyValid: true, addSortIndex: false }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                const { offers, product } = yield OfferService.product.search(Object.assign({ ids: params.ids, project: { id: params.project.id }, itemOffered: { id: addOnProductId }, onlyValid: true, addSortIndex: false, useOffersAsPrimaryForcible: false }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
                     ? { availableAt: { id: params.availableAtOrFrom.id } }
                     : undefined))(repos);
                 availableAddOns.push(...offers.map((o) => {
@@ -530,31 +572,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;
     });
@@ -729,7 +804,8 @@ function onReservationsCreated(params) {
         yield OfferService.createAggregateScreeningEventIfNotExist({
             project: params.event.project,
             reservationFor: [{ id: params.event.id }],
-            force: false
+            force: false,
+            identifier: `onReservationsCreated:${params.transaction.transactionNumber}`
         })({ task: repos.task });
     });
 }

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;
     });
@@ -236,7 +239,8 @@ function validateAcceptedOffers(params) {
             store: params.store,
             onlyValid: true,
             addSortIndex: false,
-            validateOfferRateLimit: true
+            validateOfferRateLimit: true,
+            useOffersAsPrimaryForcible: false
         })(repos);
         // 利用可能なチケットオファーであれば受け入れる
         const acceptedOffers = (Array.isArray(acceptedOffersWithoutDetail))
@@ -252,31 +256,35 @@ function validateAcceptedOffers(params) {
             : [];
         // オファーIDごとにオファー適用条件を確認
         offerIds.forEach((offerId) => {
-            var _a;
+            var _a, _b, _c;
             const acceptedOffersByOfferId = acceptedOffers.filter((o) => o.id === offerId);
+            const numAcceptedOffersByOfferId = acceptedOffersByOfferId.length;
             let referenceQuantityValue = 1;
-            const unitPriceSpec = acceptedOffersByOfferId[0].priceSpecification.priceComponent.find((spec) => spec.typeOf === factory.priceSpecificationType.UnitPriceSpecification);
-            const unitPriceSpecReferenceQuantityValue = (_a = unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.referenceQuantity) === null || _a === void 0 ? void 0 : _a.value;
+            // 単価仕様を取り出す
+            const unitPriceSpec = acceptedOffersByOfferId[0].priceSpecification.priceComponent.find((spec) => spec.typeOf === factory.priceSpecificationType.UnitPriceSpecification && (!Array.isArray(spec.appliesToAddOn)));
+            // 単価仕様は必ず存在するはず
+            if ((unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.typeOf) !== factory.priceSpecificationType.UnitPriceSpecification) {
+                throw new factory.errors.ServiceUnavailable(`unitPriceSpec of the offer '${offerId}' not found`);
+            }
+            const unitPriceSpecReferenceQuantityValue = (_a = unitPriceSpec.referenceQuantity) === null || _a === void 0 ? void 0 : _a.value;
             if (typeof unitPriceSpecReferenceQuantityValue === 'number') {
                 referenceQuantityValue = unitPriceSpecReferenceQuantityValue;
             }
             // アイテム数が適用単位要件を満たしていなければエラー
-            if (acceptedOffersByOfferId.length % referenceQuantityValue !== 0) {
+            if (numAcceptedOffersByOfferId % referenceQuantityValue !== 0) {
                 throw new factory.errors.Argument('acceptedOffers', `Offer ${offerId} requires reference quantity value ${referenceQuantityValue}`);
             }
             // 適用アイテム数要件を満たしていなければエラー
-            if ((unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.eligibleQuantity) !== undefined) {
-                const maxValue = unitPriceSpec.eligibleQuantity.maxValue;
-                if (typeof maxValue === 'number') {
-                    if (acceptedOffersByOfferId.length > maxValue) {
-                        throw new factory.errors.Argument('acceptedOffers', `Number of offer:${offerId} must be less than or equal to ${maxValue}`);
-                    }
+            const maxValue = (_b = unitPriceSpec.eligibleQuantity) === null || _b === void 0 ? void 0 : _b.maxValue;
+            if (typeof maxValue === 'number') {
+                if (numAcceptedOffersByOfferId > maxValue) {
+                    throw new factory.errors.Argument('acceptedOffers', `Number of offer:${offerId} must be less than or equal to ${maxValue}`);
                 }
-                const minValue = unitPriceSpec.eligibleQuantity.minValue;
-                if (typeof minValue === 'number') {
-                    if (acceptedOffersByOfferId.length < minValue) {
-                        throw new factory.errors.Argument('acceptedOffers', `Number of offer:${offerId} must be more than or equal to ${minValue}`);
-                    }
+            }
+            const minValue = (_c = unitPriceSpec.eligibleQuantity) === null || _c === void 0 ? void 0 : _c.minValue;
+            if (typeof minValue === 'number') {
+                if (numAcceptedOffersByOfferId < minValue) {
+                    throw new factory.errors.Argument('acceptedOffers', `Number of offer:${offerId} must be more than or equal to ${minValue}`);
                 }
             }
         });
@@ -298,44 +306,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.d.ts

@@ -16,7 +16,7 @@ export declare function createReserveTransactionStartParams(params: {
 export declare function createAuthorizeSeatReservationActionAttributes(params: {
     acceptedOffers: factory.action.authorize.offer.seatReservation.IAcceptedOffer4chevre[];
     event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
-    pendingTransaction?: factory.action.authorize.offer.seatReservation.IPendingTransaction | undefined;
+    pendingTransaction?: factory.action.authorize.offer.seatReservation.IChevrePendingTransaction | undefined;
     transaction: factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
     broker?: factory.reservation.IBroker<factory.reservationType.EventReservation>;
 }): factory.action.authorize.offer.seatReservation.IAttributes<factory.service.webAPI.Identifier.Chevre>;