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

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

@@ -122,11 +122,9 @@ function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBef
             const validateMovieTicketResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet)(repos);
             accountsReceivablesByServiceType = validateMovieTicketResult.accountsReceivablesByServiceType;
             const paymentMethod = transaction.object.paymentMethod;
-            const paymentMethodType = String(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.typeOf);
+            const paymentMethodType = String(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.identifier);
             const additionalProperty = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.additionalProperty;
-            const paymentMethodId = (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.paymentMethodId) === 'string')
-                ? paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.paymentMethodId
-                : transaction.id;
+            const paymentMethodId = transaction.object.paymentMethodId;
             const paymentMethodName = (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.name) === 'string') ? paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.name : paymentMethodType;
             accountId = (Array.isArray(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets)) ? (_a = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets[0]) === null || _a === void 0 ? void 0 : _a.identifier : undefined;
             if (typeof accountId !== 'string' || accountId.length === 0) {
@@ -157,15 +155,16 @@ function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBef
 exports.authorize = authorize;
 function voidTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const transaction = params.object;
-        const paymentMethodType = (_a = transaction.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.typeOf;
+        const paymentMethodType = (_a = transaction.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 paymentMethodId = (_b = transaction.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.paymentMethodId;
+        // const paymentMethodId = transaction.object.paymentMethod?.paymentMethodId;
+        const paymentMethodId = transaction.object.paymentMethodId;
         if (typeof paymentMethodId !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.paymentMethodId');
+            throw new factory.errors.ArgumentNull('object.paymentMethodId');
         }
         // 決済開始時に着券していれば、取消
         // 例えばtimeoutが原因でCompletedActionStatusでない場合、外部サービス側では着券済の可能性もあるので、そこを考慮する
@@ -192,14 +191,14 @@ function voidTransaction(params) {
                         paymentMethod: {
                             paymentMethodId: paymentMethodId,
                             typeOf: paymentMethodType,
-                            name: (typeof ((_c = transaction.object.paymentMethod) === null || _c === void 0 ? void 0 : _c.name) === 'string')
+                            name: (typeof ((_b = transaction.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.name) === 'string')
                                 ? transaction.object.paymentMethod.name
                                 : paymentMethodType,
                             additionalProperty: []
                         }
                     }], agent: {
                     id: seller.id,
-                    name: (typeof seller.name === 'string') ? seller.name : String((_d = seller.name) === null || _d === void 0 ? void 0 : _d.ja),
+                    name: (typeof seller.name === 'string') ? seller.name : String((_c = seller.name) === null || _c === void 0 ? void 0 : _c.ja),
                     typeOf: seller.typeOf
                 }, recipient: transaction.recipient }, ((payAction === null || payAction === void 0 ? void 0 : payAction.purpose) !== undefined)
                 ? { purpose: payAction.purpose }

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

@@ -68,7 +68,7 @@ function validatePaymentMethod(params, paymentServiceId) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const serviceOutputIdentifier = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.accountId;
         const amount = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.amount;
-        const paymentMethodType = (_c = params.object.paymentMethod) === null || _c === void 0 ? void 0 : _c.typeOf;
+        const paymentMethodType = (_c = params.object.paymentMethod) === null || _c === void 0 ? void 0 : _c.identifier;
         if (typeof serviceOutputIdentifier !== 'string') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.accountId');
         }
@@ -76,7 +76,7 @@ function validatePaymentMethod(params, paymentServiceId) {
             throw new factory.errors.ArgumentNull('object.paymentMethod.amount');
         }
         if (typeof paymentMethodType !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
+            throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         // プロダクトから通貨区分を取得
         const paymentCatdProduct = yield repos.product.findById({ id: paymentServiceId }, ['serviceOutput'], []);
@@ -182,15 +182,12 @@ function processAccountTransaction(params) {
 }
 function voidTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c;
         const transaction = params.object;
-        const paymentMethodType = (_a = transaction.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.typeOf;
-        const paymentMethodId = (_b = transaction.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.paymentMethodId;
-        if (typeof paymentMethodType !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
-        }
+        // const paymentMethodId = transaction.object.paymentMethod?.paymentMethodId;
+        const paymentMethodId = transaction.object.paymentMethodId;
         if (typeof paymentMethodId !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.paymentMethodId');
+            throw new factory.errors.ArgumentNull('object.paymentMethodId');
         }
         const paymentServiceId = String(transaction.object.id);
         // アクションステータスに関係なく取消処理実行
@@ -204,9 +201,9 @@ function voidTransaction(params) {
         const accountTransactionService = new pecorinoapi.service.AccountTransaction({
             endpoint: String(availableChannel.serviceUrl),
             auth: new pecorinoapi.auth.ClientCredentials({
-                domain: String((_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.authorizeServerDomain),
-                clientId: String((_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.clientId),
-                clientSecret: String((_e = availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.clientSecret),
+                domain: String((_a = availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.authorizeServerDomain),
+                clientId: String((_b = availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.clientId),
+                clientSecret: String((_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.clientSecret),
                 scopes: [],
                 state: ''
             })

package/lib/chevre/service/reserve/potentialActions/onReservationCanceled.d.ts

@@ -1,3 +1,6 @@
+/**
+ * 予約取消時アクション
+ */
 import * as factory from '../../../factory';
 import { MongoRepository as TaskRepo } from '../../../repo/task';
 type IEventReservation = factory.reservation.IReservation<factory.reservationType.EventReservation>;

package/lib/chevre/service/reserve/potentialActions/onReservationCanceled.js

@@ -13,7 +13,6 @@ exports.onReservationCanceled = void 0;
 /**
  * 予約取消時アクション
  */
-const moment = require("moment");
 const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
 const offer_1 = require("../../offer");
@@ -41,9 +40,7 @@ reservationFor) {
             if (useInformReservation) {
                 if (Array.isArray(informReservations)) {
                     // やや遅延させる(確定通知が未達の可能性を考慮して)
-                    const informTaskRunsAt = moment(now)
-                        .add(settings_1.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS, 'seconds')
-                        .toDate();
+                    const informTaskRunsAt = now;
                     const reservations4inform = canceledReservations.map((r) => {
                         return {
                             typeOf: r.typeOf,

package/lib/chevre/service/reserve/potentialActions/onReservationCheckedIn.js

@@ -13,7 +13,6 @@ exports.onReservationCheckedIn = void 0;
 /**
  * 予約発券時アクション
  */
-const moment = require("moment");
 const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
 const offer_1 = require("../../offer");
@@ -28,10 +27,7 @@ function onReservationCheckedIn(params) {
         const project = { id: params.project.id, typeOf: factory.organizationType.Project };
         // inform galobally
         if (Array.isArray(informReservations)) {
-            // やや遅延させる(確定通知が未達の可能性を考慮して)
-            const informTaskRunsAt = moment(params.now)
-                .add(settings_1.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS, 'seconds')
-                .toDate();
+            const informTaskRunsAt = params.now;
             informReservations.forEach((informReservation) => {
                 var _a;
                 const informUrl = String((_a = informReservation.recipient) === null || _a === void 0 ? void 0 : _a.url);

package/lib/chevre/service/reserve/potentialActions/onReservationUsed.d.ts

@@ -1,3 +1,6 @@
+/**
+ * 予約使用時アクション
+ */
 import * as factory from '../../../factory';
 import { MongoRepository as TaskRepo } from '../../../repo/task';
 type IEventReservation = factory.reservation.IReservation<factory.reservationType.EventReservation>;

package/lib/chevre/service/reserve/potentialActions/onReservationUsed.js

@@ -13,7 +13,6 @@ exports.onReservationUsed = void 0;
 /**
  * 予約使用時アクション
  */
-const moment = require("moment");
 const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
 const offer_1 = require("../../offer");
@@ -30,9 +29,7 @@ function onReservationUsed(action, attendedReservation) {
         // inform galobally
         if (Array.isArray(informReservations)) {
             // やや遅延させる(確定通知が未達の可能性を考慮して)
-            const informTaskRunsAt = moment(now)
-                .add(settings_1.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS, 'seconds')
-                .toDate();
+            const informTaskRunsAt = now;
             const reservation4inform = {
                 typeOf: attendedReservation.typeOf,
                 project: attendedReservation.project,

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

@@ -13,7 +13,6 @@ exports.call = void 0;
 const factory = require("../../factory");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
-const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
@@ -41,8 +40,7 @@ function call(data) {
             project: new project_1.MongoRepository(settings.connection),
             seller: new seller_1.MongoRepository(settings.connection),
             task: new task_1.MongoRepository(settings.connection),
-            transaction: new transaction_1.MongoRepository(settings.connection),
-            registerServiceInProgress: new registerServiceInProgress_1.RedisRepository(settings.redisClient)
+            transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });
 }

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

@@ -0,0 +1,6 @@
+import { IOperation } from '../task';
+import * as factory from '../../factory';
+/**
+ * タスク実行関数
+ */
+export declare function call(data: factory.task.IData<factory.taskName.OnAssetTransactionStatusChanged>): IOperation<void>;

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

@@ -0,0 +1,37 @@
+"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 factory = require("../../factory");
+const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
+const assetTransaction_1 = require("../../repo/assetTransaction");
+const order_1 = require("../../repo/order");
+const task_1 = require("../../repo/task");
+const transaction_1 = require("../../repo/transaction");
+const onAssetTransactionStatusChanged_1 = require("../order/onAssetTransactionStatusChanged");
+/**
+ * タスク実行関数
+ */
+function call(data) {
+    return (settings) => __awaiter(this, void 0, void 0, function* () {
+        if (settings.redisClient === undefined) {
+            throw new factory.errors.Argument('settings', 'redisClient required');
+        }
+        yield (0, onAssetTransactionStatusChanged_1.onAssetTransactionStatusChanged)(data)({
+            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+            order: new order_1.MongoRepository(settings.connection),
+            registerActionInProgress: new registerServiceInProgress_1.RedisRepository(settings.redisClient),
+            task: new task_1.MongoRepository(settings.connection),
+            transaction: new transaction_1.MongoRepository(settings.connection)
+        });
+    });
+}
+exports.call = call;

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

@@ -0,0 +1,6 @@
+import { IOperation } from '../task';
+import * as factory from '../../factory';
+/**
+ * タスク実行関数
+ */
+export declare function call(data: factory.task.IData<factory.taskName.OnOrderPaymentCompleted>): IOperation<void>;

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

@@ -0,0 +1,35 @@
+"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 factory = require("../../factory");
+const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
+const order_1 = require("../../repo/order");
+const task_1 = require("../../repo/task");
+const transaction_1 = require("../../repo/transaction");
+const payOrder_1 = require("../order/payOrder");
+/**
+ * タスク実行関数
+ */
+function call(data) {
+    return (settings) => __awaiter(this, void 0, void 0, function* () {
+        if (settings.redisClient === undefined) {
+            throw new factory.errors.Argument('settings', 'redisClient required');
+        }
+        yield (0, payOrder_1.payOrder)(data)({
+            order: new order_1.MongoRepository(settings.connection),
+            registerActionInProgress: new registerServiceInProgress_1.RedisRepository(settings.redisClient),
+            task: new task_1.MongoRepository(settings.connection),
+            transaction: new transaction_1.MongoRepository(settings.connection)
+        });
+    });
+}
+exports.call = call;

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/transaction/placeOrderInProgress/result.js

@@ -73,15 +73,27 @@ function createPaymentMethods(params) {
         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;
         // 決済方法区分は必ず存在するはず(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, 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: 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,
+            // CreditCardIFのカード通貨区分を追加(2023-08-15~)
+            // 決済方法区分を保証(2023-08-28~)
+            paymentMethod: paymentMethodOfInvoice
+        });
     });
     // 決済方法から注文金額の計算
     // price += authorizePaymentActions

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,12 @@ 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 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_ORDER_PAYMENT_DUE_ON_PLACED = 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_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');
@@ -74,9 +73,7 @@ exports.USE_ADVANCE_BOOKING_REQUIREMENT = process.env.USE_ADVANCE_BOOKING_REQUIR
 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.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,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.327.0-alpha.1",
+    "@chevre/factory": "4.328.0",
     "@cinerino/sdk": "3.165.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.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.2"
+  "version": "21.8.0-alpha.21"
 }

package/example/src/chevre/migrateEventOrganizer.ts

@@ -1,154 +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 eventRepo = new chevre.repository.Event(mongoose.connection);
-    const placeRepo = new chevre.repository.Place(mongoose.connection);
-
-    const cursor = eventRepo.getCursor(
-        {
-            // 'project.id': { $eq: project.id },
-            'project.id': { $ne: EXCLUDED_PROJECT_ID },
-            typeOf: {
-                $in: [
-                    // chevre.factory.eventType.ScreeningEvent,
-                    chevre.factory.eventType.ScreeningEventSeries
-                ]
-            },
-            organizer: { $exists: true },
-            startDate: {
-                $gte: moment()
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(-3, 'months')
-                    .toDate()
-            }
-        },
-        {
-            _id: 1,
-            project: 1,
-            location: 1,
-            superEvent: 1,
-            startDate: 1,
-            typeOf: 1,
-            organizer: 1
-        }
-    );
-    console.log('events found');
-
-    let i = 0;
-    let updateCount = 0;
-    let invalidOrganizerCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const event: Pick<
-            chevre.factory.event.IEvent<chevre.factory.eventType.ScreeningEvent>,
-            'id' | 'project' | 'location' | 'startDate' | 'typeOf' | 'organizer' | 'superEvent'
-        > | Pick<
-            chevre.factory.event.IEvent<chevre.factory.eventType.ScreeningEventSeries>,
-            'id' | 'project' | 'location' | 'startDate' | 'typeOf' | 'organizer'
-        > = doc.toObject();
-
-        const organizerId = event.organizer?.id;
-
-        let movieTheaterId: string;
-        let movieTheaterBranchCode: string;
-        if (event.typeOf === chevre.factory.eventType.ScreeningEventSeries) {
-            movieTheaterId = event.location.id;
-            movieTheaterBranchCode = event.location.branchCode;
-        } else {
-            movieTheaterId = event.superEvent.location.id;
-            movieTheaterBranchCode = event.superEvent.location.branchCode;
-        }
-        const movieTheaters = <Pick<
-            chevre.factory.place.movieTheater.IPlaceWithoutScreeningRoom,
-            'parentOrganization' | 'branchCode'
-        >[]>
-            await placeRepo.searchMovieTheaters(
-                {
-                    limit: 1,
-                    page: 1,
-                    project: { id: { $eq: event.project.id } },
-                    id: { $eq: movieTheaterId }
-                },
-                ['parentOrganization', 'branchCode'],
-                []
-            );
-        const movieTheater = movieTheaters.shift();
-        const sellerId = movieTheater?.parentOrganization?.id;
-        console.log(
-            'movieTheater found',
-            event.project.id, event.id, event.startDate, 'sellerId:', sellerId,
-            'movieTheaterId:', movieTheaterId,
-            'movieTheaterBranchCode:', movieTheaterBranchCode,
-            i
-        );
-
-        const alreadyMigrated = typeof organizerId === 'string';
-
-        if (alreadyMigrated) {
-            console.log('already exist...', event.project.id, event.id, event.startDate, organizerId, i);
-            if (organizerId === sellerId) {
-                console.log('organizerId is valid', event.project.id, event.id, event.startDate, organizerId, i);
-            } else {
-                invalidOrganizerCount += 1;
-
-                // organizerを修正する
-                if (typeof sellerId !== 'string') {
-                    throw new Error('movieTheater not found');
-                }
-                const fixedOrganizer: chevre.factory.event.screeningEventSeries.IOrganizer = {
-                    id: sellerId
-                };
-                console.log('updating event...', event.project.id, event.id, event.startDate, i);
-                await eventRepo.updatePartiallyById({
-                    project: { id: event.project.id },
-                    id: event.id,
-                    attributes: <any>{
-                        typeOf: event.typeOf,
-                        organizer: fixedOrganizer
-                    }
-                });
-                updateCount += 1;
-                console.log('updated.', event.project.id, event.id, event.startDate, i);
-            }
-        } else {
-            throw new Error('organizer not found');
-            // if (typeof sellerId !== 'string') {
-            //     throw new Error('movieTheater not found');
-            // }
-            // if (typeof sellerId === 'string') {
-            //     const newOrganizer: chevre.factory.event.screeningEventSeries.IOrganizer = {
-            //         id: sellerId
-            //     };
-            //     console.log('updating event...', event.project.id, event.id, event.startDate, i);
-            //     await eventRepo.updatePartiallyById({
-            //         project: { id: event.project.id },
-            //         id: event.id,
-            //         attributes: <any>{
-            //             typeOf: event.typeOf,
-            //             organizer: newOrganizer
-            //         }
-            //     });
-            //     updateCount += 1;
-            //     console.log('updated.', event.project.id, event.id, event.startDate, i);
-            // }
-        }
-    });
-
-    console.log(i, 'events checked');
-    console.log(updateCount, 'events updated');
-    console.log(invalidOrganizerCount, 'invalid');
-}
-
-main()
-    .then()
-    .catch(console.error);