@chevre/domain 24.0.0-alpha.9 → 24.0.0

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,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.confirmReservation = confirmReservation;
 const debug_1 = __importDefault(require("debug"));
-const factory = __importStar(require("../../factory"));
-const factory_1 = require("./factory");
+const factory_1 = require("../../factory");
 const onReservationConfirmed_1 = require("./potentialActions/onReservationConfirmed");
 const debug = (0, debug_1.default)('chevre-domain:service:reserve:confirmReservation');
 /**
@@ -45,7 +21,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,16 +31,42 @@ 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;
+                    // // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
+                    // delete (r as any)._id;
                     return r;
                 });
             }
@@ -76,23 +78,25 @@ function reserveTransaction2action(params) {
     const transaction = params.transaction;
     const reservationFor = transaction.object.reservationFor;
     if (reservationFor === undefined) {
-        throw new factory.errors.NotFound('transaction.object.reservationFor');
-    }
-    let underName;
-    if (typeof transaction.object.underName?.typeOf === 'string') {
-        underName = transaction.object.underName;
+        throw new factory_1.factory.errors.NotFound('transaction.object.reservationFor');
     }
-    const moneyTransferActions = [];
-    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)({
-            acceptedOffer: acceptedOffer4reservation,
-            reservation,
-            transaction: params.transaction,
-            underName
-        }));
-    });
+    // let underName: factory.assetTransaction.reserve.IUnderName | undefined;
+    // if (typeof transaction.object.underName?.typeOf === 'string') {
+    //     underName = transaction.object.underName;
+    // }
+    // const moneyTransferActions: factory.action.transfer.moneyTransfer.IAttributes[] = [];
+    // 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(...createMoneyTransferActions({
+    //         acceptedOffer: acceptedOffer4reservation,
+    //         reservation,
+    //         transaction: params.transaction,
+    //         underName
+    //     }));
+    // });
     const reservationPackage = {
         reservationFor: {
             id: String(reservationFor.id),
@@ -102,21 +106,41 @@ 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: {
-            moneyTransfer: moneyTransferActions
+        // discontinue(2026-04-18~)
+        // moneyTransfer: moneyTransferActions
         },
         purpose: { typeOf: transaction.typeOf, id: transaction.id },
         ...(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 +149,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 +177,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 +199,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 +219,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 +234,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,15 +1,9 @@
-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 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>;
-}): import("@chevre/factory/lib/action/transfer/moneyTransfer").IAttributes[];
+export declare const NUM_TRY_INFORM_RESERVATION = 10;
 export interface IPotentialCancelAction extends factory.action.cancel.reservation.IAttributes {
     purpose: {
         id: string;

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

@@ -1,95 +1,13 @@
 "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;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NUM_TRY_INFORM_RESERVATION = void 0;
 exports.optimizeUnderName4inform = optimizeUnderName4inform;
-exports.createMoneyTransferActions = createMoneyTransferActions;
 exports.createCancelPendingReservationAction = createCancelPendingReservationAction;
-const factory = __importStar(require("../../factory"));
+const factory_1 = require("../../factory");
 function optimizeUnderName4inform(params) {
     return { id: params.underName.id, typeOf: params.underName.typeOf };
 }
 exports.NUM_TRY_INFORM_RESERVATION = 10;
-function createMoneyTransferActions(params) {
-    const pointAward = params.acceptedOffer?.itemOffered?.pointAward;
-    const moneyTransfer = [];
-    // ポイント特典があれば適用
-    const pointAwardToLocationIdentifier = pointAward?.toLocation?.identifier;
-    const pointAwardToLocationTypeOf = pointAward?.toLocation?.typeOf;
-    if (typeof pointAward?.amount?.value === 'number'
-        && typeof pointAwardToLocationIdentifier === 'string'
-        && typeof pointAwardToLocationTypeOf === 'string') {
-        const fromLocation = {
-            typeOf: (typeof params.reservation.reservedTicket.issuedBy?.typeOf === 'string')
-                ? params.reservation.reservedTicket.issuedBy.typeOf
-                : params.transaction.typeOf,
-            name: (typeof params.reservation.reservedTicket.issuedBy?.name === 'string')
-                ? params.reservation.reservedTicket.issuedBy.name
-                : params.transaction.id
-        };
-        const toLocation = {
-            identifier: pointAwardToLocationIdentifier,
-            typeOf: factory.permit.PermitType.Permit,
-            issuedThrough: { id: String(pointAward.toLocation?.issuedThrough?.id) }
-        };
-        const recipient = {
-            typeOf: (typeof params.underName?.typeOf === 'string')
-                ? params.underName?.typeOf
-                : factory.personType.Person,
-            id: (typeof params.underName?.id === 'string')
-                ? params.underName?.id
-                : '',
-            name: String(params.underName?.name)
-        };
-        moneyTransfer.push({
-            project: params.transaction.project,
-            typeOf: factory.actionType.MoneyTransfer,
-            agent: params.transaction.project,
-            recipient,
-            object: {
-                typeOf: factory.account.transactionType.Deposit
-            },
-            purpose: {
-                typeOf: params.transaction.typeOf,
-                id: params.transaction.id,
-                // 入金取引に識別子を指定する
-                ...(typeof pointAward.purpose?.identifier === 'string') ? { identifier: pointAward.purpose.identifier } : undefined
-            },
-            amount: {
-                typeOf: 'MonetaryAmount',
-                value: pointAward.amount?.value,
-                currency: pointAward.amount?.currency
-            },
-            fromLocation: fromLocation,
-            toLocation: toLocation,
-            ...(typeof pointAward.description === 'string') ? { description: pointAward.description } : undefined,
-            ...(pointAward.recipient !== undefined) ? { recipient: pointAward.recipient } : undefined
-        });
-    }
-    return moneyTransfer;
-}
 function createCancelPendingReservationAction(params) {
     const transaction = params.transaction;
     const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
@@ -97,29 +15,29 @@ function createCancelPendingReservationAction(params) {
     if (pendingReservations.length > 0) {
         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');
         }
         // ReservationPackageに対応(2022-12-23~)
         const reservationPackage = {
-            typeOf: factory.reservationType.ReservationPackage,
+            typeOf: factory_1.factory.reservationType.ReservationPackage,
             reservationNumber: transaction.transactionNumber,
             reservationFor: { typeOf: reservationFor.typeOf, id: String(reservationFor.id) },
             reservationStatus: (typeof params.transaction.object.reservationStatus === 'string')
                 ? params.transaction.object.reservationStatus
-                : factory.reservationStatusType.ReservationPending
+                : factory_1.factory.reservationStatusType.ReservationPending
         };
         let placeOrderAsInstrument;
         if (Array.isArray(params.transaction.instrument)) {
             for (const eachInstrument of params.transaction.instrument) {
-                if (eachInstrument.typeOf === factory.transactionType.PlaceOrder && typeof eachInstrument.id === 'string') {
-                    placeOrderAsInstrument = { id: eachInstrument.id, typeOf: factory.transactionType.PlaceOrder };
+                if (eachInstrument.typeOf === factory_1.factory.transactionType.PlaceOrder && typeof eachInstrument.id === 'string') {
+                    placeOrderAsInstrument = { id: eachInstrument.id, typeOf: factory_1.factory.transactionType.PlaceOrder };
                     break;
                 }
             }
         }
         cancelActionAttributes = {
             project: transaction.project,
-            typeOf: factory.actionType.CancelAction,
+            typeOf: factory_1.factory.actionType.CancelAction,
             purpose: { typeOf: transaction.typeOf, id: transaction.id },
             agent: transaction.project,
             object: reservationPackage,

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

@@ -1,11 +1,11 @@
-import * as factory from '../../factory';
+import { factory } from '../../factory';
+import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AuthorizationRepo } from '../../repo/authorization';
 import type { OrderRepo } from '../../repo/order';
 import type { ReservationRepo } from '../../repo/reservation';
-type AvailableReservationType = factory.reservationType.BusReservation | factory.reservationType.EventReservation;
-type IReservationResult = Pick<factory.reservation.IReservation<AvailableReservationType>, 'id' | 'additionalTicketText' | 'checkedIn' | 'reservationStatus'> & {
+type IReservationResult = Pick<factory.reservation.eventReservation.IReservation, 'id' | 'additionalTicketText' | 'checkedIn' | 'reservationStatus'> & {
     reservedTicket: {
-        ticketType: Pick<factory.reservation.ITicketType<AvailableReservationType>, 'identifier'> & {
+        ticketType: Pick<factory.reservation.eventReservation.ITicketType, 'identifier'> & {
             name: {
                 ja?: string;
             };
@@ -28,6 +28,7 @@ declare function findByCode(params: {
         id?: string;
     };
 }): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     authorization: AuthorizationRepo;
     order: OrderRepo;
     reservation: ReservationRepo;

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

@@ -1,45 +1,23 @@
 "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;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findByCode = findByCode;
-const factory = __importStar(require("../../factory"));
+const factory_1 = require("../../factory");
 function findByCode(params) {
     return async (repos) => {
         if (typeof params.id !== 'string' || params.id.length === 0) {
-            throw new factory.errors.ArgumentNull('id');
+            throw new factory_1.factory.errors.ArgumentNull('id');
         }
         if (typeof params.code !== 'string' || params.code.length === 0) {
-            throw new factory.errors.ArgumentNull('code');
+            throw new factory_1.factory.errors.ArgumentNull('code');
         }
         const reservationId = String(params.id);
         const authorization = await repos.authorization.findValidOneByCode({
             project: { id: params.project.id },
             code: params.code
         });
+        let ticketType;
         switch (authorization.object.typeOf) {
-            case factory.order.OrderType.Order:
+            case factory_1.factory.order.OrderType.Order: {
                 const { orderNumber } = authorization.object;
                 if (typeof orderNumber === 'string' && orderNumber.length > 0) {
                     // reservationIdを含む注文の存在を確認するだけでよい
@@ -49,23 +27,55 @@ function findByCode(params) {
                         reservationId,
                         seller: params.seller
                     });
+                    const acceptedOffer = (await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+                        limit: 1,
+                        page: 1,
+                        // $slice?: [number, number];
+                        orderNumber: { $eq: orderNumber },
+                        project: { id: { $eq: params.project.id } },
+                        acceptedOffers: {
+                            itemOffered: {
+                                id: { $eq: reservationId }
+                                // typeOf?: { $in?: factory.order.IItemOffered['typeOf'][] };
+                            }
+                        }
+                    }, ['itemOffered'])).shift();
+                    if (acceptedOffer === undefined) {
+                        throw new factory_1.factory.errors.NotFound('acceptedOffer');
+                    }
+                    if (acceptedOffer.itemOffered.typeOf !== factory_1.factory.reservationType.EventReservation) {
+                        throw new factory_1.factory.errors.Argument('id', `itemOffered.typeOf must be ${factory_1.factory.reservationType.EventReservation}`);
+                    }
+                    ticketType = {
+                        identifier: acceptedOffer.itemOffered.reservedTicket.ticketType.identifier,
+                        name: { ja: acceptedOffer.itemOffered.reservedTicket.ticketType.name?.ja }
+                    };
+                }
+                else {
+                    throw new factory_1.factory.errors.NotFound('orderNumber');
                 }
                 break;
+            }
             default:
-                throw new factory.errors.NotImplemented(`authorization object typeOf: ${authorization.object.typeOf} not implemented`);
+                throw new factory_1.factory.errors.NotImplemented(`authorization object typeOf: ${authorization.object.typeOf} not implemented`);
         }
-        const reservationFromRepo = await repos.reservation.projectFieldsById({
+        const reservationFromRepo = await repos.reservation.findReservationById({
             id: reservationId,
-            inclusion: ['additionalTicketText', 'checkedIn', 'reservationStatus', 'reservedTicket']
+            inclusion: [
+                'additionalTicketText', 'checkedIn', 'reservationStatus',
+                // 'reservedTicket'
+            ]
         });
-        const { id, additionalTicketText, checkedIn, reservationStatus, reservedTicket } = reservationFromRepo;
+        const { id, additionalTicketText, checkedIn, reservationStatus } = reservationFromRepo;
         const reservation = {
             id, reservationStatus,
             reservedTicket: {
-                ticketType: {
-                    identifier: reservedTicket.ticketType.identifier,
-                    name: { ja: reservedTicket.ticketType.name?.ja }
-                }
+                // ticketTypeは注文を参照する(2026-03-25~)
+                // ticketType: {
+                //     identifier: reservedTicket.ticketType.identifier,
+                //     name: { ja: reservedTicket.ticketType.name?.ja }
+                // },
+                ticketType
             },
             ...(typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined,
             ...(typeof checkedIn === 'boolean') ? { checkedIn } : undefined