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

package/README.md

@@ -1,8 +1,6 @@
 # Chevre Domain Library for Node.js
 
 [![npm (scoped)](https://img.shields.io/npm/v/@chevre/domain.svg)](https://www.npmjs.com/package/@chevre/domain)
-[![CircleCI](https://circleci.com/gh/chevre-jp/domain.svg?style=svg)](https://circleci.com/gh/chevre-jp/domain)
-[![Coverage Status](https://coveralls.io/repos/github/chevre-jp/domain/badge.svg?branch=master)](https://coveralls.io/github/chevre-jp/domain?branch=master)
 [![Known Vulnerabilities](https://snyk.io/test/github/chevre-jp/domain/badge.svg)](https://snyk.io/test/github/chevre-jp/domain)
 [![npm](https://img.shields.io/npm/dm/@chevre/domain.svg)](https://nodei.co/npm/@chevre/domain/)
 

package/lib/chevre/emailMessageBuilder.js

@@ -93,9 +93,7 @@ async function createEmailMessageAbout(params) {
     }
     return about;
 }
-function createEmailMessageSender(params, 
-// settings: Settings
-setting) {
+function createEmailMessageSender(params, setting) {
     if (typeof setting.defaultSenderEmail !== 'string') {
         throw new factory_1.factory.errors.NotFound('setting.defaultSenderEmail');
     }
@@ -113,9 +111,7 @@ setting) {
 /**
  * 注文配送メッセージを作成する
  */
-async function createSendOrderMessage(params, 
-// settings: Settings
-setting) {
+async function createSendOrderMessage(params, setting) {
     const emailMessageText = await createEmailMessageText({
         order: params.order,
         email: params.email,
@@ -169,9 +165,7 @@ setting) {
 /**
  * 注文返品メッセージを作成する
  */
-async function createReturnOrderMessage(params, 
-// settings: Settings
-setting) {
+async function createReturnOrderMessage(params, setting) {
     const emailMessageText = await createEmailMessageText({
         order: params.order,
         email: params.email,
@@ -225,9 +219,7 @@ setting) {
 /**
  * 返金メッセージを作成する
  */
-async function createRefundMessage(params, 
-// settings: Settings
-setting) {
+async function createRefundMessage(params, setting) {
     const emailMessageText = await createEmailMessageText({
         order: params.order,
         email: params.email

package/lib/chevre/index.d.ts

@@ -1,4 +1,3 @@
-import { credentials } from './credentials';
 import * as errorHandler from './errorHandler';
 import * as eventEmitter from './eventEmitter';
 import { factory } from './factory';
@@ -6,4 +5,4 @@ import * as repository from './repository';
 import * as service from './service';
 import * as settings from './settings';
 import * as taskSettings from './taskSettings';
-export { credentials, errorHandler, eventEmitter, factory, repository, service, settings, taskSettings };
+export { errorHandler, eventEmitter, factory, repository, service, settings, taskSettings };

package/lib/chevre/index.js

@@ -33,9 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.taskSettings = exports.settings = exports.service = exports.repository = exports.factory = exports.eventEmitter = exports.errorHandler = exports.credentials = void 0;
-const credentials_1 = require("./credentials");
-Object.defineProperty(exports, "credentials", { enumerable: true, get: function () { return credentials_1.credentials; } });
+exports.taskSettings = exports.settings = exports.service = exports.repository = exports.factory = exports.eventEmitter = exports.errorHandler = void 0;
 const errorHandler = __importStar(require("./errorHandler"));
 exports.errorHandler = errorHandler;
 const eventEmitter = __importStar(require("./eventEmitter"));

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

@@ -1,12 +1,10 @@
 import type { Connection } from 'mongoose';
 import { factory } from '../factory';
+import { AcceptedOfferInReserveRepo, IAcceptedOffer } from './acceptedOfferInReserve';
 type IProjection4searchWithUnwoundAcceptedOffers = {
     [key in keyof factory.order.IOrder]?: 1;
-} & {
-    _id?: 0 | 1;
-};
-type IDistinctField = 'acceptedOffers.id' | 'acceptedOffers.itemOffered.reservationNumber' | 'acceptedOffers.itemOffered.reservationFor.id' | 'acceptedOffers.itemOffered.issuedThrough.id' | 'acceptedOffers.itemOffered.typeOf' | 'acceptedOffers.serialNumber' | 'acceptedOffers.offeredThrough.identifier' | 'acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode' | 'acceptedOffers.itemOffered.object.pendingTransaction.transactionNumber';
-type IAcceptedOffer = factory.order.IAcceptedOffer;
+} & {};
+type IDistinctField = 'acceptedOffers.id' | 'acceptedOffers.itemOffered.reservationNumber' | 'acceptedOffers.itemOffered.reservationFor.id' | 'acceptedOffers.serialNumber' | 'acceptedOffers.offeredThrough.identifier' | 'acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode';
 interface ISearchSlicedAcceptedOffersResult {
     acceptedOffers: IAcceptedOffer[];
     numAcceptedOffers: number;
@@ -14,15 +12,18 @@ interface ISearchSlicedAcceptedOffersResult {
 /**
  * 注文オファーリポジトリ
  */
-export declare class AcceptedOfferRepo {
+export declare class AcceptedOfferRepo extends AcceptedOfferInReserveRepo {
     private readonly orderModel;
     constructor(connection: Connection);
     /**
      * オファー展開の注文検索
      */
     searchWithUnwoundAcceptedOffers(params: factory.order.ISearchConditions, projection: IProjection4searchWithUnwoundAcceptedOffers, options: {
-        useLimitAfterSkip: boolean;
-    }): Promise<factory.order.IOrder[]>;
+        useItemOfferedByReserve: boolean;
+    }): Promise<(factory.order.IOrder & {
+        acceptedOffers: [IAcceptedOffer];
+        _id?: never;
+    })[]>;
     aggreateOwnershipInfosByOrder(filter: {
         orderNumber: {
             $eq: string;
@@ -36,7 +37,6 @@ export declare class AcceptedOfferRepo {
     searchAcceptedOffersByOrderNumber(filter: {
         limit?: number;
         page?: number;
-        $slice?: [number, number];
         orderNumber: {
             $eq: string;
         };
@@ -53,9 +53,6 @@ export declare class AcceptedOfferRepo {
                 id?: {
                     $eq?: string;
                 };
-                typeOf?: {
-                    $in?: factory.order.IItemOffered['typeOf'][];
-                };
                 reservationFor?: {
                     id?: {
                         $in?: string[];
@@ -70,7 +67,9 @@ export declare class AcceptedOfferRepo {
                 };
             };
         };
-    }, inclusion?: (keyof IAcceptedOffer)[]): Promise<IAcceptedOffer[]>;
+    }, options: {
+        useItemOfferedByReserve: boolean;
+    }): Promise<IAcceptedOffer[]>;
     /**
      * 注文オファーをsliceして検索する(2024-01-10~)
      */
@@ -84,6 +83,8 @@ export declare class AcceptedOfferRepo {
                 $eq: string;
             };
         };
+    }, options: {
+        useItemOfferedByReserve: boolean;
     }): Promise<ISearchSlicedAcceptedOffersResult>;
     countByOrderNumber(filter: {
         orderNumber: {

package/lib/chevre/repo/acceptedOffer.js

@@ -3,23 +3,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AcceptedOfferRepo = void 0;
 const factory_1 = require("../factory");
 const order_1 = require("./mongoose/schemas/order");
+const acceptedOfferInReserve_1 = require("./acceptedOfferInReserve");
 const order_2 = require("./order");
 const settings_1 = require("../settings");
+// const debug = createDebug('chevre-domain:repo:acceptedOffer');
 /**
  * 注文オファーリポジトリ
  */
-class AcceptedOfferRepo {
+class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveRepo {
     orderModel;
     constructor(connection) {
+        super(connection);
         this.orderModel = connection.model(order_1.modelName, (0, order_1.createSchema)());
     }
     /**
      * オファー展開の注文検索
      */
     async searchWithUnwoundAcceptedOffers(params, projection, options) {
-        const { useLimitAfterSkip } = options;
         const conditions = order_2.OrderRepo.CREATE_MONGO_CONDITIONS(params);
         const aggregate = this.orderModel.aggregate();
+        // unwind->matchでは遅い
+        // match->unwind->matchにする(2026-05-08~)
+        conditions.forEach((c) => {
+            aggregate.match(c);
+        });
         // pipelineの順序に注意
         // @see https://docs.mongodb.com/manual/reference/operator/aggregation/sort/
         /* istanbul ignore else */
@@ -32,35 +39,75 @@ class AcceptedOfferRepo {
         });
         aggregate.project({
             ...projection,
+            _id: 0, // hide _id(2026-05-16~)
             acceptedOffers: ['$acceptedOffers']
         });
         if (typeof params.limit === 'number' && params.limit > 0) {
             const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
             // support skip -> limit(2025-07-09~)
-            if (useLimitAfterSkip) {
-                aggregate.skip(params.limit * (page - 1))
-                    .limit(params.limit);
-            }
-            else {
-                aggregate.limit(params.limit * page)
-                    .skip(params.limit * (page - 1));
-            }
+            aggregate.skip(params.limit * (page - 1))
+                .limit(params.limit);
         }
-        return aggregate
-            // .allowDiskUse(true) // false化(2023-11-30~)
+        const orders = await aggregate
             .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
             .exec();
+        // 予約取引を参照(2026-05-17~)
+        const offeredThroughIdentifier = orders.at(0)?.acceptedOffers[0].offeredThrough?.identifier;
+        const useReserveTransaction = offeredThroughIdentifier !== factory_1.factory.service.webAPI.Identifier.COA; // COAでは予約取引を参照しない
+        const { useItemOfferedByReserve } = options;
+        if (useReserveTransaction) {
+            const reservationNumbers = [...new Set(orders.map((order) => String(order.acceptedOffers[0].serialNumber)))];
+            let acceptedOffersByReserveTransaction = [];
+            if (reservationNumbers.length > 0) {
+                acceptedOffersByReserveTransaction = await this.findAcceptedOffersByReservationNumbers({ reservationNumbers });
+            }
+            return orders.map((order) => {
+                const acceptedOffer = order.acceptedOffers[0];
+                const acceptedOfferByReserveTransaction = acceptedOffersByReserveTransaction.find(((offer) => offer.itemOffered.id === acceptedOffer.itemOffered.id));
+                // 予約は必ず存在するはず
+                if (acceptedOfferByReserveTransaction === undefined) {
+                    console.error('repo:acceptedOffer: searchWithUnwoundAcceptedOffers: acceptedOfferByReserveTransaction: undefined!!!', acceptedOffer.itemOffered.id);
+                }
+                const priceSpecByReserveTransaction = acceptedOfferByReserveTransaction?.priceSpecification;
+                // 予約の価格は必ず存在するはず
+                if (priceSpecByReserveTransaction === undefined) {
+                    console.error('repo:acceptedOffer: searchWithUnwoundAcceptedOffers: priceSpecByReserveTransaction: undefined!!!', acceptedOffer.itemOffered.id);
+                }
+                const itemOfferedByReserve = acceptedOfferByReserveTransaction?.itemOffered;
+                // itemOfferedByReserveは必ず存在するはず
+                if (itemOfferedByReserve === undefined) {
+                    console.error('repo:acceptedOffer: searchWithUnwoundAcceptedOffers: itemOfferedByReserve: undefined!!!', acceptedOffer.itemOffered.id);
+                }
+                const { priceSpecification: _originalPriceSpec, // 注文ドキュメントのpriceSpecificationはもう採用しない(2026-05-21~)
+                itemOffered, ...acceptedOfferWithoutPrice } = acceptedOffer;
+                return {
+                    ...order,
+                    acceptedOffers: [
+                        {
+                            ...acceptedOfferWithoutPrice,
+                            ...((priceSpecByReserveTransaction !== undefined) && { priceSpecification: priceSpecByReserveTransaction }), // 予約取引参照の値で上書き
+                            ...(useItemOfferedByReserve && itemOfferedByReserve !== undefined)
+                                ? { itemOffered: itemOfferedByReserve } // 予約取引参照の値で上書き(2026-05-25~)
+                                : { itemOffered }
+                        }
+                    ]
+                };
+            });
+        }
+        else {
+            return orders;
+        }
     }
     async aggreateOwnershipInfosByOrder(filter) {
         const aggregate = this.orderModel.aggregate([
+            { $match: { orderNumber: { $eq: filter.orderNumber.$eq } } },
+            { $match: { typeOf: { $eq: factory_1.factory.order.OrderType.Order } } },
             {
                 $unwind: {
                     path: '$acceptedOffers',
                     includeArrayIndex: 'acceptedOfferIndex'
                 }
             },
-            { $match: { orderNumber: { $eq: filter.orderNumber.$eq } } },
-            { $match: { typeOf: { $eq: factory_1.factory.order.OrderType.Order } } },
             {
                 $project: {
                     _id: 0,
@@ -81,22 +128,35 @@ class AcceptedOfferRepo {
     /**
      * 注文オファーを展開して検索する
      */
-    async searchAcceptedOffersByOrderNumber(filter, inclusion) {
-        const matchStages = [
+    async searchAcceptedOffersByOrderNumber(filter, 
+    // inclusion?: (keyof IAcceptedOffer)[], // 分かりにくいので廃止(2026-05-17~)
+    options) {
+        /**
+         * unwind前に1ドキュメントを特定するためのstage
+         */
+        const matchStagesOneDocument = [
             { $match: { orderNumber: { $eq: filter.orderNumber.$eq } } },
             { $match: { 'project.id': { $eq: filter.project.id.$eq } } },
             { $match: { typeOf: { $eq: factory_1.factory.order.OrderType.Order } } }
         ];
+        /**
+         * unwind後にオファー内容で絞るstage
+         */
+        const matchStages = [
+        // { $match: { orderNumber: { $eq: filter.orderNumber.$eq } } }, // matchStagesOneDocumentへ移行(2026-05-12~)
+        // { $match: { 'project.id': { $eq: filter.project.id.$eq } } }, // matchStagesOneDocumentへ移行(2026-05-12~)
+        // { $match: { typeOf: { $eq: factory.order.OrderType.Order } } } // matchStagesOneDocumentへ移行(2026-05-12~)
+        ];
         const itemOfferedIdEq = filter.acceptedOffers?.itemOffered?.id?.$eq;
         if (typeof itemOfferedIdEq === 'string') {
             matchStages.push({ $match: { 'acceptedOffers.itemOffered.id': { $exists: true, $eq: itemOfferedIdEq } } });
         }
-        const itemOfferedTypeOfIn = filter.acceptedOffers?.itemOffered?.typeOf?.$in;
-        if (Array.isArray(itemOfferedTypeOfIn)) {
-            matchStages.push({
-                $match: { 'acceptedOffers.itemOffered.typeOf': { $exists: true, $in: itemOfferedTypeOfIn } }
-            });
-        }
+        // const itemOfferedTypeOfIn = filter.acceptedOffers?.itemOffered?.typeOf?.$in;
+        // if (Array.isArray(itemOfferedTypeOfIn)) {
+        //     matchStages.push({
+        //         $match: { 'acceptedOffers.itemOffered.typeOf': { $exists: true, $in: itemOfferedTypeOfIn } }
+        //     });
+        // }
         const resevationForIdIn = filter.acceptedOffers?.itemOffered?.reservationFor?.id?.$in;
         if (Array.isArray(resevationForIdIn)) {
             matchStages.push({
@@ -114,9 +174,7 @@ class AcceptedOfferRepo {
             });
         }
         const aggregate = this.orderModel.aggregate([
-            // if (typeof params.sort?.orderDate === 'number') {
-            //     aggregate.sort({ orderDate: params.sort.orderDate });
-            // }
+            ...matchStagesOneDocument,
             {
                 $unwind: {
                     path: '$acceptedOffers'
@@ -125,40 +183,54 @@ class AcceptedOfferRepo {
             },
             ...matchStages
         ]);
-        if (Array.isArray(inclusion) && inclusion.length > 0) {
-            const specifiedProjection = {
-                _id: 0
-            };
-            inclusion.forEach((key) => {
-                specifiedProjection[key] = `$acceptedOffers.${key}`;
-            });
-            aggregate.project(specifiedProjection);
-        }
-        else {
-            aggregate.project({
-                _id: 0,
-                itemOffered: '$acceptedOffers.itemOffered',
-                priceSpecification: '$acceptedOffers.priceSpecification',
-                typeOf: '$acceptedOffers.typeOf',
-                id: '$acceptedOffers.id',
-                offeredThrough: '$acceptedOffers.offeredThrough',
-                name: '$acceptedOffers.name',
-                serialNumber: '$acceptedOffers.serialNumber'
-            });
-        }
+        // if (Array.isArray(inclusion) && inclusion.length > 0) {
+        //     const specifiedProjection: Record<string, string | 0> = {
+        //         _id: 0
+        //     };
+        //     inclusion.forEach((key) => {
+        //         specifiedProjection[key] = `$acceptedOffers.${key}`;
+        //     });
+        //     aggregate.project(specifiedProjection);
+        // } else {
+        //     aggregate.project({
+        //         _id: 0,
+        //         itemOffered: '$acceptedOffers.itemOffered',
+        //         priceSpecification: '$acceptedOffers.priceSpecification',
+        //         typeOf: '$acceptedOffers.typeOf',
+        //         id: '$acceptedOffers.id',
+        //         offeredThrough: '$acceptedOffers.offeredThrough',
+        //         name: '$acceptedOffers.name',
+        //         serialNumber: '$acceptedOffers.serialNumber'
+        //     });
+        // }
+        aggregate.project({
+            _id: 0,
+            itemOffered: '$acceptedOffers.itemOffered',
+            priceSpecification: '$acceptedOffers.priceSpecification',
+            typeOf: '$acceptedOffers.typeOf',
+            id: '$acceptedOffers.id',
+            offeredThrough: '$acceptedOffers.offeredThrough',
+            name: '$acceptedOffers.name',
+            serialNumber: '$acceptedOffers.serialNumber'
+        });
         if (typeof filter.limit === 'number' && filter.limit > 0) {
             const page = (typeof filter.page === 'number' && filter.page > 0) ? filter.page : 1;
-            aggregate.limit(filter.limit * page)
-                .skip(filter.limit * (page - 1));
+            // support skip -> limit(2026-05-12~)
+            // aggregate.limit(filter.limit * page)
+            //     .skip(filter.limit * (page - 1));
+            aggregate.skip(filter.limit * (page - 1))
+                .limit(filter.limit);
         }
-        return aggregate
+        const acceptedOffers = await aggregate
             .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
             .exec();
+        // 予約取引を参照(2026-05-18~)
+        return this.addAcceptedOffersDetails(acceptedOffers, options);
     }
     /**
      * 注文オファーをsliceして検索する(2024-01-10~)
      */
-    async searchSlicedAcceptedOffersByOrderNumber(filter) {
+    async searchSlicedAcceptedOffersByOrderNumber(filter, options) {
         const aggregate = this.orderModel.aggregate([
             { $match: { orderNumber: { $eq: filter.orderNumber.$eq } } },
             { $match: { 'project.id': { $eq: filter.project.id.$eq } } },
@@ -177,7 +249,12 @@ class AcceptedOfferRepo {
         if (result === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.order.OrderType.Order);
         }
-        return result;
+        const { acceptedOffers, numAcceptedOffers } = result;
+        // 予約取引を参照(2026-05-18~)
+        return {
+            acceptedOffers: await this.addAcceptedOffersDetails(acceptedOffers, options),
+            numAcceptedOffers
+        };
     }
     async countByOrderNumber(filter) {
         const aggregate = this.orderModel.aggregate([

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

@@ -0,0 +1,32 @@
+import type { Connection } from 'mongoose';
+import { factory } from '../factory';
+import { IModel } from './mongoose/schemas/assetTransaction';
+import { IAcceptedOfferByReserveTransaction } from './factory/acceptedOffer/reserveTransaction2itemOffered';
+export type IAcceptedOffer = Omit<factory.order.IAcceptedOffer, 'priceSpecification'> & {
+    /**
+     * COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
+     */
+    priceSpecification?: factory.order.ITicketPriceSpecification;
+};
+/**
+ * 予約取引に依存した注文オファーリポジトリ
+ */
+export declare class AcceptedOfferInReserveRepo {
+    protected readonly reserveTransactionModel: IModel;
+    constructor(connection: Connection);
+    /**
+     * 予約番号指定で予約取引から注文オファーを生成する
+     */
+    protected findAcceptedOffersByReservationNumbers(params: {
+        /**
+         * 予約番号リスト
+         */
+        reservationNumbers: string[];
+    }): Promise<IAcceptedOfferByReserveTransaction[]>;
+    /**
+     * 予約取引からオファー詳細情報を付加する
+     */
+    protected addAcceptedOffersDetails(acceptedOffers: IAcceptedOffer[], options: {
+        useItemOfferedByReserve: boolean;
+    }): Promise<IAcceptedOffer[]>;
+}

package/lib/chevre/repo/acceptedOfferInReserve.js

@@ -0,0 +1,84 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AcceptedOfferInReserveRepo = void 0;
+const debug_1 = __importDefault(require("debug"));
+const factory_1 = require("../factory");
+const assetTransaction_1 = require("./mongoose/schemas/assetTransaction");
+const reserveTransaction2itemOffered_1 = require("./factory/acceptedOffer/reserveTransaction2itemOffered");
+const debug = (0, debug_1.default)('chevre-domain:repo:acceptedOffer');
+/**
+ * 予約取引に依存した注文オファーリポジトリ
+ */
+class AcceptedOfferInReserveRepo {
+    reserveTransactionModel;
+    constructor(connection) {
+        this.reserveTransactionModel = connection.model(assetTransaction_1.modelName, (0, assetTransaction_1.createSchema)());
+    }
+    /**
+     * 予約番号指定で予約取引から注文オファーを生成する
+     */
+    async findAcceptedOffersByReservationNumbers(params) {
+        const { reservationNumbers } = params;
+        if (!Array.isArray(reservationNumbers) || reservationNumbers.length === 0) {
+            throw new factory_1.factory.errors.ArgumentNull('reservationNumbers');
+        }
+        const reserveTransactions = await this.reserveTransactionModel.find({
+            transactionNumber: { $in: reservationNumbers },
+            typeOf: { $eq: factory_1.factory.assetTransactionType.Reserve }
+        }, {
+            object: 1
+        })
+            .lean()
+            .exec();
+        debug('findSubReservationsByReservationNumbers: reservationNumbers.length === reserveTransactions.length?', reservationNumbers.length === reserveTransactions.length);
+        return reserveTransactions.reduce((a, b) => {
+            return [...a, ...(0, reserveTransaction2itemOffered_1.reserveTransaction2itemOffered)(b)];
+        }, []);
+    }
+    /**
+     * 予約取引からオファー詳細情報を付加する
+     */
+    async addAcceptedOffersDetails(acceptedOffers, options) {
+        const offeredThroughIdentifier = acceptedOffers.at(0)?.offeredThrough?.identifier;
+        if (offeredThroughIdentifier === factory_1.factory.service.webAPI.Identifier.COA) {
+            // COAでは予約取引を参照しない
+            return acceptedOffers;
+        }
+        const reservationNumbers = [...new Set(acceptedOffers.map((acceptedOffer) => String(acceptedOffer.serialNumber)))];
+        let acceptedOffersByReserveTransaction = [];
+        if (reservationNumbers.length > 0) {
+            acceptedOffersByReserveTransaction = await this.findAcceptedOffersByReservationNumbers({ reservationNumbers });
+        }
+        const { useItemOfferedByReserve } = options;
+        return acceptedOffers.map((acceptedOffer) => {
+            const acceptedOfferByReserveTransaction = acceptedOffersByReserveTransaction.find(((offer) => offer.itemOffered.id === acceptedOffer.itemOffered.id));
+            // 予約は必ず存在するはず
+            if (acceptedOfferByReserveTransaction === undefined) {
+                console.error('repo:acceptedOffer: addAcceptedOffersDetails: acceptedOfferByReserveTransaction: undefined!!!', acceptedOffer.itemOffered.id);
+            }
+            const priceSpecByReserveTransaction = acceptedOfferByReserveTransaction?.priceSpecification;
+            // 予約の価格は必ず存在するはず
+            if (priceSpecByReserveTransaction === undefined) {
+                console.error('repo:acceptedOffer: addAcceptedOffersDetails: priceSpecByReserveTransaction: undefined!!!', acceptedOffer.itemOffered.id);
+            }
+            const itemOfferedByReserve = acceptedOfferByReserveTransaction?.itemOffered;
+            // itemOfferedByReserveは必ず存在するはず
+            if (itemOfferedByReserve === undefined) {
+                console.error('repo:acceptedOffer: addAcceptedOffersDetails: itemOfferedByReserve: undefined!!!', acceptedOffer.itemOffered.id);
+            }
+            const { priceSpecification: _originalPriceSpec, // 注文ドキュメントのpriceSpecificationはもう採用しない(2026-05-21~)
+            itemOffered, ...acceptedOfferWithoutPrice } = acceptedOffer;
+            return {
+                ...acceptedOfferWithoutPrice,
+                ...((priceSpecByReserveTransaction !== undefined) && { priceSpecification: priceSpecByReserveTransaction }), // 予約取引参照の値で上書き
+                ...(useItemOfferedByReserve && itemOfferedByReserve !== undefined)
+                    ? { itemOffered: itemOfferedByReserve } // 予約取引参照の値で上書き
+                    : { itemOffered }
+            };
+        });
+    }
+}
+exports.AcceptedOfferInReserveRepo = AcceptedOfferInReserveRepo;

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

@@ -2,6 +2,11 @@ import type { Connection, PipelineStage } from 'mongoose';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/accountingReport';
 type IMatchStage = PipelineStage.Match;
+type IReportAsFindResult = Pick<factory.report.accountingReport.IReport, 'mainEntity'> & {
+    isPartOf: {
+        mainEntity: factory.report.accountingReport.IOrderAsMainEntity;
+    };
+};
 /**
  * 経理レポートリポジトリ
  */
@@ -35,11 +40,13 @@ export declare class AccountingReportRepo {
         };
         hasPart: factory.report.accountingReport.IChildReport;
     }): Promise<void>;
-    search(params: factory.report.accountingReport.ISearchConditions & {
+    findAccountingReports(params: factory.report.accountingReport.ISearchConditions & {
         seller?: {
             id?: string;
         };
-    }): Promise<any[]>;
+        limit: number;
+        page: number;
+    }): Promise<IReportAsFindResult[]>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;

package/lib/chevre/repo/accountingReport.js

@@ -4,7 +4,6 @@ exports.AccountingReportRepo = void 0;
 const errorHandler_1 = require("../errorHandler");
 const factory_1 = require("../factory");
 const accountingReport_1 = require("./mongoose/schemas/accountingReport");
-const DEFAULT_SEARCH_LIMIT = 100;
 /**
  * 経理レポートリポジトリ
  */
@@ -49,30 +48,6 @@ class AccountingReportRepo {
                 $match: { 'mainEntity.orderDate': { $lte: orderDateLte } }
             });
         }
-        // discontinue(2026-05-01~)
-        // const reservationForStartDateGte = params.order?.acceptedOffers?.itemOffered?.reservationFor?.startDate?.$gte;
-        // if (reservationForStartDateGte instanceof Date) {
-        //     matchStages.push({
-        //         $match: {
-        //             'mainEntity.acceptedOffers.itemOffered.reservationFor.startDate': {
-        //                 $exists: true,
-        //                 $gte: reservationForStartDateGte
-        //             }
-        //         }
-        //     });
-        // }
-        // discontinue(2026-05-01~)
-        // const reservationForStartDateLte = params.order?.acceptedOffers?.itemOffered?.reservationFor?.startDate?.$lte;
-        // if (reservationForStartDateLte instanceof Date) {
-        //     matchStages.push({
-        //         $match: {
-        //             'mainEntity.acceptedOffers.itemOffered.reservationFor.startDate': {
-        //                 $exists: true,
-        //                 $lte: reservationForStartDateLte
-        //             }
-        //         }
-        //     });
-        // }
         return matchStages;
     }
     async syncMainEntity(params) {
@@ -137,18 +112,16 @@ class AccountingReportRepo {
             throw new factory_1.factory.errors.NotFound(this.accountingReportModel.modelName);
         }
     }
-    async search(params) {
-        const limit = (typeof params.limit === 'number') ? Math.min(params.limit, DEFAULT_SEARCH_LIMIT) : DEFAULT_SEARCH_LIMIT;
-        const page = (typeof params.page === 'number') ? Math.max(params.page, 1) : 1;
-        const unwindAcceptedOffers = params.$unwindAcceptedOffers === '1';
+    async findAccountingReports(params) {
+        const { limit, page } = params;
         const matchStages = AccountingReportRepo.CREATE_MONGO_CONDITIONS(params);
         const aggregate = this.accountingReportModel.aggregate([
+            ...matchStages,
             // pipelineの順序に注意
             // @see https://docs.mongodb.com/manual/reference/operator/aggregation/sort/
             { $sort: { 'mainEntity.orderDate': factory_1.factory.sortType.Descending } },
             { $unwind: '$hasPart' },
-            ...(unwindAcceptedOffers) ? [{ $unwind: '$mainEntity.acceptedOffers' }] : [],
-            ...matchStages,
+            // hasPart内に対する検索条件は存在しないため、unwind後のmatchは不要
             {
                 $project: {
                     _id: 0,
@@ -159,10 +132,9 @@ class AccountingReportRepo {
                 }
             }
         ]);
-        return aggregate.allowDiskUse(true)
-            .limit(limit * page)
+        return aggregate
             .skip(limit * (page - 1))
-            // .setOptions({ maxTimeMS: 10000 })
+            .limit(limit)
             .exec();
     }
     async unsetUnnecessaryFields(params) {

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

@@ -30,7 +30,7 @@ export type IRecipeAsActionAttributes<T extends factory.recipe.RecipeCategory> =
 export type IMinimizedPurchaseNumberAuthResult = Pick<factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthResult, 'mkknmiNumSum' | 'resultInfo' | 'ykknmiNumSum'> & {
     knyknrNoInfoOut: Omit<factory.action.check.paymentMethod.movieTicket.IPurchaseNumberInfo, 'ykknInfo' | 'mkknInfo'>[] | null;
 };
-export type IKeyOfProjection = keyof IAction<factory.actionType> | keyof IAction<factory.actionType.AuthorizeAction> | keyof IAction<factory.actionType.MoneyTransfer> | keyof IAction<factory.actionType.ReplaceAction> | 'identifier';
+export type IKeyOfProjection = keyof IAction<factory.actionType> | keyof IAction<factory.actionType.AuthorizeAction> | keyof IAction<factory.actionType.ReplaceAction> | 'identifier';
 export declare const AVAILABLE_PROJECT_FIELDS: IKeyOfProjection[];
 /**
  * アクション状態管理リポジトリ