@chevre/domain 24.1.0-alpha.20 → 24.1.0-alpha.21

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

@@ -20,6 +20,10 @@ export declare class AcceptedOfferRepo {
      * 予約番号指定で予約取引からitemOfferedを生成する
      */
     private findSubReservationsByReservationNumbers;
+    /**
+     * 予約取引からオファー詳細情報を付加する
+     */
+    private addAcceptedOffersDetails;
     /**
      * オファー展開の注文検索
      */
@@ -73,7 +77,7 @@ export declare class AcceptedOfferRepo {
                 };
             };
         };
-    }, options?: {
+    }, options: {
         useReserveTransaction: boolean;
     }): Promise<IAcceptedOffer[]>;
     /**
@@ -89,6 +93,8 @@ export declare class AcceptedOfferRepo {
                 $eq: string;
             };
         };
+    }, options: {
+        useReserveTransaction: boolean;
     }): Promise<ISearchSlicedAcceptedOffersResult>;
     countByOrderNumber(filter: {
         orderNumber: {

package/lib/chevre/repo/acceptedOffer.js

@@ -1,12 +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.AcceptedOfferRepo = void 0;
+const debug_1 = __importDefault(require("debug"));
 const factory_1 = require("../factory");
 const order_1 = require("./mongoose/schemas/order");
 const assetTransaction_1 = require("./mongoose/schemas/assetTransaction");
 const reserveTransaction2itemOffered_1 = require("./factory/acceptedOffer/reserveTransaction2itemOffered");
 const order_2 = require("./order");
 const settings_1 = require("../settings");
+const debug = (0, debug_1.default)('chevre-domain:repo:acceptedOffer');
 /**
  * 注文オファーリポジトリ
  */
@@ -37,6 +42,42 @@ class AcceptedOfferRepo {
             return [...a, ...(0, reserveTransaction2itemOffered_1.reserveTransaction2itemOffered)(b)];
         }, []);
     }
+    /**
+     * 予約取引からオファー詳細情報を付加する
+     */
+    async addAcceptedOffersDetails(acceptedOffers) {
+        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)))];
+        debug('addAcceptedOffersDetails:', reservationNumbers.length, 'reservationNumbers found.');
+        let subReservations = [];
+        if (reservationNumbers.length > 0) {
+            subReservations = await this.findSubReservationsByReservationNumbers({ reservationNumbers });
+        }
+        debug('addAcceptedOffersDetails: reservationNumbers.length === subReservations.length?', reservationNumbers.length === subReservations.length);
+        return acceptedOffers.map((acceptedOffer) => {
+            const subReservation = subReservations.find(((reservation) => reservation.id === acceptedOffer.itemOffered.id));
+            // 予約は必ず存在するはず
+            if (subReservation === undefined) {
+                console.error('addAcceptedOffersDetails: subReservation: undefined!!!', acceptedOffer.itemOffered.id);
+            }
+            const priceSpecByReserveTransaction = subReservation?.price;
+            // 予約の価格は必ず存在するはず
+            if (priceSpecByReserveTransaction === undefined) {
+                console.error('addAcceptedOffersDetails: priceSpecByReserveTransaction: undefined!!!', acceptedOffer.itemOffered.id);
+            }
+            const { priceSpecification, ...acceptedOfferWithoutPrice } = acceptedOffer;
+            return {
+                ...acceptedOfferWithoutPrice,
+                ...(priceSpecByReserveTransaction !== undefined)
+                    ? { priceSpecification: priceSpecByReserveTransaction } // 予約取引参照の値で上書き
+                    : { priceSpecification } // 万が一予約取引に存在しなければ注文ドキュメントの値を採用
+            };
+        });
+    }
     /**
      * オファー展開の注文検索
      */
@@ -81,12 +122,12 @@ class AcceptedOfferRepo {
             && offeredThroughIdentifier !== factory_1.factory.service.webAPI.Identifier.COA; // COAでは予約取引を参照しない
         if (useReserveTransaction) {
             const reservationNumbers = [...new Set(orders.map((order) => String(order.acceptedOffers[0].serialNumber)))];
-            // console.log(reservationNumbers.length, 'reservationNumbers found')
+            debug('searchWithUnwoundAcceptedOffers:', reservationNumbers.length, 'reservationNumbers found.');
             let subReservations = [];
             if (reservationNumbers.length > 0) {
                 subReservations = await this.findSubReservationsByReservationNumbers({ reservationNumbers });
             }
-            // console.log(subReservations.length, 'subReservations found');
+            debug('searchWithUnwoundAcceptedOffers: reservationNumbers.length === subReservations.length?', reservationNumbers.length === subReservations.length);
             return orders.map((order) => {
                 const acceptedOffer = order.acceptedOffers[0];
                 const subReservation = subReservations.find(((reservation) => reservation.id === acceptedOffer.itemOffered.id));
@@ -243,37 +284,10 @@ class AcceptedOfferRepo {
         const acceptedOffers = await aggregate
             .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
             .exec();
-        // 予約取引を参照(2026-05-17~)
-        const offeredThroughIdentifier = acceptedOffers.at(0)?.offeredThrough?.identifier;
-        const useReserveTransaction = options?.useReserveTransaction === true
-            && offeredThroughIdentifier !== factory_1.factory.service.webAPI.Identifier.COA; // COAでは予約取引を参照しない
+        // 予約取引を参照(2026-05-18~)
+        const useReserveTransaction = options?.useReserveTransaction === true;
         if (useReserveTransaction) {
-            const reservationNumbers = [...new Set(acceptedOffers.map((acceptedOffer) => String(acceptedOffer.serialNumber)))];
-            // console.log(reservationNumbers.length, 'reservationNumbers found')
-            let subReservations = [];
-            if (reservationNumbers.length > 0) {
-                subReservations = await this.findSubReservationsByReservationNumbers({ reservationNumbers });
-            }
-            // console.log(subReservations.length, 'subReservations found');
-            return acceptedOffers.map((acceptedOffer) => {
-                const subReservation = subReservations.find(((reservation) => reservation.id === acceptedOffer.itemOffered.id));
-                // 予約は必ず存在するはず
-                if (subReservation === undefined) {
-                    console.error('searchAcceptedOffersByOrderNumber: subReservation: undefined!!!', acceptedOffer.itemOffered.id);
-                }
-                const priceSpecByReserveTransaction = subReservation?.price;
-                // 予約の価格は必ず存在するはず
-                if (priceSpecByReserveTransaction === undefined) {
-                    console.error('searchAcceptedOffersByOrderNumber: priceSpecByReserveTransaction: undefined!!!', acceptedOffer.itemOffered.id);
-                }
-                const { priceSpecification, ...acceptedOfferWithoutPrice } = acceptedOffer;
-                return {
-                    ...acceptedOfferWithoutPrice,
-                    ...(priceSpecByReserveTransaction !== undefined)
-                        ? { priceSpecification: priceSpecByReserveTransaction } // 予約取引参照の値で上書き
-                        : { priceSpecification } // 万が一予約取引に存在しなければ注文ドキュメントの値を採用
-                };
-            });
+            return this.addAcceptedOffersDetails(acceptedOffers);
         }
         else {
             return acceptedOffers;
@@ -282,7 +296,7 @@ class AcceptedOfferRepo {
     /**
      * 注文オファーを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 } } },
@@ -301,7 +315,18 @@ 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~)
+        const useReserveTransaction = options?.useReserveTransaction === true;
+        if (useReserveTransaction) {
+            return {
+                acceptedOffers: await this.addAcceptedOffersDetails(acceptedOffers),
+                numAcceptedOffers
+            };
+        }
+        else {
+            return result;
+        }
     }
     async countByOrderNumber(filter) {
         const aggregate = this.orderModel.aggregate([

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

@@ -96,7 +96,8 @@ function deleteReservationsByOrder(order) {
             acceptedOffers: {
             // itemOffered: { typeOf: { $in: [factory.reservationType.EventReservation] } }
             }
-        });
+        }, { useReserveTransaction: true } // 予約取引参照(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 });

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

@@ -102,7 +102,8 @@ function sendOrder(params) {
                     $slice: [offerIndexBase, limit],
                     orderNumber: { $eq: order.orderNumber },
                     project: { id: { $eq: order.project.id } }
-                });
+                }, { useReserveTransaction: true } // 予約取引参照(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/reserve/findByCode.js

@@ -39,7 +39,8 @@ function findByCode(params) {
                                 // typeOf?: { $in?: factory.order.IItemOffered['typeOf'][] };
                             }
                         }
-                    })).shift();
+                    }, { useReserveTransaction: true } // 予約取引参照(2026-05-18~)
+                    )).shift();
                     if (acceptedOffer === undefined) {
                         throw new factory_1.factory.errors.NotFound('acceptedOffer');
                     }

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

@@ -1,13 +1,7 @@
 "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"));
-// import { isDeepStrictEqual } from 'util';
 const factory_1 = require("../../factory");
-const debug = (0, debug_1.default)('chevre-domain:service:reserve:findReservations');
 /**
  * 予約を検索する
  */
@@ -30,8 +24,6 @@ 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;

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

@@ -16,7 +16,8 @@ function searchByOrder(params) {
                 // typeOf: { $in: [reservationType] }
                 }
             }
-        });
+        }, { useReserveTransaction: true } // 予約取引参照(2026-05-18~)
+        );
         const reservationIds = acceptedOffers.map((offer) => {
             if (offer.itemOffered.typeOf === reservationType) {
                 return offer.itemOffered.id;

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

@@ -137,7 +137,8 @@ function fixOrderAsPurpose(params) {
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: order.orderNumber },
             project: { id: { $eq: params.project.id } }
-        });
+        }, { useReserveTransaction: true } // 予約取引参照(2026-05-18~)
+        );
         return {
             ...order,
             acceptedOffers

package/lib/chevre/service/task/payment/payByTask.js

@@ -77,7 +77,8 @@ function fixOrderAsPurpose(params, transaction) {
                         reservedTicket: { ticketedSeat: { seatNumber: { $in: seatNumbers } } }
                     }
                 }
-            });
+            }, { useReserveTransaction: true } // 予約取引参照(2026-05-18~)
+            );
         }
         return {
             ...orderWithoutAcceptedOffers,

package/lib/chevre/service/transaction/returnOrder/preStart.js

@@ -141,13 +141,11 @@ function fixOrders(params) {
         const eventIds = await repos.acceptedOffer.distinctValues({
             orderNumber: { $in: [params.object.order[0].orderNumber] }
         }, 'acceptedOffers.itemOffered.reservationFor.id');
-        // const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumbers({
-        //     orderNumber: { $in: [params.object.order[0].orderNumber] }
-        // });
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: params.object.order[0].orderNumber },
             project: { id: { $eq: params.project.id } }
-        });
+        }, { useReserveTransaction: true } // 予約取引参照(2026-05-18~)
+        );
         return { acceptedOffers, eventIds, offerIds, orders };
     };
 }

package/lib/chevre/service/validation/validateOrder.js

@@ -10,47 +10,6 @@ const factory_1 = require("../../factory");
 const factory_2 = require("../offer/event/authorize/factory");
 // import { acceptedOffers2amount as acceptedOffers2amount4product } from '../offer/product/factory';
 const validateMovieTicket_1 = require("../transaction/placeOrder/confirm/validation/validateMovieTicket");
-// const debug = createDebug('chevre-domain:service:validation');
-// type ICreatingCheckEventTask = Pick<
-//     factory.task.checkResource.IAttributes,
-//     'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status' | 'description'
-// > & {
-//     description: string;
-// };
-// function createCheckEventTasks(params: {
-//     order: Pick<factory.order.IOrder, 'orderNumber' | 'typeOf'>;
-//     project: { id: string };
-//     reservationForIds: string[];
-// }): ICreatingCheckEventTask[] {
-//     const { order, project, reservationForIds } = params;
-//     const runsAt = new Date();
-//     return reservationForIds.map((reservationForId) => {
-//         const object: factory.task.checkResource.IResourceAsEvent = { id: reservationForId, typeOf: factory.eventType.ScreeningEvent };
-//         const data: factory.task.checkResource.IData = {
-//             object,
-//             project: { id: project.id, typeOf: factory.organizationType.Project },
-//             typeOf: factory.actionType.CheckAction
-//         };
-//         const description: string = util.format(
-//             '%s:%s:%s:%s',
-//             order.typeOf,
-//             order.orderNumber,
-//             factory.eventType.ScreeningEvent,
-//             reservationForId
-//         );
-//         return {
-//             description,
-//             project: { id: project.id, typeOf: factory.organizationType.Project },
-//             name: factory.taskName.CheckResource,
-//             status: factory.taskStatus.Ready,
-//             runsAt,
-//             remainingNumberOfTries: 3,
-//             numberOfTried: 0,
-//             executionResults: [],
-//             data
-//         };
-//     });
-// }
 function validateOrder(params) {
     return async (repos) => {
         const order = await repos.order.projectFieldsByOrderNumber({
@@ -63,7 +22,8 @@ function validateOrder(params) {
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: params.orderNumber },
             project: { id: { $eq: params.project.id } }
-        });
+        }, { useReserveTransaction: true } // 予約取引参照(2026-05-18~)
+        );
         let payTransactions = [];
         if (order.paymentMethods.length > 0) {
             payTransactions = await repos.assetTransaction.search({
@@ -101,14 +61,8 @@ function validateOrder(params) {
                     throw new Error(`invalid acceptedOffer.priceSpecification.priceComponent [${typeof priceSpecification.priceComponent}]`);
                 }
             }
-            // 旧メンバーシップ&ペイメントカードを例外として除外(互換性維持対応をしていないため)
-            if ((0, moment_1.default)(order.orderDate)
-                .isAfter((0, moment_1.default)('2023-09-30T15:00:00Z'))
-            // || typeOf !== factory.permit.PermitType.Permit
-            ) {
-                if (typeof serialNumber !== 'string' || serialNumber.length === 0) {
-                    throw new Error(`invalid acceptedOffer.serialNumber [${typeof serialNumber}]`);
-                }
+            if (typeof serialNumber !== 'string' || serialNumber.length === 0) {
+                throw new Error(`invalid acceptedOffer.serialNumber [${typeof serialNumber}]`);
             }
         });
         let reservationForIds = [];
@@ -176,21 +130,8 @@ function validateOrder(params) {
                 }
                 break;
             }
-            // case factory.permit.PermitType.Permit: {
-            //     numOrderedItemExpected = acceptedOffers.length;
-            //     const permitAcceptedOffers = acceptedOffers as factory.order.IAcceptedOffer<factory.order.IPermit>[];
-            //     priceExpected = acceptedOffers2amount4product({
-            //         acceptedOffers: permitAcceptedOffers
-            //     });
-            //     break;
-            // }
-            // case factory.actionType.MoneyTransfer:
-            //     break;
             default:
-                if ((0, moment_1.default)(order.orderDate)
-                    .isAfter((0, moment_1.default)('2024-02-01T15:00:00Z'))) {
-                    throw new Error(`invalid itemOfferedTypeOf [${itemOfferedTypeOf}]`);
-                }
+                throw new Error(`invalid itemOfferedTypeOf [${itemOfferedTypeOf}]`);
         }
         // orderedItem検証
         if (order.orderedItem.length !== numOrderedItemExpected) {
@@ -225,20 +166,5 @@ function validateOrder(params) {
                 throw new Error(`invalid ticketIdentifiers.length:${reservationReservedTicketIdentifiers.length} [expected:${acceptedOffers.length}]`);
             }
         }
-        // useMongoAsStockHolderProjectsの場合のイベント検証タスク作成を廃止(もう十分検証したので)(2025-07-11~)
-        // add check event task(2025-05-01~)
-        // const setting = <Pick<ISetting, 'useMongoAsStockHolderProjects'> | null>
-        //     await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['useMongoAsStockHolderProjects']);
-        // const useMongoAsStockHolderProjects = setting?.useMongoAsStockHolderProjects;
-        // if (Array.isArray(useMongoAsStockHolderProjects) && useMongoAsStockHolderProjects.includes(params.project.id)) {
-        //     const creatingCheckResourceTask = createCheckEventTasks({
-        //         order: { orderNumber: order.orderNumber, typeOf: factory.order.OrderType.Order },
-        //         project: { id: params.project.id },
-        //         reservationForIds
-        //     });
-        //     if (creatingCheckResourceTask.length > 0) {
-        //         await repos.task.saveMany(creatingCheckResourceTask, { emitImmediately: true });
-        //     }
-        // }
     };
 }

package/package.json

@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.1.0-alpha.20"
+  "version": "24.1.0-alpha.21"
 }