@chevre/domain 21.7.0-alpha.0 → 21.7.0-alpha.10

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

@@ -28,7 +28,7 @@ function createPayActions(params) {
     }
     return payActions;
 }
-// tslint:disable-next-line:cyclomatic-complexity
+// tslint:disable-next-line:cyclomatic-complexity max-func-body-length
 function createPayObject(params) {
     var _a;
     const transaction = params.transaction;
@@ -37,12 +37,20 @@ function createPayObject(params) {
     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 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')
+        ? paymentMethod.amount
+        : paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.amount.value;
     const paymentServiceOutput = createPayObjectServiceOutput(params);
     let payObject;
     switch (transaction.object.typeOf) {
         case factory.service.paymentService.PaymentServiceType.FaceToFace:
             // 対面決済ではとりあえず問答無用にJPY
-            const totalPaymentDue4faceToFace = { typeOf: 'MonetaryAmount', currency: factory.priceCurrency.JPY, value: Number(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.amount) };
+            const totalPaymentDue4faceToFace = {
+                typeOf: 'MonetaryAmount',
+                currency: factory.priceCurrency.JPY,
+                value: paymentMethodAmountValue
+            };
             payObject = {
                 typeOf: transaction.object.typeOf,
                 id: (typeof transaction.object.id === 'string') ? transaction.object.id : '',
@@ -52,7 +60,11 @@ function createPayObject(params) {
         case factory.service.paymentService.PaymentServiceType.PaymentCard:
             const totalPaymentDue = (typeof ((_a = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.totalPaymentDue) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
                 ? paymentMethod.totalPaymentDue
-                : { typeOf: 'MonetaryAmount', currency: factory.priceCurrency.JPY, value: Number(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.amount) };
+                : {
+                    typeOf: 'MonetaryAmount',
+                    currency: factory.priceCurrency.JPY,
+                    value: paymentMethodAmountValue
+                };
             payObject = {
                 typeOf: transaction.object.typeOf,
                 id: (typeof transaction.object.id === 'string') ? transaction.object.id : '',
@@ -68,11 +80,17 @@ function createPayObject(params) {
             };
             break;
         case factory.service.paymentService.PaymentServiceType.CreditCard:
-            payObject = Object.assign({ typeOf: transaction.object.typeOf, id: (typeof transaction.object.id === 'string') ? transaction.object.id : '', paymentMethod: Object.assign({ additionalProperty: (Array.isArray(additionalProperty)) ? additionalProperty : [], name: paymentMethodName, paymentMethodId: paymentMethodId, totalPaymentDue: {
+            payObject = {
+                typeOf: transaction.object.typeOf,
+                id: (typeof transaction.object.id === 'string') ? transaction.object.id : '',
+                paymentMethod: Object.assign({ additionalProperty: (Array.isArray(additionalProperty)) ? additionalProperty : [], name: paymentMethodName, paymentMethodId: paymentMethodId, totalPaymentDue: {
                         typeOf: 'MonetaryAmount',
                         currency: factory.priceCurrency.JPY,
-                        value: Number(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.amount)
-                    }, typeOf: paymentMethodType }, (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.accountId) === 'string') ? { accountId: paymentMethod.accountId } : undefined) }, (paymentServiceOutput !== undefined) ? { serviceOutput: paymentServiceOutput } : undefined);
+                        value: paymentMethodAmountValue
+                    }, typeOf: paymentMethodType }, (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.accountId) === 'string') ? { accountId: paymentMethod.accountId } : undefined)
+                // CreditCardIFのカード通貨区分を追加(2023-08-07~)
+                // ...(paymentServiceOutput !== undefined) ? { serviceOutput: paymentServiceOutput } : undefined
+            };
             break;
         case factory.service.paymentService.PaymentServiceType.MovieTicket:
             payObject = Object.assign({ typeOf: transaction.object.typeOf, id: (typeof transaction.object.id === 'string') ? transaction.object.id : '', paymentMethod: {
@@ -94,7 +112,6 @@ function createPayObject(params) {
     return payObject;
 }
 function createPayObjectServiceOutput(params) {
-    var _a, _b;
     const transaction = params.transaction;
     const paymentMethod = transaction.object.paymentMethod;
     const order = params.order;
@@ -105,17 +122,21 @@ function createPayObjectServiceOutput(params) {
             break;
         case factory.service.paymentService.PaymentServiceType.CreditCard:
             // CreditCardIFのカード通貨区分を追加(2023-08-07~)
-            const creditCardAsPaymentServiceOutput = (typeof ((_b = (_a = transaction.object.serviceOutput) === null || _a === void 0 ? void 0 : _a.amount) === null || _b === void 0 ? void 0 : _b.currency) === 'string')
-                ? {
-                    amount: {
-                        currency: transaction.object.serviceOutput.amount.currency,
-                        value: transaction.object.paymentMethod.amount
-                    }
-                }
-                : undefined;
-            if (creditCardAsPaymentServiceOutput !== undefined) {
-                paymentServiceOutput = creditCardAsPaymentServiceOutput;
-            }
+            // const creditCardAsPaymentServiceOutput: factory.order.IOrderPaymentMethodIssuedThroughServiceOutput | undefined =
+            //     (typeof transaction.object.paymentMethod?.amount !== 'number'
+            //         && typeof transaction.object.paymentMethod?.amount?.currency === 'string')
+            //         ? {
+            //             paymentMethod: {
+            //                 amount: {
+            //                     currency: transaction.object.paymentMethod.amount.currency,
+            //                     value: transaction.object.paymentMethod.amount.value
+            //                 }
+            //             }
+            //         }
+            //         : undefined;
+            // if (creditCardAsPaymentServiceOutput !== undefined) {
+            //     paymentServiceOutput = creditCardAsPaymentServiceOutput;
+            // }
             break;
         case factory.service.paymentService.PaymentServiceType.MovieTicket:
             const paymentMethodType = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.typeOf;

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;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     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,7 @@ 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 = (_j = (_h = params.paymentService.serviceOutput) === null || _h === void 0 ? void 0 : _h.amount) === null || _j === void 0 ? void 0 : _j.currency;
+        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;
         if (typeof paymentServiceOutputAmountCurrency !== 'string') {
             if (typeof params.object.refundFee === 'number') {
                 refundFee = params.object.refundFee;

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

@@ -1,4 +1,5 @@
 import { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
+import { MongoRepository as EventRepo } from '../../repo/event';
 import { MongoRepository as OrderRepo } from '../../repo/order';
 import { MongoRepository as OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import { MongoRepository as ReservationRepo } from '../../repo/reservation';
@@ -11,6 +12,7 @@ declare function deleteOrder(params: {
     object: Pick<factory.order.IOrder, 'project' | 'typeOf' | 'confirmationNumber' | 'orderDate' | 'orderNumber'>;
 }): (repos: {
     accountingReport: AccountingReportRepo;
+    event: EventRepo;
     order: OrderRepo;
     ownershipInfo: OwnershipInfoRepo;
     reservation: ReservationRepo;

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

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteOrder = void 0;
 const factory_1 = require("../delivery/factory");
 const factory = require("../../factory");
+const settings_1 = require("../../settings");
 /**
  * 注文に関わるリソースを削除する
  * 冪等性を確保すること
@@ -38,6 +39,10 @@ function deleteOrder(params) {
         }
         // 経理レポート削除
         yield repos.accountingReport.deleteByOrderNumber({ mainEntity: { orderNumber: order.orderNumber } });
+        // 終了済の関連イベントを削除(2023-08-16~)
+        if (settings_1.USE_DELETE_EVENT_BY_ORDER) {
+            yield deleteEventsByOrder(order)(repos);
+        }
         // 注文削除
         yield repos.order.deleteByOrderNumber({ orderNumber: order.orderNumber });
     });
@@ -73,3 +78,40 @@ function deleteOwnershipInfosByOrder(order) {
         }
     });
 }
+function deleteEventsByOrder(order) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const now = new Date();
+        const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+        const reservationForIds = acceptedOffers.filter((o) => {
+            return (o.itemOffered.typeOf === factory.reservationType.EventReservation
+                || o.itemOffered.typeOf === factory.reservationType.BusReservation)
+                && typeof o.itemOffered.reservationFor.id === 'string';
+        })
+            .map((o) => {
+            return String(o.itemOffered.reservationFor.id);
+        });
+        if (reservationForIds.length > 0) {
+            for (const reservationForId of reservationForIds) {
+                // 関連注文が存在しなければ削除
+                const relatedOrders = yield repos.order.search({
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: order.project.id } },
+                    acceptedOffers: {
+                        itemOffered: {
+                            reservationFor: { ids: [reservationForId] }
+                        }
+                    }
+                }, { _id: 1 });
+                if (relatedOrders.length === 0) {
+                    yield repos.event.deleteManyEndedByIds({
+                        typeOf: { $in: [factory.eventType.Event, factory.eventType.ScreeningEvent] },
+                        project: { id: order.project.id },
+                        ids: [reservationForId],
+                        endDate: { $lte: now }
+                    });
+                }
+            }
+        }
+    });
+}

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

@@ -80,28 +80,39 @@ function createMovieTicket(params) {
     };
 }
 function createAuthorizeResult(params) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const payTransactionObject = params.payTransaction.object;
     const totalPaymentDue = (_a = payTransactionObject.paymentMethod) === null || _a === void 0 ? void 0 : _a.totalPaymentDue;
     if (typeof (totalPaymentDue === null || totalPaymentDue === void 0 ? void 0 : totalPaymentDue.typeOf) !== 'string') {
         throw new factory.errors.ServiceUnavailable('payTransaction.object.paymentMethod.totalPaymentDue undefined');
     }
-    const issuedThrough = Object.assign({ typeOf: payTransactionObject.typeOf, id: (typeof payTransactionObject.id === 'string') ? payTransactionObject.id : '' }, (typeof ((_c = (_b = payTransactionObject.serviceOutput) === null || _b === void 0 ? void 0 : _b.amount) === null || _c === void 0 ? void 0 : _c.currency) === 'string')
-        ? { serviceOutput: payTransactionObject.serviceOutput }
+    const issuedThrough = {
+        typeOf: payTransactionObject.typeOf,
+        id: (typeof payTransactionObject.id === 'string') ? payTransactionObject.id : ''
+    };
+    // 決済取引から決済カード通貨区分を取り出す
+    const paymentMethodAmountCurrencyByPayTransaction = (typeof ((_b = payTransactionObject.paymentMethod) === null || _b === void 0 ? void 0 : _b.amount) !== 'number')
+        ? (_d = (_c = payTransactionObject.paymentMethod) === null || _c === void 0 ? void 0 : _c.amount) === null || _d === void 0 ? void 0 : _d.currency
+        : undefined;
+    const paymentMethodAsObject = Object.assign({ typeOf: params.object.paymentMethod }, (payTransactionObject.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
+        && typeof paymentMethodAmountCurrencyByPayTransaction === 'string')
+        ? { amount: { currency: paymentMethodAmountCurrencyByPayTransaction } }
         : undefined);
     return {
-        accountId: (typeof ((_d = payTransactionObject.paymentMethod) === null || _d === void 0 ? void 0 : _d.accountId) === 'string')
+        accountId: (typeof ((_e = payTransactionObject.paymentMethod) === null || _e === void 0 ? void 0 : _e.accountId) === 'string')
             ? payTransactionObject.paymentMethod.accountId
             : '',
         // 廃止(2023-08-07~)
         // amount: params.object.amount,
         issuedThrough,
-        paymentMethod: params.object.paymentMethod,
+        // 完全廃止(paymentMethodAsObjectへ完全移行)(2023-08-16~)
+        // paymentMethod: params.object.paymentMethod,
+        paymentMethodAsObject,
         paymentStatus: factory.paymentStatusType.PaymentDue,
-        paymentMethodId: (typeof ((_e = payTransactionObject.paymentMethod) === null || _e === void 0 ? void 0 : _e.paymentMethodId) === 'string')
+        paymentMethodId: (typeof ((_f = payTransactionObject.paymentMethod) === null || _f === void 0 ? void 0 : _f.paymentMethodId) === 'string')
             ? payTransactionObject.paymentMethod.paymentMethodId
             : '',
-        name: (typeof ((_f = payTransactionObject.paymentMethod) === null || _f === void 0 ? void 0 : _f.name) === 'string')
+        name: (typeof ((_g = payTransactionObject.paymentMethod) === null || _g === void 0 ? void 0 : _g.name) === 'string')
             ? payTransactionObject.paymentMethod.name
             : params.object.paymentMethod,
         totalPaymentDue: totalPaymentDue,

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

@@ -114,7 +114,9 @@ function processAuthorizeCreditCard(params) {
             shopPass: params.shopPass,
             orderId: params.orderId,
             jobCd: GMO.utils.util.JobCd.Auth,
-            amount: params.object.amount,
+            amount: (typeof params.object.amount === 'number')
+                ? params.object.amount
+                : params.object.amount.value,
             siteId: (_a = params.availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.siteId,
             sitePass: (_b = params.availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.sitePass
         };

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

@@ -127,7 +127,7 @@ function validatePaymentMethod(params, paymentServiceId) {
 }
 function processAccountTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         let pendingTransaction;
         const defaultName = `${factory.assetTransactionType.Pay} Transaction ${params.transactionNumber}`;
         const agent = Object.assign(Object.assign({}, params.agent), { name: (typeof params.agent.name === 'string') ? params.agent.name : defaultName });
@@ -165,7 +165,11 @@ function processAccountTransaction(params) {
             expires: params.expires,
             recipient: recipient,
             object: {
-                amount: { value: (_f = params.paymentMethod) === null || _f === void 0 ? void 0 : _f.amount },
+                amount: {
+                    value: (typeof ((_f = params.paymentMethod) === null || _f === void 0 ? void 0 : _f.amount) === 'number')
+                        ? (_g = params.paymentMethod) === null || _g === void 0 ? void 0 : _g.amount
+                        : (_h = params.paymentMethod) === null || _h === void 0 ? void 0 : _h.amount.value
+                },
                 description: description,
                 fromLocation: {
                     accountNumber: accountNumber

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

@@ -13,6 +13,7 @@ exports.call = void 0;
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const reservation_1 = require("../../repo/reservation");
@@ -28,6 +29,7 @@ function call(data) {
             accountingReport: new accountingReport_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+            event: new event_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),
             ownershipInfo: new ownershipInfo_1.MongoRepository(settings.connection),
             reservation: new reservation_1.MongoRepository(settings.connection),

package/lib/chevre/service/transaction/deleteTransaction.d.ts

@@ -2,6 +2,7 @@ import * as factory from '../../factory';
 import { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
+import { MongoRepository as EventRepo } from '../../repo/event';
 import { MongoRepository as OrderRepo } from '../../repo/order';
 import { MongoRepository as OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import { MongoRepository as ReservationRepo } from '../../repo/reservation';
@@ -15,6 +16,7 @@ export declare function deleteTransaction(params: factory.task.IData<factory.tas
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
+    event: EventRepo;
     order: OrderRepo;
     ownershipInfo: OwnershipInfoRepo;
     reservation: ReservationRepo;

package/lib/chevre/service/transaction/moneyTransfer/factory.js

@@ -14,12 +14,8 @@ function createStartParams(params, passport, seller, amount, fromLocation, toLoc
             id: String(seller.id),
             name: seller.name,
             typeOf: seller.typeOf
-            // ↓最適化(2022-05-24~)
-            // ...{ project: seller.project }
         },
-        object: Object.assign(Object.assign({ amount: amount, fromLocation: fromLocation, toLocation: toLocation, 
-            // authorizeActions: [],
-            pendingTransaction: Object.assign({ transactionNumber }, (typeof ((_a = params.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.identifier) === 'string')
+        object: Object.assign(Object.assign({ amount: amount, fromLocation: fromLocation, toLocation: toLocation, pendingTransaction: Object.assign({ transactionNumber }, (typeof ((_a = params.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.identifier) === 'string')
                 ? { identifier: params.object.pendingTransaction.identifier }
                 : undefined) }, (passport !== undefined) ? { passport } : undefined), (typeof params.object.description === 'string') ? { description: params.object.description } : undefined),
         expires: params.expires

package/lib/chevre/service/transaction/moneyTransfer.js

@@ -537,7 +537,6 @@ function confirm(params) {
         yield repos.transaction.confirm({
             typeOf: factory.transactionType.MoneyTransfer,
             id: transaction.id,
-            authorizeActions: [],
             result: {},
             potentialActions: potentialActions
         });

package/lib/chevre/service/transaction/placeOrderInProgress/result/acceptedOffers.js

@@ -117,10 +117,6 @@ function createProductItems(params) {
 exports.createProductItems = createProductItems;
 function createMoneyTransferAcceptedOffers(params) {
     // 通貨転送承認アクション
-    // const authorizeMoneyTansferActions = (<IAuthorizeMoneyTransferOffer[]>params.transaction.object.authorizeActions)
-    //     .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
-    //     .filter((a) => a.object.typeOf === factory.offerType.Offer)
-    //     .filter((a) => a.object.itemOffered?.typeOf === factory.actionType.MoneyTransfer);
     const authorizeMoneyTansferActions = params.authorizeActions
         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
         .filter((a) => a.object.typeOf === factory.offerType.Offer)

package/lib/chevre/service/transaction/placeOrderInProgress/result.js

@@ -70,16 +70,18 @@ function createPaymentMethods(params) {
     });
     // 決済方法をセット
     authorizePaymentActions.forEach((a) => {
+        var _a, _b, _c;
         const result = a.result;
-        paymentMethods.push({
-            accountId: result.accountId,
-            additionalProperty: (Array.isArray(result.additionalProperty)) ? result.additionalProperty : [],
-            issuedThrough: result.issuedThrough,
-            name: result.name,
-            paymentMethodId: result.paymentMethodId,
-            totalPaymentDue: result.totalPaymentDue,
-            typeOf: result.paymentMethod
-        });
+        const paymentMethodAmountCurrencyByAuthorizeAction = (_b = (_a = result.paymentMethodAsObject) === null || _a === void 0 ? void 0 : _a.amount) === null || _b === void 0 ? void 0 : _b.currency;
+        const paymentMethodOfInvoice = (typeof paymentMethodAmountCurrencyByAuthorizeAction === 'string') ?
+            { amount: { currency: paymentMethodAmountCurrencyByAuthorizeAction } }
+            : undefined;
+        // 決済方法区分は必ず存在するはず(2023-08-15~)
+        const paymentMethodType = (_c = result.paymentMethodAsObject) === null || _c === void 0 ? void 0 : _c.typeOf;
+        if (typeof paymentMethodType !== 'string') {
+            throw new factory.errors.NotFound('authorizePaymentAction.result.paymentMethodAsObject.typeOf');
+        }
+        paymentMethods.push(Object.assign({ accountId: result.accountId, additionalProperty: (Array.isArray(result.additionalProperty)) ? result.additionalProperty : [], issuedThrough: result.issuedThrough, name: result.name, paymentMethodId: result.paymentMethodId, totalPaymentDue: result.totalPaymentDue, typeOf: paymentMethodType }, (paymentMethodOfInvoice !== undefined) ? { paymentMethod: paymentMethodOfInvoice } : undefined));
     });
     // 決済方法から注文金額の計算
     // price += authorizePaymentActions

package/lib/chevre/service/transaction/placeOrderInProgress/validation/validateMovieTicket.js

@@ -11,14 +11,16 @@ const debug = createDebug('cinerino-domain:service:validateMovieTicket');
  * 座席予約オファー承認に対してムビチケ承認条件が整っているかどうか検証する
  */
 function validateMovieTicket(paymentMethodType, transaction, authorizeActions) {
-    // const authorizeActions = transaction.object.authorizeActions;
     const authorizeMovieTicketActions = authorizeActions.filter((a) => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         return a.actionStatus === factory.actionStatusType.CompletedActionStatus
             && ((_a = a.result) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment
             && ((_b = a.result) === null || _b === void 0 ? void 0 : _b.issuedThrough.typeOf) === factory.service.paymentService.PaymentServiceType.MovieTicket
-            && ((_c = a.result) === null || _c === void 0 ? void 0 : _c.paymentMethod) === paymentMethodType;
-    });
+            // 決済方法区分は必ず存在するはず(2023-08-15~)
+            && ((_d = (_c = a.result) === null || _c === void 0 ? void 0 : _c.paymentMethodAsObject) === null || _d === void 0 ? void 0 : _d.typeOf) === paymentMethodType;
+    }
+    // && a.result?.paymentMethod === paymentMethodType
+    );
     const seatReservationAuthorizeActions = authorizeActions.filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus
         && a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);
     // 予約によって必要とされるMovieTicket

package/lib/chevre/service/transaction/placeOrderInProgress/validation.js

@@ -38,10 +38,7 @@ function validateTransaction(transaction, authorizeActions) {
     validatePaymentUrl(transaction, authorizeActions);
 }
 exports.validateTransaction = validateTransaction;
-function findMovieTicketPaymentMethodTypesFromTransaction(
-// transaction: factory.transaction.placeOrder.ITransaction,
-authorizeActions) {
-    // const authorizeActions = transaction.object.authorizeActions;
+function findMovieTicketPaymentMethodTypesFromTransaction(authorizeActions) {
     const authorizeMovieTicketPaymentActions = authorizeActions.filter((a) => {
         var _a, _b;
         return a.actionStatus === factory.actionStatusType.CompletedActionStatus
@@ -55,9 +52,6 @@ authorizeActions) {
     seatReservationAuthorizeActions.forEach((action) => {
         var _a;
         // a.objectではなくa.resultを使用する(2022-06-04~)
-        // const acceptedOffer =
-        // tslint:disable-next-line:max-line-length
-        //     (<factory.action.authorize.offer.seatReservation.IObject<factory.service.webAPI.Identifier.Chevre>>action.object).acceptedOffer;
         const acceptedOffers = (_a = action.result) === null || _a === void 0 ? void 0 : _a.acceptedOffers;
         acceptedOffers === null || acceptedOffers === void 0 ? void 0 : acceptedOffers.forEach((offer) => {
             var _a;
@@ -72,14 +66,15 @@ authorizeActions) {
         });
     });
     const paymentMethodTypes = [
-        ...authorizeMovieTicketPaymentActions.map((a) => { var _a; return String((_a = a.result) === null || _a === void 0 ? void 0 : _a.paymentMethod); }),
+        // 決済方法区分は必ず存在するはず(2023-08-15~)
+        ...authorizeMovieTicketPaymentActions.map((a) => { var _a, _b; return String((_b = (_a = a.result) === null || _a === void 0 ? void 0 : _a.paymentMethodAsObject) === null || _b === void 0 ? void 0 : _b.typeOf); }),
+        // ...authorizeMovieTicketPaymentActions.map((a) => String(a.result?.paymentMethod)),
         ...requiredMovieTicketPaymentMethodTypes
     ];
     return [...new Set(paymentMethodTypes)];
 }
 function validateProfile(transaction) {
     // object.customerで検証(2022-05-26~)
-    // const profile = transaction.agent;
     const profile = transaction.object.customer;
     if (typeof (profile === null || profile === void 0 ? void 0 : profile.email) !== 'string' || (profile === null || profile === void 0 ? void 0 : profile.email.length) === 0
         || typeof (profile === null || profile === void 0 ? void 0 : profile.familyName) !== 'string' || (profile === null || profile === void 0 ? void 0 : profile.familyName.length) === 0
@@ -89,7 +84,6 @@ function validateProfile(transaction) {
     }
 }
 function validatePrice(transaction, authorizeActions) {
-    // const authorizeActions = transaction.object.authorizeActions;
     let priceByAgent = 0;
     let priceBySeller = 0;
     // 決済承認を確認
@@ -121,7 +115,6 @@ function validatePrice(transaction, authorizeActions) {
     }
 }
 function validatePaymentUrl(transaction, authorizeActions) {
-    // const authorizeActions = transaction.object.authorizeActions;
     var _a, _b;
     // 決済URLが発行されている場合、検証
     const paymentMethodId = (_a = transaction.object.paymentMethods) === null || _a === void 0 ? void 0 : _a.paymentMethodId;
@@ -145,10 +138,7 @@ function validatePaymentUrl(transaction, authorizeActions) {
 /**
  * JPY以外の通貨について取引を検証する
  */
-function validateMonetaryAmount(
-// transaction: factory.transaction.placeOrder.ITransaction,
-authorizeActions) {
-    // const authorizeActions = transaction.object.authorizeActions;
+function validateMonetaryAmount(authorizeActions) {
     const authorizeMonetaryAmountActions = authorizeActions
         .filter((a) => {
         var _a, _b;
@@ -216,7 +206,7 @@ function validatePaymentMethods(params) {
         const creditCardPaymentMethodCount = params.order.paymentMethods.filter((p) => {
             var _a, _b;
             // カード通貨区分の存在する決済サービスを考慮(2023-08-09~)
-            const serviceOutputAmountCurrency = (_b = (_a = p.issuedThrough.serviceOutput) === null || _a === void 0 ? void 0 : _a.amount) === null || _b === void 0 ? void 0 : _b.currency;
+            const serviceOutputAmountCurrency = (_b = (_a = p.paymentMethod) === null || _a === void 0 ? void 0 : _a.amount) === null || _b === void 0 ? void 0 : _b.currency;
             return p.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
                 && typeof serviceOutputAmountCurrency !== 'string';
         }).length;
@@ -230,10 +220,6 @@ exports.validatePaymentMethods = validatePaymentMethods;
  * イベントオファー適用条件確認
  */
 function validateEventOffers(params) {
-    // const seatReservationAuthorizeActions = <IAuthorizeSeatReservationOffer[]>
-    //     params.transaction.object.authorizeActions
-    //         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
-    //         .filter((a) => a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);
     const seatReservationAuthorizeActions = params.authorizeActions
         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
         .filter((a) => a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);

package/lib/chevre/service/transaction/placeOrderInProgress.js

@@ -102,7 +102,6 @@ function confirm(params) {
         }
         // 取引に対する全ての承認アクションをマージ
         const authorizeActions = yield searchAuthorizeActions(params)(repos);
-        // transaction.object.authorizeActions = authorizeActions;
         // 注文番号を発行
         const orderNumber = yield publishOrderNumberIfNotExist({
             project: { id: transaction.project.id },
@@ -134,8 +133,6 @@ function confirm(params) {
             yield repos.transaction.confirm({
                 typeOf: transaction.typeOf,
                 id: transaction.id,
-                // 保管有無を設定化(2023-05-16~)
-                authorizeActions: [],
                 result: result,
                 potentialActions: potentialActions
             });

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

@@ -588,7 +588,6 @@ function confirm(params) {
         yield repos.transaction.confirm({
             typeOf: transaction.typeOf,
             id: transaction.id,
-            authorizeActions: [],
             result: result,
             potentialActions: potentialActions
         });

package/lib/chevre/settings.d.ts

@@ -40,6 +40,8 @@ export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_NEW_EVENT_AVAILABILITY_KEY_FROM: moment.Moment;
 export declare const USE_ADVANCE_BOOKING_REQUIREMENT: boolean;
+export declare const USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT: boolean;
+export declare const USE_DELETE_EVENT_BY_ORDER: boolean;
 export declare const INFORM_RESERVATION_TASK_DELAY_IN_SECONDS: number;
 export declare const MONGO_MAX_TIME_MS: number;
 /**

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.MONGO_MAX_TIME_MS = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_ADVANCE_BOOKING_REQUIREMENT = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.MONGO_MAX_TIME_MS = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT = exports.USE_ADVANCE_BOOKING_REQUIREMENT = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -72,6 +72,8 @@ exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = (typeof process.env.USE_NEW_EVENT_
 //     ? process.env.USE_NEW_STOCK_HOLDER_REPO_IDS.split(' ')
 //     : [];
 exports.USE_ADVANCE_BOOKING_REQUIREMENT = process.env.USE_ADVANCE_BOOKING_REQUIREMENT === '1';
+exports.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT = process.env.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT === '1';
+exports.USE_DELETE_EVENT_BY_ORDER = process.env.USE_DELETE_EVENT_BY_ORDER === '1';
 exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = (typeof process.env.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS === 'string')
     ? Number(process.env.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS)
     : 0;

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.325.0-alpha.0",
-    "@cinerino/sdk": "3.163.0",
+    "@chevre/factory": "4.325.0-alpha.5",
+    "@cinerino/sdk": "3.164.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.7.0-alpha.0"
+  "version": "21.7.0-alpha.10"
 }