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

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

@@ -13,6 +13,7 @@ exports.call = void 0;
 const factory = require("../../factory");
 const accountTitle_1 = require("../../repo/accountTitle");
 const action_1 = require("../../repo/action");
+const aggregateOffer_1 = require("../../repo/aggregateOffer");
 const categoryCode_1 = require("../../repo/categoryCode");
 const creativeWork_1 = require("../../repo/creativeWork");
 const event_1 = require("../../repo/event");
@@ -25,6 +26,7 @@ const product_1 = require("../../repo/product");
 const productOffer_1 = require("../../repo/productOffer");
 const task_1 = require("../../repo/task");
 const onResourceDeleted_1 = require("./onResourceUpdated/onResourceDeleted");
+const syncOfferCatalog_1 = require("./onResourceUpdated/syncOfferCatalog");
 const settings_1 = require("../../settings");
 const informResources = settings_1.settings.onResourceUpdated.informResource;
 /**
@@ -35,6 +37,7 @@ function call(data) {
         yield onResourceUpdated(data)({
             accountTitle: new accountTitle_1.MongoRepository(connectionSettings.connection),
             action: new action_1.MongoRepository(connectionSettings.connection),
+            aggregateOffer: new aggregateOffer_1.MongoRepository(connectionSettings.connection),
             categoryCode: new categoryCode_1.MongoRepository(connectionSettings.connection),
             creativeWork: new creativeWork_1.MongoRepository(connectionSettings.connection),
             event: new event_1.MongoRepository(connectionSettings.connection),
@@ -107,6 +110,15 @@ function onResourceUpdated(params) {
                         typeOf: params.typeOf
                     })(repos);
                     break;
+                // カタログに対応(2023-09-12~)
+                case 'OfferCatalog':
+                    yield (0, syncOfferCatalog_1.syncOfferCatalog)({
+                        project: { id: params.project.id },
+                        ids: params.id,
+                        typeOf: params.typeOf,
+                        isDeleted: false
+                    })(repos);
+                    break;
                 default:
                 // no op
             }

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

@@ -159,7 +159,11 @@ function transaction2refundFee(params) {
     return refundFee;
 }
 function createStartRefundTransactionParams(params) {
-    var _a;
+    var _a, _b;
+    const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;
+    if (typeof paymentMethodType !== 'string') {
+        throw new factory.errors.NotFound('object.paymentMethod.identifier');
+    }
     return {
         project: { id: params.project.id, typeOf: factory.organizationType.Project },
         typeOf: factory.assetTransactionType.Refund,
@@ -173,11 +177,12 @@ function createStartRefundTransactionParams(params) {
         recipient: { typeOf: params.recipient.typeOf, name: params.recipient.name },
         object: {
             typeOf: params.paymentServiceType,
-            id: (typeof ((_a = params.object.issuedThrough) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? params.object.issuedThrough.id : '',
+            id: (typeof ((_b = params.object.issuedThrough) === null || _b === void 0 ? void 0 : _b.id) === 'string') ? params.object.issuedThrough.id : '',
             paymentMethod: {
                 additionalProperty: params.object.additionalProperty,
                 name: params.object.name,
-                typeOf: params.object.typeOf,
+                // typeOf: params.object.typeOf,
+                typeOf: paymentMethodType,
                 paymentMethodId: params.object.paymentMethodId
             },
             refundFee: params.refundFee

package/lib/chevre/service/task/syncAggregateOffer.d.ts

@@ -0,0 +1,7 @@
+import * as factory from '../../factory';
+import { IConnectionSettings } from '../task';
+export type IOperation<T> = (settings: IConnectionSettings) => Promise<T>;
+/**
+ * タスク実行関数
+ */
+export declare function call(data: factory.task.syncAggregateOffer.IData): IOperation<void>;

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

@@ -0,0 +1,23 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.call = void 0;
+const offer_1 = require("../../repo/offer");
+/**
+ * タスク実行関数
+ */
+function call(data) {
+    return (connectionSettings) => __awaiter(this, void 0, void 0, function* () {
+        const offerRepo = new offer_1.MongoRepository(connectionSettings.connection);
+        yield offerRepo.sync2aggregateOffer(data);
+    });
+}
+exports.call = call;

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

@@ -65,35 +65,51 @@ function createPaymentMethods(params) {
     const authorizePaymentActions = params.authorizeActions
         .filter((a) => {
         var _a;
+        const resultAsInvoice = (Array.isArray(a.result))
+            ? (_a = a.result) === null || _a === void 0 ? void 0 : _a.find((resultObject) => resultObject.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+            : a.result;
         return a.actionStatus === factory.actionStatusType.CompletedActionStatus
-            && ((_a = a.result) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment;
+            && (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment;
     });
     // 決済方法をセット
     authorizePaymentActions.forEach((a) => {
-        var _a, _b, _c;
-        const result = a.result;
-        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;
+        var _a, _b, _c, _d;
+        // const result = (<factory.action.authorize.paymentMethod.any.IResult>a.result);
+        const resultAsInvoice = (Array.isArray(a.result))
+            ? (_a = a.result) === null || _a === void 0 ? void 0 : _a.find((resultObject) => resultObject.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+            : a.result;
+        const paymentMethodAmountCurrencyByAuthorizeAction = (_c = (_b = resultAsInvoice.paymentMethodAsObject) === null || _b === void 0 ? void 0 : _b.amount) === null || _c === void 0 ? void 0 : _c.currency;
         // 決済方法区分は必ず存在するはず(2023-08-15~)
-        const paymentMethodType = (_c = result.paymentMethodAsObject) === null || _c === void 0 ? void 0 : _c.typeOf;
+        const paymentMethodType = (_d = resultAsInvoice.paymentMethodAsObject) === null || _d === void 0 ? void 0 : _d.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, paymentStatus: result.paymentStatus, totalPaymentDue: result.totalPaymentDue, typeOf: paymentMethodType }, (paymentMethodOfInvoice !== undefined) ? { paymentMethod: paymentMethodOfInvoice } : undefined));
+        const paymentMethodOfInvoice = Object.assign({ identifier: paymentMethodType }, (typeof paymentMethodAmountCurrencyByAuthorizeAction === 'string') ?
+            { amount: { currency: paymentMethodAmountCurrencyByAuthorizeAction } }
+            : undefined);
+        paymentMethods.push({
+            accountId: resultAsInvoice.accountId,
+            additionalProperty: (Array.isArray(resultAsInvoice.additionalProperty)) ? resultAsInvoice.additionalProperty : [],
+            issuedThrough: resultAsInvoice.issuedThrough,
+            name: resultAsInvoice.name,
+            paymentMethodId: resultAsInvoice.paymentMethodId,
+            paymentStatus: resultAsInvoice.paymentStatus,
+            totalPaymentDue: resultAsInvoice.totalPaymentDue,
+            typeOf: paymentMethodType,
+            // CreditCardIFのカード通貨区分を追加(2023-08-15~)
+            // 決済方法区分を保証(2023-08-28~)
+            paymentMethod: paymentMethodOfInvoice
+        });
     });
     // 決済方法から注文金額の計算
-    // price += authorizePaymentActions
-    //     .filter((a) => {
-    //         return a.result?.totalPaymentDue?.currency === factory.priceCurrency.JPY;
-    //     })
-    //     .reduce((a, b) => a + (<IAuthorizeAnyPaymentResult>b.result).amount, 0);
     price += authorizePaymentActions
         .reduce((a, b) => {
         var _a, _b;
-        const jpyAmount = (((_b = (_a = b.result) === null || _a === void 0 ? void 0 : _a.totalPaymentDue) === null || _b === void 0 ? void 0 : _b.currency) === factory.priceCurrency.JPY)
-            ? b.result.totalPaymentDue.value
+        const resultAsInvoice = (Array.isArray(b.result))
+            ? (_a = b.result) === null || _a === void 0 ? void 0 : _a.find((resultObject) => resultObject.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+            : b.result;
+        const jpyAmount = (((_b = resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.totalPaymentDue) === null || _b === void 0 ? void 0 : _b.currency) === factory.priceCurrency.JPY)
+            ? resultAsInvoice.totalPaymentDue.value
             : 0;
         return a + jpyAmount;
     }, 0);

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

@@ -12,15 +12,17 @@ const debug = createDebug('cinerino-domain:service:validateMovieTicket');
  */
 function validateMovieTicket(paymentMethodType, transaction, authorizeActions) {
     const authorizeMovieTicketActions = authorizeActions.filter((a) => {
-        var _a, _b, _c, _d;
+        var _a, _b;
+        const resultAsInvoice = (Array.isArray(a.result))
+            ? (_a = a.result) === null || _a === void 0 ? void 0 : _a.find((resultObject) => resultObject.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+            : a.result;
         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
+            && (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment
+            && (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.issuedThrough.typeOf) === factory.service.paymentService.PaymentServiceType.MovieTicket
             // 決済方法区分は必ず存在するはず(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
-    );
+            && ((_b = resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.paymentMethodAsObject) === null || _b === void 0 ? void 0 : _b.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
@@ -149,10 +151,10 @@ function authorizeSeatReservationActions2requiredMovieTickets(params) {
                         appliesToMovieTickets4paymentMethod = appliesToMovieTickets4reservation.filter((a) => {
                             return a.serviceOutput.typeOf === paymentMethodType;
                         });
-                    }
-                    else if (typeof (appliesToMovieTickets4reservation === null || appliesToMovieTickets4reservation === void 0 ? void 0 : appliesToMovieTickets4reservation.identifier) === 'string') {
-                        // Arrayでない場合を廃止(2022-08-01~)
-                        throw new factory.errors.NotImplemented('appliesToMovieTickets.typeOf as string not implemented');
+                        // Array以外への考慮自体を廃止(2023-09-01~)
+                        // } else if (typeof appliesToMovieTickets4reservation?.identifier === 'string') {
+                        //     // Arrayでない場合を廃止(2022-08-01~)
+                        //     throw new factory.errors.NotImplemented('appliesToMovieTickets.typeOf as string not implemented');
                     }
                     if (Array.isArray(appliesToMovieTickets4paymentMethod) && appliesToMovieTickets4paymentMethod.length > 0) {
                         appliesToMovieTickets4paymentMethod.forEach((appliesToMovieTicket) => {

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

@@ -40,10 +40,13 @@ function validateTransaction(transaction, authorizeActions) {
 exports.validateTransaction = validateTransaction;
 function findMovieTicketPaymentMethodTypesFromTransaction(authorizeActions) {
     const authorizeMovieTicketPaymentActions = authorizeActions.filter((a) => {
-        var _a, _b;
+        var _a;
+        const resultAsInvoice = (Array.isArray(a.result))
+            ? (_a = a.result) === null || _a === void 0 ? void 0 : _a.find((resultObject) => resultObject.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+            : a.result;
         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;
+            && (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment
+            && (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.issuedThrough.typeOf) === factory.service.paymentService.PaymentServiceType.MovieTicket;
     });
     const seatReservationAuthorizeActions = authorizeActions.filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus
         && a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);
@@ -67,7 +70,13 @@ function findMovieTicketPaymentMethodTypesFromTransaction(authorizeActions) {
     });
     const paymentMethodTypes = [
         // 決済方法区分は必ず存在するはず(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) => {
+            var _a, _b;
+            const resultAsInvoice = (Array.isArray(a.result))
+                ? (_a = a.result) === null || _a === void 0 ? void 0 : _a.find((resultObject) => resultObject.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+                : a.result;
+            return String((_b = resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.paymentMethodAsObject) === null || _b === void 0 ? void 0 : _b.typeOf);
+        }),
         // ...authorizeMovieTicketPaymentActions.map((a) => String(a.result?.paymentMethod)),
         ...requiredMovieTicketPaymentMethodTypes
     ];
@@ -90,17 +99,20 @@ function validatePrice(transaction, authorizeActions) {
     const authorizePaymentActions = authorizeActions
         .filter((a) => {
         var _a;
+        const resultAsInvoice = (Array.isArray(a.result))
+            ? (_a = a.result) === null || _a === void 0 ? void 0 : _a.find((resultObject) => resultObject.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+            : a.result;
         return a.actionStatus === factory.actionStatusType.CompletedActionStatus
-            && ((_a = a.result) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment;
+            && (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment;
     });
-    // priceByAgent += authorizePaymentActions
-    //     .filter((a) => a.result?.totalPaymentDue?.currency === factory.priceCurrency.JPY)
-    //     .reduce((a, b) => a + (<IAuthorizeAnyPaymentResult>b.result).amount, 0);
     priceByAgent += authorizePaymentActions
         .reduce((a, b) => {
         var _a, _b;
-        const jpyAmount = (((_b = (_a = b.result) === null || _a === void 0 ? void 0 : _a.totalPaymentDue) === null || _b === void 0 ? void 0 : _b.currency) === factory.priceCurrency.JPY)
-            ? b.result.totalPaymentDue.value
+        const resultAsInvoice = (Array.isArray(b.result))
+            ? (_a = b.result) === null || _a === void 0 ? void 0 : _a.find((resultObject) => resultObject.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+            : b.result;
+        const jpyAmount = (((_b = resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.totalPaymentDue) === null || _b === void 0 ? void 0 : _b.currency) === factory.priceCurrency.JPY)
+            ? resultAsInvoice.totalPaymentDue.value
             : 0;
         return a + jpyAmount;
     }, 0);
@@ -125,11 +137,20 @@ function validatePaymentUrl(transaction, authorizeActions) {
         const authorizePaymentActions = authorizeActions
             .filter((a) => {
             var _a;
+            const resultAsInvoice = (Array.isArray(a.result))
+                ? (_a = a.result) === null || _a === void 0 ? void 0 : _a.find((resultObject) => resultObject.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+                : a.result;
             return a.actionStatus === factory.actionStatusType.CompletedActionStatus
-                && ((_a = a.result) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment;
+                && (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment;
         });
         // 決済承認を確認
-        const authorizePaymentAction4paymentUrlExists = authorizePaymentActions.some((a) => { var _a; return ((_a = a.result) === null || _a === void 0 ? void 0 : _a.paymentMethodId) === paymentMethodId; });
+        const authorizePaymentAction4paymentUrlExists = authorizePaymentActions.some((a) => {
+            var _a;
+            const resultAsInvoice = (Array.isArray(a.result))
+                ? (_a = a.result) === null || _a === void 0 ? void 0 : _a.find((resultObject) => resultObject.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+                : a.result;
+            return (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.paymentMethodId) === paymentMethodId;
+        });
         if (!authorizePaymentAction4paymentUrlExists) {
             throw new factory.errors.Argument('Transaction', 'Payment for published payment URL required');
         }
@@ -142,11 +163,14 @@ function validateMonetaryAmount(authorizeActions) {
     const authorizeMonetaryAmountActions = authorizeActions
         .filter((a) => {
         var _a, _b;
+        const resultAsInvoice = (Array.isArray(a.result))
+            ? (_a = a.result) === null || _a === void 0 ? void 0 : _a.find((resultObject) => resultObject.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+            : a.result;
         return a.actionStatus === factory.actionStatusType.CompletedActionStatus
-            && ((_a = a.result) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment
+            && (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment
             // JPY以外の通貨に対して承認可能なのはPaymentServiceType.PaymentCardのみ
-            && a.result.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.PaymentCard
-            && ((_b = a.result.totalPaymentDue) === null || _b === void 0 ? void 0 : _b.currency) !== factory.priceCurrency.JPY;
+            && resultAsInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.PaymentCard
+            && ((_b = resultAsInvoice.totalPaymentDue) === null || _b === void 0 ? void 0 : _b.currency) !== factory.priceCurrency.JPY;
     });
     const requiredMonetaryAmountByCurrencyType = [];
     authorizeActions
@@ -163,7 +187,13 @@ function validateMonetaryAmount(authorizeActions) {
         }
     }, 0);
     const requiredCurrencyTypes = [...new Set(requiredMonetaryAmountByCurrencyType.map((m) => m.currency))];
-    const authorizedCurrencyTypes = [...new Set(authorizeMonetaryAmountActions.map((m) => { var _a, _b; return (_b = (_a = m.result) === null || _a === void 0 ? void 0 : _a.totalPaymentDue) === null || _b === void 0 ? void 0 : _b.currency; }))];
+    const authorizedCurrencyTypes = [...new Set(authorizeMonetaryAmountActions.map((a) => {
+            var _a, _b;
+            const resultAsInvoice = (Array.isArray(a.result))
+                ? (_a = a.result) === null || _a === void 0 ? void 0 : _a.find((resultObject) => resultObject.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+                : a.result;
+            return (_b = resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.totalPaymentDue) === null || _b === void 0 ? void 0 : _b.currency;
+        }))];
     if (requiredCurrencyTypes.length !== authorizedCurrencyTypes.length) {
         throw new factory.errors.Argument('Transaction', 'MonetaryAmount account types not matched');
     }
@@ -172,7 +202,13 @@ function validateMonetaryAmount(authorizeActions) {
             .filter((m) => m.currency === currencyType)
             .reduce((a, b) => a + b.value, 0);
         const authorizedMonetaryAmount = authorizeMonetaryAmountActions
-            .filter((a) => { var _a, _b; return ((_b = (_a = a.result) === null || _a === void 0 ? void 0 : _a.totalPaymentDue) === null || _b === void 0 ? void 0 : _b.currency) === currencyType; })
+            .filter((a) => {
+            var _a, _b;
+            const resultAsInvoice = (Array.isArray(a.result))
+                ? (_a = a.result) === null || _a === void 0 ? void 0 : _a.find((resultObject) => resultObject.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+                : a.result;
+            return ((_b = resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.totalPaymentDue) === null || _b === void 0 ? void 0 : _b.currency) === currencyType;
+        })
             .reduce((a, b) => a + b.object.amount, 0);
         return requiredMonetaryAmount === authorizedMonetaryAmount;
     });

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

@@ -22,6 +22,7 @@ const validation_1 = require("./placeOrderInProgress/validation");
 const validateSeller_1 = require("./placeOrderInProgress/validation/validateSeller");
 const validation_2 = require("./validation");
 const errorHandler_1 = require("../../errorHandler");
+const settings_1 = require("../../settings");
 exports.POINT_AWARD_IDENTIFIER_NAME = 'pointAwardIdentifiers';
 /**
  * 取引開始
@@ -226,7 +227,9 @@ function createResult(params) {
         orderNumber: params.orderNumber,
         transaction: transaction,
         orderDate: params.result.order.orderDate,
-        orderStatus: factory.orderStatus.OrderProcessing,
+        // OrderPaymentDueオプションを追加(2023-08-25~)
+        // 注文作成時のステータスとなる
+        orderStatus: (settings_1.USE_ORDER_PAYMENT_DUE_ON_PLACED) ? factory.orderStatus.OrderPaymentDue : factory.orderStatus.OrderProcessing,
         isGift: false,
         authorizeActions: params.authorizeActions
     });

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

@@ -138,18 +138,19 @@ function createReturnPaymentMethodIssuedThroughMovieTicketActions(params) {
         const order = params.order;
         const returnFeesMovieTicketByTransaction = params.transaction.object.returnPolicy.returnFeesMovieTicket;
         return Promise.all(params.order.paymentMethods
-            .filter((paymentMethod) => {
-            return paymentMethod.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.MovieTicket;
+            .filter((invoice) => {
+            return invoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.MovieTicket;
         })
             // 決済カード着券取消有無設定を適用
-            .filter((paymentMethod) => {
+            .filter((invoice) => {
             // デフォルトで実行する
             let returnPaymentMethod = true;
-            const movieTicketIdentifier = paymentMethod.accountId;
+            const movieTicketIdentifier = invoice.accountId;
             const returnFeesMovieTicketSettingsByIdentifier = returnFeesMovieTicketByTransaction === null || returnFeesMovieTicketByTransaction === void 0 ? void 0 : returnFeesMovieTicketByTransaction.filter((r) => {
-                var _a;
+                var _a, _b;
                 return r.identifier === String(movieTicketIdentifier)
-                    && ((_a = r.serviceOutput) === null || _a === void 0 ? void 0 : _a.typeOf) === paymentMethod.typeOf;
+                    // && r.serviceOutput?.typeOf === invoice.typeOf;
+                    && ((_a = r.serviceOutput) === null || _a === void 0 ? void 0 : _a.typeOf) === ((_b = invoice.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier);
             });
             // 設定がなければスルー
             if (Array.isArray(returnFeesMovieTicketSettingsByIdentifier) && returnFeesMovieTicketSettingsByIdentifier.length > 0) {

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

@@ -356,7 +356,11 @@ function isSellerReturnPolicyApplicable(params) {
     if (Array.isArray(applicablePaymentMethod)) {
         const everyOrderApplicable = params.orders.every((order) => {
             // 全決済方法区分がapplicablePaymentMethodに含まれれば適用
-            return order.paymentMethods.every((paymentMethod) => applicablePaymentMethod.includes(paymentMethod.typeOf));
+            return order.paymentMethods.every((invoice) => {
+                var _a;
+                return typeof ((_a = invoice.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier) === 'string'
+                    && applicablePaymentMethod.includes(invoice.paymentMethod.identifier);
+            });
         });
         // 全注文について確認ができれば適用
         if (everyOrderApplicable) {

package/lib/chevre/settings.d.ts

@@ -36,13 +36,15 @@ export type ISettings = factory.project.ISettings & {
 };
 export declare const DEFAULT_TASKS_EXPORT_AGENT_NAME: string;
 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 USE_CUSTOM_SENDER_EMAIL: boolean;
-export declare const INFORM_RESERVATION_TASK_DELAY_IN_SECONDS: number;
+export declare const USE_ORDER_PAYMENT_DUE_ON_PLACED: boolean;
+export declare const USE_AUTHORIZE_PAYMENT_RESULT_AS_ARRAY: boolean;
+export declare const USE_AGGREGATE_OFFERS_AS_PRIMARY: boolean;
+export declare const USE_PROHIBIT_OFFERS_AS_PRIMARY: boolean;
+export declare const USE_OPTIMIZE_TICKET_OFFER: boolean;
 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_CUSTOM_SENDER_EMAIL = 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_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.USE_OPTIMIZE_TICKET_OFFER = exports.USE_PROHIBIT_OFFERS_AS_PRIMARY = exports.USE_AGGREGATE_OFFERS_AS_PRIMARY = exports.USE_AUTHORIZE_PAYMENT_RESULT_AS_ARRAY = exports.USE_ORDER_PAYMENT_DUE_ON_PLACED = 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_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = 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')
@@ -60,7 +60,6 @@ exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = (typeof process.env.TRANSA
 exports.DEFAULT_SENDER_EMAIL = process.env.DEFAULT_SENDER_EMAIL;
 exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = `${process.env.GAE_APPLICATION}:${process.env.GAE_SERVICE}:jobs`;
 exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_ASSET_TRANSACTION_SYNC_PROCESSING === '1';
-exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING === '1';
 exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = (typeof process.env.USE_NEW_EVENT_AVAILABILITY_KEY_FROM === 'string')
     ? moment(process.env.USE_NEW_EVENT_AVAILABILITY_KEY_FROM)
     : moment('2023-08-31T15:00:00Z');
@@ -73,10 +72,11 @@ exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = (typeof process.env.USE_NEW_EVENT_
 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.USE_CUSTOM_SENDER_EMAIL = process.env.USE_CUSTOM_SENDER_EMAIL === '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;
+exports.USE_ORDER_PAYMENT_DUE_ON_PLACED = process.env.USE_ORDER_PAYMENT_DUE_ON_PLACED === '1';
+exports.USE_AUTHORIZE_PAYMENT_RESULT_AS_ARRAY = process.env.USE_AUTHORIZE_PAYMENT_RESULT_AS_ARRAY === '1';
+exports.USE_AGGREGATE_OFFERS_AS_PRIMARY = process.env.USE_AGGREGATE_OFFERS_AS_PRIMARY === '1';
+exports.USE_PROHIBIT_OFFERS_AS_PRIMARY = process.env.USE_PROHIBIT_OFFERS_AS_PRIMARY === '1';
+exports.USE_OPTIMIZE_TICKET_OFFER = process.env.USE_OPTIMIZE_TICKET_OFFER === '1';
 exports.MONGO_MAX_TIME_MS = (typeof process.env.MONGO_MAX_TIME_MS === 'string')
     ? Number(process.env.MONGO_MAX_TIME_MS)
     // tslint:disable-next-line:no-magic-numbers

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.327.0-alpha.2",
-    "@cinerino/sdk": "3.165.0",
+    "@chevre/factory": "4.329.0-alpha.12",
+    "@cinerino/sdk": "3.167.0-alpha.5",
     "@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.8.0-alpha.6"
+  "version": "21.8.0-alpha.60"
 }

package/example/src/chevre/migrateAuthorizePaymentActionResult.ts

@@ -1,83 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-// const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const actionRepo = new chevre.repository.Action(mongoose.connection);
-
-    const cursor = actionRepo.getCursor(
-        {
-            typeOf: { $eq: chevre.factory.actionType.AuthorizeAction },
-            actionStatus: { $eq: chevre.factory.actionStatusType.CompletedActionStatus },
-            'object.typeOf': { $exists: true, $eq: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment },
-            'result.typeOf': { $exists: true, $eq: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment },
-            startDate: {
-                $gte: moment('2022-08-16T00:00:00Z')
-                    .toDate()
-                // $lte: moment('2023-08-01T00:00:00Z')
-                //     .toDate()
-            }
-        },
-        {
-            _id: 1,
-            typeOf: 1,
-            result: 1,
-            project: 1,
-            startDate: 1,
-            actionStatus: 1
-        }
-    );
-    console.log('actions found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const action: Pick<
-            chevre.factory.action.authorize.paymentMethod.any.IAction,
-            'id' | 'project' | 'result' | 'typeOf' | 'startDate' | 'actionStatus'
-        > = doc.toObject();
-
-        const oldPaymentMethodType = (<any>action).result?.paymentMethod;
-        const paymentMethodType = action.result?.paymentMethodAsObject?.typeOf;
-        const alreadyMigrated = typeof paymentMethodType === 'string' && oldPaymentMethodType === paymentMethodType;
-
-        if (alreadyMigrated) {
-            console.log('already exist...', action.project.id, action.id, action.startDate, paymentMethodType, i);
-        } else {
-            if (typeof oldPaymentMethodType !== 'string') {
-                console.error('updating action...', action.project.id, action.id, action.startDate, oldPaymentMethodType, i, updateCount);
-                throw new Error('oldPaymentMethodType undefined');
-            }
-
-            const newPaymentMethodAsObject: chevre.factory.action.authorize.paymentMethod.any.IResultPaymentMethod = {
-                typeOf: oldPaymentMethodType
-            };
-            console.log(
-                'updating action...', action.project.id, action.id, action.startDate, newPaymentMethodAsObject.typeOf, i, updateCount);
-            await actionRepo.updateById({
-                id: action.id,
-                update: {
-                    'result.paymentMethodAsObject': newPaymentMethodAsObject
-                }
-            });
-            updateCount += 1;
-            console.log('updated.', action.project.id, action.id, action.startDate, newPaymentMethodAsObject.typeOf, i, updateCount);
-        }
-    });
-
-    console.log(i, 'actions checked');
-    console.log(updateCount, 'actions updated');
-}
-
-main()
-    .then()
-    .catch(console.error);