@chevre/domain 20.1.0-alpha.45 → 20.1.0-alpha.47

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

@@ -24,49 +24,66 @@ exports.createStartParams = createStartParams;
 function createPotentialActions(params) {
     var _a, _b;
     const transaction = params.transaction;
-    let targetReservations = [];
+    let cancelReservationActionAttributes = [];
+    // 予約番号指定であれば予約番号単位でアクション生成(2022-12-27~)
     // 予約番号指定の取消取引であれば、予約取引から取消対象予約リストを作成する
-    const reservationForByReserveTransaction = (_a = transaction.object.transaction) === null || _a === void 0 ? void 0 : _a.object.reservationFor;
-    const subReservationByReserveTransaction = (_b = transaction.object.transaction) === null || _b === void 0 ? void 0 : _b.object.subReservation;
-    if (reservationForByReserveTransaction !== undefined && Array.isArray(subReservationByReserveTransaction)) {
-        targetReservations = subReservationByReserveTransaction.map((r) => {
-            return Object.assign(Object.assign({}, r), { reservationFor: reservationForByReserveTransaction });
-        });
-    }
-    else if (Array.isArray(transaction.object.reservations)) {
-        targetReservations = transaction.object.reservations;
-    }
-    // 予約取消アクション属性作成
-    const cancelReservationActionAttributes = targetReservations.map((reservation) => {
-        var _a;
-        // 最適化(2022-06-06~)
+    const reservationNumber = (_a = transaction.object.transaction) === null || _a === void 0 ? void 0 : _a.transactionNumber;
+    const reservationForByReserveTransaction = (_b = transaction.object.transaction) === null || _b === void 0 ? void 0 : _b.object.reservationFor;
+    if (reservationForByReserveTransaction !== undefined && typeof reservationNumber === 'string') {
         const cancelObject = {
-            typeOf: reservation.typeOf,
-            id: reservation.id,
-            issuedThrough: {
-                typeOf: (_a = reservation.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf
-            },
             reservationFor: {
-                typeOf: reservation.reservationFor.typeOf,
-                id: reservation.reservationFor.id
+                typeOf: reservationForByReserveTransaction.typeOf,
+                id: reservationForByReserveTransaction.id
             },
-            reservationNumber: reservation.reservationNumber,
+            reservationNumber,
             // ReservationConfirmed->ReservationCancelledのみ処理されるように保証する
-            reservationStatus: factory.reservationStatusType.ReservationConfirmed
+            reservationStatus: factory.reservationStatusType.ReservationConfirmed,
+            typeOf: factory.reservationType.ReservationPackage
         };
-        return {
-            project: transaction.project,
-            typeOf: factory.actionType.CancelAction,
-            // result: {},
-            object: cancelObject,
-            agent: transaction.project,
-            potentialActions: {},
-            purpose: {
-                typeOf: transaction.typeOf,
-                id: transaction.id
-            }
-        };
-    });
+        cancelReservationActionAttributes = [{
+                project: transaction.project,
+                typeOf: factory.actionType.CancelAction,
+                object: cancelObject,
+                agent: transaction.project,
+                potentialActions: {},
+                purpose: {
+                    typeOf: transaction.typeOf,
+                    id: transaction.id
+                }
+            }];
+    }
+    else if (Array.isArray(transaction.object.reservations)) {
+        // 予約取消アクション属性作成
+        cancelReservationActionAttributes = transaction.object.reservations.map((reservation) => {
+            var _a;
+            // 最適化(2022-06-06~)
+            const cancelObject = {
+                typeOf: reservation.typeOf,
+                id: reservation.id,
+                issuedThrough: {
+                    typeOf: (_a = reservation.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf
+                },
+                reservationFor: {
+                    typeOf: reservation.reservationFor.typeOf,
+                    id: reservation.reservationFor.id
+                },
+                reservationNumber: reservation.reservationNumber,
+                // ReservationConfirmed->ReservationCancelledのみ処理されるように保証する
+                reservationStatus: factory.reservationStatusType.ReservationConfirmed
+            };
+            return {
+                project: transaction.project,
+                typeOf: factory.actionType.CancelAction,
+                object: cancelObject,
+                agent: transaction.project,
+                potentialActions: {},
+                purpose: {
+                    typeOf: transaction.typeOf,
+                    id: transaction.id
+                }
+            };
+        });
+    }
     return {
         cancelReservation: cancelReservationActionAttributes
     };

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

@@ -144,66 +144,122 @@ exports.cancelPendingReservation = cancelPendingReservation;
  * 予約をキャンセルする
  */
 function cancelReservation(actionAttributesList) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
-        const canceledReservations = [];
-        yield Promise.all(actionAttributesList.map((actionAttributes) => __awaiter(this, void 0, void 0, function* () {
-            let canceledReservation;
-            const action = yield repos.action.start(actionAttributes);
-            try {
-                if (actionAttributes.object.typeOf === factory.reservationType.ReservationPackage) {
-                    throw new factory.errors.NotImplemented('ReservationPackage not implemented');
-                }
-                else {
-                    const reservation = yield repos.reservation.findById({
-                        id: actionAttributes.object.id
-                    });
-                    // 予約取引を検索
-                    const reserveTransactions = yield repos.assetTransaction.search({
-                        limit: 1,
-                        page: 1,
-                        typeOf: factory.assetTransactionType.Reserve,
-                        object: { reservations: { id: { $in: [reservation.id] } } }
-                    });
-                    const reserveTransaction = reserveTransactions.shift();
-                    let exectedHolder;
-                    if (reserveTransaction !== undefined) {
-                        exectedHolder = reserveTransaction.id;
+        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 action = yield repos.action.start(actionAttributes);
+                let cancelResult;
+                try {
+                    if (actionAttributes.object.typeOf === factory.reservationType.ReservationPackage) {
+                        // 予約取引を検索
+                        const reserveTransactions = yield repos.assetTransaction.search({
+                            limit: 1,
+                            page: 1,
+                            typeOf: factory.assetTransactionType.Reserve,
+                            transactionNumber: { $eq: actionAttributes.object.reservationNumber }
+                        });
+                        const reserveTransaction = reserveTransactions.shift();
+                        if (reserveTransaction === undefined) {
+                            throw new factory.errors.NotFound('ReserveTransaction');
+                        }
+                        const reservationFor = reserveTransaction.object.reservationFor;
+                        if (reservationFor === undefined) {
+                            throw new factory.errors.NotFound('transaction.object.reservationFor');
+                        }
+                        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 = Object.assign(Object.assign({}, cancelingSubReservation), { reservationFor });
+                                yield processUnlockSeat({
+                                    reservation: cancelingReservation,
+                                    expectedHolder: reserveTransaction.id
+                                })(repos);
+                                yield processUnlockOfferRateLimit({ reservation: cancelingReservation, reservationFor })(repos);
+                            })));
+                        }
+                        // 予約番号単位でキャンセル状態に変更する
+                        cancelResult = yield repos.reservation.cancelByReservationNumber({
+                            reservationNumber: actionAttributes.object.reservationNumber,
+                            previousReservationStatus: actionAttributes.object.reservationStatus,
+                            modifiedTime: now
+                        });
                     }
-                    if (typeof exectedHolder === 'string') {
-                        yield processUnlockSeat({
-                            reservation: reservation,
-                            expectedHolder: exectedHolder
-                        })(repos);
+                    else {
+                        const reservation = yield repos.reservation.findById({
+                            id: actionAttributes.object.id
+                        });
+                        // 予約取引を検索
+                        const reserveTransactions = yield repos.assetTransaction.search({
+                            limit: 1,
+                            page: 1,
+                            typeOf: factory.assetTransactionType.Reserve,
+                            object: { reservations: { id: { $in: [reservation.id] } } }
+                        });
+                        const reserveTransaction = reserveTransactions.shift();
+                        let exectedHolder;
+                        if (reserveTransaction !== undefined) {
+                            exectedHolder = reserveTransaction.id;
+                        }
+                        if (typeof exectedHolder === 'string') {
+                            yield processUnlockSeat({
+                                reservation: reservation,
+                                expectedHolder: exectedHolder
+                            })(repos);
+                        }
+                        yield processUnlockOfferRateLimit({ reservation, reservationFor: reservation.reservationFor })(repos);
+                        // 予約をキャンセル状態に変更する
+                        const canceledReservation = yield repos.reservation.cancel({
+                            id: reservation.id,
+                            previousReservationStatus: actionAttributes.object.reservationStatus,
+                            modifiedTime: now
+                        });
+                        canceledReservations.push(canceledReservation);
                     }
-                    yield processUnlockOfferRateLimit({ reservation, reservationFor: reservation.reservationFor })(repos);
-                    // 予約をキャンセル状態に変更する
-                    canceledReservation = yield repos.reservation.cancel({
-                        id: reservation.id,
-                        previousReservationStatus: actionAttributes.object.reservationStatus,
-                        modifiedTime: now
-                    });
-                    canceledReservations.push(canceledReservation);
                 }
-            }
-            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 (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 (__) {
+                        // 失敗したら仕方ない
+                    }
+                    throw error;
                 }
-                catch (__) {
-                    // 失敗したら仕方ない
+                const actionResult = Object.assign({}, (cancelResult !== undefined) ? {
+                    cancelResult: {
+                        n: cancelResult.n,
+                        nModified: cancelResult.nModified,
+                        ok: cancelResult.ok
+                    }
+                } : undefined
+                // canceledReservationId: canceledReservation?.id
+                );
+                yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+                yield (0, onReservationCanceled_1.onReservationCanceledByAction)(actionAttributes)({ task: repos.task });
+            })));
+            if (actionAttributesList[0].object.typeOf === factory.reservationType.ReservationPackage) {
+                const reservationNumber = actionAttributesList[0].object.reservationNumber;
+                if (typeof reservationNumber === 'string' && reservationNumber.length > 0) {
+                    // 最新のconfirmedReservationsを検索
+                    canceledReservations = yield repos.reservation.search({
+                        reservationNumber: { $eq: reservationNumber },
+                        typeOf: factory.reservationType.EventReservation
+                    });
+                    canceledReservations = canceledReservations.map((r) => {
+                        // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
+                        delete r._id;
+                        return r;
+                    });
                 }
-                throw error;
             }
-            const actionResult = {
-                canceledReservationId: canceledReservation === null || canceledReservation === void 0 ? void 0 : canceledReservation.id
-            };
-            yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
-            yield (0, onReservationCanceled_1.onReservationCanceledByAction)(actionAttributes)({ task: repos.task });
-        })));
-        yield (0, onReservationCanceled_1.onReservationCanceled)(canceledReservations, true)({ task: repos.task });
+            yield (0, onReservationCanceled_1.onReservationCanceled)(canceledReservations, true)({ task: repos.task });
+        }
     });
 }
 exports.cancelReservation = cancelReservation;

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

@@ -5,7 +5,7 @@ export interface IProject {
     id: string;
     typeOf: factory.organizationType.Project;
 }
-export declare type ISubReservation = Omit<IEventReservation, 'project' | 'reservationFor' | 'reservationNumber' | 'reservationStatus' | 'underName'>;
+export declare type ISubReservation = Omit<IEventReservation, 'broker' | 'project' | 'reservationFor' | 'reservationNumber' | 'reservationStatus' | 'underName'>;
 /**
  * 確定予約通知
  */

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

@@ -110,7 +110,7 @@ function onReservationConfirmed(confirmedReservations) {
                     // ReservationPackage通知に変更(2022-12-24~)
                     // const informObject: IInformObject = confirmedReservations.map(maskUnderName);
                     const informObject = [Object.assign({ project: confirmedReservations[0].project, reservationFor: confirmedReservations[0].reservationFor, reservationNumber: confirmedReservations[0].reservationNumber, reservationStatus: confirmedReservations[0].reservationStatus, subReservation: confirmedReservations.map((r) => {
-                                const { project, reservationFor, reservationNumber, reservationStatus, underName } = r, subReservation = __rest(r, ["project", "reservationFor", "reservationNumber", "reservationStatus", "underName"]);
+                                const { broker, project, reservationFor, reservationNumber, reservationStatus, underName } = r, subReservation = __rest(r, ["broker", "project", "reservationFor", "reservationNumber", "reservationStatus", "underName"]);
                                 return subReservation;
                             }), typeOf: factory.reservationType.ReservationPackage }, (typeof ((_b = confirmedReservations[0].underName) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')
                             ? { underName: (0, factory_1.maskUnderName)(confirmedReservations[0]).underName }

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.280.0-alpha.10",
-    "@cinerino/sdk": "3.135.0-alpha.4",
+    "@chevre/factory": "4.280.0-alpha.11",
+    "@cinerino/sdk": "3.135.0-alpha.6",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.1.0-alpha.45"
+  "version": "20.1.0-alpha.47"
 }