@chevre/domain 21.27.0-alpha.6 → 21.27.0-alpha.7

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

@@ -1,24 +1,25 @@
 import * as factory from '../../factory';
 type IEventReservation = factory.reservation.IReservation<factory.reservationType.EventReservation>;
 type IMaskedUnderName = Pick<factory.reservation.IUnderName<factory.reservationType.EventReservation>, 'id' | 'typeOf'>;
-type IEventReservationUnderNameMasked = Omit<factory.reservation.IReservation<factory.reservationType.EventReservation>, 'underName'> & {
-    underName?: IMaskedUnderName;
-};
-export declare function maskUnderName(reservation: IEventReservation): IEventReservationUnderNameMasked;
-export interface IProject {
+export declare function optimizeUnderName4inform(params: {
+    underName: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+}): IMaskedUnderName;
+interface IProject {
     id: string;
     typeOf: factory.organizationType.Project;
 }
-export type ISubReservation = Omit<IEventReservation, 'broker' | 'project' | 'reservationFor' | 'reservationNumber' | 'reservationStatus' | 'underName'>;
+export type ISubReservation4inform = Pick<IEventReservation, 'additionalProperty' | 'additionalTicketText' | 'attended' | 'bookingTime' | 'checkedIn' | 'id' | 'modifiedTime' | 'numSeats' | 'price' | 'programMembershipUsed' | 'reservedTicket' | 'subReservation' | 'typeOf'>;
 /**
  * 確定予約通知
  */
 export interface IReservationPackage4informConfirmed {
+    issuedThrough: factory.reservation.eventReservation.IIssuedThrough;
     project: IProject;
+    provider: factory.reservation.IProvider;
     reservationFor: factory.reservation.IReservationFor<factory.reservationType.EventReservation>;
     reservationNumber: string;
     reservationStatus: factory.reservationStatusType;
-    subReservation: ISubReservation[];
+    subReservation: ISubReservation4inform[];
     underName?: IMaskedUnderName;
     typeOf: factory.reservationType.ReservationPackage;
 }

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

@@ -1,23 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NUM_TRY_INFORM_RESERVATION = exports.maskUnderName = void 0;
-function maskUnderName(reservation) {
-    var _a;
-    const underName = (typeof ((_a = reservation.underName) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-        // ReservationPackage通知アクションのobject.underNameを最小化(2024-03-19~)
-        // ? {
-        //     ...reservation.underName,
-        //     email: MASKED_PROFILE,
-        //     telephone: MASKED_PROFILE,
-        //     name: MASKED_PROFILE,
-        //     familyName: MASKED_PROFILE,
-        //     givenName: MASKED_PROFILE,
-        //     // identifierも隠蔽(2022-12-27~)
-        //     identifier: []
-        // }
-        ? { id: reservation.underName.id, typeOf: reservation.underName.typeOf }
-        : undefined;
-    return Object.assign(Object.assign({}, reservation), (underName !== undefined) ? { underName } : undefined);
+exports.NUM_TRY_INFORM_RESERVATION = exports.optimizeUnderName4inform = void 0;
+function optimizeUnderName4inform(params) {
+    // ReservationPackage通知アクションのobject.underNameを最小化(2024-03-19~)
+    // ? {
+    //     ...reservation.underName,
+    //     email: MASKED_PROFILE,
+    //     telephone: MASKED_PROFILE,
+    //     name: MASKED_PROFILE,
+    //     familyName: MASKED_PROFILE,
+    //     givenName: MASKED_PROFILE,
+    //     // identifierも隠蔽(2022-12-27~)
+    //     identifier: []
+    // }
+    return { id: params.underName.id, typeOf: params.underName.typeOf };
 }
-exports.maskUnderName = maskUnderName;
+exports.optimizeUnderName4inform = optimizeUnderName4inform;
 exports.NUM_TRY_INFORM_RESERVATION = 10;

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

@@ -8,17 +8,6 @@ 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;
 /**
@@ -65,30 +54,44 @@ exports.onReservationConfirmedByAction = onReservationConfirmedByAction;
 function onReservationConfirmed(confirmedReservations) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         if (Array.isArray(confirmedReservations) && confirmedReservations.length > 0) {
+            // ひとつめの予約からReservationPackageの共有属性を取り出す
+            const { issuedThrough, project, provider, reservationFor, reservationNumber, reservationStatus, underName } = confirmedReservations[0];
             yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
-                project: confirmedReservations[0].project,
-                reservationFor: [{ id: confirmedReservations[0].reservationFor.id }],
+                project,
+                reservationFor: [{ id: reservationFor.id }],
                 force: false,
-                identifier: `onReservationConfirmed:${confirmedReservations[0].reservationNumber}`
+                identifier: `onReservationConfirmed:${reservationNumber}`
             })({ task: repos.task });
             const now = new Date();
             const taskAttributes = [];
             // inform galobally
             if (Array.isArray(informReservations)) {
                 taskAttributes.push(...informReservations.map((informReservation) => {
-                    var _a, _b;
-                    const informUrl = String((_a = informReservation.recipient) === null || _a === void 0 ? void 0 : _a.url);
+                    var _a;
+                    const subReservations4inform = confirmedReservations.map((r) => {
+                        // const {
+                        //     broker, project, reservationFor, reservationNumber, reservationStatus, underName,
+                        //     ...subReservation
+                        // } = r;
+                        const { additionalProperty, additionalTicketText, attended, bookingTime, checkedIn, id, modifiedTime, numSeats, price, programMembershipUsed, reservedTicket, subReservation, typeOf } = r;
+                        return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ id,
+                            typeOf,
+                            reservedTicket }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined), (typeof attended === 'boolean') ? { attended } : undefined), (typeof checkedIn === 'boolean') ? { checkedIn } : undefined), (bookingTime instanceof Date) ? { bookingTime } : undefined), (modifiedTime instanceof Date) ? { modifiedTime } : undefined), (typeof numSeats === 'number') ? { numSeats } : undefined), (price !== undefined) ? { price } : undefined), (programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined), (Array.isArray(subReservation)) ? { subReservation } : undefined);
+                    });
                     // ReservationPackage通知に変更(2022-12-24~)
-                    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 { 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 }
+                    const informObject = [Object.assign({ issuedThrough,
+                            project,
+                            provider,
+                            reservationFor,
+                            reservationNumber,
+                            reservationStatus, subReservation: subReservations4inform, typeOf: factory.reservationType.ReservationPackage }, (typeof (underName === null || underName === void 0 ? void 0 : underName.typeOf) === 'string')
+                            ? { underName: (0, factory_1.optimizeUnderName4inform)({ underName }) }
                             : undefined)];
+                    const informUrl = String((_a = informReservation.recipient) === null || _a === void 0 ? void 0 : _a.url);
                     const informReservationAttributes = {
-                        agent: confirmedReservations[0].project,
+                        agent: project,
                         object: informObject,
-                        project: confirmedReservations[0].project,
+                        project,
                         recipient: {
                             id: '',
                             name: informUrl,
@@ -98,7 +101,7 @@ function onReservationConfirmed(confirmedReservations) {
                         typeOf: factory.actionType.InformAction
                     };
                     return {
-                        project: confirmedReservations[0].project,
+                        project,
                         name: factory.taskName.TriggerWebhook,
                         status: factory.taskStatus.Ready,
                         runsAt: now,

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

@@ -1,11 +1,10 @@
 /**
  * 予約サービス
  */
-import { maskUnderName } from './reserve/factory';
 import { cancelPendingReservation, cancelReservation } from './reserve/cancelReservation';
 import { checkInReservation } from './reserve/checkInReservation';
 import { confirmReservation } from './reserve/confirmReservation';
 import { findByCode } from './reserve/findByCode';
 import { searchByOrder } from './reserve/searchByOrder';
 import { verifyToken4reservation } from './reserve/verifyToken4reservation';
-export { maskUnderName, cancelPendingReservation, cancelReservation, checkInReservation, confirmReservation, findByCode, searchByOrder, verifyToken4reservation };
+export { cancelPendingReservation, cancelReservation, checkInReservation, confirmReservation, findByCode, searchByOrder, verifyToken4reservation };

package/lib/chevre/service/reserve.js

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyToken4reservation = exports.searchByOrder = exports.findByCode = exports.confirmReservation = exports.checkInReservation = exports.cancelReservation = exports.cancelPendingReservation = exports.maskUnderName = void 0;
+exports.verifyToken4reservation = exports.searchByOrder = exports.findByCode = exports.confirmReservation = exports.checkInReservation = exports.cancelReservation = exports.cancelPendingReservation = void 0;
 /**
  * 予約サービス
  */
-const factory_1 = require("./reserve/factory");
-Object.defineProperty(exports, "maskUnderName", { enumerable: true, get: function () { return factory_1.maskUnderName; } });
 const cancelReservation_1 = require("./reserve/cancelReservation");
 Object.defineProperty(exports, "cancelPendingReservation", { enumerable: true, get: function () { return cancelReservation_1.cancelPendingReservation; } });
 Object.defineProperty(exports, "cancelReservation", { enumerable: true, get: function () { return cancelReservation_1.cancelReservation; } });
@@ -17,6 +15,5 @@ const findByCode_1 = require("./reserve/findByCode");
 Object.defineProperty(exports, "findByCode", { enumerable: true, get: function () { return findByCode_1.findByCode; } });
 const searchByOrder_1 = require("./reserve/searchByOrder");
 Object.defineProperty(exports, "searchByOrder", { enumerable: true, get: function () { return searchByOrder_1.searchByOrder; } });
-// import { useReservation } from './reserve/useReservation';
 const verifyToken4reservation_1 = require("./reserve/verifyToken4reservation");
 Object.defineProperty(exports, "verifyToken4reservation", { enumerable: true, get: function () { return verifyToken4reservation_1.verifyToken4reservation; } });

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.27.0-alpha.6"
+  "version": "21.27.0-alpha.7"
 }