@chevre/domain 24.0.0-alpha.7 → 24.0.0-alpha.70

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

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -33,8 +10,8 @@ exports.processUnlockOfferRateLimit = processUnlockOfferRateLimit;
  * 予約サービス
  */
 const moment_1 = __importDefault(require("moment"));
-const factory = __importStar(require("../../factory"));
-const factory_1 = require("./factory");
+const factory_1 = require("../../factory");
+const factory_2 = require("./factory");
 const onPendingReservationCanceled_1 = require("./potentialActions/onPendingReservationCanceled");
 const onReservationCanceled_1 = require("./potentialActions/onReservationCanceled");
 /**
@@ -65,23 +42,23 @@ function cancelPengindIfNotYet(params) {
         const reserveTransactions = await repos.assetTransaction.search({
             limit: 1,
             page: 1,
-            typeOf: factory.assetTransactionType.Reserve,
+            typeOf: factory_1.factory.assetTransactionType.Reserve,
             ids: [reserveTransactionId]
         });
         const reserveTransaction = reserveTransactions.shift();
         if (reserveTransaction === undefined) {
-            throw new factory.errors.NotFound(factory.assetTransactionType.Reserve);
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.assetTransactionType.Reserve);
         }
         let actionId;
-        const actionAttributes = (0, factory_1.createCancelPendingReservationAction)({ transaction: reserveTransaction });
+        const actionAttributes = (0, factory_2.createCancelPendingReservationAction)({ transaction: reserveTransaction });
         // 冪等性を担保(2023-06-05~)
-        const completedActions = await repos.action.search({
+        const completedActions = await repos.action.findActionsByType({
             limit: 1,
             page: 1,
-            actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
-            typeOf: { $eq: factory.actionType.CancelAction },
+            actionStatus: { $in: [factory_1.factory.actionStatusType.CompletedActionStatus] },
+            typeOf: { $eq: factory_1.factory.actionType.CancelAction },
             object: {
-                typeOf: { $eq: factory.reservationType.ReservationPackage },
+                typeOf: { $eq: factory_1.factory.reservationType.ReservationPackage },
                 reservationNumber: { $eq: reserveTransaction.transactionNumber }
             },
             purpose: {
@@ -100,10 +77,10 @@ function cancelPengindIfNotYet(params) {
                     if (reserveTransaction !== undefined) {
                         const reservationFor = reserveTransaction.object.reservationFor;
                         if (reservationFor === undefined) {
-                            throw new factory.errors.NotFound('transaction.object.reservationFor');
+                            throw new factory_1.factory.errors.NotFound('transaction.object.reservationFor');
                         }
                         // ReservationPackageに対応(2022-12-23~)
-                        if (actionObject.typeOf === factory.reservationType.ReservationPackage) {
+                        if (actionObject.typeOf === factory_1.factory.reservationType.ReservationPackage) {
                             const subReservation = reserveTransaction.object.subReservation;
                             if (Array.isArray(subReservation) && subReservation.length > 0) {
                                 await Promise.all(subReservation.map(async (cancelingSubReservation) => {
@@ -115,9 +92,7 @@ function cancelPengindIfNotYet(params) {
                                             subReservation: cancelingSubReservation.subReservation,
                                             reservationFor: {
                                                 id: String(reservationFor.id),
-                                                startDate: (reservationFor.typeOf === factory.eventType.ScreeningEvent)
-                                                    ? reservationFor.startDate
-                                                    : reservationFor.departureTime
+                                                startDate: reservationFor.startDate
                                             }
                                         },
                                         // holder:取引番号に対応(2023-06-05~)
@@ -140,12 +115,12 @@ function cancelPengindIfNotYet(params) {
                             }
                             else {
                                 // 完全廃止(2023-07-19~)
-                                throw new factory.errors.NotImplemented('disablePendingReservations must be true');
+                                throw new factory_1.factory.errors.NotImplemented('disablePendingReservations must be true');
                             }
                         }
                         else {
                             // 廃止(2022-12-27~)
-                            throw new factory.errors.NotImplemented(`object.typeOf '${actionObject.typeOf}' not implemented`);
+                            throw new factory_1.factory.errors.NotImplemented(`object.typeOf '${actionObject.typeOf}' not implemented`);
                         }
                     }
                 }
@@ -192,21 +167,21 @@ function cancelReservation(actionAttributesList) {
                 let cancelResult;
                 let canceledReservationForId;
                 try {
-                    if (actionAttributes.object.typeOf === factory.reservationType.ReservationPackage) {
+                    if (actionAttributes.object.typeOf === factory_1.factory.reservationType.ReservationPackage) {
                         // 予約取引を検索
                         const reserveTransactions = await repos.assetTransaction.search({
                             limit: 1,
                             page: 1,
-                            typeOf: factory.assetTransactionType.Reserve,
+                            typeOf: factory_1.factory.assetTransactionType.Reserve,
                             transactionNumber: { $eq: actionAttributes.object.reservationNumber }
                         });
                         const reserveTransaction = reserveTransactions.shift();
                         if (reserveTransaction === undefined) {
-                            throw new factory.errors.NotFound(factory.assetTransactionType.Reserve);
+                            throw new factory_1.factory.errors.NotFound(factory_1.factory.assetTransactionType.Reserve);
                         }
                         const reservationFor = reserveTransaction.object.reservationFor;
                         if (reservationFor === undefined) {
-                            throw new factory.errors.NotFound('transaction.object.reservationFor');
+                            throw new factory_1.factory.errors.NotFound('transaction.object.reservationFor');
                         }
                         canceledReservationForId = String(reservationFor.id);
                         const subReservation = reserveTransaction.object.subReservation;
@@ -220,9 +195,7 @@ function cancelReservation(actionAttributesList) {
                                         subReservation: cancelingSubReservation.subReservation,
                                         reservationFor: {
                                             id: String(reservationFor.id),
-                                            startDate: (reservationFor.typeOf === factory.eventType.ScreeningEvent)
-                                                ? reservationFor.startDate
-                                                : reservationFor.departureTime
+                                            startDate: reservationFor.startDate
                                         }
                                     },
                                     // holder:取引番号に対応(2023-06-05~)
@@ -248,7 +221,7 @@ function cancelReservation(actionAttributesList) {
                         });
                     }
                     else {
-                        const reservation = await repos.reservation.projectFieldsById({
+                        const reservation = await repos.reservation.findReservationById({
                             id: actionAttributes.object.id,
                             inclusion: ['reservationNumber', 'reservationStatus', 'project', 'reservedTicket', 'subReservation', 'reservationFor']
                         });
@@ -256,7 +229,7 @@ function cancelReservation(actionAttributesList) {
                         const reserveTransactions = await repos.assetTransaction.search({
                             limit: 1,
                             page: 1,
-                            typeOf: factory.assetTransactionType.Reserve,
+                            typeOf: factory_1.factory.assetTransactionType.Reserve,
                             object: { reservations: { id: { $in: [reservation.id] } } }
                         });
                         const reserveTransaction = reserveTransactions.shift();
@@ -280,14 +253,18 @@ function cancelReservation(actionAttributesList) {
                                 expectedHolder
                             })(repos);
                         }
-                        await processUnlockOfferRateLimit({
-                            project: { id: reservation.project.id },
-                            reservation: {
-                                reservationNumber: reservation.reservationNumber,
-                                reservedTicket: reservation.reservedTicket
-                            },
-                            reservationFor: reservation.reservationFor
-                        })(repos);
+                        const subReservationByTransaction = reserveTransaction?.object.subReservation?.find((s) => s.id === reservation.id);
+                        if (subReservationByTransaction !== undefined) {
+                            await processUnlockOfferRateLimit({
+                                project: { id: reservation.project.id },
+                                reservation: {
+                                    reservationNumber: reservation.reservationNumber,
+                                    // reservedTicket: reservation.reservedTicket
+                                    reservedTicket: subReservationByTransaction.reservedTicket
+                                },
+                                reservationFor: reservation.reservationFor
+                            })(repos);
+                        }
                         // 予約をキャンセル状態に変更する
                         await repos.reservation.cancelById({
                             id: reservation.id,
@@ -319,14 +296,15 @@ function cancelReservation(actionAttributesList) {
                 };
                 await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
                 let canceledReservations = [];
-                if (actionAttributes.object.typeOf === factory.reservationType.ReservationPackage) {
+                if (actionAttributes.object.typeOf === factory_1.factory.reservationType.ReservationPackage) {
                     const reservationNumber = actionAttributes.object.reservationNumber;
                     if (typeof reservationNumber === 'string' && reservationNumber.length > 0) {
                         // 最新のconfirmedReservationsを検索
-                        canceledReservations = await repos.reservation.projectFields({
+                        canceledReservations = await repos.reservation.findReservations({
                             reservationNumber: { $eq: reservationNumber },
-                            typeOf: factory.reservationType.EventReservation
-                        }, { project: 1, typeOf: 1, modifiedTime: 1, reservationNumber: 1 });
+                            typeOf: factory_1.factory.reservationType.EventReservation
+                        }, { project: 1, typeOf: 1, modifiedTime: 1, reservationNumber: 1 } // 廃止属性の影響なし(2026-03-25~)
+                        );
                         canceledReservations = canceledReservations.map((r) => {
                             // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
                             delete r._id;
@@ -335,7 +313,7 @@ function cancelReservation(actionAttributesList) {
                     }
                 }
                 else {
-                    const canceledReservation = await repos.reservation.projectFieldsById({
+                    const canceledReservation = await repos.reservation.findReservationById({
                         id: actionAttributes.object.id,
                         inclusion: ['project', 'typeOf', 'modifiedTime', 'reservationNumber']
                     });
@@ -425,8 +403,8 @@ function processUnlockSeat(params) {
 function processUnlockOfferRateLimit(params) {
     return async (repos) => {
         const reservation = params.reservation;
-        const scope = reservation.reservedTicket.ticketType.validRateLimit?.scope;
-        const unitInSeconds = reservation.reservedTicket.ticketType.validRateLimit?.unitInSeconds;
+        const scope = reservation.reservedTicket.ticketType?.validRateLimit?.scope;
+        const unitInSeconds = reservation.reservedTicket.ticketType?.validRateLimit?.unitInSeconds;
         if (typeof scope === 'string' && typeof unitInSeconds === 'number') {
             const rateLimitKey = {
                 project: { id: params.project.id },
@@ -439,11 +417,8 @@ function processUnlockOfferRateLimit(params) {
                     }
                 },
                 reservationFor: {
-                    startDate: (params.reservationFor.typeOf === factory.eventType.ScreeningEvent)
-                        ? (0, moment_1.default)(params.reservationFor.startDate)
-                            .toDate()
-                        : (0, moment_1.default)(params.reservationFor.departureTime)
-                            .toDate()
+                    startDate: (0, moment_1.default)(params.reservationFor.startDate)
+                        .toDate()
                 },
                 reservationNumber: reservation.reservationNumber
             };

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

@@ -1,34 +1,11 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkInReservation = checkInReservation;
 const debug_1 = __importDefault(require("debug"));
-const factory = __importStar(require("../../factory"));
+const factory_1 = require("../../factory");
 const confirmReservation_1 = require("./confirmReservation");
 const onReservationCheckedIn_1 = require("./potentialActions/onReservationCheckedIn");
 const debug = (0, debug_1.default)('chevre-domain:service:reserve:checkInReservation');
@@ -43,11 +20,11 @@ function checkInReservation(params) {
         if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
             const existingReservationCount = await repos.reservation.count({
                 id: { $in: params.object.ids },
-                typeOf: factory.reservationType.EventReservation
+                typeOf: factory_1.factory.reservationType.EventReservation
             });
             if (existingReservationCount !== params.object.ids.length) {
                 if (params.options.retryOnReservationNotFound === true) {
-                    throw new factory.errors.NotFound(factory.reservationType.EventReservation, `Some reservations dot not exist. ${params.object.ids.join(',')}`);
+                    throw new factory_1.factory.errors.NotFound(factory_1.factory.reservationType.EventReservation, `Some reservations dot not exist. ${params.object.ids.join(',')}`);
                 }
             }
             if (existingReservationCount > 0) {
@@ -60,11 +37,11 @@ function checkInReservation(params) {
             for (const reservationNumber of params.object.reservationNumbers) {
                 const existingReservationCount = await repos.reservation.count({
                     reservationNumber: { $eq: reservationNumber },
-                    typeOf: factory.reservationType.EventReservation
+                    typeOf: factory_1.factory.reservationType.EventReservation
                 });
                 if (existingReservationCount === 0) {
                     if (params.options.retryOnReservationNotFound === true) {
-                        throw new factory.errors.NotFound(factory.reservationType.EventReservation, `Some reservations dot not exist. ${params.object.reservationNumbers.join(',')}`);
+                        throw new factory_1.factory.errors.NotFound(factory_1.factory.reservationType.EventReservation, `Some reservations dot not exist. ${params.object.reservationNumbers.join(',')}`);
                     }
                 }
                 if (existingReservationCount > 0) {
@@ -114,21 +91,21 @@ function reserveIfNotYet(params) {
         let reserveTransactions = [];
         if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
             reserveTransactions = await repos.assetTransaction.search({
-                typeOf: factory.assetTransactionType.Reserve,
+                typeOf: factory_1.factory.assetTransactionType.Reserve,
                 object: {
                     reservations: { id: { $in: params.object.ids } }
                 },
-                statuses: [factory.transactionStatusType.Confirmed]
+                statuses: [factory_1.factory.transactionStatusType.Confirmed]
             }, ['transactionNumber']);
             debug(reserveTransactions.length, 'reserveTransactions found in reserveIfNotYet. ids:', params.object.ids, 'reserveTransactions:', JSON.stringify(reserveTransactions));
         }
         if (Array.isArray(params.object.reservationNumbers) && params.object.reservationNumbers.length > 0) {
             reserveTransactions = await repos.assetTransaction.search({
-                typeOf: factory.assetTransactionType.Reserve,
+                typeOf: factory_1.factory.assetTransactionType.Reserve,
                 object: {
                     reservationNumber: { $in: params.object.reservationNumbers }
                 },
-                statuses: [factory.transactionStatusType.Confirmed]
+                statuses: [factory_1.factory.transactionStatusType.Confirmed]
             }, ['transactionNumber']);
             debug(reserveTransactions.length, 'reserveTransactions found in reserveIfNotYet. reservationNumbers:', params.object.reservationNumbers, 'reserveTransactions:', JSON.stringify(reserveTransactions));
         }

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

@@ -1,4 +1,4 @@
-import * as factory from '../../factory';
+import { factory } from '../../factory';
 import type { ActionRepo } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../repo/authorization';

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

@@ -1,35 +1,12 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirmReservation = confirmReservation;
 const debug_1 = __importDefault(require("debug"));
-const factory = __importStar(require("../../factory"));
-const factory_1 = require("./factory");
+const factory_1 = require("../../factory");
+const factory_2 = require("./factory");
 const onReservationConfirmed_1 = require("./potentialActions/onReservationConfirmed");
 const debug = (0, debug_1.default)('chevre-domain:service:reserve:confirmReservation');
 /**
@@ -45,7 +22,7 @@ function confirmReservation(params) {
         //         await onReservationConfirmedByAction(actionAttributes)({ task: repos.task });
         //     }
         // }));
-        const actionAttributes = await reserveIfNotYet(params.potentialReserveAction, { byTask: params.byTask })(repos);
+        const { actionAttributes, reserveTransaction } = await reserveIfNotYet(params.potentialReserveAction, { byTask: params.byTask })(repos);
         if (params.useOnReservationConfirmed) {
             await (0, onReservationConfirmed_1.onReservationConfirmedByAction)(actionAttributes)({ task: repos.task });
         }
@@ -55,13 +32,39 @@ function confirmReservation(params) {
             const reservationNumber = params.potentialReserveAction.object.reservationNumber;
             if (typeof reservationNumber === 'string' && reservationNumber.length > 0) {
                 // 最新のconfirmedReservationsを検索
-                confirmedReservations = await repos.reservation.projectFields({
+                const rawReservations = await repos.reservation.findReservations({
                     reservationNumber: { $eq: reservationNumber },
-                    typeOf: factory.reservationType.EventReservation
+                    typeOf: factory_1.factory.reservationType.EventReservation
                 }
                 // project all fields
                 // {}
                 );
+                // price,underName,ticketTypeは予約取引から補完する(2026-03-25~)
+                confirmedReservations = rawReservations.map((rawReservation) => {
+                    const subReservationByTransaction = reserveTransaction.object.subReservation?.find((s) => s.id === rawReservation.id);
+                    // 予約取引内にsubReservationは必ず存在するはず
+                    if (subReservationByTransaction === undefined) {
+                        throw new factory_1.factory.errors.NotFound('reserveTransaction.object.subReservation');
+                    }
+                    // 予約取引内にreservationForは必ず存在するはず
+                    if (reserveTransaction.object.reservationFor === undefined) {
+                        throw new factory_1.factory.errors.NotFound('reserveTransaction.object.reservationFor');
+                    }
+                    const priceByTransaction = subReservationByTransaction.price;
+                    const underNameByTransaction = reserveTransaction.object.underName;
+                    const ticketTypeByTransaction = subReservationByTransaction.reservedTicket.ticketType;
+                    // console.log('creating confirmedReservation...', rawReservation, priceByTransaction, underNameByTransaction, ticketTypeByTransaction);
+                    return {
+                        ...rawReservation,
+                        price: priceByTransaction,
+                        underName: underNameByTransaction,
+                        reservedTicket: {
+                            ...rawReservation.reservedTicket,
+                            ticketType: ticketTypeByTransaction
+                        },
+                        reservationFor: reserveTransaction.object.reservationFor // reservationForは予約取引から参照する(2026-04-05~)
+                    };
+                });
                 confirmedReservations = confirmedReservations.map((r) => {
                     // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
                     delete r._id;
@@ -76,7 +79,7 @@ function reserveTransaction2action(params) {
     const transaction = params.transaction;
     const reservationFor = transaction.object.reservationFor;
     if (reservationFor === undefined) {
-        throw new factory.errors.NotFound('transaction.object.reservationFor');
+        throw new factory_1.factory.errors.NotFound('transaction.object.reservationFor');
     }
     let underName;
     if (typeof transaction.object.underName?.typeOf === 'string') {
@@ -86,7 +89,7 @@ function reserveTransaction2action(params) {
     const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
     pendingReservations.forEach((reservation) => {
         const acceptedOffer4reservation = transaction.object.acceptedOffer?.find((o) => o.itemOffered?.serviceOutput?.id === reservation.id);
-        moneyTransferActions.push(...(0, factory_1.createMoneyTransferActions)({
+        moneyTransferActions.push(...(0, factory_2.createMoneyTransferActions)({
             acceptedOffer: acceptedOffer4reservation,
             reservation,
             transaction: params.transaction,
@@ -102,12 +105,12 @@ function reserveTransaction2action(params) {
         reservationNumber: transaction.object.reservationNumber,
         reservationStatus: (typeof params.transaction.object.reservationStatus === 'string')
             ? params.transaction.object.reservationStatus
-            : factory.reservationStatusType.ReservationPending,
-        typeOf: factory.reservationType.ReservationPackage
+            : factory_1.factory.reservationStatusType.ReservationPending,
+        typeOf: factory_1.factory.reservationType.ReservationPackage
     };
     return {
         project: transaction.project,
-        typeOf: factory.actionType.ReserveAction,
+        typeOf: factory_1.factory.actionType.ReserveAction,
         object: reservationPackage,
         agent: transaction.project,
         potentialActions: {
@@ -117,6 +120,25 @@ function reserveTransaction2action(params) {
         ...(Array.isArray(transaction.instrument)) ? { instrument: transaction.instrument } : undefined // add(2025-02-17~)
     };
 }
+/**
+ * 予約取引に保管されたunderNameから予約のunderNameを生成する
+ */
+function createReservationUnderName(params) {
+    const { underNameByTransaction } = params;
+    // 予約のunderNameを最適化(2026-03-27~)
+    // return underNameByTransaction;
+    const { id, identifier, typeOf, name, givenName, familyName, email, telephone } = underNameByTransaction;
+    return {
+        typeOf,
+        name,
+        ...((Array.isArray(identifier)) && { identifier }),
+        ...((typeof email === 'string') && { email }),
+        ...((typeof familyName === 'string') && { familyName }),
+        ...((typeof givenName === 'string') && { givenName }),
+        ...((typeof id === 'string') && { id }),
+        ...((typeof telephone === 'string') && { telephone })
+    };
+}
 function reserveIfNotYet(
 // params: factory.action.reserve.IAttributes,
 params, options) {
@@ -125,19 +147,19 @@ params, options) {
         const reserveTransaction = (await repos.assetTransaction.search({
             limit: 1,
             page: 1,
-            typeOf: factory.assetTransactionType.Reserve,
+            typeOf: factory_1.factory.assetTransactionType.Reserve,
             transactionNumber: { $eq: reservationPackage.reservationNumber }
         })).shift();
         if (reserveTransaction === undefined) {
-            throw new factory.errors.NotFound(factory.assetTransactionType.Reserve);
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.assetTransactionType.Reserve);
         }
         const actionAttributes = reserveTransaction2action({ transaction: reserveTransaction });
         // 冪等性を担保(2023-05-31~)
         debug('searching completed reserveAction... byTask:', options?.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
-        const completedActions = await repos.action.search({
+        const completedActions = await repos.action.findActionsByType({
             limit: 1,
             page: 1,
-            actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
+            actionStatus: { $in: [factory_1.factory.actionStatusType.CompletedActionStatus] },
             typeOf: { $eq: actionAttributes.typeOf },
             object: {
                 typeOf: { $eq: actionAttributes.object.typeOf }
@@ -153,15 +175,14 @@ params, options) {
             const action = await repos.action.start(actionAttributes);
             try {
                 let underName;
+                const underNameByTransaction = reserveTransaction.object.underName;
                 // 予約取引に保管されたunderNameを使用する(2023-05-30~)
-                if (typeof reserveTransaction.object.underName?.typeOf === 'string') {
-                    underName = reserveTransaction.object.underName;
-                    // 廃止(2023-05-31~)→予約取引から取得に変更
-                    // } else if (typeof reservationPackage.underName?.typeOf === 'string') {
-                    //     underName = reservationPackage.underName;
+                if (typeof underNameByTransaction?.typeOf === 'string') {
+                    // 予約のunderNameを最適化(2026-03-27~)
+                    underName = createReservationUnderName({ underNameByTransaction });
                 }
                 // ReservationPackageに対応(2022-12-22~)
-                if (actionAttributes.object.typeOf === factory.reservationType.ReservationPackage) {
+                if (actionAttributes.object.typeOf === factory_1.factory.reservationType.ReservationPackage) {
                     // Pendingの予約が存在しないバージョンに対応する(2023-05-29~)
                     if (reserveTransaction.object.disablePendingReservations === true) {
                         const reservationFor = reserveTransaction.object.reservationFor;
@@ -176,7 +197,7 @@ params, options) {
                                 project: { id: reserveTransaction.project.id },
                                 provider: (typeof reserveTransaction.object.provider?.id === 'string')
                                     ? reserveTransaction.object.provider
-                                    : { id: reserveTransaction.agent.id, typeOf: factory.organizationType.Corporation },
+                                    : { id: reserveTransaction.agent.id, typeOf: factory_1.factory.organizationType.Corporation },
                                 subReservation: subReservations,
                                 issuedThrough,
                                 reservationFor,
@@ -196,7 +217,7 @@ params, options) {
                 }
                 else {
                     // 廃止(2023-01-18)
-                    throw new factory.errors.Forbidden(`${actionAttributes.object.typeOf} not acceptable`);
+                    throw new factory_1.factory.errors.Forbidden(`${actionAttributes.object.typeOf} not acceptable`);
                 }
             }
             catch (error) {
@@ -211,6 +232,6 @@ params, options) {
             const actionResult = {};
             await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
         }
-        return actionAttributes;
+        return { actionAttributes, reserveTransaction };
     };
 }

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

@@ -1,14 +1,14 @@
-import * as factory from '../../factory';
+import { factory } from '../../factory';
 export declare function optimizeUnderName4inform(params: {
-    underName: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+    underName: Pick<factory.reservation.IUnderName, 'id' | 'typeOf'>;
 }): factory.notification.reservation.IMaskedUnderName;
 export type IPotentialInformReservationAction = factory.task.triggerWebhook.IPotentialInformReservationAction;
-export declare const NUM_TRY_INFORM_RESERVATION: number;
+export declare const NUM_TRY_INFORM_RESERVATION = 10;
 export declare function createMoneyTransferActions(params: {
     acceptedOffer?: factory.assetTransaction.reserve.IAcceptedOffer4object;
     reservation: Pick<factory.assetTransaction.reserve.IObjectSubReservation, 'reservedTicket'>;
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
-    underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+    underName?: Pick<factory.reservation.IUnderName, 'id' | 'typeOf' | 'name'>;
 }): import("@chevre/factory/lib/action/transfer/moneyTransfer").IAttributes[];
 export interface IPotentialCancelAction extends factory.action.cancel.reservation.IAttributes {
     purpose: {