@chevre/domain 21.2.0-alpha.95 → 21.2.0-alpha.96

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

@@ -67,7 +67,7 @@ export declare class MongoRepository {
     addReservations(params: {
         typeOf: factory.assetTransactionType.Reserve;
         id: string;
-        object: Pick<factory.assetTransaction.reserve.IObject, 'acceptedOffer' | 'reservationFor' | 'subReservation'>;
+        object: Pick<factory.assetTransaction.reserve.IObject, 'acceptedOffer' | 'issuedThrough' | 'reservationFor' | 'subReservation'>;
     }): Promise<factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>>;
     /**
      * 取引を確定する

package/lib/chevre/repo/assetTransaction.js

@@ -309,22 +309,23 @@ class MongoRepository {
         });
     }
     addReservations(params) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.transactionModel.findOneAndUpdate({
                 _id: { $eq: params.id },
                 typeOf: { $eq: params.typeOf },
                 status: { $eq: factory.transactionStatusType.InProgress }
-            }, {
-                'object.acceptedOffer': params.object.acceptedOffer,
+            }, Object.assign({ 'object.acceptedOffer': params.object.acceptedOffer, 
                 // 念のため残す(2021/10/14)が、そのうち削除
                 // 冗長なので削除(2021/10/19～)
                 // 'object.event': params.object.reservationFor,
-                'object.reservationFor': params.object.reservationFor,
+                'object.reservationFor': params.object.reservationFor, 
                 // 念のため残す(2021/10/14)が、そのうち削除
                 // 冗長なので削除(2021/10/19～)
                 // 'object.reservations': params.object.subReservation,
-                'object.subReservation': params.object.subReservation
-            }, { new: true })
+                'object.subReservation': params.object.subReservation }, (typeof ((_a = params.object.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
+                ? { 'object.issuedThrough': params.object.issuedThrough }
+                : undefined), { new: true })
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.transactionModel.modelName);

package/lib/chevre/repo/mongoose/schemas/reservation.d.ts

@@ -61,12 +61,12 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     project?: any;
     additionalProperty?: any;
     reservationFor?: any;
+    issuedThrough?: any;
     subReservation?: any;
     broker?: any;
     underName?: any;
     price?: any;
     priceCurrency?: string | undefined;
-    issuedThrough?: any;
     reservedTicket?: any;
     additionalTicketText?: string | undefined;
     bookingTime?: Date | undefined;
@@ -89,12 +89,12 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     project?: any;
     additionalProperty?: any;
     reservationFor?: any;
+    issuedThrough?: any;
     subReservation?: any;
     broker?: any;
     underName?: any;
     price?: any;
     priceCurrency?: string | undefined;
-    issuedThrough?: any;
     reservedTicket?: any;
     additionalTicketText?: string | undefined;
     bookingTime?: Date | undefined;
@@ -117,12 +117,12 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     project?: any;
     additionalProperty?: any;
     reservationFor?: any;
+    issuedThrough?: any;
     subReservation?: any;
     broker?: any;
     underName?: any;
     price?: any;
     priceCurrency?: string | undefined;
-    issuedThrough?: any;
     reservedTicket?: any;
     additionalTicketText?: string | undefined;
     bookingTime?: Date | undefined;

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

@@ -35,11 +35,15 @@ export declare class MongoRepository {
         reservationNumber: string;
         previousReservationStatus: factory.reservationStatusType;
         underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+        broker?: factory.reservation.IBroker<factory.reservationType>;
+        issuedThrough?: factory.assetTransaction.reserve.IIssuedThrough;
     }): Promise<void>;
     confirmByIdIfNotExist(params: {
         reservation: factory.assetTransaction.reserve.IObjectSubReservation;
         reservationFor: factory.assetTransaction.reserve.IReservationFor;
         underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+        broker?: factory.reservation.IBroker<factory.reservationType>;
+        issuedThrough?: factory.assetTransaction.reserve.IIssuedThrough;
     }): Promise<void>;
     /**
      * 予約取消

package/lib/chevre/repo/reservation.js

@@ -913,22 +913,24 @@ class MongoRepository {
         });
     }
     confirmByReservationNumber(params) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = {
                 reservationNumber: { $eq: String(params.reservationNumber) },
                 reservationStatus: { $eq: params.previousReservationStatus }
             };
-            const update = Object.assign({ 
+            const update = Object.assign(Object.assign(Object.assign({ 
                 // previousReservationStatusを保管(2023-01-19~)
-                previousReservationStatus: params.previousReservationStatus, reservationStatus: factory.reservationStatusType.ReservationConfirmed, modifiedTime: new Date() }, (params.underName !== undefined) ? { underName: params.underName } : undefined);
+                previousReservationStatus: params.previousReservationStatus, reservationStatus: factory.reservationStatusType.ReservationConfirmed, modifiedTime: new Date() }, (params.underName !== undefined) ? { underName: params.underName } : undefined), (typeof ((_a = params.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.broker } : undefined), (typeof ((_b = params.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { issuedThrough: params.issuedThrough } : undefined);
             yield this.reservationModel.updateMany(conditions, update)
                 .exec();
         });
     }
     confirmByIdIfNotExist(params) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const confirmedReservation = yield this.reservationModel.findOneAndUpdate({ _id: { $eq: params.reservation.id } }, {
-                $setOnInsert: Object.assign(Object.assign(Object.assign({}, params.reservation), { _id: params.reservation.id, reservationFor: params.reservationFor, reservationStatus: factory.reservationStatusType.ReservationConfirmed, modifiedTime: new Date() }), (params.underName !== undefined) ? { underName: params.underName } : undefined)
+                $setOnInsert: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, params.reservation), { _id: params.reservation.id, reservationFor: params.reservationFor, reservationStatus: factory.reservationStatusType.ReservationConfirmed, modifiedTime: new Date() }), (params.underName !== undefined) ? { underName: params.underName } : undefined), (typeof ((_a = params.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.broker } : undefined), (typeof ((_b = params.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { issuedThrough: params.issuedThrough } : undefined)
             }, { upsert: true, new: true })
                 .select({ _id: 1 })
                 .exec();

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

@@ -47,6 +47,11 @@ export declare function createAdditionalTicketText(params: {
 }): string | undefined;
 export type IUnitPriceSpecification = factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.UnitPriceSpecification>;
 export declare function createReservationFor(params: factory.event.screeningEvent.IEvent | factory.event.event.IEvent): factory.assetTransaction.reserve.IReservationFor;
+export declare function createIssuedThrough(params: {
+    reservationFor: factory.event.screeningEvent.IEvent | factory.event.event.IEvent;
+}): {
+    issuedThrough: factory.reservation.busReservation.IIssuedThrough | factory.reservation.eventReservation.IIssuedThrough;
+};
 export declare function createReservation(params: {
     project: {
         id: string;
@@ -78,6 +83,6 @@ export declare function createPotentialActions(params: factory.assetTransaction.
     reservationPackage?: factory.action.reserve.IReservationPackageAsObject;
     underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
 };
-export declare function createPendingReservationAction(params: {
+export declare function createCancelPendingReservationAction(params: {
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
-}): factory.action.cancel.reservation.IAttributes[];
+}): factory.action.cancel.reservation.IAttributes | undefined;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createPendingReservationAction = exports.createPotentialActions = exports.createReservation = exports.createReservationFor = exports.createAdditionalTicketText = exports.createAdditionalProperty = exports.validateAppliesToMovieTicket = exports.createReservedTicket = exports.createPointAward = exports.createStartParams = void 0;
+exports.createCancelPendingReservationAction = exports.createPotentialActions = exports.createReservation = exports.createIssuedThrough = exports.createReservationFor = exports.createAdditionalTicketText = exports.createAdditionalProperty = exports.validateAppliesToMovieTicket = exports.createReservedTicket = exports.createPointAward = exports.createStartParams = void 0;
 /**
  * 予約取引ファクトリー
  */
@@ -356,6 +356,42 @@ function optimizeReservationSuperEvent(params) {
         ? { headline: superEvent.headline }
         : undefined);
 }
+function createIssuedThrough(params) {
+    var _a;
+    const eventOffers = params.reservationFor.offers;
+    // offersは必ず存在するはず
+    if (eventOffers === undefined) {
+        throw new factory.errors.NotFound('reservationFor.offers');
+    }
+    const serviceTypeOfIssuedThrough = (typeof ((_a = eventOffers.itemOffered.serviceType) === null || _a === void 0 ? void 0 : _a.codeValue) === 'string')
+        ? {
+            codeValue: eventOffers.itemOffered.serviceType.codeValue,
+            inCodeSet: {
+                typeOf: 'CategoryCodeSet',
+                identifier: factory.categoryCode.CategorySetIdentifier.ServiceType
+            },
+            typeOf: 'CategoryCode'
+        }
+        : undefined;
+    const availableChannel = eventOffers.itemOffered.availableChannel;
+    if (params.reservationFor.typeOf === factory.eventType.ScreeningEvent) {
+        const issuedThrough = Object.assign({ typeOf: factory.product.ProductType.EventService, 
+            // 興行IDを追加(2022-09-08~)
+            id: eventOffers.itemOffered.id, availableChannel }, (typeof (serviceTypeOfIssuedThrough === null || serviceTypeOfIssuedThrough === void 0 ? void 0 : serviceTypeOfIssuedThrough.typeOf) === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined);
+        return {
+            issuedThrough
+        };
+    }
+    else {
+        const issuedThrough = Object.assign({ typeOf: factory.product.ProductType.Transportation, 
+            // 興行IDを追加(2022-09-08~)
+            id: eventOffers.itemOffered.id, availableChannel }, (typeof (serviceTypeOfIssuedThrough === null || serviceTypeOfIssuedThrough === void 0 ? void 0 : serviceTypeOfIssuedThrough.typeOf) === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined);
+        return {
+            issuedThrough
+        };
+    }
+}
+exports.createIssuedThrough = createIssuedThrough;
 // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
 function createReservation(params) {
     var _a, _b, _c, _d, _e;
@@ -561,10 +597,10 @@ function createMoneyTransferActions(params) {
     }
     return moneyTransfer;
 }
-function createPendingReservationAction(params) {
+function createCancelPendingReservationAction(params) {
     const transaction = params.transaction;
     const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
-    let cancelActionAttributes = [];
+    let cancelActionAttributes;
     if (pendingReservations.length > 0) {
         const reservationFor = transaction.object.reservationFor;
         if (reservationFor === undefined) {
@@ -579,15 +615,15 @@ function createPendingReservationAction(params) {
                 ? params.transaction.object.reservationStatus
                 : factory.reservationStatusType.ReservationPending
         };
-        cancelActionAttributes = [{
-                project: transaction.project,
-                typeOf: factory.actionType.CancelAction,
-                purpose: { typeOf: transaction.typeOf, id: transaction.id },
-                agent: transaction.project,
-                object: reservationPackage,
-                potentialActions: {}
-            }];
+        cancelActionAttributes = {
+            project: transaction.project,
+            typeOf: factory.actionType.CancelAction,
+            purpose: { typeOf: transaction.typeOf, id: transaction.id },
+            agent: transaction.project,
+            object: reservationPackage,
+            potentialActions: {}
+        };
     }
     return cancelActionAttributes;
 }
-exports.createPendingReservationAction = createPendingReservationAction;
+exports.createCancelPendingReservationAction = createCancelPendingReservationAction;

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

@@ -136,6 +136,7 @@ function addReservations(params) {
         })(repos);
         // 予約イベント最適化
         const reservationFor = (0, factory_1.createReservationFor)(event);
+        const { issuedThrough } = (0, factory_1.createIssuedThrough)({ reservationFor: event });
         // const minimizedObjectSubReservations: factory.assetTransaction.reserve.IMinimizedObjectSubReservation[] =
         //     objectSubReservations.map((r) => {
         //         return {
@@ -159,6 +160,8 @@ function addReservations(params) {
                 id: transaction.id,
                 object: {
                     acceptedOffer: acceptedOffers4transactionObject,
+                    // issuedThroughを追加(2023-06-05~)
+                    issuedThrough,
                     reservationFor,
                     // subReservationにreservationForを保管しない(2021-10-19～)
                     subReservation: objectSubReservations
@@ -786,8 +789,8 @@ function cancel(params) {
         });
         // 本来非同期でタスクが実行されるが、同期的に仮予約取消が実行されていないと、サービス利用側が困る可能性があるので、
         // 同期的にもcancelPendingReservationを実行しておく
-        const cancelActionAttributes = (0, factory_1.createPendingReservationAction)({ transaction });
-        if (cancelActionAttributes.length > 0) {
+        const cancelActionAttributes = (0, factory_1.createCancelPendingReservationAction)({ transaction });
+        if (cancelActionAttributes !== undefined) {
             yield (0, cancelReservation_1.cancelPendingReservation)(cancelActionAttributes)(repos);
         }
     });
@@ -832,8 +835,8 @@ function exportTasksById(params) {
             case factory.transactionStatusType.Canceled:
                 // sync対応(2023-01-13~)
                 if (!settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING) {
-                    const cancelActionAttributes4canceled = (0, factory_1.createPendingReservationAction)({ transaction });
-                    if (cancelActionAttributes4canceled.length > 0) {
+                    const cancelActionAttributes4canceled = (0, factory_1.createCancelPendingReservationAction)({ transaction });
+                    if (cancelActionAttributes4canceled !== undefined) {
                         const cancelPendingReservationTask = {
                             project: transaction.project,
                             name: factory.taskName.CancelPendingReservation,
@@ -843,7 +846,7 @@ function exportTasksById(params) {
                             numberOfTried: 0,
                             executionResults: [],
                             data: {
-                                actionAttributes: cancelActionAttributes4canceled
+                                actionAttributes: [cancelActionAttributes4canceled]
                             }
                         };
                         taskAttributes.push(cancelPendingReservationTask);
@@ -851,8 +854,8 @@ function exportTasksById(params) {
                 }
                 break;
             case factory.transactionStatusType.Expired:
-                const cancelActionAttributes = (0, factory_1.createPendingReservationAction)({ transaction });
-                if (cancelActionAttributes.length > 0) {
+                const cancelActionAttributes = (0, factory_1.createCancelPendingReservationAction)({ transaction });
+                if (cancelActionAttributes !== undefined) {
                     const cancelPendingReservationTask = {
                         project: transaction.project,
                         name: factory.taskName.CancelPendingReservation,
@@ -862,7 +865,7 @@ function exportTasksById(params) {
                         numberOfTried: 0,
                         executionResults: [],
                         data: {
-                            actionAttributes: cancelActionAttributes
+                            actionAttributes: [cancelActionAttributes]
                         }
                     };
                     taskAttributes.push(cancelPendingReservationTask);

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

@@ -8,7 +8,7 @@ import { MongoRepository as TaskRepo } from '../../repo/task';
 /**
  * 進行中の予約をキャンセルする
  */
-declare function cancelPendingReservation(actionAttributesList: factory.action.cancel.reservation.IAttributes[]): (repos: {
+declare function cancelPendingReservation(actionAttributes: factory.action.cancel.reservation.IAttributes): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     stockHolder: StockHolderRepo;

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

@@ -19,65 +19,112 @@ const onReservationCanceled_1 = require("./potentialActions/onReservationCancele
 /**
  * 進行中の予約をキャンセルする
  */
-// tslint:disable-next-line:max-func-body-length
-function cancelPendingReservation(actionAttributesList) {
-    // tslint:disable-next-line:max-func-body-length
+function cancelPendingReservation(actionAttributes) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const now = new Date();
         let canceledReservations = [];
-        if (actionAttributesList.length > 0) {
-            // tslint:disable-next-line:max-func-body-length
-            yield Promise.all(actionAttributesList.map((actionAttributes) => __awaiter(this, void 0, void 0, function* () {
-                const reserveTransactionId = actionAttributes.purpose.id;
-                // アクション開始
-                const action = yield repos.action.start(actionAttributes);
-                const actionObject = actionAttributes.object;
-                let cancelResult;
-                try {
-                    // 予約取引を検索
-                    const reserveTransactions = yield repos.assetTransaction.search({
-                        limit: 1,
-                        page: 1,
-                        typeOf: factory.assetTransactionType.Reserve,
-                        ids: [reserveTransactionId]
-                    });
-                    const reserveTransaction = reserveTransactions.shift();
-                    if (reserveTransaction !== undefined) {
-                        const reservationFor = reserveTransaction.object.reservationFor;
-                        if (reservationFor === undefined) {
-                            throw new factory.errors.NotFound('transaction.object.reservationFor');
+        const { reserveTransaction } = yield cancelPengindIfNotYet(actionAttributes, now)(repos);
+        if (actionAttributes.object.typeOf === factory.reservationType.ReservationPackage) {
+            if (reserveTransaction.object.disablePendingReservations === true) {
+                // Pendingが存在しない場合は検索しても無駄(2023-06-05~)
+            }
+            else {
+                canceledReservations = yield repos.reservation.search({
+                    reservationNumber: { $eq: actionAttributes.object.reservationNumber },
+                    typeOf: factory.reservationType.EventReservation
+                });
+                canceledReservations = canceledReservations.map((r) => {
+                    // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
+                    delete r._id;
+                    return r;
+                });
+            }
+        }
+        yield (0, onReservationCanceled_1.onReservationCanceled)(canceledReservations, false, {
+            project: { id: reserveTransaction.project.id },
+            id: String((_a = reserveTransaction.object.reservationFor) === null || _a === void 0 ? void 0 : _a.id)
+        })({ task: repos.task });
+    });
+}
+exports.cancelPendingReservation = cancelPendingReservation;
+function cancelPengindIfNotYet(params, now) {
+    // tslint:disable-next-line:max-func-body-length
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const actionAttributes = params;
+        const reserveTransactionId = actionAttributes.purpose.id;
+        // 予約取引を検索
+        const reserveTransactions = yield repos.assetTransaction.search({
+            limit: 1,
+            page: 1,
+            typeOf: factory.assetTransactionType.Reserve,
+            ids: [reserveTransactionId]
+        });
+        const reserveTransaction = reserveTransactions.shift();
+        if (reserveTransaction === undefined) {
+            throw new factory.errors.NotFound(factory.assetTransactionType.Reserve);
+        }
+        // 冪等性を担保(2023-06-05~)
+        const completedActions = yield repos.action.search({
+            limit: 1,
+            page: 1,
+            actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
+            typeOf: { $eq: params.typeOf },
+            object: {
+                typeOf: { $eq: params.object.typeOf },
+                reservationNumber: { $eq: params.object.reservationNumber }
+            },
+            purpose: {
+                id: { $in: [params.purpose.id] },
+                typeOf: { $in: [params.purpose.typeOf] }
+            }
+        }, ['_id'], []);
+        if (completedActions.length === 0) {
+            // アクション開始
+            const action = yield repos.action.start(actionAttributes);
+            const actionObject = actionAttributes.object;
+            let cancelResult;
+            try {
+                if (reserveTransaction !== undefined) {
+                    const reservationFor = reserveTransaction.object.reservationFor;
+                    if (reservationFor === undefined) {
+                        throw new factory.errors.NotFound('transaction.object.reservationFor');
+                    }
+                    // ReservationPackageに対応(2022-12-23~)
+                    if (actionObject.typeOf === factory.reservationType.ReservationPackage) {
+                        const subReservation = reserveTransaction.object.subReservation;
+                        if (Array.isArray(subReservation) && subReservation.length > 0) {
+                            yield Promise.all(subReservation.map((cancelingSubReservation) => __awaiter(this, void 0, void 0, function* () {
+                                yield processUnlockSeat({
+                                    reservation: {
+                                        id: cancelingSubReservation.id,
+                                        reservedTicket: cancelingSubReservation.reservedTicket,
+                                        subReservation: cancelingSubReservation.subReservation,
+                                        reservationFor: {
+                                            id: String(reservationFor.id),
+                                            startDate: (reservationFor.typeOf === factory.eventType.ScreeningEvent)
+                                                ? reservationFor.startDate
+                                                : reservationFor.departureTime
+                                        }
+                                    },
+                                    // holder:取引番号に対応(2023-06-05~)
+                                    expectedHolder: (reserveTransaction.object.useHoldStockByTransactionNumber === true)
+                                        ? reserveTransaction.transactionNumber
+                                        : reserveTransactionId
+                                })(repos);
+                                yield processUnlockOfferRateLimit({
+                                    reservation: {
+                                        reservationNumber: reserveTransaction.object.reservationNumber,
+                                        reservedTicket: cancelingSubReservation.reservedTicket
+                                    },
+                                    reservationFor
+                                })(repos);
+                            })));
+                        }
+                        if (reserveTransaction.object.disablePendingReservations === true) {
+                            // disablePendingReservationsの場合は処理不要(2023-06-05~)
                         }
-                        // ReservationPackageに対応(2022-12-23~)
-                        if (actionObject.typeOf === factory.reservationType.ReservationPackage) {
-                            const subReservation = reserveTransaction.object.subReservation;
-                            if (Array.isArray(subReservation) && subReservation.length > 0) {
-                                yield Promise.all(subReservation.map((cancelingSubReservation) => __awaiter(this, void 0, void 0, function* () {
-                                    yield processUnlockSeat({
-                                        reservation: {
-                                            id: cancelingSubReservation.id,
-                                            reservedTicket: cancelingSubReservation.reservedTicket,
-                                            subReservation: cancelingSubReservation.subReservation,
-                                            reservationFor: {
-                                                id: String(reservationFor.id),
-                                                startDate: (reservationFor.typeOf === factory.eventType.ScreeningEvent)
-                                                    ? reservationFor.startDate
-                                                    : reservationFor.departureTime
-                                            }
-                                        },
-                                        // holder:取引番号に対応(2023-06-05~)
-                                        expectedHolder: (reserveTransaction.object.useHoldStockByTransactionNumber === true)
-                                            ? reserveTransaction.transactionNumber
-                                            : reserveTransactionId
-                                    })(repos);
-                                    yield processUnlockOfferRateLimit({
-                                        reservation: {
-                                            reservationNumber: reserveTransaction.object.reservationNumber,
-                                            reservedTicket: cancelingSubReservation.reservedTicket
-                                        },
-                                        reservationFor
-                                    })(repos);
-                                })));
-                            }
+                        else {
                             // 予約番号単位でキャンセル状態に変更する
                             cancelResult = yield repos.reservation.cancelByReservationNumber({
                                 reservationNumber: actionObject.reservationNumber,
@@ -85,54 +132,41 @@ function cancelPendingReservation(actionAttributesList) {
                                 modifiedTime: now
                             });
                         }
-                        else {
-                            // 廃止(2022-12-27~)
-                            throw new factory.errors.NotImplemented(`object.typeOf '${actionObject.typeOf}' not implemented`);
-                        }
                     }
-                }
-                catch (error) {
-                    // actionにエラー結果を追加
-                    try {
-                        const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
-                        yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
-                    }
-                    catch (__) {
-                        // 失敗したら仕方ない
+                    else {
+                        // 廃止(2022-12-27~)
+                        throw new factory.errors.NotImplemented(`object.typeOf '${actionObject.typeOf}' not implemented`);
                     }
-                    throw error;
                 }
-                // アクション完了
-                const actionResult = Object.assign({}, (cancelResult !== undefined) ? {
-                    cancelResult: {
-                        // n: cancelResult.n,
-                        // nModified: cancelResult.nModified,
-                        // ok: cancelResult.ok,
-                        matchedCount: cancelResult.matchedCount,
-                        modifiedCount: cancelResult.modifiedCount
-                    }
-                } : undefined
-                // canceledReservationId: canceledReservation?.id
-                );
-                yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
-                if (actionObject.typeOf === factory.reservationType.ReservationPackage) {
-                    // 最新のconfirmedReservationsを検索
-                    canceledReservations = yield repos.reservation.search({
-                        reservationNumber: { $eq: actionObject.reservationNumber },
-                        typeOf: factory.reservationType.EventReservation
-                    });
-                    canceledReservations = canceledReservations.map((r) => {
-                        // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
-                        delete r._id;
-                        return r;
-                    });
+            }
+            catch (error) {
+                // actionにエラー結果を追加
+                try {
+                    const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
+                    yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
                 }
-                yield (0, onReservationCanceled_1.onReservationCanceled)(canceledReservations, false)({ task: repos.task });
-            })));
+                catch (__) {
+                    // 失敗したら仕方ない
+                }
+                throw error;
+            }
+            // アクション完了
+            const actionResult = Object.assign({}, (cancelResult !== undefined) ? {
+                cancelResult: {
+                    // n: cancelResult.n,
+                    // nModified: cancelResult.nModified,
+                    // ok: cancelResult.ok,
+                    matchedCount: cancelResult.matchedCount,
+                    modifiedCount: cancelResult.modifiedCount
+                }
+            } : undefined
+            // canceledReservationId: canceledReservation?.id
+            );
+            yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
         }
+        return { reserveTransaction };
     });
 }
-exports.cancelPendingReservation = cancelPendingReservation;
 /**
  * 予約をキャンセルする
  */
@@ -145,6 +179,7 @@ function cancelReservation(actionAttributesList) {
             yield Promise.all(actionAttributesList.map((actionAttributes) => __awaiter(this, void 0, void 0, function* () {
                 const action = yield repos.action.start(actionAttributes);
                 let cancelResult;
+                let canceledReservationForId;
                 try {
                     if (actionAttributes.object.typeOf === factory.reservationType.ReservationPackage) {
                         // 予約取引を検索
@@ -156,12 +191,13 @@ function cancelReservation(actionAttributesList) {
                         });
                         const reserveTransaction = reserveTransactions.shift();
                         if (reserveTransaction === undefined) {
-                            throw new factory.errors.NotFound('ReserveTransaction');
+                            throw new factory.errors.NotFound(factory.assetTransactionType.Reserve);
                         }
                         const reservationFor = reserveTransaction.object.reservationFor;
                         if (reservationFor === undefined) {
                             throw new factory.errors.NotFound('transaction.object.reservationFor');
                         }
+                        canceledReservationForId = String(reservationFor.id);
                         const subReservation = reserveTransaction.object.subReservation;
                         if (Array.isArray(subReservation) && subReservation.length > 0) {
                             yield Promise.all(subReservation.map((cancelingSubReservation) => __awaiter(this, void 0, void 0, function* () {
@@ -210,6 +246,7 @@ function cancelReservation(actionAttributesList) {
                             object: { reservations: { id: { $in: [reservation.id] } } }
                         });
                         const reserveTransaction = reserveTransactions.shift();
+                        canceledReservationForId = reservation.reservationFor.id;
                         // holder:取引番号に対応(2023-06-05~)
                         const expectedHolder = ((reserveTransaction === null || reserveTransaction === void 0 ? void 0 : reserveTransaction.object.useHoldStockByTransactionNumber) === true)
                             ? reserveTransaction.transactionNumber
@@ -288,7 +325,10 @@ function cancelReservation(actionAttributesList) {
                     });
                     canceledReservations = [canceledReservation];
                 }
-                yield (0, onReservationCanceled_1.onReservationCanceled)(canceledReservations, true)({ task: repos.task });
+                yield (0, onReservationCanceled_1.onReservationCanceled)(canceledReservations, true, {
+                    project: { id: actionAttributes.project.id },
+                    id: canceledReservationForId
+                })({ task: repos.task });
             })));
         }
     });

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

@@ -103,7 +103,9 @@ function reserveIfNotYet(params, options) {
                                 yield repos.reservation.confirmByIdIfNotExist({
                                     reservation: subReservation,
                                     reservationFor,
-                                    underName
+                                    underName,
+                                    broker: reserveTransaction.object.broker,
+                                    issuedThrough: reserveTransaction.object.issuedThrough
                                 });
                             })));
                         }
@@ -113,7 +115,9 @@ function reserveIfNotYet(params, options) {
                         yield repos.reservation.confirmByReservationNumber({
                             reservationNumber: reservationPackage.reservationNumber,
                             previousReservationStatus: reservationPackage.reservationStatus,
-                            underName
+                            underName,
+                            broker: reserveTransaction.object.broker,
+                            issuedThrough: reserveTransaction.object.issuedThrough
                         });
                     }
                 }

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

@@ -25,7 +25,7 @@ export interface IReservationPackage4informConfirmed {
  * 予約取消通知
  */
 export interface IReservation4informCanceled {
-    typeOf: factory.reservationType.EventReservation;
+    typeOf: factory.reservationType.BusReservation | factory.reservationType.EventReservation;
     project: IProject;
     id: string;
     reservationStatus: factory.reservationStatusType.ReservationCancelled;

package/lib/chevre/service/reserve/potentialActions/onReservationCanceled.d.ts

@@ -1,10 +1,25 @@
 import * as factory from '../../../factory';
 import { MongoRepository as TaskRepo } from '../../../repo/task';
 type IEventReservation = factory.reservation.IReservation<factory.reservationType.EventReservation>;
+type IBusReservation = factory.reservation.IReservation<factory.reservationType.BusReservation>;
+export declare function onReservationCanceled(
 /**
- * 予約取消後のアクション
+ * ステータス変更された予約リスト
  */
-export declare function onReservationCanceled(canceledReservations: IEventReservation[], useInformReservation: boolean): (repos: {
+canceledReservations: IEventReservation[] | IBusReservation[], 
+/**
+ * 予約通知有無
+ */
+useInformReservation: boolean, 
+/**
+ * 集計対象イベント
+ */
+reservationFor: {
+    project: {
+        id: string;
+    };
+    id: string;
+}): (repos: {
     task: TaskRepo;
 }) => Promise<void>;
 export {};

package/lib/chevre/service/reserve/potentialActions/onReservationCanceled.js

@@ -19,27 +19,19 @@ const settings_1 = require("../../../settings");
 const offer_1 = require("../../offer");
 const factory_1 = require("../factory");
 const informReservations = settings_1.settings.onReservationStatusChanged.informReservation;
+function onReservationCanceled(
 /**
- * 予約取消後のアクション
+ * ステータス変更された予約リスト
  */
-// export function onReservationCanceledByAction(
-//     actionAttributes: factory.action.cancel.reservation.IAttributes
-// ) {
-//     return async (repos: {
-//         task: TaskRepo;
-//     }) => {
-//         const potentialActions = actionAttributes.potentialActions;
-//         const taskAttributes: factory.task.IAttributes<factory.taskName>[] = [];
-//         if (potentialActions !== undefined) {
-//             // no op
-//         }
-//         // タスク保管
-//         if (taskAttributes.length > 0) {
-//             await repos.task.saveMany(taskAttributes, { emitImmediately: true });
-//         }
-//     };
-// }
-function onReservationCanceled(canceledReservations, useInformReservation) {
+canceledReservations, 
+/**
+ * 予約通知有無
+ */
+useInformReservation, 
+/**
+ * 集計対象イベント
+ */
+reservationFor) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         if (Array.isArray(canceledReservations) && canceledReservations.length > 0) {
             const now = new Date();
@@ -93,10 +85,20 @@ function onReservationCanceled(canceledReservations, useInformReservation) {
             if (taskAttributes.length > 0) {
                 yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
             }
+            // const reservationForId = canceledReservations[0].reservationFor.id;
+            // if (typeof reservationForId === 'string') {
+            //     await createAggregateScreeningEventIfNotExist({
+            //         project,
+            //         reservationFor: [{ id: reservationForId }],
+            //         force: false
+            //     })({ task: repos.task });
+            // }
+        }
+        if (typeof (reservationFor === null || reservationFor === void 0 ? void 0 : reservationFor.id) === 'string') {
             // 冗長な作成を避ける
             yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
-                project,
-                reservationFor: [{ id: canceledReservations[0].reservationFor.id }],
+                project: { id: reservationFor.project.id },
+                reservationFor: [{ id: reservationFor.id }],
                 force: false
             })({ task: repos.task });
         }

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

@@ -32,7 +32,11 @@ function call(data) {
         const reservationRepo = new reservation_1.MongoRepository(settings.connection);
         const stockHolderRepo = new stockHolder_1.StockHolderRepository(settings.redisClient);
         const offerRateLimitRepo = new offer_1.RedisRepository(settings.redisClient);
-        yield ReserveService.cancelPendingReservation(data.actionAttributes)({
+        // アクション数は予約番号単位で1しかありえないはず(2023-06-05~)
+        if (data.actionAttributes.length !== 1) {
+            throw new factory.errors.Argument('data.actionAttributes', 'data.actionAttributes.length must be 1');
+        }
+        yield ReserveService.cancelPendingReservation(data.actionAttributes[0])({
             action: actionRepo,
             assetTransaction: assetTransactionRepo,
             stockHolder: stockHolderRepo,

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.313.0-alpha.24",
+    "@chevre/factory": "4.313.0-alpha.25",
     "@cinerino/sdk": "3.157.0-alpha.6",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.95"
+  "version": "21.2.0-alpha.96"
 }