@chevre/domain 24.1.0-alpha.9 → 25.0.0-alpha.0

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;
             };

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

@@ -39,7 +39,7 @@ function findByCode(params) {
                                 // typeOf?: { $in?: factory.order.IItemOffered['typeOf'][] };
                             }
                         }
-                    }, ['itemOffered'])).shift();
+                    }, { noName: true })).shift();
                     if (acceptedOffer === undefined) {
                         throw new factory_1.factory.errors.NotFound('acceptedOffer');
                     }

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

@@ -1,21 +1,29 @@
 import { factory } from '../../factory';
 import type { ReserveTransactionRepo } from '../../repo/assetTransaction/reserve';
-import type { IDeprecatedField, IKeyOfProjection, ReservationRepo } from '../../repo/reservation';
+import type { IKeyOfProjection, ReservationRepo } from '../../repo/reservation';
 /**
  * 予約検索レスポンスとしての予約
  * 予約ドキュメントに予約取引の情報を補完する
  */
-type IReservationAsFindResult = Omit<factory.reservation.eventReservation.IReservation, 'price' | 'underName' | 'reservedTicket' | 'reservationFor'> & {
-    price?: factory.reservation.eventReservation.IPrice;
+type IReservationAsFindResult = Omit<factory.reservation.eventReservation.IReservation, 'underName' | 'reservedTicket' | 'reservationFor'> & {
     underName?: factory.assetTransaction.reserve.IUnderName;
-    reservedTicket?: factory.assetTransaction.reserve.IObjectSubReservation['reservedTicket'];
-    reservationFor?: factory.assetTransaction.reserve.IReservationFor;
+    reservedTicket?: factory.reservation.eventReservation.IReservedTicket | factory.assetTransaction.reserve.IObjectSubReservation['reservedTicket'];
+    reservationFor?: factory.reservation.eventReservation.IReservationForMinimized | factory.assetTransaction.reserve.IReservationFor;
+    price?: never;
 };
 /**
  * 予約を検索する
  */
 export declare function findReservations(params: factory.reservation.eventReservation.ISearchConditions, options: {
-    inclusion: Partial<Record<IKeyOfProjection | IDeprecatedField, 1>>;
+    inclusion: Partial<Record<IKeyOfProjection | 'underName', 1>>;
+    /**
+     * reservationForを予約ドキュメントそのままで返すかどうか
+     */
+    minimizeReservationFor: boolean;
+    /**
+     * reservedTicketからticketTypeを除外するかどうか
+     */
+    minimizeReservedTicket: boolean;
 }): (repos: {
     assetTransaction: {
         reserve: ReserveTransactionRepo;

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

@@ -1,23 +1,17 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findReservations = findReservations;
-const debug_1 = __importDefault(require("debug"));
-const debug = (0, debug_1.default)('chevre-domain:service:reserve:findReservations');
 /**
  * 予約を検索する
  */
 function findReservations(params, options) {
     return async (repos) => {
-        const { inclusion } = options;
+        const { inclusion, minimizeReservationFor, minimizeReservedTicket } = options;
         const rawReservations = await repos.reservation.findReservations(params, inclusion);
         if (rawReservations.length === 0) {
             return [];
         }
         else {
-            const requirePrice = Object.keys(inclusion).includes('price');
             const requireUnderName = Object.keys(inclusion).includes('underName');
             const requireReservedTicket = Object.keys(inclusion).includes('reservedTicket');
             const requireReservationFor = Object.keys(inclusion).includes('reservationFor');
@@ -25,45 +19,41 @@ function findReservations(params, options) {
             const subReservations = await repos.assetTransaction.reserve.findSubReservationsById({
                 ids: reservationIds
             });
-            // 予約取引から参照した予約数と同じはず
-            debug('useReserveTransaction: true. reservations.length === subReservations.length?', rawReservations.length === subReservations.length);
             return rawReservations.map((reservation) => {
                 const subReservationByTransaction = subReservations.find((s) => s.id === reservation.id);
-                const priceByTransaction = subReservationByTransaction?.price;
                 const underNameByTransaction = subReservationByTransaction?.underName;
                 const ticketTypeByTransaction = subReservationByTransaction?.reservedTicket?.ticketType;
                 const reservationForByTransaction = subReservationByTransaction?.reservationFor;
-                // 予約ドキュメントを最適化し始めたため、もう等しくない(2026-04-06~)
-                // // 予約取引から参照した属性と全く等しいはず
-                // if (requirePrice) {
-                // }
-                // if (requireUnderName) {
-                // }
-                // if (requireReservedTicket) {
-                // }
-                // if (requireReservationFor) {
-                //     const reservationForMatched = isDeepStrictEqual(reservation.reservationFor, reservationForByTransaction);
-                //     debug('requireReservationFor. reservationForMatched?', reservationForMatched);
-                //     if (!reservationForMatched) {
-                //         console.error('reservationForMatched: false!!!', reservation.id);
-                //     }
-                // }
-                const { reservationFor, reservedTicket, ...rawReservation4result } = reservation; // eslint-disable-line @typescript-eslint/no-unused-vars
+                const { reservationFor, issuedThrough: _issuedThrough, priceCurrency: _priceCurrency, numSeats: _numSeats, reservedTicket, ...rawReservation4result } = reservation;
                 return {
                     ...rawReservation4result, // 予約ドキュメントはそのまま返す
-                    ...(requirePrice && priceByTransaction !== undefined) ? { price: priceByTransaction } : undefined, // priceがあれば上書き
                     ...(requireUnderName && underNameByTransaction !== undefined) ? { underName: underNameByTransaction } : undefined, // underNameがあれば上書き
-                    ...(requireReservedTicket && ticketTypeByTransaction !== undefined) // ticketTypeがあれば上書き
-                        ? {
-                            reservedTicket: {
-                                ...reservedTicket, // 予約ドキュメントのreservedTicketはそのまま返す
-                                ticketType: ticketTypeByTransaction
+                    ...(requireReservedTicket)
+                        ? (!minimizeReservedTicket && ticketTypeByTransaction !== undefined)
+                            ? {
+                                reservedTicket: {
+                                    ...reservedTicket, // 予約ドキュメントのreservedTicketはそのまま返す
+                                    ticketType: ticketTypeByTransaction
+                                }
                             }
-                        }
+                            : { reservedTicket } // 予約検索レスポンスからticketTypeは廃止(2026-06-01~)
                         : undefined,
-                    ...(requireReservationFor && reservationForByTransaction !== undefined)
-                        ? { reservationFor: reservationForByTransaction }
-                        : undefined, // reservationForがあれば上書き(2026-04-06~)
+                    ...(requireReservationFor)
+                        ? (!minimizeReservationFor && reservationForByTransaction !== undefined)
+                            ? { reservationFor: reservationForByTransaction }
+                            : { reservationFor } // 予約検索レスポンスのreservationForはそのまま返す(2026-06-01~)
+                        : undefined,
+                    // ...(requireReservedTicket && ticketTypeByTransaction !== undefined) // ticketTypeがあれば上書き
+                    //     ? {
+                    //         reservedTicket: {
+                    //             ...reservedTicket, // 予約ドキュメントのreservedTicketはそのまま返す
+                    //             ticketType: ticketTypeByTransaction
+                    //         }
+                    //     }
+                    //     : undefined,
+                    // ...(requireReservationFor && reservationForByTransaction !== undefined)
+                    //     ? { reservationFor: reservationForByTransaction }
+                    //     : undefined, // reservationForがあれば上書き(2026-04-06~)
                 };
             });
         }

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

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

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

@@ -5,7 +5,6 @@ exports.onReservationCanceled = onReservationCanceled;
  * 予約取消時アクション
  */
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 const factory_2 = require("../factory");
 function onReservationCanceled(
 /**

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

@@ -5,13 +5,14 @@ import { factory } from '../../../factory';
 import { AuthorizationRepo } from '../../../repo/authorization';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
-export type IConfirmedReservation = Omit<factory.reservation.eventReservation.IReservation, 'price' | 'underName' | 'reservedTicket' | 'reservationFor'> & {
-    price?: factory.reservation.eventReservation.IPrice;
+export type IConfirmedReservation = Omit<factory.reservation.eventReservation.IReservation, 'price' | 'underName' | 'reservedTicket' | 'reservationFor' | 'issuedThrough'> & {
+    price?: factory.assetTransaction.reserve.IPrice;
     underName?: Pick<factory.reservation.IUnderName, 'id' | 'typeOf'>;
     reservedTicket: Omit<factory.assetTransaction.reserve.ISubReservationReservedTicket, 'ticketType'> & {
-        ticketType: factory.reservation.eventReservation.ITicketType;
+        ticketType: factory.assetTransaction.reserve.ITicketType;
     };
     reservationFor: factory.assetTransaction.reserve.IReservationFor;
+    issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
 };
 /**
  * 予約確定後のアクション

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

@@ -6,7 +6,6 @@ exports.onReservationConfirmed = onReservationConfirmed;
  * 予約確定時アクション
  */
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 const factory_2 = require("../factory");
 /**
  * 予約確定後のアクション
@@ -98,22 +97,14 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
                 }
             }
             const subReservations4inform = confirmedReservations.map((r) => {
-                const { additionalProperty, additionalTicketText, 
-                // attended, checkedIn,
-                id, modifiedTime, 
-                // numSeats,
-                price, programMembershipUsed, reservedTicket, subReservation, typeOf } = r;
+                const { additionalProperty, additionalTicketText, id, modifiedTime, price, programMembershipUsed, reservedTicket, subReservation, typeOf } = r;
                 return {
-                    // bookingTime, // discontinue(2024-10-27~)
                     id,
                     typeOf,
                     reservedTicket,
                     ...(Array.isArray(additionalProperty)) ? { additionalProperty } : undefined,
                     ...(typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined,
-                    // ...(typeof attended === 'boolean') ? { attended } : undefined, // discontinue(2024-10-27~)
-                    // ...(typeof checkedIn === 'boolean') ? { checkedIn } : undefined, // discontinue(2024-10-27~)
                     ...(modifiedTime instanceof Date) ? { modifiedTime } : undefined,
-                    // ...(typeof numSeats === 'number') ? { numSeats } : undefined, // discontinue(2024-10-27~)
                     ...(price !== undefined) ? { price } : undefined,
                     ...(programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined,
                     ...(Array.isArray(subReservation)) ? { subReservation } : undefined

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

@@ -9,7 +9,6 @@ exports.onReservationUsed = onReservationUsed;
  */
 const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 const factory_2 = require("../factory");
 /**
  * 予約使用

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onReservationsCreated = onReservationsCreated;
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 const factory_2 = require("../factory");
 /**
  * 予約作成時イベント

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

@@ -11,14 +11,18 @@ function searchByOrder(params) {
             page: params.page,
             project: { id: { $eq: params.project.id } },
             orderNumber: { $eq: params.orderNumber },
-            acceptedOffers: { itemOffered: { typeOf: { $in: [reservationType] } } }
-        }, ['itemOffered']);
+            acceptedOffers: {
+                itemOffered: {
+                // typeOf: { $in: [reservationType] }
+                }
+            }
+        }, { noName: true });
         const reservationIds = acceptedOffers.map((offer) => {
             if (offer.itemOffered.typeOf === reservationType) {
                 return offer.itemOffered.id;
             }
             else {
-                // 検索条件にreservationTypeを含めているので、ありえないケース
+                // EventReservationしか存在しないので、ありえないケース
                 throw new factory_1.factory.errors.Internal(`unexpected itemOffered.typeOf ${offer.itemOffered.typeOf}`);
             }
         });

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

@@ -11,6 +11,7 @@ const event_1 = require("../../repo/event");
 const orderNumber_1 = require("../../repo/orderNumber");
 const project_1 = require("../../repo/project");
 const reserveInterface_1 = require("../../repo/reserveInterface");
+const integration_1 = require("../../repo/setting/integration");
 // import { TransactionRepo } from '../../repo/transaction';
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const acceptOffer_1 = require("../offer/eventServiceByCOA/acceptOffer");
@@ -19,7 +20,7 @@ let coaAuthClient;
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient, settings }, options) => {
+    return async ({ connection, redisClient }, options) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
@@ -27,6 +28,7 @@ function call(params) {
         if (!options.executeById) {
             return;
         }
+        const settings = new integration_1.IntegrationSettingRepo({ connection });
         const reserveInterfaceRepo = new reserveInterface_1.ReserveInterfaceRepo(connection);
         const coaAPI = await reserveInterfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
         if (typeof coaAPI?.id !== 'string') {
@@ -58,14 +60,15 @@ function call(params) {
         const actionRepo = new acceptCOAOffer_1.AcceptCOAOfferActionRepo(connection);
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
+            const coaIntegrationSettings = await settings.getByKey('coa');
             const reserveService = new coa_service_1.COA.service.Reserve({
                 endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
                 auth: coaAuthClient
-            }, { timeout: settings.coa.timeout });
+            }, { timeout: coaIntegrationSettings.timeoutReserve });
             const masterService = new coa_service_1.COA.service.Master({
                 endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
                 auth: coaAuthClient
-            }, { timeout: settings.coa.timeout });
+            }, { timeout: coaIntegrationSettings.timeoutMaster });
             const { agent, object, potentialActions, purpose } = params.data;
             // agent.idからflgMemberを自動セット(2024-12-16~)
             const isMember = memberClients.includes(agent.id);

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

@@ -24,6 +24,7 @@ const potentialAction_1 = require("../../repo/potentialAction");
 const product_1 = require("../../repo/product");
 const project_1 = require("../../repo/project");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
+const integration_1 = require("../../repo/setting/integration");
 const task_1 = require("../../repo/task");
 const ticket_1 = require("../../repo/ticket");
 // import { TransactionRepo } from '../../repo/transaction';
@@ -35,7 +36,7 @@ const any_1 = require("../payment/any");
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient, settings }, options) => {
+    return async ({ connection, redisClient }, options) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
@@ -44,11 +45,12 @@ function call(params) {
             return;
         }
         let callResult;
+        const settings = new integration_1.IntegrationSettingRepo({ connection });
         // const actionRepo = new ActionRepo(connection);
         const authorizePaymentMethodActionRepo = new authorizePaymentMethod_1.AuthorizePaymentMethodActionRepo(connection);
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         const paymentServiceId = params.data.object.issuedThrough.id;
-        const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
+        const credentialsExpireInSeconds = (await settings.getByKey('movieticketReserve')).credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
             && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
         try {

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

@@ -9,6 +9,7 @@ const offer_1 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
 const reserveInterface_1 = require("../../repo/reserveInterface");
 const setting_1 = require("../../repo/setting");
+const integration_1 = require("../../repo/setting/integration");
 const stockHolder_1 = require("../../repo/stockHolder");
 const task_1 = require("../../repo/task");
 const cancelReservation_1 = require("../reserve/cancelReservation");
@@ -23,10 +24,11 @@ let coaAuthClient = new coa_service_1.COA.auth.RefreshToken({
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient, settings }) => {
+    return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
+        const settings = new integration_1.IntegrationSettingRepo({ connection });
         const { data } = params;
         // support COAReserve(2025-03-01~)
         if (data.purpose?.typeOf === factory_1.factory.assetTransactionType.Reserve) {
@@ -54,7 +56,7 @@ function call(params) {
             const reserveService = new coa_service_1.COA.service.Reserve({
                 endpoint: coaAuthClient.options.endpoint,
                 auth: coaAuthClient
-            }, { timeout: settings.coa.timeout });
+            }, { timeout: (await settings.getByKey('coa')).timeoutReserve });
             const { object, instrument } = data;
             await (0, cancelReservation_2.cancelPendingReservation)({
                 object,

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

@@ -8,13 +8,14 @@ const event_1 = require("../../repo/event");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
+const integration_1 = require("../../repo/setting/integration");
 // import { TransactionProcessRepo } from '../../repo/transactionProcess';
 const pay_1 = require("../assetTransaction/pay");
 /**
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient, settings }, options) => {
+    return async ({ connection, redisClient }, options) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
@@ -22,10 +23,11 @@ function call(params) {
         if (!options.executeById) {
             return;
         }
+        const settings = new integration_1.IntegrationSettingRepo({ connection });
         const actionRepo = new checkMovieTicket_1.CheckMovieTicketActionRepo(connection);
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         const paymentServiceId = params.data.object[0]?.id;
-        const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
+        const credentialsExpireInSeconds = (await settings.getByKey('movieticketReserve')).credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
             && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
         try {

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

@@ -1,6 +1,6 @@
 import { COA } from '@motionpicture/coa-service';
 import { factory } from '../../factory';
-import { Settings } from '../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../repo/setting/integration';
 import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import { ActionRepo } from '../../repo/action';