@chevre/domain 21.27.0-alpha.1 → 21.27.0-alpha.10

package/example/src/chevre/transaction/processPlaceOrder.ts

@@ -37,8 +37,7 @@ async function main() {
         object: {
             clientUser: <any>{ client_id: CLIENT_ID }
         },
-        seller: { id: '59d20831e53ebc2b4e774466' },
-        validateEligibleCustomerType: false
+        seller: { id: '59d20831e53ebc2b4e774466' }
     })({
         member: await chevre.repository.Member.createInstance(mongoose.connection),
         projectMakesOffer: await chevre.repository.ProjectMakesOffer.createInstance(mongoose.connection),
@@ -117,8 +116,7 @@ async function main() {
                                 options: {
                                     useCancelPayTransactionOnFailed: false,
                                     useCheckMovieTicketBeforePay: false,
-                                    useCheckByIdentifierIfNotYet: false,
-                                    useSearchTrade4accountId: false
+                                    useCheckByIdentifierIfNotYet: false
                                 }
                             })({
                                 accountingReport: await chevre.repository.AccountingReport.createInstance(mongoose.connection),

package/example/src/chevre/validateCheckMovieTicketActions.ts

@@ -0,0 +1,70 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
+
+    const cursor = actionRepo.getCursor(
+        {
+            typeOf: { $eq: chevre.factory.actionType.CheckAction },
+            'object.typeOf': { $eq: chevre.factory.service.paymentService.PaymentServiceType.MovieTicket },
+            // 'project.id': { $eq: project.id },
+            startDate: {
+                $gte: moment()
+                    // tslint:disable-next-line:no-magic-numbers
+                    .add(-90, 'days')
+                    .toDate()
+                // $lte: moment('2023-08-01T21:20:43.133Z')
+                //     .toDate()
+            }
+        },
+        {
+            startDate: 1,
+            object: 1,
+            project: 1,
+            instrument: 1,
+            purpose: 1
+        }
+    );
+    console.log('actions found');
+
+    let i = 0;
+    let updateCount = 0;
+    const actions: Pick<
+        chevre.factory.action.check.paymentMethod.movieTicket.IAction,
+        'startDate' | 'object' | 'project' | 'instrument' | 'id' | 'purpose'
+    >[] = [];
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const action: Pick<
+            chevre.factory.action.check.paymentMethod.movieTicket.IAction,
+            'startDate' | 'object' | 'project' | 'instrument' | 'id' | 'purpose'
+        > = doc.toObject();
+
+        const alreadyMigrated = typeof action.purpose?.id === 'string'
+            && action.purpose?.id.length > 0;
+
+        if (alreadyMigrated) {
+            console.log('already exist.', action.project.id, action.id, action.purpose?.typeOf, action.purpose?.id, action.startDate, i);
+        } else {
+            console.log('updating...', action.project.id, action.id, action.purpose?.typeOf, action.purpose?.id, action.startDate, i);
+            updateCount += 1;
+            actions.push(action);
+            console.log('updated.', action.project.id, action.id, action.purpose?.typeOf, action.purpose?.id, action.startDate, i);
+        }
+    });
+
+    console.log('invalidAction:', actions);
+    console.log(i, 'actions checked');
+    console.log(updateCount, 'actions updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/credentials.d.ts

@@ -33,7 +33,14 @@ export declare const credentials: {
         accessTokenAlert: string;
     };
     movieticketReserve: {
+        /**
+         * 着券時タイムアウト
+         */
         timeout: number;
+        /**
+         * 認証時タイムアウト
+         */
+        timeoutCheck: number;
     };
     sendGrid: {
         apiKey: string | undefined;

package/lib/chevre/credentials.js

@@ -29,7 +29,7 @@ exports.credentials = {
     },
     gmo: {
         // tslint:disable-next-line:no-magic-numbers
-        timeout: (typeof process.env.GMO_TIMEOUT === 'string') ? Number(process.env.GMO_TIMEOUT) : 10000,
+        timeout: (typeof process.env.GMO_TIMEOUT === 'string') ? Number(process.env.GMO_TIMEOUT) : 5000,
         useFetch: process.env.GMO_USE_FETCH === '1'
     },
     lineNotify: {
@@ -38,16 +38,20 @@ exports.credentials = {
         accessTokenAlert: process.env.LINE_NOTIFY_ACCESS_TOKEN_ALERT
     },
     movieticketReserve: {
+        /**
+         * 着券時タイムアウト
+         */
         // tslint:disable-next-line:no-magic-numbers
-        timeout: (typeof process.env.MVTK_TIMEOUT === 'string') ? Number(process.env.MVTK_TIMEOUT) : 10000
+        timeout: (typeof process.env.MVTK_TIMEOUT === 'string') ? Number(process.env.MVTK_TIMEOUT) : 5000,
+        /**
+         * 認証時タイムアウト
+         */
+        // tslint:disable-next-line:no-magic-numbers
+        timeoutCheck: (typeof process.env.MVTK_TIMEOUT_CHECK === 'string') ? Number(process.env.MVTK_TIMEOUT_CHECK) : 5000
     },
     sendGrid: {
         apiKey: process.env.SENDGRID_API_KEY
     },
-    // discontinue(2023-12-12~)
-    // hub: {
-    //     clientId: <string>process.env.HUB_CLIENT_ID
-    // },
     jwt: {
         secret: process.env.TOKEN_SECRET,
         issuer: process.env.RESOURCE_SERVER_IDENTIFIER

package/lib/chevre/repo/action.d.ts

@@ -83,6 +83,14 @@ export declare class MongoRepository {
         typeOf: factory.actionType;
         id: string;
     }): Promise<void>;
+    /**
+     * アクション失敗
+     */
+    giveUpWithObject(params: {
+        typeOf: factory.actionType;
+        id: string;
+        error: Error;
+    }): Promise<IAction<factory.actionType>>;
     /**
      * アクション失敗
      */

package/lib/chevre/repo/action.js

@@ -535,16 +535,34 @@ class MongoRepository {
             }
         });
     }
+    /**
+     * アクション失敗
+     */
+    giveUpWithObject(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const actionError = Object.assign(Object.assign({}, params.error), { message: params.error.message, name: params.error.name });
+            const doc = yield this.actionModel.findOneAndUpdate({
+                typeOf: params.typeOf,
+                _id: params.id
+            }, {
+                actionStatus: factory.actionStatusType.FailedActionStatus,
+                error: actionError,
+                endDate: new Date()
+            }, { new: true })
+                .select({ __v: 0, createdAt: 0, updatedAt: 0 })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.actionModel.modelName);
+            }
+            return doc.toObject();
+        });
+    }
     /**
      * アクション失敗
      */
     giveUp(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const actionError = Object.assign(Object.assign({}, params.error), { message: params.error.message, name: params.error.name });
-            // const actionError: Object = params.error;
-            // if (params.error instanceof Error) {
-            //     actionError = { ...params.error, message: params.error.message, name: params.error.name };
-            // }
             const doc = yield this.actionModel.findOneAndUpdate({
                 typeOf: params.typeOf,
                 _id: params.id

package/lib/chevre/repo/mongoose/schemas/action.js

@@ -24,8 +24,9 @@ const schemaDefinition = {
     fromLocation: mongoose_1.SchemaTypes.Mixed,
     toLocation: mongoose_1.SchemaTypes.Mixed,
     instrument: mongoose_1.SchemaTypes.Mixed,
-    // add location(2022-11-11~)
-    location: mongoose_1.SchemaTypes.Mixed
+    location: mongoose_1.SchemaTypes.Mixed,
+    replacer: mongoose_1.SchemaTypes.Mixed,
+    targetCollection: mongoose_1.SchemaTypes.Mixed // add targetCollection(2024-03-19~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

package/lib/chevre/repo/transaction.js

@@ -242,10 +242,17 @@ class MongoRepository {
             else {
                 expires = params.expires;
             }
-            return this.transactionModel.create(Object.assign(Object.assign({}, params), { typeOf: params.typeOf, status: factory.transactionStatusType.InProgress, startDate, endDate: undefined, expires, tasksExportAction: {
+            const transaction = yield this.transactionModel.create(Object.assign(Object.assign({}, params), { typeOf: params.typeOf, status: factory.transactionStatusType.InProgress, startDate, endDate: undefined, expires, tasksExportAction: {
                     actionStatus: factory.actionStatusType.PotentialActionStatus
                 }, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported }))
                 .then((doc) => doc.toObject());
+            // 取引開始時にも取引イベントエミッター連携(2024-03-21~)
+            transaction_2.transactionEventEmitter.emitTransactionStatusChanged({
+                id: transaction.id,
+                typeOf: transaction.typeOf,
+                status: factory.transactionStatusType.InProgress
+            });
+            return transaction;
         });
     }
     /**

package/lib/chevre/service/assetTransaction/pay/potentialActions.d.ts

@@ -7,14 +7,4 @@ declare function createPayActions(params: {
         acceptedOffersMovieTicketUsed: IAcceptedOfferMovieTicketUsed[];
     };
 }): factory.action.trade.pay.IAttributes[];
-/**
- * 取引のポストアクションを作成する
- */
-declare function createPotentialActions(params: {
-    transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Pay>;
-    potentialActions?: factory.assetTransaction.pay.IPotentialActionsParams;
-    order: Pick<factory.order.IOrder, 'typeOf' | 'confirmationNumber' | 'orderNumber'> & {
-        acceptedOffersMovieTicketUsed: IAcceptedOfferMovieTicketUsed[];
-    };
-}): factory.assetTransaction.IPotentialActions<factory.assetTransactionType.Pay>;
-export { createPayActions, createPotentialActions, IAcceptedOfferMovieTicketUsed };
+export { createPayActions, IAcceptedOfferMovieTicketUsed };

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createPotentialActions = exports.createPayActions = void 0;
+exports.createPayActions = void 0;
 const factory = require("../../../factory");
 const createPayObjectServiceOutput_1 = require("./potentialActions/createPayObjectServiceOutput");
 function createPayActions(params) {
@@ -151,13 +151,3 @@ function createInformPaymentActions(params) {
     }
     return informPaymentActions;
 }
-/**
- * 取引のポストアクションを作成する
- */
-function createPotentialActions(params) {
-    const payActionAttributesList = createPayActions(params);
-    return {
-        pay: payActionAttributesList
-    };
-}
-exports.createPotentialActions = createPotentialActions;

package/lib/chevre/service/assetTransaction/pay.d.ts

@@ -94,16 +94,13 @@ export import IPaymentAgencyTransaction = CreditCardPayment.IPaymentAgencyTransa
 export declare function start(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, options: {
     useCheckMovieTicketBeforePay: boolean;
     useCheckByIdentifierIfNotYet: boolean;
-    searchTrade4accountId: boolean;
     pendingPaymentAgencyTransaction?: CreditCardPayment.IPaymentAgencyTransaction;
 }): IStartOperation<factory.assetTransaction.pay.ITransaction>;
 /**
  * 取引確定
  */
 export declare function confirm(params: factory.assetTransaction.pay.IConfirmParams & {
-    options: {
-        minimizePotentialActions: boolean;
-    };
+    options: {};
 }): IConfirmOperation<void>;
 export declare function fixOrderAsPurpose(params: {
     potentialActions: {

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

@@ -18,7 +18,6 @@ const MovieTicketPayment = require("../payment/movieTicket");
 const PaymentCardPayment = require("../payment/paymentCard");
 const validation_1 = require("./pay/account/validation");
 const factory_1 = require("./pay/factory");
-const potentialActions_1 = require("./pay/potentialActions");
 const debug = createDebug('chevre-domain:service:assetTransaction');
 /**
  * 外部決済ロケーション発行
@@ -42,7 +41,7 @@ function publishPaymentUrl(params) {
         let result;
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.CreditCard:
-                const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, { searchTrade4accountId: false, processPublishPaymentUrl: true })(repos);
+                const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, { processPublishPaymentUrl: true })(repos);
                 let paymentUrl;
                 // 3DS拡張(2024-01-02~)
                 const retUrl = (_c = params.object.paymentMethod.creditCard) === null || _c === void 0 ? void 0 : _c.retUrl;
@@ -148,7 +147,7 @@ function start(params, options) {
                 break;
             case factory.service.paymentService.PaymentServiceType.CreditCard:
                 transaction =
-                    yield processAuthorizeCreditCard(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), Object.assign({ searchTrade4accountId: options.searchTrade4accountId }, (options.pendingPaymentAgencyTransaction !== undefined)
+                    yield processAuthorizeCreditCard(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), Object.assign({}, (options.pendingPaymentAgencyTransaction !== undefined)
                         ? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
                         : undefined))(repos);
                 break;
@@ -306,7 +305,7 @@ function processAuthorizeAccount(params, transaction, paymentServiceId) {
 }
 function processAuthorizeCreditCard(params, transaction, paymentServiceId, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, Object.assign({ processPublishPaymentUrl: false, searchTrade4accountId: options.searchTrade4accountId }, (options.pendingPaymentAgencyTransaction !== undefined)
+        const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, Object.assign({ processPublishPaymentUrl: false }, (options.pendingPaymentAgencyTransaction !== undefined)
             ? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
             : undefined))(repos);
         return saveAuthorizeResult({
@@ -375,32 +374,22 @@ function confirm(params) {
             throw new factory.errors.ArgumentNull('potentialActions.pay.purpose');
         }
         let potentialActions;
-        if (params.options.minimizePotentialActions) {
-            // 注文検証
-            const existingOrders = yield repos.order.search({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: transaction.project.id } },
-                confirmationNumbers: [confirmationNumber],
-                orderNumbers: [orderNumber]
-            }, { orderNumber: 1 });
-            if (existingOrders.length === 0) {
-                throw new factory.errors.NotFound(factory.order.OrderType.Order);
-            }
-            const payActionData4order = {
-                object: { paymentMethod: { paymentMethodId: transaction.transactionNumber } },
-                purpose: { confirmationNumber, orderNumber, typeOf: factory.order.OrderType.Order }
-            };
-            potentialActions = { pay: [payActionData4order] };
-        }
-        else {
-            const order = yield fixOrderAsPurpose({ potentialActions: { pay: { purpose: { confirmationNumber, orderNumber } } } }, transaction)(repos);
-            potentialActions = (0, potentialActions_1.createPotentialActions)({
-                transaction: transaction,
-                potentialActions: params.potentialActions,
-                order
-            });
+        // 注文検証
+        const existingOrders = yield repos.order.search({
+            limit: 1,
+            page: 1,
+            project: { id: { $eq: transaction.project.id } },
+            confirmationNumbers: [confirmationNumber],
+            orderNumbers: [orderNumber]
+        }, { orderNumber: 1 });
+        if (existingOrders.length === 0) {
+            throw new factory.errors.NotFound(factory.order.OrderType.Order);
         }
+        const payActionData4order = {
+            object: { paymentMethod: { paymentMethodId: transaction.transactionNumber } },
+            purpose: { confirmationNumber, orderNumber, typeOf: factory.order.OrderType.Order }
+        };
+        potentialActions = { pay: [payActionData4order] };
         yield repos.assetTransaction.confirm(Object.assign({ typeOf: factory.assetTransactionType.Pay, id: transaction.id, result: {}, potentialActions: potentialActions }, (typeof overwritingPaymentMethodIdentifier === 'string')
             ? { object: { paymentMethod: { identifier: overwritingPaymentMethodIdentifier } } }
             : undefined));

package/lib/chevre/service/assetTransaction/reserve/factory.d.ts

@@ -52,7 +52,7 @@ export declare function createAdditionalTicketText(params: {
     reservedTicket: factory.reservation.ITicket;
 }): string | undefined;
 export type IUnitPriceSpecification = factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.UnitPriceSpecification>;
-export declare function createReservationFor(params: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>): factory.assetTransaction.reserve.IReservationFor;
+export declare function createReservationFor(params: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>, useOptimizeReservation: boolean): factory.assetTransaction.reserve.IReservationFor;
 export declare function createIssuedThrough(params: {
     reservationFor: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>;
 }): {

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

@@ -332,10 +332,10 @@ function createAdditionalTicketText(params) {
     return (_b = (_a = params.acceptedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.additionalTicketText;
 }
 exports.createAdditionalTicketText = createAdditionalTicketText;
-function createReservationFor(params) {
+function createReservationFor(params, useOptimizeReservation) {
     var _a, _b;
     if (params.typeOf === factory.eventType.ScreeningEvent) {
-        return Object.assign({ endDate: params.endDate, id: params.id, location: params.location, name: params.name, startDate: params.startDate, superEvent: optimizeReservationSuperEvent(params), typeOf: params.typeOf }, (params.doorTime instanceof Date)
+        return Object.assign({ endDate: params.endDate, id: params.id, location: params.location, name: params.name, startDate: params.startDate, superEvent: optimizeReservationSuperEvent(params, useOptimizeReservation), typeOf: params.typeOf }, (params.doorTime instanceof Date)
             ? { doorTime: params.doorTime }
             : undefined);
     }
@@ -348,13 +348,13 @@ function createReservationFor(params) {
     }
 }
 exports.createReservationFor = createReservationFor;
-function optimizeReservationSuperEvent(params) {
+function optimizeReservationSuperEvent(params, useOptimizeReservation) {
     const superEvent = params.superEvent;
     return Object.assign(Object.assign({ id: superEvent.id, 
         // kanaName: superEvent.kanaName, // 廃止(2024-01-26~)
         location: superEvent.location, name: superEvent.name, soundFormat: superEvent.soundFormat, typeOf: superEvent.typeOf, videoFormat: superEvent.videoFormat, workPerformed: superEvent.workPerformed }, (superEvent.headline !== undefined)
         ? { headline: superEvent.headline }
-        : undefined), (settings_1.USE_OPTIMIZE_RESERVATION)
+        : undefined), (useOptimizeReservation)
         ? {}
         : {
             additionalProperty: (Array.isArray(superEvent.additionalProperty))
@@ -477,6 +477,7 @@ function createPotentialActions(params) {
     if (reservationFor === undefined) {
         throw new factory.errors.NotFound('transaction.object.reservationFor');
     }
+    const useOptimizeReservation = !settings_1.USE_OPTIMIZE_RESERVATION_EXCEPTIONS.includes(transaction.project.id);
     // 予約アクション属性作成
     const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
     let reserveActionAttributes = [];
@@ -486,7 +487,7 @@ function createPotentialActions(params) {
         // ReservationPackageに対応(2022-12-22~)
         // purpose:Orderの指定があれば、underName,issuedByを調整(2022-05-23~)
         if (typeof ((_a = params.order) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
-            const ordre2reservationUnderNameResult = ordre2reservationUnderName({ order: params.order });
+            const ordre2reservationUnderNameResult = ordre2reservationUnderName({ order: params.order, useOptimizeReservation });
             underName = ordre2reservationUnderNameResult.underName;
         }
         const moneyTransferActions = [];
@@ -543,7 +544,7 @@ exports.createPotentialActions = createPotentialActions;
 function createReservationUnderNameIdentifier(params) {
     // 必要最低限の識別子のみ継承する(2024-03-16~)
     let identifiersFromCustomer = (Array.isArray(params.order.customer.identifier)) ? params.order.customer.identifier : [];
-    if (settings_1.USE_OPTIMIZE_RESERVATION) {
+    if (params.useOptimizeReservation) {
         identifiersFromCustomer = identifiersFromCustomer.filter(({ name }) => name === 'clientId');
     }
     return [
@@ -552,14 +553,14 @@ function createReservationUnderNameIdentifier(params) {
     ];
 }
 function createReservationUnderName(params) {
-    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ identifier: createReservationUnderNameIdentifier({ order: params.order }), name: String(params.order.customer.name), typeOf: params.order.customer.typeOf }, (typeof params.order.customer.address === 'string') ? { address: params.order.customer.address } : undefined), (typeof params.order.customer.age === 'string') ? { age: params.order.customer.age } : undefined), (typeof params.order.customer.email === 'string') ? { email: params.order.customer.email } : undefined), (typeof params.order.customer.familyName === 'string') ? { familyName: params.order.customer.familyName } : undefined), (typeof params.order.customer.gender === 'string') ? { gender: params.order.customer.gender } : undefined), (typeof params.order.customer.givenName === 'string') ? { givenName: params.order.customer.givenName } : undefined), (typeof params.order.customer.id === 'string') ? { id: params.order.customer.id } : undefined), (typeof params.order.customer.telephone === 'string') ? { telephone: params.order.customer.telephone } : undefined), (typeof params.order.customer.url === 'string') ? { url: params.order.customer.url } : undefined);
+    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ identifier: createReservationUnderNameIdentifier({ order: params.order, useOptimizeReservation: params.useOptimizeReservation }), name: String(params.order.customer.name), typeOf: params.order.customer.typeOf }, (typeof params.order.customer.address === 'string') ? { address: params.order.customer.address } : undefined), (typeof params.order.customer.age === 'string') ? { age: params.order.customer.age } : undefined), (typeof params.order.customer.email === 'string') ? { email: params.order.customer.email } : undefined), (typeof params.order.customer.familyName === 'string') ? { familyName: params.order.customer.familyName } : undefined), (typeof params.order.customer.gender === 'string') ? { gender: params.order.customer.gender } : undefined), (typeof params.order.customer.givenName === 'string') ? { givenName: params.order.customer.givenName } : undefined), (typeof params.order.customer.id === 'string') ? { id: params.order.customer.id } : undefined), (typeof params.order.customer.telephone === 'string') ? { telephone: params.order.customer.telephone } : undefined), (typeof params.order.customer.url === 'string') ? { url: params.order.customer.url } : undefined);
 }
 /**
  * 注文者情報を予約者情報へ変換する
  */
 function ordre2reservationUnderName(params) {
     return {
-        underName: createReservationUnderName({ order: params.order })
+        underName: createReservationUnderName({ order: params.order, useOptimizeReservation: params.useOptimizeReservation })
     };
 }
 function createMoneyTransferActions(params) {

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

@@ -141,7 +141,8 @@ function addReservations(params) {
             validateAppliesToMovieTicket: params.validateAppliesToMovieTicket
         })(repos);
         // 予約イベント最適化
-        const reservationFor = (0, factory_1.createReservationFor)(event);
+        const useOptimizeReservation = !settings_1.USE_OPTIMIZE_RESERVATION_EXCEPTIONS.includes(transaction.project.id);
+        const reservationFor = (0, factory_1.createReservationFor)(event, useOptimizeReservation);
         const { issuedThrough } = (0, factory_1.createIssuedThrough)({ reservationFor: event });
         // 取引に予約追加
         let lockedOfferRateLimitKeys = [];

package/lib/chevre/service/event.js

@@ -304,16 +304,6 @@ function saveScreeningEvents(params) {
         for (const screeningEvent of screeningEvents) {
             try {
                 const attributes = screeningEvent;
-                // repository側で制御しているため不要(2022-08-26~)
-                // const attributes = {
-                //     ...screeningEvent,
-                //     ...{
-                //         // 残席数は作成時のみ
-                //         $setOnInsert: { remainingAttendeeCapacity: screeningEvent.remainingAttendeeCapacity }
-                //     }
-                // };
-                // repository側で制御しているためdeleteは不要(2022-08-26~)
-                // delete attributes.remainingAttendeeCapacity;
                 saveParams.push({
                     id: screeningEvent.id,
                     attributes: attributes,
@@ -321,10 +311,7 @@ function saveScreeningEvents(params) {
                 });
             }
             catch (error) {
-                // tslint:disable-next-line:no-single-line-block-comment
-                /* istanbul ignore next */
-                // tslint:disable-next-line:no-console
-                console.error(error);
+                // no op
             }
         }
         yield repos.event.saveMany(saveParams);
@@ -425,10 +412,7 @@ function cancelDeletedEvents(params) {
                 });
             }
             catch (error) {
-                // tslint:disable-next-line:no-single-line-block-comment
-                /* istanbul ignore next */
-                // tslint:disable-next-line:no-console
-                console.error(error);
+                // no op
             }
         }
         debug(`${cancelledIds.length} events cancelled.`);