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

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/lib/chevre/service/reserve/factory.d.ts

@@ -5,10 +5,22 @@ export interface IProject {
     id: string;
     typeOf: factory.organizationType.Project;
 }
+export declare type ISubReservation = Omit<IEventReservation, 'project' | 'reservationFor' | 'reservationNumber' | 'reservationStatus' | 'underName'>;
+/**
+ * 確定予約通知
+ */
+export interface IReservationPackage4informConfirmed {
+    project: IProject;
+    reservationFor: factory.reservation.IReservationFor<factory.reservationType.EventReservation>;
+    reservationNumber: string;
+    reservationStatus: factory.reservationStatusType;
+    subReservation: ISubReservation[];
+    underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+    typeOf: factory.reservationType.ReservationPackage;
+}
 /**
  * 確定予約通知
  */
-export declare type IReservation4informConfirmed = IEventReservation;
 /**
  * 予約取消通知
  */
@@ -44,7 +56,7 @@ export interface IReservation4informUsed {
         dateUsed?: Date;
     };
 }
-export declare type IReservation4inform = IReservation4informConfirmed | IReservation4informCanceled | IReservation4informCheckedIn | IReservation4informUsed;
+export declare type IReservation4inform = IReservationPackage4informConfirmed | IReservation4informCanceled | IReservation4informCheckedIn | IReservation4informUsed;
 export declare type IInformObject = IReservation4inform[];
 export declare type InformReservationActionattributes = factory.action.interact.inform.IAttributes<IInformObject, any>;
 export declare const NUM_TRY_INFORM_RESERVATION: number;

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

@@ -3,13 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NUM_TRY_INFORM_RESERVATION = exports.maskUnderName = void 0;
 const MASKED_PROFILE = '****';
 function maskUnderName(reservation) {
-    var _a, _b;
+    var _a;
     const underName = (typeof ((_a = reservation.underName) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
         ? Object.assign(Object.assign({}, reservation.underName), { email: MASKED_PROFILE, telephone: MASKED_PROFILE, name: MASKED_PROFILE, familyName: MASKED_PROFILE, givenName: MASKED_PROFILE }) : undefined;
-    const reservedTicketUnderName = (typeof ((_b = reservation.reservedTicket.underName) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')
-        ? Object.assign(Object.assign({}, reservation.reservedTicket.underName), { email: MASKED_PROFILE, telephone: MASKED_PROFILE, name: MASKED_PROFILE, familyName: MASKED_PROFILE, givenName: MASKED_PROFILE }) : undefined;
-    const reservedTicket = Object.assign(Object.assign({}, reservation.reservedTicket), (reservedTicketUnderName !== undefined) ? { underName: reservedTicketUnderName } : undefined);
-    return Object.assign(Object.assign(Object.assign({}, reservation), (underName !== undefined) ? { underName } : undefined), { reservedTicket });
+    return Object.assign(Object.assign({}, reservation), (underName !== undefined) ? { underName } : undefined);
 }
 exports.maskUnderName = maskUnderName;
 exports.NUM_TRY_INFORM_RESERVATION = 10;

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

@@ -8,6 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onReservationConfirmed = exports.onReservationConfirmedByAction = void 0;
 /**
@@ -94,9 +105,16 @@ function onReservationConfirmed(confirmedReservations) {
             // inform galobally
             if (Array.isArray(informReservations)) {
                 taskAttributes.push(...informReservations.map((informReservation) => {
-                    var _a;
+                    var _a, _b;
                     const informUrl = String((_a = informReservation.recipient) === null || _a === void 0 ? void 0 : _a.url);
-                    const informObject = confirmedReservations.map(factory_1.maskUnderName);
+                    // 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"]);
+                                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 }
+                            : undefined)];
                     const informReservationAttributes = {
                         agent: confirmedReservations[0].project,
                         object: informObject,

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.42"
 }