@chevre/domain 23.2.0-alpha.60 → 23.2.0-alpha.62

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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirmReservation = confirmReservation;
 const createDebug = require("debug");
@@ -19,18 +10,18 @@ const debug = createDebug('chevre-domain:service:reserve:confirmReservation');
  * 予約を確定する
  */
 function confirmReservation(params) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
+    ) => {
         // await Promise.all(params.actionAttributesList.map(async (potentialReserveAction) => {
         //     const actionAttributes = await reserveIfNotYet(potentialReserveAction, { byTask: params.byTask })(repos);
         //     if (params.useOnReservationConfirmed) {
         //         await onReservationConfirmedByAction(actionAttributes)({ task: repos.task });
         //     }
         // }));
-        const actionAttributes = yield reserveIfNotYet(params.potentialReserveAction, { byTask: params.byTask })(repos);
+        const actionAttributes = await reserveIfNotYet(params.potentialReserveAction, { byTask: params.byTask })(repos);
         if (params.useOnReservationConfirmed) {
-            yield (0, onReservationConfirmed_1.onReservationConfirmedByAction)(actionAttributes)({ task: repos.task });
+            await (0, onReservationConfirmed_1.onReservationConfirmedByAction)(actionAttributes)({ task: repos.task });
         }
         if (params.useOnReservationConfirmed) {
             let confirmedReservations = [];
@@ -38,7 +29,7 @@ function confirmReservation(params) {
             const reservationNumber = params.potentialReserveAction.object.reservationNumber;
             if (typeof reservationNumber === 'string' && reservationNumber.length > 0) {
                 // 最新のconfirmedReservationsを検索
-                confirmedReservations = yield repos.reservation.projectFields({
+                confirmedReservations = await repos.reservation.projectFields({
                     reservationNumber: { $eq: reservationNumber },
                     typeOf: factory.reservationType.EventReservation
                 }
@@ -51,26 +42,24 @@ function confirmReservation(params) {
                     return r;
                 });
             }
-            yield (0, onReservationConfirmed_1.onReservationConfirmed)(confirmedReservations, actionAttributes)(repos);
+            await (0, onReservationConfirmed_1.onReservationConfirmed)(confirmedReservations, actionAttributes)(repos);
         }
-    });
+    };
 }
 function reserveTransaction2action(params) {
-    var _a;
     const transaction = params.transaction;
     const reservationFor = transaction.object.reservationFor;
     if (reservationFor === undefined) {
         throw new factory.errors.NotFound('transaction.object.reservationFor');
     }
     let underName;
-    if (typeof ((_a = transaction.object.underName) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
+    if (typeof transaction.object.underName?.typeOf === 'string') {
         underName = transaction.object.underName;
     }
     const moneyTransferActions = [];
     const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
     pendingReservations.forEach((reservation) => {
-        var _a;
-        const acceptedOffer4reservation = (_a = transaction.object.acceptedOffer) === null || _a === void 0 ? void 0 : _a.find((o) => { var _a, _b; return ((_b = (_a = o.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.id) === reservation.id; });
+        const acceptedOffer4reservation = transaction.object.acceptedOffer?.find((o) => o.itemOffered?.serviceOutput?.id === reservation.id);
         moneyTransferActions.push(...(0, factory_1.createMoneyTransferActions)({
             acceptedOffer: acceptedOffer4reservation,
             reservation,
@@ -90,19 +79,25 @@ function reserveTransaction2action(params) {
             : factory.reservationStatusType.ReservationPending,
         typeOf: factory.reservationType.ReservationPackage
     };
-    return Object.assign({ project: transaction.project, typeOf: factory.actionType.ReserveAction, object: reservationPackage, agent: transaction.project, potentialActions: {
+    return {
+        project: transaction.project,
+        typeOf: factory.actionType.ReserveAction,
+        object: reservationPackage,
+        agent: transaction.project,
+        potentialActions: {
             moneyTransfer: moneyTransferActions
-        }, purpose: { typeOf: transaction.typeOf, id: transaction.id } }, (Array.isArray(transaction.instrument)) ? { instrument: transaction.instrument } : undefined // add(2025-02-17~)
-    );
+        },
+        purpose: { typeOf: transaction.typeOf, id: transaction.id },
+        ...(Array.isArray(transaction.instrument)) ? { instrument: transaction.instrument } : undefined // add(2025-02-17~)
+    };
 }
 function reserveIfNotYet(
 // params: factory.action.reserve.IAttributes,
 params, options) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return async (repos) => {
         const reservationPackage = params.object;
-        const reserveTransaction = (yield repos.assetTransaction.search({
+        const reserveTransaction = (await repos.assetTransaction.search({
             limit: 1,
             page: 1,
             typeOf: factory.assetTransactionType.Reserve,
@@ -113,8 +108,8 @@ params, options) {
         }
         const actionAttributes = reserveTransaction2action({ transaction: reserveTransaction });
         // 冪等性を担保(2023-05-31~)
-        debug('searching completed reserveAction... byTask:', options === null || options === void 0 ? void 0 : options.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
-        const completedActions = yield repos.action.search({
+        debug('searching completed reserveAction... byTask:', options?.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
+        const completedActions = await repos.action.search({
             limit: 1,
             page: 1,
             actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
@@ -128,13 +123,13 @@ params, options) {
                 typeOf: { $in: [actionAttributes.purpose.typeOf] }
             }
         }, ['id']);
-        debug(completedActions.length, 'completed reserveAction found. byTask:', options === null || options === void 0 ? void 0 : options.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
+        debug(completedActions.length, 'completed reserveAction found. byTask:', options?.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
         if (completedActions.length === 0) {
-            const action = yield repos.action.start(actionAttributes);
+            const action = await repos.action.start(actionAttributes);
             try {
                 let underName;
                 // 予約取引に保管されたunderNameを使用する(2023-05-30~)
-                if (typeof ((_a = reserveTransaction.object.underName) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
+                if (typeof reserveTransaction.object.underName?.typeOf === 'string') {
                     underName = reserveTransaction.object.underName;
                     // 廃止(2023-05-31~)→予約取引から取得に変更
                     // } else if (typeof reservationPackage.underName?.typeOf === 'string') {
@@ -148,13 +143,13 @@ params, options) {
                         const subReservations = reserveTransaction.object.subReservation;
                         const issuedThrough = reserveTransaction.object.issuedThrough;
                         if (Array.isArray(subReservations)
-                            && typeof (reservationFor === null || reservationFor === void 0 ? void 0 : reservationFor.typeOf) === 'string'
-                            && typeof (issuedThrough === null || issuedThrough === void 0 ? void 0 : issuedThrough.typeOf) === 'string') {
+                            && typeof reservationFor?.typeOf === 'string'
+                            && typeof issuedThrough?.typeOf === 'string') {
                             // confirmManyに変更(2023-06-13~)
-                            const confirmManyIfNotExistResult = yield repos.reservation.confirmManyIfNotExist({
+                            const confirmManyIfNotExistResult = await repos.reservation.confirmManyIfNotExist({
                                 bookingTime: reserveTransaction.startDate, // startDateに設定(2024-04-08~)
                                 project: { id: reserveTransaction.project.id },
-                                provider: (typeof ((_b = reserveTransaction.object.provider) === null || _b === void 0 ? void 0 : _b.id) === 'string')
+                                provider: (typeof reserveTransaction.object.provider?.id === 'string')
                                     ? reserveTransaction.object.provider
                                     : { id: reserveTransaction.agent.id, typeOf: factory.organizationType.Corporation },
                                 subReservation: subReservations,
@@ -181,7 +176,7 @@ params, options) {
             }
             catch (error) {
                 try {
-                    yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                    await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
                 }
                 catch (__) {
                     // 失敗したら仕方ない
@@ -189,8 +184,8 @@ params, options) {
                 throw error;
             }
             const actionResult = {};
-            yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+            await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
         }
         return actionAttributes;
-    });
+    };
 }

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

@@ -10,44 +10,60 @@ function optimizeUnderName4inform(params) {
 }
 exports.NUM_TRY_INFORM_RESERVATION = 10;
 function createMoneyTransferActions(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
-    const pointAward = (_b = (_a = params.acceptedOffer) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.pointAward;
+    const pointAward = params.acceptedOffer?.itemOffered?.pointAward;
     const moneyTransfer = [];
     // ポイント特典があれば適用
-    const pointAwardToLocationIdentifier = (_c = pointAward === null || pointAward === void 0 ? void 0 : pointAward.toLocation) === null || _c === void 0 ? void 0 : _c.identifier;
-    const pointAwardToLocationTypeOf = (_d = pointAward === null || pointAward === void 0 ? void 0 : pointAward.toLocation) === null || _d === void 0 ? void 0 : _d.typeOf;
-    if (typeof ((_e = pointAward === null || pointAward === void 0 ? void 0 : pointAward.amount) === null || _e === void 0 ? void 0 : _e.value) === 'number'
+    const pointAwardToLocationIdentifier = pointAward?.toLocation?.identifier;
+    const pointAwardToLocationTypeOf = pointAward?.toLocation?.typeOf;
+    if (typeof pointAward?.amount?.value === 'number'
         && typeof pointAwardToLocationIdentifier === 'string'
         && typeof pointAwardToLocationTypeOf === 'string') {
         const fromLocation = {
-            typeOf: (typeof ((_f = params.reservation.reservedTicket.issuedBy) === null || _f === void 0 ? void 0 : _f.typeOf) === 'string')
+            typeOf: (typeof params.reservation.reservedTicket.issuedBy?.typeOf === 'string')
                 ? params.reservation.reservedTicket.issuedBy.typeOf
                 : params.transaction.typeOf,
-            name: (typeof ((_g = params.reservation.reservedTicket.issuedBy) === null || _g === void 0 ? void 0 : _g.name) === 'string')
+            name: (typeof params.reservation.reservedTicket.issuedBy?.name === 'string')
                 ? params.reservation.reservedTicket.issuedBy.name
                 : params.transaction.id
         };
         const toLocation = {
             identifier: pointAwardToLocationIdentifier,
             typeOf: factory.permit.PermitType.Permit,
-            issuedThrough: { id: String((_j = (_h = pointAward.toLocation) === null || _h === void 0 ? void 0 : _h.issuedThrough) === null || _j === void 0 ? void 0 : _j.id) }
+            issuedThrough: { id: String(pointAward.toLocation?.issuedThrough?.id) }
         };
         const recipient = {
-            typeOf: (typeof ((_k = params.underName) === null || _k === void 0 ? void 0 : _k.typeOf) === 'string')
-                ? (_l = params.underName) === null || _l === void 0 ? void 0 : _l.typeOf
+            typeOf: (typeof params.underName?.typeOf === 'string')
+                ? params.underName?.typeOf
                 : factory.personType.Person,
-            id: (typeof ((_m = params.underName) === null || _m === void 0 ? void 0 : _m.id) === 'string')
-                ? (_o = params.underName) === null || _o === void 0 ? void 0 : _o.id
+            id: (typeof params.underName?.id === 'string')
+                ? params.underName?.id
                 : '',
-            name: String((_p = params.underName) === null || _p === void 0 ? void 0 : _p.name)
+            name: String(params.underName?.name)
         };
-        moneyTransfer.push(Object.assign(Object.assign({ project: params.transaction.project, typeOf: factory.actionType.MoneyTransfer, agent: params.transaction.project, recipient, object: {
+        moneyTransfer.push({
+            project: params.transaction.project,
+            typeOf: factory.actionType.MoneyTransfer,
+            agent: params.transaction.project,
+            recipient,
+            object: {
                 typeOf: factory.account.transactionType.Deposit
-            }, purpose: Object.assign({ typeOf: params.transaction.typeOf, id: params.transaction.id }, (typeof ((_q = pointAward.purpose) === null || _q === void 0 ? void 0 : _q.identifier) === 'string') ? { identifier: pointAward.purpose.identifier } : undefined), amount: {
+            },
+            purpose: {
+                typeOf: params.transaction.typeOf,
+                id: params.transaction.id,
+                // 入金取引に識別子を指定する
+                ...(typeof pointAward.purpose?.identifier === 'string') ? { identifier: pointAward.purpose.identifier } : undefined
+            },
+            amount: {
                 typeOf: 'MonetaryAmount',
-                value: (_r = pointAward.amount) === null || _r === void 0 ? void 0 : _r.value,
-                currency: (_s = pointAward.amount) === null || _s === void 0 ? void 0 : _s.currency
-            }, fromLocation: fromLocation, toLocation: toLocation }, (typeof pointAward.description === 'string') ? { description: pointAward.description } : undefined), (pointAward.recipient !== undefined) ? { recipient: pointAward.recipient } : undefined));
+                value: pointAward.amount?.value,
+                currency: pointAward.amount?.currency
+            },
+            fromLocation: fromLocation,
+            toLocation: toLocation,
+            ...(typeof pointAward.description === 'string') ? { description: pointAward.description } : undefined,
+            ...(pointAward.recipient !== undefined) ? { recipient: pointAward.recipient } : undefined
+        });
     }
     return moneyTransfer;
 }
@@ -78,8 +94,14 @@ function createCancelPendingReservationAction(params) {
                 }
             }
         }
-        cancelActionAttributes = Object.assign({ project: transaction.project, typeOf: factory.actionType.CancelAction, purpose: { typeOf: transaction.typeOf, id: transaction.id }, agent: transaction.project, object: reservationPackage }, (placeOrderAsInstrument !== undefined) ? { instrument: [placeOrderAsInstrument] } : undefined // add about(2025-02-19~)
-        );
+        cancelActionAttributes = {
+            project: transaction.project,
+            typeOf: factory.actionType.CancelAction,
+            purpose: { typeOf: transaction.typeOf, id: transaction.id },
+            agent: transaction.project,
+            object: reservationPackage,
+            ...(placeOrderAsInstrument !== undefined) ? { instrument: [placeOrderAsInstrument] } : undefined // add about(2025-02-19~)
+        };
     }
     return cancelActionAttributes;
 }

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

@@ -1,19 +1,9 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findByCode = findByCode;
 const factory = require("../../factory");
 function findByCode(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (repos) => {
         if (typeof params.id !== 'string' || params.id.length === 0) {
             throw new factory.errors.ArgumentNull('id');
         }
@@ -21,7 +11,7 @@ function findByCode(params) {
             throw new factory.errors.ArgumentNull('code');
         }
         const reservationId = String(params.id);
-        const authorization = yield repos.authorization.findValidOneByCode({
+        const authorization = await repos.authorization.findValidOneByCode({
             project: { id: params.project.id },
             code: params.code
         });
@@ -30,7 +20,7 @@ function findByCode(params) {
                 const { orderNumber } = authorization.object;
                 if (typeof orderNumber === 'string' && orderNumber.length > 0) {
                     // reservationIdを含む注文の存在を確認するだけでよい
-                    yield repos.order.findByOrderNumberAndReservationId({
+                    await repos.order.findByOrderNumberAndReservationId({
                         project: { id: params.project.id },
                         orderNumber,
                         reservationId,
@@ -41,17 +31,22 @@ function findByCode(params) {
             default:
                 throw new factory.errors.NotImplemented(`authorization object typeOf: ${authorization.object.typeOf} not implemented`);
         }
-        const reservationFromRepo = yield repos.reservation.projectFieldsById({
+        const reservationFromRepo = await repos.reservation.projectFieldsById({
             id: reservationId,
             inclusion: ['additionalTicketText', 'checkedIn', 'reservationStatus', 'reservedTicket']
         });
         const { id, additionalTicketText, checkedIn, reservationStatus, reservedTicket } = reservationFromRepo;
-        const reservation = Object.assign(Object.assign({ id, reservationStatus, reservedTicket: {
+        const reservation = {
+            id, reservationStatus,
+            reservedTicket: {
                 ticketType: {
                     identifier: reservedTicket.ticketType.identifier,
-                    name: { ja: (_a = reservedTicket.ticketType.name) === null || _a === void 0 ? void 0 : _a.ja }
+                    name: { ja: reservedTicket.ticketType.name?.ja }
                 }
-            } }, (typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined), (typeof checkedIn === 'boolean') ? { checkedIn } : undefined);
+            },
+            ...(typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined,
+            ...(typeof checkedIn === 'boolean') ? { checkedIn } : undefined
+        };
         return { reservation };
-    });
+    };
 }

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

@@ -1,29 +1,19 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onPendingReservationCanceled = onPendingReservationCanceled;
 const factory = require("../../../factory");
 // import { Settings } from '../../../settings';
 const factory_1 = require("../factory");
 function onPendingReservationCanceled(params) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    ) => {
         const { reservationFor, reservationNumber } = params;
         // create AggregateScreeningEvent task -> migrate to agg(2024-10-29~)
-        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onReservationStatusChanged']);
+        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onReservationStatusChanged']);
         // inform(2024-10-25~)
         // const informReservations = settings.onReservationStatusChanged.informReservation;
-        const informReservations = (_a = setting === null || setting === void 0 ? void 0 : setting.onReservationStatusChanged) === null || _a === void 0 ? void 0 : _a.informReservation;
+        const informReservations = setting?.onReservationStatusChanged?.informReservation;
         const now = new Date();
         const taskAttributes = [];
         const informObject = {
@@ -35,7 +25,7 @@ function onPendingReservationCanceled(params) {
         };
         const informIdentifier = `${factory.reservationType.ReservationPackage}:${informObject.reservationNumber}:${informObject.reservationStatus}`;
         let placeOrderAsAbout;
-        if (Array.isArray((_b = params.cancelAction) === null || _b === void 0 ? void 0 : _b.instrument)) {
+        if (Array.isArray(params.cancelAction?.instrument)) {
             for (const eachInstrument of params.cancelAction.instrument) {
                 if (eachInstrument.typeOf === factory.transactionType.PlaceOrder && typeof eachInstrument.id === 'string') {
                     placeOrderAsAbout = { id: eachInstrument.id, typeOf: factory.transactionType.PlaceOrder };
@@ -46,21 +36,25 @@ function onPendingReservationCanceled(params) {
         // 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);
-                const recipientName = (_b = informReservation.recipient) === null || _b === void 0 ? void 0 : _b.name;
-                const informReservationAttributes = Object.assign({ object: informObject, recipient: {
+                const informUrl = String(informReservation.recipient?.url);
+                const recipientName = informReservation.recipient?.name;
+                const informReservationAttributes = {
+                    object: informObject,
+                    recipient: {
                         id: '',
                         name: (typeof recipientName === 'string') ? recipientName : 'unknown', // redefine name(2025-02-17~)
                         typeOf: factory.creativeWorkType.WebApplication
                         // url: informUrl // discontinue(2025-02-13~)
-                    }, target: {
+                    },
+                    target: {
                         httpMethod: 'POST',
                         encodingType: factory.encodingFormat.Application.json,
                         typeOf: 'EntryPoint',
                         urlTemplate: informUrl
-                    }, identifier: informIdentifier }, (placeOrderAsAbout !== undefined) ? { about: placeOrderAsAbout } : undefined // add about(2025-02-19~)
-                );
+                    },
+                    identifier: informIdentifier,
+                    ...(placeOrderAsAbout !== undefined) ? { about: placeOrderAsAbout } : undefined // add about(2025-02-19~)
+                };
                 return {
                     project: { id: params.project.id, typeOf: factory.organizationType.Project },
                     name: factory.taskName.TriggerWebhook,
@@ -75,7 +69,7 @@ function onPendingReservationCanceled(params) {
         }
         // タスク保管
         if (taskAttributes.length > 0) {
-            yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
+            await repos.task.saveMany(taskAttributes, { emitImmediately: true });
         }
-    });
+    };
 }

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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onReservationCanceled = onReservationCanceled;
 /**
@@ -27,13 +18,12 @@ canceledReservations,
  * 集計対象イベント
  */
 reservationFor, cancelAction) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onReservationStatusChanged']);
+    ) => {
+        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onReservationStatusChanged']);
         // const informReservations = settings.onReservationStatusChanged.informReservation;
-        const informReservations = (_a = setting === null || setting === void 0 ? void 0 : setting.onReservationStatusChanged) === null || _a === void 0 ? void 0 : _a.informReservation;
+        const informReservations = setting?.onReservationStatusChanged?.informReservation;
         let orderAsAbout;
         if (Array.isArray(cancelAction.instrument)) {
             for (const eachInstrument of cancelAction.instrument) {
@@ -60,21 +50,24 @@ reservationFor, cancelAction) {
             });
             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);
-                    const recipientName = (_b = informReservation.recipient) === null || _b === void 0 ? void 0 : _b.name;
-                    const informReservationAttributes = Object.assign({ object: reservations4inform, recipient: {
+                    const informUrl = String(informReservation.recipient?.url);
+                    const recipientName = informReservation.recipient?.name;
+                    const informReservationAttributes = {
+                        object: reservations4inform,
+                        recipient: {
                             id: '',
                             name: (typeof recipientName === 'string') ? recipientName : 'unknown', // redefine name(2025-02-17~)
                             typeOf: factory.creativeWorkType.WebApplication
                             // url: informUrl // discontinue(2025-02-13~)
-                        }, target: {
+                        },
+                        target: {
                             httpMethod: 'POST',
                             encodingType: factory.encodingFormat.Application.json,
                             typeOf: 'EntryPoint',
                             urlTemplate: informUrl
-                        } }, (orderAsAbout !== undefined) ? { about: orderAsAbout } : undefined // add about(2025-02-19~)
-                    );
+                        },
+                        ...(orderAsAbout !== undefined) ? { about: orderAsAbout } : undefined // add about(2025-02-19~)
+                    };
                     return {
                         project,
                         name: factory.taskName.TriggerWebhook,
@@ -89,11 +82,11 @@ reservationFor, cancelAction) {
             }
             // タスク保管
             if (taskAttributes.length > 0) {
-                yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
+                await repos.task.saveMany(taskAttributes, { emitImmediately: true });
             }
         }
-        if (typeof (reservationFor === null || reservationFor === void 0 ? void 0 : reservationFor.id) === 'string') {
+        if (typeof reservationFor?.id === 'string') {
             // create AggregateScreeningEvent task -> migrate to agg(2024-10-29~)
         }
-    });
+    };
 }

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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onReservationCheckedIn = onReservationCheckedIn;
 /**
@@ -17,29 +8,44 @@ const factory = require("../../../factory");
 const factory_1 = require("../factory");
 function onReservationCheckedIn(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return async (repos) => {
         const { dateIssued } = params.object.reservedTicket;
-        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onReservationStatusChanged']);
+        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onReservationStatusChanged']);
         const tasks = [];
         const project = { id: params.project.id, typeOf: factory.organizationType.Project };
-        const informReservations = (_a = setting === null || setting === void 0 ? void 0 : setting.onReservationStatusChanged) === null || _a === void 0 ? void 0 : _a.informReservation;
+        const informReservations = setting?.onReservationStatusChanged?.informReservation;
         let reservations4inform = [];
-        const ticketToken = (_b = params.purpose) === null || _b === void 0 ? void 0 : _b.code;
+        const ticketToken = params.purpose?.code;
         if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
             reservations4inform = params.object.ids.map((reservationId, index) => {
-                return Object.assign(Object.assign({ typeOf: factory.reservationType.EventReservation, project, id: reservationId, checkedIn: true }, (dateIssued instanceof Date) ? { modifiedTime: dateIssued } : undefined), (index === 0 && typeof ticketToken === 'string') ? { reservedTicket: { ticketToken } } : undefined);
+                return {
+                    typeOf: factory.reservationType.EventReservation,
+                    project,
+                    id: reservationId,
+                    checkedIn: true,
+                    ...(dateIssued instanceof Date) ? { modifiedTime: dateIssued } : undefined, // 初発券時のみ(2024-12-03~)
+                    // inform ticketToken(2024-10-30~)
+                    ...(index === 0 && typeof ticketToken === 'string') ? { reservedTicket: { ticketToken } } : undefined
+                };
             });
         }
         if (Array.isArray(params.object.reservationNumbers) && params.object.reservationNumbers.length > 0) {
             // ReservationPackageへ変更(2024-11-03~)
-            reservations4inform = yield Promise.all(params.object.reservationNumbers.map((reservationNumber, index) => __awaiter(this, void 0, void 0, function* () {
-                const subReservationIds = yield repos.reservation.searchIdsByReservationNumber({
+            reservations4inform = await Promise.all(params.object.reservationNumbers.map(async (reservationNumber, index) => {
+                const subReservationIds = await repos.reservation.searchIdsByReservationNumber({
                     reservationNumber: { $in: [reservationNumber] }
                 });
-                return Object.assign(Object.assign({ typeOf: factory.reservationType.ReservationPackage, project,
-                    reservationNumber, checkedIn: true, subReservation: subReservationIds.map((id) => ({ id })) }, (dateIssued instanceof Date) ? { modifiedTime: dateIssued } : undefined), (index === 0 && typeof ticketToken === 'string') ? { reservedTicket: { ticketToken } } : undefined);
-            })));
+                return {
+                    typeOf: factory.reservationType.ReservationPackage,
+                    project,
+                    reservationNumber,
+                    checkedIn: true,
+                    subReservation: subReservationIds.map((id) => ({ id })),
+                    ...(dateIssued instanceof Date) ? { modifiedTime: dateIssued } : undefined, // 初発券時のみ(2024-12-03~)
+                    // inform ticketToken(2024-10-30~)
+                    ...(index === 0 && typeof ticketToken === 'string') ? { reservedTicket: { ticketToken } } : undefined
+                };
+            }));
         }
         if (reservations4inform.length > 0) {
             const informTaskRunsAt = new Date();
@@ -50,21 +56,24 @@ function onReservationCheckedIn(params) {
                     orderAsAbout = { orderNumber: params.instrument.orderNumber, typeOf: factory.order.OrderType.Order };
                 }
                 informReservations.forEach((informReservation) => {
-                    var _a, _b;
-                    const informUrl = String((_a = informReservation.recipient) === null || _a === void 0 ? void 0 : _a.url);
-                    const recipientName = (_b = informReservation.recipient) === null || _b === void 0 ? void 0 : _b.name;
-                    const informReservationAttributes = Object.assign({ object: reservations4inform, recipient: {
+                    const informUrl = String(informReservation.recipient?.url);
+                    const recipientName = informReservation.recipient?.name;
+                    const informReservationAttributes = {
+                        object: reservations4inform,
+                        recipient: {
                             id: '',
                             name: (typeof recipientName === 'string') ? recipientName : 'unknown', // redefine name(2025-02-17~)
                             typeOf: factory.creativeWorkType.WebApplication
                             // url: informUrl // discontinue(2025-02-13~)
-                        }, target: {
+                        },
+                        target: {
                             httpMethod: 'POST',
                             encodingType: factory.encodingFormat.Application.json,
                             typeOf: 'EntryPoint',
                             urlTemplate: informUrl
-                        } }, (orderAsAbout !== undefined) ? { about: orderAsAbout } : undefined // add about(2025-02-19~)
-                    );
+                        },
+                        ...(orderAsAbout !== undefined) ? { about: orderAsAbout } : undefined // add about(2025-02-19~)
+                    };
                     const informReservationTask = {
                         project,
                         name: factory.taskName.TriggerWebhook,
@@ -80,8 +89,8 @@ function onReservationCheckedIn(params) {
             }
         }
         if (tasks.length > 0) {
-            yield repos.task.saveMany(tasks, { emitImmediately: true });
+            await repos.task.saveMany(tasks, { emitImmediately: true });
         }
         // create AggregateScreeningEvent task -> migrate to agg(2024-10-29~)
-    });
+    };
 }