@chevre/domain 24.0.0-alpha.9 → 24.0.0

package/lib/chevre/service/payment/movieTicket/validation.js

@@ -1,64 +1,40 @@
 "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.validateMovieTicket = validateMovieTicket;
 const debug_1 = __importDefault(require("debug"));
-const factory = __importStar(require("../../../factory"));
-const processPurchaseNumberAuth_1 = require("./processPurchaseNumberAuth");
+const factory_1 = require("../../../factory");
 const debug = (0, debug_1.default)('chevre-domain:service:payment');
 function validateMovieTicket(params, paymentServiceId, 
 // useCheckByIdentifierIfNotYet: boolean,
 checkedAction, purpose) {
-    return async (repos, settings) => {
+    return async (repos) => {
         const movieTickets = params.object.paymentMethod?.movieTickets;
         if (!Array.isArray(movieTickets)) {
-            throw new factory.errors.Argument('movieTickets', 'object.paymentMethod.movieTickets must be an array');
+            throw new factory_1.factory.errors.Argument('movieTickets', 'object.paymentMethod.movieTickets must be an array');
         }
         // イベント1つのみ許可
         const eventIds = [...new Set(movieTickets.map((t) => t.serviceOutput.reservationFor.id))];
         if (eventIds.length !== 1) {
-            throw new factory.errors.Argument('movieTickets', 'Number of events must be 1');
+            throw new factory_1.factory.errors.Argument('movieTickets', 'Number of events must be 1');
         }
         // 決済カードidentifierは1つのみ許可
         const movieTicketIdentifiers = [...new Set(movieTickets.map((t) => t.identifier))];
         if (movieTicketIdentifiers.length !== 1) {
-            throw new factory.errors.Argument('movieTickets', 'Number of movie ticket identifiers must be 1');
+            throw new factory_1.factory.errors.Argument('movieTickets', 'Number of movie ticket identifiers must be 1');
         }
         const movieTicketIdentifier = movieTicketIdentifiers[0];
         // 決済カードaccessCodeは1つのみ許可(2023-06-23~)
         const accessCodes = [...new Set(movieTickets.map((t) => t.accessCode))];
         if (accessCodes.length !== 1) {
-            throw new factory.errors.Argument('movieTickets', 'Number of movie ticket accessCodes must be 1');
+            throw new factory_1.factory.errors.Argument('movieTickets', 'Number of movie ticket accessCodes must be 1');
         }
         // ムビチケ系統の決済方法タイプは動的
         const paymentMethodType = params.object.paymentMethod?.identifier;
         if (typeof paymentMethodType !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
+            throw new factory_1.factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         // イベント取得属性最適化(2023-01-23~)
         const screeningEvent = await repos.event.projectEventFieldsById({ id: eventIds[0] }, [
@@ -68,7 +44,7 @@ checkedAction, purpose) {
         // 販売者からムビチケ決済情報取得
         const sellerId = params.recipient?.id;
         if (typeof sellerId !== 'string') {
-            throw new factory.errors.ArgumentNull('recipient.id');
+            throw new factory_1.factory.errors.ArgumentNull('recipient.id');
         }
         // const sellers = <Pick<factory.seller.ISeller, 'id' | 'paymentAccepted' | 'project'>[]>await repos.seller.search(
         //     {
@@ -89,7 +65,7 @@ checkedAction, purpose) {
             codeValue: paymentMethodType
         });
         if (paymentAccepted !== true) {
-            throw new factory.errors.Argument('recipient', `payment not accepted [${paymentMethodType}]`);
+            throw new factory_1.factory.errors.Argument('recipient', `payment not accepted [${paymentMethodType}]`);
         }
         const checkResult = await checkByIdentifierIfNotYet({
             movieTicketIdentifier,
@@ -100,7 +76,7 @@ checkedAction, purpose) {
             // useCheckByIdentifierIfNotYet,
             checkedAction,
             purpose
-        })(repos, settings);
+        })(repos);
         const accountsReceivablesByServiceType = [];
         // 券種ごとに枚数が足りているか
         const serviceTypes = [...new Set(movieTickets.map((t) => t.serviceType))];
@@ -115,7 +91,7 @@ checkedAction, purpose) {
             }
             if (availableMovieTicketsCountByServiceType < requiredMovieTicketsCountByServiceType) {
                 const shortNumber = requiredMovieTicketsCountByServiceType - availableMovieTicketsCountByServiceType;
-                throw new factory.errors.Argument('movieTickets', `${shortNumber} movie tickets by service type ${serviceType} short`);
+                throw new factory_1.factory.errors.Argument('movieTickets', `${shortNumber} movie tickets by service type ${serviceType} short`);
             }
             // checkResultから計上金額を取得
             const accountsReceivableByResponse = ykknInfoOfServiceType?.kijUnip;
@@ -130,48 +106,64 @@ checkedAction, purpose) {
     };
 }
 function checkByIdentifierIfNotYet(params) {
-    return async (repos, settings) => {
+    return async (repos) => {
         let checkResult;
         let alreadyCheckedAction; // すでにCheckActionが存在すれば認証しない(2023-06-06~)
         const placeOrderId = params.purpose.id;
         if (typeof placeOrderId === 'string') {
             // no op
         }
+        else {
+            // 注文取引IDの未指定ケースは廃止(2026-03-21~)
+            throw new factory_1.factory.errors.ArgumentNull('purpose.id');
+            // // 注文取引IDの未指定ケースがあるかどうか確認するためにlog
+            // console.log('checkByIdentifierIfNotYet: placeOrderId undefined. params:', JSON.stringify(params));
+        }
         const specifiedCheckedActionId = params.checkedAction?.id;
         if (typeof specifiedCheckedActionId === 'string' && specifiedCheckedActionId !== '') {
-            alreadyCheckedAction = (await repos.action.search({
-                limit: 1,
-                page: 1,
-                id: { $in: [specifiedCheckedActionId] },
-                actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
-                ...(typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined
-            }, ['id'])).shift();
+            alreadyCheckedAction = (await repos.checkMovieTicketAction.findCompletedCheckActions({
+                // limit: 1,
+                // page: 1,
+                // id: { $in: [specifiedCheckedActionId] },
+                id: specifiedCheckedActionId,
+                // actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
+                // ...(typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined
+                ...(typeof placeOrderId === 'string') ? { purpose: { id: placeOrderId } } : undefined
+            })).shift();
             if (alreadyCheckedAction === undefined) {
-                throw new factory.errors.NotFound(factory.actionType.CheckAction);
+                throw new factory_1.factory.errors.NotFound(factory_1.factory.actionType.CheckAction);
             }
         }
         else {
-            alreadyCheckedAction = (await repos.action.search({
-                limit: 1,
-                page: 1,
-                sort: { startDate: factory.sortType.Descending },
-                typeOf: { $eq: factory.actionType.CheckAction },
-                actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
-                object: {
-                    typeOf: { $eq: factory.service.paymentService.PaymentServiceType.MovieTicket },
-                    id: { $eq: params.paymentServiceId }, // 指定の決済サービスにおいて
-                    movieTickets: {
-                        identifier: { $eq: params.movieTicketIdentifier }, // 指定の決済カードコードを
-                        serviceOutput: {
-                            reservationFor: { id: { $eq: params.screeningEvent.id } } // 指定のイベントにおいて
-                        }
-                    }
-                },
-                ...(typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined
-            }, ['id'])).shift();
+            // 認証IDの未指定ケースは廃止(2026-03-21~)
+            throw new factory_1.factory.errors.ArgumentNull('checkedAction.id');
+            // // 認証IDの未指定ケースがあるかどうか確認するためにlog
+            // console.log('checkByIdentifierIfNotYet: specifiedCheckedActionId undefined. params:', JSON.stringify(params));
+            // alreadyCheckedAction = (await repos.checkMovieTicketAction.findCompletedCheckActions(
+            //     {
+            //         // limit: 1,
+            //         // page: 1,
+            //         sort: { startDate: factory.sortType.Descending },
+            //         // typeOf: { $eq: factory.actionType.CheckAction },
+            //         // actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
+            //         object: {
+            //             typeOf: { $eq: factory.service.paymentService.PaymentServiceType.MovieTicket },
+            //             id: { $eq: params.paymentServiceId }, // 指定の決済サービスにおいて
+            //             movieTickets: {
+            //                 identifier: { $eq: params.movieTicketIdentifier }, // 指定の決済カードコードを
+            //                 serviceOutput: {
+            //                     reservationFor: { id: { $eq: params.screeningEvent.id } } // 指定のイベントにおいて
+            //                 }
+            //             }
+            //         },
+            //         // ...(typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined
+            //         ...(typeof placeOrderId === 'string') ? { purpose: { id: placeOrderId } } : undefined
+            //     }
+            // )).shift();
         }
+        debug('checkByIdentifierIfNotYet: alreadyCheckedAction:', JSON.stringify(alreadyCheckedAction), 'params:', JSON.stringify(params));
         if (alreadyCheckedAction !== undefined) {
-            const recipe = await repos.action.findRecipeByAction({
+            const recipe = await repos.checkMovieTicketAction.findRecipeByAction({
                 project: { id: params.screeningEvent.project.id },
                 recipeFor: { id: alreadyCheckedAction.id }
             });
@@ -184,8 +176,11 @@ function checkByIdentifierIfNotYet(params) {
             }
         }
         if (checkResult === undefined) {
-            debug('checkByIdentifier processing because movieTickets not checked yet...', checkResult);
-            checkResult = await (0, processPurchaseNumberAuth_1.processPurchaseNumberAuth)(params)(repos, settings);
+            // 認証IDの未指定ケースは廃止(2026-03-21~)
+            console.error('checkByIdentifierIfNotYet: checkResult undefined. params:', JSON.stringify(params));
+            throw new factory_1.factory.errors.NotFound('checkResult');
+            // debug('checkByIdentifier processing because movieTickets not checked yet...', checkResult);
+            // checkResult = await processPurchaseNumberAuth(params)(repos, settings);
         }
         return checkResult;
     };

package/lib/chevre/service/payment/movieTicket/voidTransaction.d.ts

@@ -1,12 +1,16 @@
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
-import type { ActionRepo } from '../../../repo/action';
+import type { PayActionRepo } from '../../../repo/action/pay';
+import type { RefundActionRepo } from '../../../repo/action/refund';
 import type { CredentialsRepo } from '../../../repo/credentials';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { TaskRepo } from '../../../repo/task';
-import * as factory from '../../../factory';
+import { factory } from '../../../factory';
 import { Settings } from '../../../settings';
 declare function voidTransaction(params: factory.task.voidPayment.IData): (repos: {
-    action: ActionRepo;
+    actions: {
+        pay: PayActionRepo;
+        refund: RefundActionRepo;
+    };
     accountingReport: AccountingReportRepo;
     credentials: CredentialsRepo;
     paymentService: PaymentServiceRepo;

package/lib/chevre/service/payment/movieTicket/voidTransaction.js

@@ -1,67 +1,44 @@
 "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.voidTransaction = voidTransaction;
-const factory = __importStar(require("../../../factory"));
+const factory_1 = require("../../../factory");
 const refundMovieTicket_1 = require("./refundMovieTicket");
 function voidTransaction(params) {
     return async (repos, settings) => {
         const transaction = params.object;
         const paymentMethodType = transaction.object.paymentMethod?.identifier;
         if (typeof paymentMethodType !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
+            throw new factory_1.factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         // const paymentMethodId = transaction.object.paymentMethod?.paymentMethodId;
         const paymentMethodId = transaction.object.paymentMethodId;
         if (typeof paymentMethodId !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethodId');
+            throw new factory_1.factory.errors.ArgumentNull('object.paymentMethodId');
         }
         // 決済開始時に着券していれば、取消
         // 例えばtimeoutが原因でCompletedActionStatusでない場合、外部サービス側では着券済の可能性もあるので、そこを考慮する
-        const payAction = await repos.action.findPayAction({
+        const payAction = await repos.actions.pay.findPayActionByPaymentMethodId({
             project: { id: transaction.project.id },
             paymentMethodId,
             actionStatus: {
                 $in: [
-                    factory.actionStatusType.ActiveActionStatus,
-                    factory.actionStatusType.CompletedActionStatus,
-                    factory.actionStatusType.FailedActionStatus
+                    factory_1.factory.actionStatusType.ActiveActionStatus,
+                    factory_1.factory.actionStatusType.CompletedActionStatus,
+                    factory_1.factory.actionStatusType.FailedActionStatus
                 ]
             }
         });
         if (payAction !== undefined) {
             const seller = transaction.recipient;
             if (typeof seller?.id !== 'string') {
-                throw new factory.errors.NotFound('payTransaction.recipient');
+                throw new factory_1.factory.errors.NotFound('payTransaction.recipient');
             }
-            if (payAction.purpose.typeOf !== factory.order.OrderType.Order) {
-                throw new factory.errors.Internal(`unexpected payAction.purpose.typeOf ${payAction.purpose.typeOf}`);
+            if (payAction.purpose.typeOf !== factory_1.factory.order.OrderType.Order) {
+                throw new factory_1.factory.errors.Internal(`unexpected payAction.purpose.typeOf ${payAction.purpose.typeOf}`);
             }
             const refundAction = {
                 project: transaction.project,
-                typeOf: factory.actionType.RefundAction,
+                typeOf: factory_1.factory.actionType.RefundAction,
                 object: [{
                         typeOf: transaction.object.typeOf,
                         id: (typeof transaction.object.id === 'string') ? transaction.object.id : '',
@@ -76,7 +53,7 @@ function voidTransaction(params) {
                     }],
                 agent: {
                     id: seller.id,
-                    name: (typeof seller.name === 'string') ? seller.name : String(seller.name?.ja),
+                    name: (typeof seller.name === 'string') ? seller.name : String(seller.name),
                     typeOf: seller.typeOf
                 },
                 recipient: transaction.recipient,

package/lib/chevre/service/reserve/cancelReservation.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 { OfferRateLimitRepo } from '../../repo/rateLimit/offer';
@@ -36,9 +36,9 @@ declare function processUnlockOfferRateLimit(params: {
     };
     reservation: {
         reservationNumber: string;
-        reservedTicket: factory.reservation.ITicket;
+        reservedTicket: Pick<factory.assetTransaction.reserve.ISubReservationReservedTicket, 'ticketType'>;
     };
-    reservationFor: factory.assetTransaction.reserve.IReservationFor;
+    reservationFor: Pick<factory.assetTransaction.reserve.IReservationFor, 'id' | 'typeOf' | 'startDate'>;
 }): (repos: {
     offerRateLimit: OfferRateLimitRepo;
 }) => Promise<void>;

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,23 +296,24 @@ 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;
+                            // // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
+                            // delete (r as any)._id;
                             return r;
                         });
                     }
                 }
                 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
             };