@chevre/domain 21.2.0-alpha.12 → 21.2.0-alpha.120

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

@@ -19,67 +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* () {
-                // let canceledReservation: factory.reservation.eventReservation.IReservation | undefined;
-                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* () {
-                                    // const cancelingReservation: factory.reservation.eventReservation.IReservation = {
-                                    //     ...cancelingSubReservation,
-                                    //     reservationFor
-                                    // };
-                                    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
-                                            }
-                                        },
-                                        expectedHolder: reserveTransactionId
-                                    })(repos);
-                                    yield processUnlockOfferRateLimit({
-                                        reservation: {
-                                            reservationNumber: cancelingSubReservation.reservationNumber,
-                                            reservedTicket: cancelingSubReservation.reservedTicket
-                                        },
-                                        reservationFor
-                                    })(repos);
-                                })));
-                            }
+                        else {
                             // 予約番号単位でキャンセル状態に変更する
                             cancelResult = yield repos.reservation.cancelByReservationNumber({
                                 reservationNumber: actionObject.reservationNumber,
@@ -87,82 +132,41 @@ function cancelPendingReservation(actionAttributesList) {
                                 modifiedTime: now
                             });
                         }
-                        else {
-                            // 廃止(2022-12-27~)
-                            throw new factory.errors.NotImplemented(`object.typeOf '${actionObject.typeOf}' not implemented`);
-                            // const cancelingSubReservation = reserveTransaction.object.subReservation?.find((r) => {
-                            //     return r.id === actionObject.id;
-                            // });
-                            // // 取消対象予約が取引に存在すれば、適宜unlock
-                            // if (cancelingSubReservation !== undefined) {
-                            //     const cancelingReservation: factory.reservation.eventReservation.IReservation = {
-                            //         ...cancelingSubReservation,
-                            //         reservationFor
-                            //     };
-                            //     await processUnlockSeat({
-                            //         reservation: cancelingReservation,
-                            //         expectedHolder: reserveTransactionId
-                            //     })(repos);
-                            //     await processUnlockOfferRateLimit({ reservation: cancelingReservation, reservationFor })(repos);
-                            //     // 予約が存在すればキャンセル状態に変更する
-                            //     const reservationCount = await repos.reservation.count({
-                            //         typeOf: cancelingSubReservation.typeOf,
-                            //         ids: [cancelingSubReservation.id]
-                            //     });
-                            //     if (reservationCount > 0) {
-                            //         await repos.reservation.cancel<factory.reservationType.EventReservation>({
-                            //             id: cancelingSubReservation.id,
-                            //             previousReservationStatus: actionObject.reservationStatus,
-                            //             modifiedTime: now
-                            //         });
-                            //     }
-                            // }
-                        }
-                    }
-                }
-                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 });
-                // await onReservationCanceledByAction(actionAttributes)({ task: repos.task });
-                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;
 /**
  * 予約をキャンセルする
  */
@@ -175,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) {
                         // 予約取引を検索
@@ -186,19 +191,16 @@ 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* () {
-                                // const cancelingReservation: factory.reservation.eventReservation.IReservation = {
-                                //     ...cancelingSubReservation,
-                                //     reservationFor
-                                // };
                                 yield processUnlockSeat({
                                     reservation: {
                                         id: cancelingSubReservation.id,
@@ -211,11 +213,14 @@ function cancelReservation(actionAttributesList) {
                                                 : reservationFor.departureTime
                                         }
                                     },
-                                    expectedHolder: reserveTransaction.id
+                                    // holder:取引番号に対応(2023-06-05~)
+                                    expectedHolder: (reserveTransaction.object.useHoldStockByTransactionNumber === true)
+                                        ? reserveTransaction.transactionNumber
+                                        : reserveTransaction.id
                                 })(repos);
                                 yield processUnlockOfferRateLimit({
                                     reservation: {
-                                        reservationNumber: cancelingSubReservation.reservationNumber,
+                                        reservationNumber: reserveTransaction.object.reservationNumber,
                                         reservedTicket: cancelingSubReservation.reservedTicket
                                     },
                                     reservationFor
@@ -241,10 +246,11 @@ function cancelReservation(actionAttributesList) {
                             object: { reservations: { id: { $in: [reservation.id] } } }
                         });
                         const reserveTransaction = reserveTransactions.shift();
-                        let expectedHolder;
-                        if (reserveTransaction !== undefined) {
-                            expectedHolder = reserveTransaction.id;
-                        }
+                        canceledReservationForId = reservation.reservationFor.id;
+                        // holder:取引番号に対応(2023-06-05~)
+                        const expectedHolder = ((reserveTransaction === null || reserveTransaction === void 0 ? void 0 : reserveTransaction.object.useHoldStockByTransactionNumber) === true)
+                            ? reserveTransaction.transactionNumber
+                            : reserveTransaction === null || reserveTransaction === void 0 ? void 0 : reserveTransaction.id;
                         if (typeof expectedHolder === 'string') {
                             yield processUnlockSeat({
                                 reservation: {
@@ -297,7 +303,6 @@ function cancelReservation(actionAttributesList) {
                 // canceledReservationId: canceledReservation?.id
                 );
                 yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
-                // await onReservationCanceledByAction(actionAttributes)({ task: repos.task });
                 let canceledReservations = [];
                 if (actionAttributes.object.typeOf === factory.reservationType.ReservationPackage) {
                     const reservationNumber = actionAttributes.object.reservationNumber;
@@ -320,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/checkInReservation.d.ts

@@ -1,9 +1,8 @@
-/**
- * 予約サービス
- */
+import { MongoRepository as ActionRepo } from '../../repo/action';
+import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import { MongoRepository as ReservationRepo } from '../../repo/reservation';
 import { MongoRepository as TaskRepo } from '../../repo/task';
-export declare function checkInRerservation(params: {
+interface ICheckInReservationParams {
     project: {
         id: string;
     };
@@ -23,7 +22,13 @@ export declare function checkInRerservation(params: {
             ids?: string[];
         };
     };
+}
+export declare function checkInReservation(params: ICheckInReservationParams & {
+    reserveIfNotYet: boolean;
 }): (repos: {
+    action: ActionRepo;
+    assetTransaction: AssetTransactionRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
 }) => Promise<void>;
+export {};

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

@@ -9,18 +9,43 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkInRerservation = void 0;
+exports.checkInReservation = void 0;
+const createDebug = require("debug");
+const factory = require("../../factory");
+const confirmReservation_1 = require("./confirmReservation");
 const onReservationCheckedIn_1 = require("./potentialActions/onReservationCheckedIn");
-function checkInRerservation(params) {
+const debug = createDebug('chevre-domain:service:reserve:checkInReservation');
+function checkInReservation(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
+        // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
+        debug('reserveIfNotYet?', params.reserveIfNotYet, 'ids:', params.object.ids, 'reservationNumbers:', params.object.reservationNumbers);
+        if (params.reserveIfNotYet === true) {
+            yield reserveIfNotYet(params)(repos);
+        }
         // 発券処理(Array対応)
         let checkedInReservationIds;
         if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
+            const existingReservationCount = yield repos.reservation.count({
+                id: { $in: params.object.ids },
+                typeOf: factory.reservationType.EventReservation
+            });
+            if (existingReservationCount !== params.object.ids.length) {
+                throw new factory.errors.NotFound(factory.reservationType.EventReservation, `Some reservations dot not exist. ${params.object.ids.join(',')}`);
+            }
             yield repos.reservation.checkInIfNot({ id: { $in: params.object.ids }, now });
             checkedInReservationIds = params.object.ids;
         }
         if (Array.isArray(params.object.reservationNumbers) && params.object.reservationNumbers.length > 0) {
+            for (const reservationNumber of params.object.reservationNumbers) {
+                const existingReservationCount = yield repos.reservation.count({
+                    reservationNumber: { $eq: reservationNumber },
+                    typeOf: factory.reservationType.EventReservation
+                });
+                if (existingReservationCount === 0) {
+                    throw new factory.errors.NotFound(factory.reservationType.EventReservation, `Some reservations dot not exist. ${params.object.reservationNumbers.join(',')}`);
+                }
+            }
             yield repos.reservation.checkInIfNot({ reservationNumber: { $in: params.object.reservationNumbers }, now });
             // 予約番号リストを予約IDリストに変換
             checkedInReservationIds = yield repos.reservation.searchIdsByReservationNumber({
@@ -37,4 +62,53 @@ function checkInRerservation(params) {
         })({ task: repos.task });
     });
 }
-exports.checkInRerservation = checkInRerservation;
+exports.checkInReservation = checkInReservation;
+function reserveIfNotYet(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        let reserveTransactions = [];
+        if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
+            reserveTransactions = yield repos.assetTransaction.search({
+                typeOf: factory.assetTransactionType.Reserve,
+                object: {
+                    reservations: { id: { $in: params.object.ids } }
+                },
+                statuses: [factory.transactionStatusType.Confirmed]
+            }, ['_id', 'transactionNumber', 'object', 'project', 'typeOf']);
+            debug(reserveTransactions.length, 'reserveTransactions found in reserveIfNotYet. ids:', params.object.ids);
+        }
+        if (Array.isArray(params.object.reservationNumbers) && params.object.reservationNumbers.length > 0) {
+            reserveTransactions = yield repos.assetTransaction.search({
+                typeOf: factory.assetTransactionType.Reserve,
+                object: {
+                    reservationNumber: { $in: params.object.reservationNumbers }
+                },
+                statuses: [factory.transactionStatusType.Confirmed]
+            }, ['_id', 'transactionNumber', 'object', 'project', 'typeOf']);
+            debug(reserveTransactions.length, 'reserveTransactions found in reserveIfNotYet. reservationNumbers:', params.object.reservationNumbers);
+        }
+        yield Promise.all(reserveTransactions.map((reserveTransaction) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            if (typeof ((_a = reserveTransaction.object.reservationFor) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
+                yield (0, confirmReservation_1.confirmReservation)({
+                    actionAttributesList: [{
+                            project: reserveTransaction.project,
+                            typeOf: factory.actionType.ReserveAction,
+                            object: {
+                                typeOf: reserveTransaction.object.typeOf,
+                                reservationNumber: reserveTransaction.object.reservationNumber,
+                                reservationStatus: (typeof reserveTransaction.object.reservationStatus === 'string')
+                                    ? reserveTransaction.object.reservationStatus
+                                    : factory.reservationStatusType.ReservationPending,
+                                reservationFor: reserveTransaction.object.reservationFor
+                            },
+                            agent: reserveTransaction.project,
+                            purpose: { typeOf: reserveTransaction.typeOf, id: reserveTransaction.id }
+                        }],
+                    useOnReservationConfirmed: false,
+                    byTask: false
+                })(repos);
+                debug('confirmReservation processed in reserveIfNotYet. reservationNumber:', reserveTransaction.object.reservationNumber);
+            }
+        })));
+    });
+}

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

@@ -1,15 +1,18 @@
-/**
- * 予約サービス
- */
 import * as factory from '../../factory';
 import { MongoRepository as ActionRepo } from '../../repo/action';
+import { MongoRepository as AssetTrasactionRepo } from '../../repo/assetTransaction';
 import { MongoRepository as ReservationRepo } from '../../repo/reservation';
 import { MongoRepository as TaskRepo } from '../../repo/task';
 /**
  * 予約を確定する
  */
-export declare function confirmReservation(actionAttributesList: factory.action.reserve.IAttributes[]): (repos: {
+export declare function confirmReservation(params: {
+    actionAttributesList: factory.action.reserve.IAttributes[];
+    useOnReservationConfirmed: boolean;
+    byTask: boolean;
+}): (repos: {
     action: ActionRepo;
+    assetTransaction: AssetTrasactionRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
 }) => Promise<void>;