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

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

@@ -1,14 +1,27 @@
 import * as factory from '../../factory';
+export declare const RESERVED_AGENT_IDENTIFIER_NAMES: string[];
 declare type IEventReservation = factory.reservation.IReservation<factory.reservationType.EventReservation>;
 export declare function maskUnderName(reservation: IEventReservation): IEventReservation;
 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 +57,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

@@ -1,15 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NUM_TRY_INFORM_RESERVATION = exports.maskUnderName = void 0;
+exports.NUM_TRY_INFORM_RESERVATION = exports.maskUnderName = exports.RESERVED_AGENT_IDENTIFIER_NAMES = void 0;
+exports.RESERVED_AGENT_IDENTIFIER_NAMES = [
+    'orderNumber',
+    'tokenIssuer',
+    'iss',
+    'clientId',
+    'sub',
+    'hostname',
+    'username'
+];
 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 });
+    // 不要なidentifierをmask(2022-12-24~)
+    const identifiers = (Array.isArray(reservation.identifier))
+        ? reservation.identifier.filter((p) => {
+            return !exports.RESERVED_AGENT_IDENTIFIER_NAMES.includes(p.name);
+        })
+        : undefined;
+    return Object.assign(Object.assign(Object.assign({}, reservation), (Array.isArray(identifiers)) ? { identifier: identifiers } : undefined), (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.41"
+  "version": "20.1.0-alpha.43"
 }