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

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.js

@@ -18,7 +18,8 @@ const debug = (0, debug_1.default)('chevre-domain:service:order');
 function onOrderProcessing(params) {
     return async (repos, settings) => {
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
-        const { numTryConfirmReserveTransaction } = settings;
+        // const { numTryConfirmReserveTransaction } = settings;
+        const numTryConfirmReserveTransaction = await settings.getByKey('numTryConfirmReserveTransaction');
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks;
         let creatingCheckResourceTask;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned.js

@@ -10,7 +10,6 @@ exports.onOrderReturned = onOrderReturned;
 const debug_1 = __importDefault(require("debug"));
 const google_libphonenumber_1 = require("google-libphonenumber");
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 // import { createMaskedCustomer } from '../../../factory/order';
 const factory_2 = require("./onOrderReturned/factory");
 const debug = (0, debug_1.default)('chevre-domain:service:order');

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onOrderUpdated = onOrderUpdated;
 const factory_1 = require("../../factory");
-// import { Settings } from '../../settings';
 const factory_2 = require("./onOrderUpdated/factory");
 function onOrderUpdated(params) {
     return async (repos

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

@@ -4,7 +4,7 @@ import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import { factory } from '../../factory';
-import { Settings } from '../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../repo/setting/integration';
 /**
  * 注文を決済する
  */

package/lib/chevre/service/order/placeOrder/createPlacingOrderFromExistingTransaction.d.ts

@@ -22,4 +22,4 @@ declare function createPlacingOrderFromExistingTransaction(params: {
     placeOrderTransaction: IPlaceOrderTransaction;
     serialNumbers: string[];
 }>;
-export { ICreatePlacingOrderFromExistingTransactionRepos, createPlacingOrderFromExistingTransaction };
+export { ICreatePlacingOrderFromExistingTransactionRepos, IPlacingOrder, createPlacingOrderFromExistingTransaction };

package/lib/chevre/service/order/placeOrder/createPlacingOrderFromExistingTransaction.js

@@ -80,7 +80,10 @@ function createPlacingOrderFromExistingTransaction(params) {
             .map(({ instrument }) => String(instrument.transactionNumber));
         try {
             // すでにtypeOf: Orderに変更済の場合acceptedOffersは空になるが、そもそもorderedItemはその後上書きされないので、空のまま処理して問題なし
-            acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersByOrderNumber({ orderNumber: { $eq: orderNumber } }))
+            acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersWithPriceByOrderNumber({
+                orderNumber,
+                project: { id: params.project.id }
+            }))
                 .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
         }
         catch (error) {

package/lib/chevre/service/order/placeOrder/factory/orderedItem.d.ts

@@ -3,6 +3,6 @@ import { factory } from '../../../../factory';
  * 受入オファーを注文アイテムに変換する
  */
 declare function acceptedOffers2orderedItem(params: {
-    eventReservationAcceptedOffers: factory.order.IAcceptedOffer[];
+    eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered'>[];
 }): factory.order.IOrderedItem[];
 export { acceptedOffers2orderedItem };

package/lib/chevre/service/order/placeOrder/factory/orderedItem.js

@@ -9,11 +9,6 @@ function acceptedOffers2orderedItem(params) {
     // 予約がある場合
     const { reservationOrderItems } = createReservationAcceptedOffers(params);
     // 通貨転送がある場合
-    // const { moneyTransferOrderItems } = createMoneyTransferAcceptedOffers(params);
-    // プロダクトがある場合
-    // const { productOrderItems } = createProductItems(params);
-    // return [...reservationOrderItems, ...moneyTransferOrderItems, ...productOrderItems];
-    // return [...reservationOrderItems, ...productOrderItems];
     return reservationOrderItems;
 }
 function createReservationAcceptedOffers(params) {

package/lib/chevre/service/order/placeOrder/factory.d.ts

@@ -1,7 +1,7 @@
 import type { IPlacingOrder } from '../../../repo/orderInTransaction';
 import { factory } from '../../../factory';
 type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf' | 'result' | 'object' | 'seller'>;
-type IOrderAcceptedOffer = factory.order.IAcceptedOffer;
+type IOrderAcceptedOffer = Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'serialNumber'>;
 declare function createPaymentMethods(params: {
     authorizePaymentActions: Pick<factory.action.authorize.paymentMethod.any.IAction, 'result'>[];
 }): {

package/lib/chevre/service/order/placeOrder/factory.js

@@ -15,7 +15,6 @@ function createPaymentMethods(params) {
     // 決済方法をセット
     params.authorizePaymentActions.forEach((a) => {
         const resultAsInvoice = (Array.isArray(a.result))
-            // ? a.result?.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
             ? a.result[0]
             : undefined;
         if (resultAsInvoice === undefined) {
@@ -42,16 +41,12 @@ function createPaymentMethods(params) {
             paymentStatus: resultAsInvoice.paymentStatus,
             paymentMethod: paymentMethodOfInvoice,
             ...(resultAsInvoice.totalPaymentDue !== undefined) ? { totalPaymentDue: resultAsInvoice.totalPaymentDue } : undefined
-            // ...(USE_ORDER_PAYMENT_METHOD_TYPE_OF) // 完全廃止(2024-01-17~)
-            //     ? { typeOf: paymentMethodType }
-            //     : undefined
         });
     });
     // 決済方法から注文金額の計算
     price += params.authorizePaymentActions
         .reduce((a, b) => {
         const resultAsInvoice = (Array.isArray(b.result))
-            // ? b.result?.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
             ? b.result[0]
             : undefined;
         const jpyAmount = (resultAsInvoice?.totalPaymentDue?.currency === factory_1.factory.priceCurrency.JPY)
@@ -78,42 +73,43 @@ function createPlacingOrder(params) {
         throw new factory_1.factory.errors.NotFound('transaction.result.order');
     }
     const seller = createSeller({ transaction });
-    const name = (typeof transaction.object.name === 'string') ? transaction.object.name : undefined;
+    // discontinue(2026-06-11~)
+    // const name: string | undefined =
+    //     (typeof transaction.object.name === 'string') ? transaction.object.name : undefined;
     const broker = (typeof transaction.object.broker?.typeOf === 'string') ? transaction.object.broker : undefined;
     const { paymentMethods, price } = createPaymentMethods({ authorizePaymentActions });
     const eventReservationAcceptedOffers = [];
-    // const productAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IPermit>[] = [];
-    // const moneyTransferAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>[] = [];
     params.acceptedOffers.forEach((acceptedOffer) => {
         const itemOfferedTypeOf = acceptedOffer.itemOffered.typeOf;
         switch (itemOfferedTypeOf) {
             case factory_1.factory.reservationType.EventReservation:
                 eventReservationAcceptedOffers.push(acceptedOffer);
                 break;
-            // case factory.permit.PermitType.Permit:
-            //     productAcceptedOffers.push((acceptedOffer as factory.order.IAcceptedOffer<factory.order.IPermit>));
-            //     break;
-            // case factory.actionType.MoneyTransfer:
-            //     moneyTransferAcceptedOffers.push(<factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>>acceptedOffer);
-            //     break;
             default:
                 throw new factory_1.factory.errors.NotImplemented(`${itemOfferedTypeOf} not implemented`);
         }
     });
     const orderedItem = (0, orderedItem_1.acceptedOffers2orderedItem)({
         eventReservationAcceptedOffers,
-        // productAcceptedOffers,
-        // moneyTransferAcceptedOffers
     });
+    const confirmationNumber = transaction.object.confirmationNumber;
+    if (typeof confirmationNumber !== 'string') {
+        // 事前に発行済なはずなので、ありえないフロー
+        throw new factory_1.factory.errors.Internal('object.confirmationNumber undefined');
+    }
     return {
         ...orderByTransaction,
+        confirmationNumber,
+        typeOf: factory_1.factory.order.OrderType.Order, // 取引保管を廃止するためにここで指定(2026-06-14~)
+        orderStatus: factory_1.factory.orderStatus.OrderPaymentDue, // 取引保管を廃止するためにここで指定(2026-06-14~)
         seller, // 2024-06-17~
         paymentMethods, // 2024-06-17~
         price, // 2024-06-17~
+        priceCurrency: factory_1.factory.priceCurrency.JPY, // 取引保管を廃止するためにここで指定(2026-06-14~)
         orderDate: (0, moment_1.default)(orderByTransaction.orderDate)
             .toDate(),
         orderedItem, // 2024-06-18~
-        ...(typeof name === 'string') ? { name } : undefined, // 2024-06-17~
+        // ...(typeof name === 'string') ? { name } : undefined, // discontinue(2026-06-11~)
         ...(typeof broker?.typeOf === 'string') ? { broker } : undefined // 2024-06-17~
     };
 }

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

@@ -9,7 +9,8 @@ import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import { factory } from '../../factory';
-import { Settings } from '../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../repo/setting/integration';
+import { IPlacingOrder } from './placeOrder/createPlacingOrderFromExistingTransaction';
 interface IPlaceOrderRepos {
     acceptedOffer: AcceptedOfferRepo;
     accountingReport: AccountingReportRepo;
@@ -36,6 +37,6 @@ declare function placeOrder(params: {
     };
     useOnOrderStatusChanged: boolean;
 }): (repos: IPlaceOrderRepos, settings: Settings) => Promise<{
-    order: factory.transaction.placeOrder.IOrderAsResult;
+    order: IPlacingOrder;
 }>;
 export { IPlaceOrderRepos, placeOrder };

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

@@ -31,15 +31,7 @@ function placeOrder(params) {
         }
         const simpleOrder = {
             typeOf: order.typeOf,
-            // seller: {
-            //     id: order.seller.id,
-            //     typeOf: order.seller.typeOf,
-            //     name: order.seller.name
-            // }, // 廃止(2024-03-06~)
-            // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
             orderNumber: order.orderNumber,
-            // price: order.price,
-            // priceCurrency: order.priceCurrency,
             orderDate: order.orderDate
         };
         const orderActionPurpose = {
@@ -48,7 +40,6 @@ function placeOrder(params) {
         const orderActionAttributes = {
             agent: (typeof params.agent?.typeOf === 'string') ? params.agent : placeOrderTransaction.project,
             object: simpleOrder,
-            // potentialActions: {}, // discontinue(2024-06-28~)
             project: placeOrderTransaction.project,
             purpose: orderActionPurpose,
             typeOf: factory_1.factory.actionType.OrderAction

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

@@ -8,7 +8,6 @@ const debug_1 = __importDefault(require("debug"));
 // import { createMaskedCustomer } from '../../factory/order';
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory_1 = require("../../factory");
-// import { Settings } from '../../settings';
 const debug = (0, debug_1.default)('chevre-domain:service:order');
 function createReturnPolicy(params) {
     const { identifier, returnFees, restockingFee, typeOf } = params.returnOrderTransaction.object.returnPolicy;

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

@@ -10,7 +10,6 @@ const factory_1 = require("../delivery/factory");
 // import { findPlaceOrderTransaction } from './findPlaceOrderTransaction';
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory_2 = require("../../factory");
-// import { Settings } from '../../settings';
 const debug = (0, debug_1.default)('chevre-domain:service:order');
 /**
  * 注文を配送する
@@ -94,10 +93,7 @@ function sendOrder(params) {
                 case factory_2.factory.personType.Person:
                     createOwnerships = true; // Personのみに限定(2026-03-15~)
                     break;
-                // case factory.creativeWorkType.WebApplication:
-                //     break;
                 default:
-                // createOwnerships = true;
             }
             try {
                 const offerIndexBase = (limit * (page - 1));
@@ -107,8 +103,7 @@ function sendOrder(params) {
                     project: { id: { $eq: order.project.id } }
                 });
                 acceptedOffers = searchSlicedAcceptedOffersResult.acceptedOffers;
-                debug('delivering...', order.orderNumber, acceptedOffers.map((offer) => `${offer.itemOffered.id}`), // eslint-disable-line @typescript-eslint/no-explicit-any
-                params.object.acceptedOffers, 'offerIndexBase:', offerIndexBase);
+                debug('delivering...', order.orderNumber, params.object.acceptedOffers, 'offerIndexBase:', offerIndexBase);
                 // 所有権作成
                 if (createOwnerships) {
                     creatingOwnershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
@@ -163,7 +158,6 @@ function sendOrder(params) {
                             price: order.price,
                             priceCurrency: order.priceCurrency
                         }
-                        // placeOrderTransaction
                     })(repos);
                 }
                 else {

package/lib/chevre/service/payment/any/authorize.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
 import type { PayActionRepo } from '../../../repo/action/pay';
 import type { RefundActionRepo } from '../../../repo/action/refund';

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

@@ -162,12 +162,13 @@ function creatPayTransactionStartParams(params) {
     };
 }
 function createMovieTicket(params) {
-    let ticketIdentifier = (0, util_1.format)('%s:%s:%s', params.serviceOutput.reservationFor.id, params.serviceOutput.reservedTicket.ticketedSeat.seatSection, params.serviceOutput.reservedTicket.ticketedSeat.seatNumber);
-    // 指定があれば採用(2024-04-16~)
-    const ticketIdentifierByRequest = params.serviceOutput.reservedTicket.identifier;
-    if (typeof ticketIdentifierByRequest === 'string' && ticketIdentifierByRequest.length > 0) {
-        ticketIdentifier = ticketIdentifierByRequest;
-    }
+    const ticketIdentifier = (0, util_1.format)('%s:%s:%s', params.serviceOutput.reservationFor.id, params.serviceOutput.reservedTicket.ticketedSeat.seatSection, params.serviceOutput.reservedTicket.ticketedSeat.seatNumber);
+    // カスタム指定は廃止(2026-06-08~)
+    // // 指定があれば採用(2024-04-16~)
+    // const ticketIdentifierByRequest = params.serviceOutput.reservedTicket.identifier;
+    // if (typeof ticketIdentifierByRequest === 'string' && ticketIdentifierByRequest.length > 0) {
+    //     ticketIdentifier = ticketIdentifierByRequest;
+    // }
     const serviceOutput = {
         reservationFor: {
             typeOf: params.serviceOutput.reservationFor.typeOf,

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.person2username = person2username;
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 const person_1 = require("../../../repo/person");
 const SSKTS_PROVIDER_NAME = 'SSKTS';
 async function person2username(person, cognitoIdentityServiceProvider, setting

package/lib/chevre/service/payment/any/publishPaymentUrl.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { AcceptPayActionRepo } from '../../../repo/action/acceptPay';
 import type { AuthorizeInvoiceActionRepo } from '../../../repo/action/authorizeInvoice';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';

package/lib/chevre/service/payment/creditCard/authorize.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { AuthorizeInvoiceActionRepo } from '../../../repo/action/authorizeInvoice';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';

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

@@ -47,10 +47,11 @@ payTransaction, paymentServiceId, options) {
         try {
             // タスクによって実行されているかどうか
             const executedByTask = typeof options.executor?.id === 'string' && options.executor.id !== '';
+            const gmoIntegrationSettings = await settings.getByKey('gmo');
             // 非同期承認時に長時間対応(2024-05-18~)
-            const timeout = (executedByTask && typeof settings.gmo.timeoutBackground === 'number')
-                ? settings.gmo.timeoutBackground
-                : settings.gmo.timeout;
+            const timeout = (executedByTask && typeof gmoIntegrationSettings.timeoutBackground === 'number')
+                ? gmoIntegrationSettings.timeoutBackground
+                : gmoIntegrationSettings.timeout;
             debug('processAuthorizeCreditCard processing... executor:', options.executor?.id, 'timeout:', timeout);
             const creditCardService = new gmo_service_1.GMO.service.Credit({
                 endpoint: String(availableChannel.serviceUrl)

package/lib/chevre/service/payment/creditCard/payCreditCard.d.ts

@@ -6,7 +6,7 @@ import type { PaymentServiceProviderRepo } from '../../../repo/paymentServicePro
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 /**
  * クレジットカード決済
  */

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

@@ -39,7 +39,7 @@ function payCreditCard(params) {
         try {
             const creditService = new gmo_service_1.GMO.service.Credit({
                 endpoint: String(availableChannel.serviceUrl)
-            }, { timeout: settings.gmo.timeout });
+            }, { timeout: (await settings.getByKey('gmo')).timeout });
             await Promise.all(payObject.map(async (paymentMethod) => {
                 const processAlterTranResult = await processAlterTran({
                     shopId, shopPass, availableChannel, paymentMethod

package/lib/chevre/service/payment/creditCard/refundCreditCard.d.ts

@@ -6,7 +6,7 @@ import type { PaymentServiceProviderRepo } from '../../../repo/paymentServicePro
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 /**
  * refund CreditCard IF payment
  */

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

@@ -59,7 +59,7 @@ function refundCreditCard(params
         try {
             const creditService = new gmo_service_1.GMO.service.Credit({
                 endpoint: String(availableChannel.serviceUrl)
-            }, { timeout: settings.gmo.timeout });
+            }, { timeout: (await settings.getByKey('gmo')).timeout });
             processAlterTranResult = await processAlterTran({
                 availableChannel,
                 alterTranResultByPayAction,

package/lib/chevre/service/payment/creditCard/searchGMOTrade.d.ts

@@ -1,6 +1,6 @@
 import { GMO } from '@motionpicture/gmo-service';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 /**
  * 決済代行側の取引状態参照
  * 存在しない場合NotFoundエラー

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

@@ -11,7 +11,7 @@ const gmoError_1 = require("./gmoError");
 async function searchGMOTrade(params, settings) {
     const creditCardService = new gmo_service_1.GMO.service.Credit({
         endpoint: String(params.availableChannel.serviceUrl)
-    }, { timeout: settings.gmo.timeout });
+    }, { timeout: (await settings.getByKey('gmo')).timeout });
     // 取引状態参照
     let searchTradeResult;
     try {

package/lib/chevre/service/payment/creditCard/voidTransaction.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { AuthorizeInvoiceActionRepo } from '../../../repo/action/authorizeInvoice';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';

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

@@ -59,7 +59,7 @@ function voidTransaction(params) {
         }
         const creditCardService = new gmo_service_1.GMO.service.Credit({
             endpoint: String(availableChannel.serviceUrl)
-        }, { timeout: settings.gmo.timeout });
+        }, { timeout: (await settings.getByKey('gmo')).timeout });
         let searchTradeResult;
         try {
             searchTradeResult = await creditCardService.searchTrade({

package/lib/chevre/service/payment/factory/createPayObjectServiceOutput.d.ts

@@ -12,5 +12,12 @@ declare function createPayObjectServiceOutput(params: {
         purchaseNumberAuthResult: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthResult;
     };
 }): factory.invoice.IPaymentServiceOutput | undefined;
-type IAcceptedOfferMovieTicketUsed = Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'priceSpecification'>;
+/**
+ * 決済カードの適用された注文オファー
+ */
+type IAcceptedOfferMovieTicketUsed = Pick<factory.order.IAcceptedOffer, 'priceSpecification'> & {
+    itemOffered: Pick<factory.order.IReservation, 'reservationFor' | 'reservationNumber'> & {
+        reservedTicket: Pick<factory.order.IReservedTicket, 'identifier' | 'ticketedSeat' | 'ticketToken'> | Pick<factory.order.ICOAReservedTicket, 'identifier' | 'ticketedSeat' | 'ticketToken'>;
+    };
+};
 export { createPayObjectServiceOutput, IAcceptedOfferMovieTicketUsed };

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

@@ -131,7 +131,7 @@ function reservationPriceComponent2invoicePriceComponent(component) {
  * 決済カードの対象予約情報を作成する
  */
 function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType, payTransactionNumber) {
-    // Orderから対象予約を取得
+    // Orderから決済カードの対象予約を取得
     const reservationOffer = order.acceptedOffersMovieTicketUsed.find(({ itemOffered, priceSpecification }) => {
         let mvtkUnitPriceSpec;
         // MovieTicket適用単価オファーからidentifierを取り出す

package/lib/chevre/service/payment/movieTicket/authorize.d.ts

@@ -9,7 +9,7 @@ import type { PaymentServiceProviderRepo } from '../../../repo/paymentServicePro
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 interface IAuthorizeResult {
     accountId: string;
     accountsReceivablesByServiceType: factory.assetTransaction.pay.IAccountsReceivableByServiceType[];

package/lib/chevre/service/payment/movieTicket/checkMovieTicket.d.ts

@@ -5,7 +5,7 @@ import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import { ICheckResult } from './processPurchaseNumberAuth';
 interface ICheckOperationRepos {
     checkMovieTicketAction: CheckMovieTicketActionRepo;

package/lib/chevre/service/payment/movieTicket/payMovieTicket.d.ts

@@ -8,7 +8,7 @@ import type { PaymentServiceProviderRepo } from '../../../repo/paymentServicePro
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 interface IPayOperationRepos {
     action?: never;
     actions: {

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

@@ -53,7 +53,7 @@ function payMovieTicket(params, options) {
                     state: '',
                     credentialsRepo: repos.credentials // set credentialsRepo(2024-11-20~)
                 });
-                const seatService = new sdk_1.Surfrock.service.seat.SeatService({ endpoint: String(availableChannel.serviceUrl), auth: mvtkReserveAuthClient }, { timeout: settings.movieticketReserve.timeout });
+                const seatService = new sdk_1.Surfrock.service.seat.SeatService({ endpoint: String(availableChannel.serviceUrl), auth: mvtkReserveAuthClient }, { timeout: (await settings.getByKey('movieticketReserve')).timeoutPay });
                 processSeatInfoSyncResult = await (0, processSeatInfoSync_1.processSeatInfoSync)({ seatInfoSyncIn })({ seatService });
             }
             // add recipe(2024-06-03~)

package/lib/chevre/service/payment/movieTicket/processPurchaseNumberAuth.d.ts

@@ -3,7 +3,7 @@ import type { IMinimizedIndividualEvent } from '../../../repo/event';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 interface ICheckResult {
     purchaseNumberAuthIn: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthIn;
     purchaseNumberAuthResult: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthResult;

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

@@ -73,7 +73,7 @@ function processPurchaseNumberAuth(params) {
         const authService = new sdk_1.Surfrock.service.auth.AuthService({
             endpoint: String(availableChannel.serviceUrl),
             auth: mvtkReserveAuthClient
-        }, { timeout: settings.movieticketReserve.timeoutCheck });
+        }, { timeout: (await settings.getByKey('movieticketReserve')).timeoutCheck });
         const purchaseNumberAuthResult = await authService.purchaseNumberAuth(purchaseNumberAuthIn);
         return { purchaseNumberAuthIn, purchaseNumberAuthResult };
     };

package/lib/chevre/service/payment/movieTicket/refundMovieTicket.d.ts

@@ -5,7 +5,7 @@ import type { CredentialsRepo } from '../../../repo/credentials';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 interface IRefundOperationRepos {
     action?: never;
     actions: {

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

@@ -17,7 +17,7 @@ const processSeatInfoSyncCancel_1 = require("./refundMovieTicket/processSeatInfo
 function wait4payActionDelayIfNeeded(params) {
     return async (settings) => {
         const { payAction } = params;
-        const minIntervalBetweenPayAndRefund = settings.movieticketReserve.minIntervalBetweenPayAndRefund;
+        const minIntervalBetweenPayAndRefund = (await settings.getByKey('movieticketReserve')).minIntervalBetweenPayAndRefund;
         let waitingNecessary = false;
         if (typeof minIntervalBetweenPayAndRefund === 'number' && minIntervalBetweenPayAndRefund > 0) {
             if (payAction.actionStatus !== factory_1.factory.actionStatusType.CompletedActionStatus) {
@@ -74,7 +74,7 @@ function refundMovieTicket(params, options) {
             state: '',
             credentialsRepo: repos.credentials // set credentialsRepo(2024-11-20~)
         });
-        const seatService = new sdk_1.Surfrock.service.seat.SeatService({ endpoint: String(availableChannel.serviceUrl), auth: mvtkReserveAuthClient }, { timeout: settings.movieticketReserve.timeout });
+        const seatService = new sdk_1.Surfrock.service.seat.SeatService({ endpoint: String(availableChannel.serviceUrl), auth: mvtkReserveAuthClient }, { timeout: (await settings.getByKey('movieticketReserve')).timeoutRefund });
         let seatInfoSyncCancelIn;
         let seatInfoSyncIn;
         const useSeatInfoSyncCancel = availableChannel.credentials?.useSeatInfoSyncCancel === true;

package/lib/chevre/service/payment/movieTicket/voidTransaction.d.ts

@@ -5,7 +5,7 @@ import type { CredentialsRepo } from '../../../repo/credentials';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 declare function voidTransaction(params: factory.task.voidPayment.IData): (repos: {
     actions: {
         pay: PayActionRepo;

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

@@ -61,7 +61,8 @@ function confirmReservation(params) {
                             ...rawReservation.reservedTicket,
                             ticketType: ticketTypeByTransaction
                         },
-                        reservationFor: reserveTransaction.object.reservationFor // reservationForは予約取引から参照する(2026-04-05~)
+                        reservationFor: reserveTransaction.object.reservationFor, // reservationForは予約取引から参照する(2026-04-05~)
+                        issuedThrough: reserveTransaction.object.issuedThrough // issuedThroughは予約取引から補完する(2026-05-08~)
                     };
                 });
                 confirmedReservations = confirmedReservations.map((r) => {
@@ -189,25 +190,24 @@ params, options) {
                     if (reserveTransaction.object.disablePendingReservations === true) {
                         const reservationFor = reserveTransaction.object.reservationFor;
                         const subReservations = reserveTransaction.object.subReservation;
-                        const issuedThrough = reserveTransaction.object.issuedThrough;
+                        // const issuedThrough = reserveTransaction.object.issuedThrough;
                         if (Array.isArray(subReservations)
                             && typeof reservationFor?.typeOf === 'string'
-                            && typeof issuedThrough?.typeOf === 'string') {
-                            // confirmManyに変更(2023-06-13~)
-                            const confirmManyIfNotExistResult = await repos.reservation.confirmManyIfNotExist({
+                        // && typeof issuedThrough?.typeOf === 'string'
+                        ) {
+                            await repos.reservation.confirmManyIfNotExist({
                                 bookingTime: reserveTransaction.startDate, // startDateに設定(2024-04-08~)
                                 project: { id: reserveTransaction.project.id },
                                 provider: (typeof reserveTransaction.object.provider?.id === 'string')
                                     ? reserveTransaction.object.provider
                                     : { id: reserveTransaction.agent.id, typeOf: factory_1.factory.organizationType.Corporation },
                                 subReservation: subReservations,
-                                issuedThrough,
+                                // issuedThrough,
                                 reservationFor,
                                 reservationNumber: reserveTransaction.object.reservationNumber,
                                 underName,
                                 broker: reserveTransaction.object.broker
                             });
-                            debug('confirmManyIfNotExistResult:', confirmManyIfNotExistResult, 'reservationNumber:', reservationPackage.reservationNumber);
                         }
                     }
                     else {

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

@@ -21,7 +21,8 @@ function createCancelPendingReservationAction(params) {
         const reservationPackage = {
             typeOf: factory_1.factory.reservationType.ReservationPackage,
             reservationNumber: transaction.transactionNumber,
-            reservationFor: { typeOf: reservationFor.typeOf, id: String(reservationFor.id) },
+            // discontinue reservationFor(2026-05-09~)
+            // reservationFor: { typeOf: reservationFor.typeOf, id: String(reservationFor.id) },
             reservationStatus: (typeof params.transaction.object.reservationStatus === 'string')
                 ? params.transaction.object.reservationStatus
                 : factory_1.factory.reservationStatusType.ReservationPending

package/lib/chevre/service/reserve/findByCode.d.ts

@@ -5,7 +5,7 @@ import type { OrderRepo } from '../../repo/order';
 import type { ReservationRepo } from '../../repo/reservation';
 type IReservationResult = Pick<factory.reservation.eventReservation.IReservation, 'id' | 'additionalTicketText' | 'checkedIn' | 'reservationStatus'> & {
     reservedTicket: {
-        ticketType: Pick<factory.reservation.eventReservation.ITicketType, 'identifier'> & {
+        ticketType: Pick<factory.assetTransaction.reserve.ITicketType, 'identifier'> & {
             name: {
                 ja?: string;
             };