@chevre/domain 24.1.0-alpha.4 → 24.1.0-alpha.40

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

@@ -19,84 +19,79 @@ function createAccountingReportIfNotExist(params) {
 }
 // 最適化(2023-06-30~)
 function createOrder4report(params) {
-    if (!Array.isArray(params.acceptedOffers)) {
-        throw new factory_1.factory.errors.ArgumentNull('order.acceptedOffers');
-    }
-    const numItems = params.acceptedOffers.length;
-    // 必要な属性についてDate型に変換(でないと検索クエリを効率的に使えない)
-    const acceptedOffers = (Array.isArray(params.acceptedOffers))
-        ? params.acceptedOffers.map((o) => {
-            if (o.itemOffered.typeOf === factory_1.factory.reservationType.EventReservation) {
-                let itemOffered = o.itemOffered;
-                const reservationFor = itemOffered.reservationFor;
-                itemOffered = {
-                    ...itemOffered,
-                    reservationFor: {
-                        ...reservationFor,
-                        ...(reservationFor.doorTime !== undefined)
-                            ? {
-                                doorTime: (0, moment_timezone_1.default)(reservationFor.doorTime)
-                                    .toDate()
-                            }
-                            : undefined,
-                        ...(reservationFor.endDate !== undefined)
-                            ? {
-                                endDate: (0, moment_timezone_1.default)(reservationFor.endDate)
-                                    .toDate()
-                            }
-                            : undefined,
-                        ...(reservationFor.startDate !== undefined)
-                            ? {
-                                startDate: (0, moment_timezone_1.default)(reservationFor.startDate)
-                                    .toDate()
-                            }
-                            : undefined
-                    }
-                };
-                return {
-                    ...o,
-                    itemOffered
-                };
-            }
-            else {
-                return o;
-            }
-        })
-        : [];
-    const customer = {
-        // ...createMaskedCustomer(params),
-        id: params.customer.id,
-        typeOf: params.customer.typeOf,
-        additionalProperty: (Array.isArray(params.customer.additionalProperty))
-            ? params.customer.additionalProperty
-            : [],
-        identifier: (Array.isArray(params.customer.identifier))
-            ? params.customer.identifier
-            : []
-    };
+    // if (!Array.isArray(params.acceptedOffers)) {
+    //     throw new factory.errors.ArgumentNull('order.acceptedOffers');
+    // }
+    // const numItems: number = params.acceptedOffers.length;
+    // // 必要な属性についてDate型に変換(でないと検索クエリを効率的に使えない)
+    // const acceptedOffers = (Array.isArray(params.acceptedOffers))
+    //     ? params.acceptedOffers.map((o) => {
+    //         if (o.itemOffered.typeOf === factory.reservationType.EventReservation) {
+    //             let itemOffered = o.itemOffered;
+    //             const reservationFor = itemOffered.reservationFor;
+    //             itemOffered = {
+    //                 ...itemOffered,
+    //                 reservationFor: {
+    //                     ...reservationFor,
+    //                     ...(reservationFor.doorTime !== undefined)
+    //                         ? {
+    //                             doorTime: moment(reservationFor.doorTime)
+    //                                 .toDate()
+    //                         }
+    //                         : undefined,
+    //                     ...(reservationFor.endDate !== undefined)
+    //                         ? {
+    //                             endDate: moment(reservationFor.endDate)
+    //                                 .toDate()
+    //                         }
+    //                         : undefined,
+    //                     ...(reservationFor.startDate !== undefined)
+    //                         ? {
+    //                             startDate: moment(reservationFor.startDate)
+    //                                 .toDate()
+    //                         }
+    //                         : undefined
+    //                 }
+    //             } as factory.order.IReservation;
+    //             return {
+    //                 ...o,
+    //                 itemOffered
+    //             };
+    //         } else {
+    //             return o;
+    //         }
+    //     })
+    //     : [];
+    // const customer: factory.report.accountingReport.IOptimizedCustomer = {
+    //     id: params.customer.id,
+    //     typeOf: params.customer.typeOf,
+    //     additionalProperty: (Array.isArray(params.customer.additionalProperty))
+    //         ? params.customer.additionalProperty
+    //         : [],
+    //     identifier: (Array.isArray(params.customer.identifier))
+    //         ? params.customer.identifier
+    //         : []
+    // };
     return {
-        // ...params,
-        confirmationNumber: params.confirmationNumber,
         id: params.id,
         orderNumber: params.orderNumber,
-        orderedItem: params.orderedItem,
-        paymentMethods: params.paymentMethods,
-        price: params.price,
-        priceCurrency: params.priceCurrency,
-        seller: params.seller,
+        paymentMethods: params.paymentMethods.map(({ paymentMethodId }) => ({ paymentMethodId })),
+        seller: {
+            id: params.seller.id,
+            name: params.seller.name,
+            typeOf: params.seller.typeOf
+        },
         typeOf: params.typeOf,
-        customer,
         orderDate: (0, moment_timezone_1.default)(params.orderDate)
             .toDate(),
-        acceptedOffers,
-        numItems,
-        ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined
-        // ...(params.dateReturned !== null && params.dateReturned !== undefined)
-        //     ? {
-        //         dateReturned: moment(params.dateReturned)
-        //             .toDate()
-        //     }
-        //     : undefined
+        // confirmationNumber: params.confirmationNumber, // discontinue(2026-05-06~)
+        // price: params.price, // discontinue(2026-05-06~)
+        // priceCurrency: params.priceCurrency, // discontinue(2026-05-06~)
+        // customer, // discontinue(2026-05-06~)
+        // numItems, // discontinue(2026-05-06~)
+        // orderedItem: params.orderedItem, // discontinue(2026-05-06~)
+        // acceptedOffers, // discontinue(2026-05-06~)
+        // ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined // discontinue(2026-05-06~)
     };
 }
 function createAccountingReport(params) {

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteOrder = deleteOrder;
-const factory_1 = require("../delivery/factory");
-const factory_2 = require("../../factory");
+// import { createOwnershipInfosFromOrder } from '../delivery/factory';
+const factory_1 = require("../../factory");
 /**
  * 注文に関わるリソースを削除する
  * 冪等性を確保すること
@@ -20,24 +20,24 @@ function deleteOrder(params) {
             return;
         }
         if (typeof order.id !== 'string') {
-            throw new factory_2.factory.errors.Internal(`order.id undefined. orderNumber: ${params.object.orderNumber}`);
+            throw new factory_1.factory.errors.Internal(`order.id undefined. orderNumber: ${params.object.orderNumber}`);
         }
         // 注文アイテムの予約を削除
         await deleteReservationsByOrder(order)(repos);
-        // 所有権削除
-        try {
-            await deleteOwnershipInfosByOrder(order)(repos);
-        }
-        catch (error) {
-            console.error('deleteOwnershipInfosByOrder throws', error);
-        }
+        // 所有権は所有期限でcleanされるので、注文削除時連動はひとまず廃止(2026-05-17~)
+        // // 所有権削除
+        // try {
+        //     await deleteOwnershipInfosByOrder(order)(repos);
+        // } catch (error) {
+        //     console.error('deleteOwnershipInfosByOrder throws', error);
+        // }
         // 経理レポート削除
         await repos.accountingReport.deleteByOrderNumber({ mainEntity: { orderNumber: order.orderNumber } });
         // メモ削除(2024-02-15~)
         await repos.note.deleteNotesByAbout({
             about: {
                 id: order.id,
-                typeOf: factory_2.factory.order.OrderType.Order
+                typeOf: factory_1.factory.order.OrderType.Order
             }
         });
         // 注文削除
@@ -49,7 +49,7 @@ function deleteOrder(params) {
 function deletePersonIfNecessary(order) {
     return async (repos) => {
         // 代理注文を除く
-        const isCustomerPerson = order.customer.typeOf === factory_2.factory.personType.Person
+        const isCustomerPerson = order.customer.typeOf === factory_1.factory.personType.Person
             && typeof order.broker?.typeOf !== 'string';
         if (isCustomerPerson) {
             const ordersByPerson = await repos.order.projectFields({
@@ -60,12 +60,12 @@ function deletePersonIfNecessary(order) {
             if (ordersByPerson.length === 0) {
                 const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['userPoolIdNew']);
                 if (typeof setting?.userPoolIdNew !== 'string') {
-                    throw new factory_2.factory.errors.NotFound('setting.userPoolIdNew');
+                    throw new factory_1.factory.errors.NotFound('setting.userPoolIdNew');
                 }
                 const deletePersonTask = {
-                    project: { typeOf: factory_2.factory.organizationType.Project, id: order.project.id },
-                    name: factory_2.factory.taskName.DeletePerson,
-                    status: factory_2.factory.taskStatus.Ready,
+                    project: { typeOf: factory_1.factory.organizationType.Project, id: order.project.id },
+                    name: factory_1.factory.taskName.DeletePerson,
+                    status: factory_1.factory.taskStatus.Ready,
                     runsAt: new Date(),
                     remainingNumberOfTries: 10,
                     numberOfTried: 0,
@@ -74,8 +74,8 @@ function deletePersonIfNecessary(order) {
                         id: order.customer.id,
                         agent: {
                             id: order.project.id,
-                            typeOf: factory_2.factory.organizationType.Project,
-                            name: factory_2.factory.organizationType.Project
+                            typeOf: factory_1.factory.organizationType.Project,
+                            name: factory_1.factory.organizationType.Project
                         },
                         physically: true,
                         userPoolId: setting.userPoolIdNew,
@@ -94,36 +94,15 @@ function deleteReservationsByOrder(order) {
             orderNumber: { $eq: order.orderNumber },
             project: { id: { $eq: order.project.id } },
             acceptedOffers: {
-                itemOffered: { typeOf: { $in: [factory_2.factory.reservationType.EventReservation] } }
+            // itemOffered: { typeOf: { $in: [factory.reservationType.EventReservation] } }
             }
-        });
+        }, {
+            useItemOfferedByReserve: true // 2026-05-25~
+        } // 予約取引参照(2026-05-18~)
+        );
         const reservationIds = acceptedOffers.map((o) => String(o.itemOffered.id));
         if (reservationIds.length > 0) {
             await repos.reservation.deleteByIds({ project: { id: order.project.id }, ids: reservationIds });
         }
     };
 }
-function deleteOwnershipInfosByOrder(order) {
-    return async (repos) => {
-        const now = new Date();
-        const ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
-            order: {
-                ...order,
-                acceptedOffers: await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
-                    orderNumber: { $eq: order.orderNumber },
-                    project: { id: { $eq: order.project.id } }
-                })
-            },
-            offerIndexBase: 0
-        });
-        const ownershipIdentifiers = ownershipInfos.map((o) => String(o.identifier));
-        if (ownershipIdentifiers.length > 0) {
-            await repos.ownershipInfo.deleteExpiredByIdentifiers({
-                project: { id: order.project.id },
-                identifiers: ownershipIdentifiers,
-                // 所有期限切れのもの(ownedThroughの存在しないものは削除してはいけない)
-                ownedThrough: { $lte: now }
-            });
-        }
-    };
-}

package/lib/chevre/service/order/onAssetTransactionStatusChanged/onPayTransactionConfirmed.d.ts

@@ -5,7 +5,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';
 interface IOnPayTransactionConfirmedRepos {
     acceptedOffer: AcceptedOfferRepo;
     assetTransaction: AssetTransactionRepo;

package/lib/chevre/service/order/onAssetTransactionStatusChanged/onReserveTransactionConfirmed.d.ts

@@ -5,7 +5,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';
 interface IOnReserveTransactionConfirmedRepos {
     acceptedOffer: AcceptedOfferRepo;
     assetTransaction: AssetTransactionRepo;

package/lib/chevre/service/order/onAssetTransactionStatusChanged/paymentDue2Processing.d.ts

@@ -3,7 +3,7 @@ import type { OrderRepo } from '../../../repo/order';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 interface IPaymentDue2ProcessingRepos {
     acceptedOffer: AcceptedOfferRepo;
     order: OrderRepo;

package/lib/chevre/service/order/onAssetTransactionStatusChanged/paymentDue2Processing.js

@@ -55,28 +55,26 @@ function paymentDue2Processing(params) {
             }
         }
         if (params.useOnOrderStatusChanged) {
-            // 全acceptedOffersを検索(2023-12-08~)
-            // const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber(
-            //     {
-            //         orderNumber: { $eq: order.orderNumber },
-            //         project: { id: { $eq: params.project.id } }
-            //     },
-            //     ['itemOffered', 'offeredThrough']
-            // );
             const { numAcceptedOffers } = await repos.acceptedOffer.countByOrderNumber({
                 orderNumber: { $eq: order.orderNumber },
                 project: { id: { $eq: params.project.id } }
             });
-            const itemOfferedTypeOfs = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.itemOffered.typeOf');
+            // const itemOfferedTypeOfs = await repos.acceptedOffer.distinctValues(
+            //     { orderNumber: { $in: [params.orderNumber] } },
+            //     'acceptedOffers.itemOffered.typeOf'
+            // ) as factory.order.IItemOffered['typeOf'][];
             const serialNumbers = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.serialNumber');
             const offeredThroughIdentifier = (await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.offeredThrough.identifier')).shift();
-            debug('onAssetTransactionStatusChanged paymentDue2Processing: calling onOrderProcessing...', 'numAcceptedOffers:', numAcceptedOffers, 'itemOfferedTypeOfs:', itemOfferedTypeOfs, 'serialNumbers:', serialNumbers, 'offeredThroughIdentifier:', offeredThroughIdentifier);
+            debug('onAssetTransactionStatusChanged paymentDue2Processing: calling onOrderProcessing...', 'numAcceptedOffers:', numAcceptedOffers, 
+            // 'itemOfferedTypeOfs:', itemOfferedTypeOfs,
+            'serialNumbers:', serialNumbers, 'offeredThroughIdentifier:', offeredThroughIdentifier);
             await (0, onOrderStatusChanged_1.onOrderProcessing)({
                 order: {
                     ...order,
                     // acceptedOffers,
                     numAcceptedOffers,
-                    itemOfferedTypeOf: itemOfferedTypeOfs[0], // 1つしかない前提
+                    // itemOfferedTypeOf: itemOfferedTypeOfs[0], // 1つしかない前提
+                    itemOfferedTypeOf: factory_1.factory.reservationType.EventReservation, // EventReservationしか存在しないので固定でよし
                     serialNumbers,
                     offeredThroughIdentifier,
                     orderStatus: factory_1.factory.orderStatus.OrderProcessing // 強制的にOrderProcessingとして処理する

package/lib/chevre/service/order/onAssetTransactionStatusChanged/processing2inTransit.d.ts

@@ -1,7 +1,7 @@
 import type { OrderRepo } from '../../../repo/order';
 import type { TaskRepo } from '../../../repo/task';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 declare function processing2inTransit(params: {
     project: {
         id: string;

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

@@ -7,7 +7,7 @@ import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import { paymentDue2Processing } from './onAssetTransactionStatusChanged/paymentDue2Processing';
 import { processing2inTransit } from './onAssetTransactionStatusChanged/processing2inTransit';
 import { factory } from '../../factory';
-import { Settings } from '../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../repo/setting/integration';
 interface IOnAssetTransactionStatusChangedRepos {
     acceptedOffer: AcceptedOfferRepo;
     assetTransaction: AssetTransactionRepo;

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

@@ -9,7 +9,6 @@ exports.onOrderDelivered = onOrderDelivered;
  */
 const debug_1 = __importDefault(require("debug"));
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 const factory_2 = require("./onOrderDelivered/factory");
 const debug = (0, debug_1.default)('chevre-domain:service:order');
 function onOrderDelivered(params) {

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially/factory.d.ts

@@ -5,7 +5,12 @@ type IInTransitOrder = Pick<factory.order.IOrder, 'confirmationNumber' | 'projec
         limit: number;
         page: number;
     };
-    deliveredAcceptedOffers: factory.order.IAcceptedOffer[];
+    deliveredAcceptedOffers: (Omit<factory.order.IAcceptedOffer, 'priceSpecification'> & {
+        /**
+         * COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
+         */
+        priceSpecification?: factory.order.ITicketPriceSpecification;
+    })[];
     orderStatus: factory.orderStatus.OrderInTransit;
 };
 declare function createInformTasks(params: {

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

@@ -9,7 +9,6 @@ exports.onOrderDeliveredPartially = onOrderDeliveredPartially;
  */
 const debug_1 = __importDefault(require("debug"));
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 const factory_2 = require("./onOrderDeliveredPartially/factory");
 const debug = (0, debug_1.default)('chevre-domain:service:order');
 function onOrderDeliveredPartially(params) {

package/lib/chevre/service/order/onOrderStatusChanged/onOrderInTransit.d.ts

@@ -1,7 +1,7 @@
 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';
 interface IOnOrderInTransitRepos {
     task: TaskRepo;
     placeOrder: PlaceOrderRepo;

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

@@ -48,7 +48,7 @@ function createSendOrderTaskIfNotExist(params) {
         const sendOrderObject = {
             ...simpleOrder,
             acceptedOffers: {
-                limit: settings.deliverOrderLimit,
+                limit: (await settings.getByKey('deliverOrderLimit')),
                 page: 1 // page1から配送
             }
         };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.d.ts

@@ -1,7 +1,7 @@
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import { IExternalOrder, IProcessingOrder } from './onOrderProcessing/factory';
 import { processOrder } from './onOrderProcessing/processOrder';
 type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'typeOf' | 'potentialActions'>;

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.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.d.ts

@@ -9,7 +9,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';
 interface IPlaceOrderRepos {
     acceptedOffer: AcceptedOfferRepo;
     accountingReport: AccountingReportRepo;

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));
@@ -105,7 +101,10 @@ function sendOrder(params) {
                     $slice: [offerIndexBase, limit],
                     orderNumber: { $eq: order.orderNumber },
                     project: { id: { $eq: order.project.id } }
-                });
+                }, {
+                    useItemOfferedByReserve: true // 2026-05-25~
+                } // 予約取引参照(2026-05-18~)
+                );
                 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);

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/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)