@chevre/domain 20.1.0-alpha.40 → 20.1.0-alpha.41

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

@@ -1,9 +1,10 @@
-import { Connection } from 'mongoose';
+import { Connection, UpdateWriteOpResult } from 'mongoose';
 import * as factory from '../factory';
 export interface IUpdatePartiallyParams {
     additionalTicketText?: string;
     'reservedTicket.dateUsed'?: Date;
 }
+export declare type ICancelResult = UpdateWriteOpResult;
 /**
  * 予約リポジトリ
  */
@@ -46,7 +47,7 @@ export declare class MongoRepository {
     cancel<T extends factory.reservationType>(params: {
         id: string;
         previousReservationStatus?: factory.reservationStatusType;
-        now: Date;
+        modifiedTime: Date;
     }): Promise<factory.reservation.IReservation<T>>;
     /**
      * 予約取消
@@ -54,8 +55,8 @@ export declare class MongoRepository {
     cancelByReservationNumber(params: {
         reservationNumber: string;
         previousReservationStatus?: factory.reservationStatusType;
-        now: Date;
-    }): Promise<void>;
+        modifiedTime: Date;
+    }): Promise<ICancelResult>;
     /**
      * 発券する
      */

package/lib/chevre/repo/reservation.js

@@ -934,7 +934,7 @@ class MongoRepository {
                 : undefined);
             const update = Object.assign(Object.assign({}, (typeof params.previousReservationStatus === 'string')
                 ? { previousReservationStatus: params.previousReservationStatus }
-                : undefined), { reservationStatus: factory.reservationStatusType.ReservationCancelled, modifiedTime: params.now });
+                : undefined), { reservationStatus: factory.reservationStatusType.ReservationCancelled, modifiedTime: params.modifiedTime });
             const doc = yield this.reservationModel.findOneAndUpdate(conditions, update, { new: true })
                 .select({ __v: 0, createdAt: 0, updatedAt: 0 })
                 .exec();
@@ -962,8 +962,8 @@ class MongoRepository {
                 : undefined);
             const update = Object.assign(Object.assign({}, (typeof params.previousReservationStatus === 'string')
                 ? { previousReservationStatus: params.previousReservationStatus }
-                : undefined), { reservationStatus: factory.reservationStatusType.ReservationCancelled, modifiedTime: params.now });
-            yield this.reservationModel.updateMany(conditions, update)
+                : undefined), { reservationStatus: factory.reservationStatusType.ReservationCancelled, modifiedTime: params.modifiedTime });
+            return this.reservationModel.updateMany(conditions, update)
                 .exec();
         });
     }

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

@@ -33,6 +33,7 @@ function cancelPendingReservation(actionAttributesList) {
                 const reserveTransactionId = actionAttributes.purpose.id;
                 // アクション開始
                 const action = yield repos.action.start(actionAttributes);
+                let cancelResult;
                 try {
                     // 予約取引を検索
                     const reserveTransactions = yield repos.assetTransaction.search({
@@ -44,12 +45,12 @@ function cancelPendingReservation(actionAttributesList) {
                     const reserveTransaction = reserveTransactions.shift();
                     const actionObject = actionAttributes.object;
                     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 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* () {
@@ -62,10 +63,10 @@ function cancelPendingReservation(actionAttributesList) {
                                 })));
                             }
                             // 予約番号単位でキャンセル状態に変更する
-                            yield repos.reservation.cancelByReservationNumber({
+                            cancelResult = yield repos.reservation.cancelByReservationNumber({
                                 reservationNumber: actionObject.reservationNumber,
                                 previousReservationStatus: actionObject.reservationStatus,
-                                now
+                                modifiedTime: now
                             });
                         }
                         else {
@@ -74,10 +75,6 @@ function cancelPendingReservation(actionAttributesList) {
                             });
                             // 取消対象予約が取引に存在すれば、適宜unlock
                             if (cancelingSubReservation !== undefined) {
-                                const reservationFor = reserveTransaction.object.reservationFor;
-                                if (reservationFor === undefined) {
-                                    throw new factory.errors.NotFound('transaction.object.reservationFor');
-                                }
                                 const cancelingReservation = Object.assign(Object.assign({}, cancelingSubReservation), { reservationFor });
                                 yield processUnlockSeat({
                                     reservation: cancelingReservation,
@@ -93,7 +90,7 @@ function cancelPendingReservation(actionAttributesList) {
                                     yield repos.reservation.cancel({
                                         id: cancelingSubReservation.id,
                                         previousReservationStatus: actionObject.reservationStatus,
-                                        now
+                                        modifiedTime: now
                                     });
                                     // canceledReservations.push(canceledReservation);
                                 }
@@ -113,9 +110,15 @@ function cancelPendingReservation(actionAttributesList) {
                     throw error;
                 }
                 // アクション完了
-                const actionResult = {
+                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 });
             })));
@@ -178,7 +181,7 @@ function cancelReservation(actionAttributesList) {
                     canceledReservation = yield repos.reservation.cancel({
                         id: reservation.id,
                         previousReservationStatus: actionAttributes.object.reservationStatus,
-                        now
+                        modifiedTime: now
                     });
                     canceledReservations.push(canceledReservation);
                 }

package/package.json

@@ -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.40"
+  "version": "20.1.0-alpha.41"
 }