@chevre/domain 23.2.0-alpha.61 → 23.2.0-alpha.63

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.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.onReservationConfirmedByAction = onReservationConfirmedByAction;
 exports.onReservationConfirmed = onReservationConfirmed;
@@ -21,11 +12,10 @@ const factory_1 = require("../factory");
  * 予約確定後のアクション
  */
 function onReservationConfirmedByAction(actionAttributes) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const potentialActions = actionAttributes.potentialActions;
         const now = new Date();
         const taskAttributes = [];
-        // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (potentialActions !== undefined) {
             if (Array.isArray(potentialActions.moneyTransfer)) {
@@ -45,19 +35,17 @@ function onReservationConfirmedByAction(actionAttributes) {
         }
         // タスク保管
         if (taskAttributes.length > 0) {
-            yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
+            await repos.task.saveMany(taskAttributes, { emitImmediately: true });
         }
-    });
+    };
 }
 function onReservationConfirmed(confirmedReservations, reserveAction) {
-    // tslint:disable-next-line:max-func-body-length
-    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(reserveAction.instrument)) {
             for (const eachInstrument of reserveAction.instrument) {
@@ -75,8 +63,8 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
             const taskAttributes = [];
             let onAuthorizationCreatedTask;
             // support OnAuthorizationCreated(2025-03-15~)
-            if (typeof (orderAsAbout === null || orderAsAbout === void 0 ? void 0 : orderAsAbout.orderNumber) === 'string') {
-                const existingAuthorization = (yield repos.code.projectFields({
+            if (typeof orderAsAbout?.orderNumber === 'string') {
+                const existingAuthorization = (await repos.code.projectFields({
                     limit: 1,
                     page: 1,
                     object: {
@@ -114,43 +102,63 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
                 id, modifiedTime, 
                 // numSeats,
                 price, programMembershipUsed, reservedTicket, subReservation, typeOf } = r;
-                return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ 
+                return {
                     // bookingTime, // discontinue(2024-10-27~)
                     id,
                     typeOf,
-                    reservedTicket }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined), (modifiedTime instanceof Date) ? { modifiedTime } : undefined), (price !== undefined) ? { price } : undefined), (programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined), (Array.isArray(subReservation)) ? { subReservation } : undefined);
+                    reservedTicket,
+                    ...(Array.isArray(additionalProperty)) ? { additionalProperty } : undefined,
+                    ...(typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined,
+                    // ...(typeof attended === 'boolean') ? { attended } : undefined, // discontinue(2024-10-27~)
+                    // ...(typeof checkedIn === 'boolean') ? { checkedIn } : undefined, // discontinue(2024-10-27~)
+                    ...(modifiedTime instanceof Date) ? { modifiedTime } : undefined,
+                    // ...(typeof numSeats === 'number') ? { numSeats } : undefined, // discontinue(2024-10-27~)
+                    ...(price !== undefined) ? { price } : undefined,
+                    ...(programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined,
+                    ...(Array.isArray(subReservation)) ? { subReservation } : undefined
+                };
             });
             if (typeof issuedThrough.id !== 'string') {
                 // COA予約では予約アクションを想定していないので、興行idは必ず存在するはず
                 throw new factory.errors.Internal('reservation.issuedThrough.id must be string');
             }
-            const informObject = Object.assign({ bookingTime,
+            const informObject = {
+                bookingTime,
                 issuedThrough, // subReservationから移行(2024-03-20~)
                 project,
                 provider, // subReservationから移行(2024-03-20~)
                 reservationFor,
-                reservationNumber, reservationStatus: factory.reservationStatusType.ReservationConfirmed, subReservation: subReservations4inform, typeOf: factory.reservationType.ReservationPackage }, (typeof (underName === null || underName === void 0 ? void 0 : underName.typeOf) === 'string')
-                ? { underName: (0, factory_1.optimizeUnderName4inform)({ underName }) }
-                : undefined);
+                reservationNumber,
+                reservationStatus: factory.reservationStatusType.ReservationConfirmed,
+                subReservation: subReservations4inform,
+                typeOf: factory.reservationType.ReservationPackage,
+                ...(typeof underName?.typeOf === 'string')
+                    ? { underName: (0, factory_1.optimizeUnderName4inform)({ underName }) }
+                    : undefined
+            };
             const informIdentifier = `${factory.reservationType.ReservationPackage}:${informObject.reservationNumber}:${informObject.reservationStatus}`;
             // 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 }, (orderAsAbout !== undefined) ? { about: orderAsAbout } : undefined // add about(2025-02-19~)
-                    );
+                        },
+                        identifier: informIdentifier, // add(2024-10-24~)
+                        ...(orderAsAbout !== undefined) ? { about: orderAsAbout } : undefined // add about(2025-02-19~)
+                    };
                     return {
                         project,
                         name: factory.taskName.TriggerWebhook,
@@ -165,11 +173,11 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
             }
             // タスク保管
             if (taskAttributes.length > 0) {
-                yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
+                await repos.task.saveMany(taskAttributes, { emitImmediately: true });
             }
             if (onAuthorizationCreatedTask !== undefined) {
-                yield repos.task.createIfNotExistByAlternateName(onAuthorizationCreatedTask, { emitImmediately: true });
+                await repos.task.createIfNotExistByAlternateName(onAuthorizationCreatedTask, { emitImmediately: true });
             }
         }
-    });
+    };
 }

package/lib/chevre/service/reserve/potentialActions/onReservationUsed.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.onReservationUsed = onReservationUsed;
 /**
@@ -21,16 +12,14 @@ const factory_1 = require("../factory");
  * 予約使用
  */
 function onReservationUsed(attendedReservation, action) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onReservationStatusChanged']);
+    ) => {
+        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onReservationStatusChanged']);
         const tasks = [];
         const now = new Date();
         // 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 informTaskRunsAt = now;
         // support notification.reservation.IUseAction(2024-11-11~)
         let action4inform;
@@ -40,15 +29,26 @@ function onReservationUsed(attendedReservation, action) {
         const useForTheFirstTime = attendedReservation.reservedTicket.dateUsed !== undefined
             && moment(action.startDate)
                 .isSame(moment(attendedReservation.reservedTicket.dateUsed), 'milliseconds');
-        reservation4inform = Object.assign({ typeOf: attendedReservation.typeOf, id: attendedReservation.id }, (useForTheFirstTime)
-            ? {
-                modifiedTime: attendedReservation.modifiedTime,
-                reservedTicket: { dateUsed: attendedReservation.reservedTicket.dateUsed }
-            }
-            : undefined);
-        action4inform = Object.assign({ typeOf: action.typeOf, project: action.project, id: action.id, object: reservation4inform }, (typeof ((_b = action.location) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
-            ? { location: { identifier: action.location.identifier } }
-            : undefined);
+        reservation4inform = {
+            typeOf: attendedReservation.typeOf,
+            id: attendedReservation.id,
+            // dateUsedの通知は初使用時のみで十分(2024-11-27~)
+            ...(useForTheFirstTime)
+                ? {
+                    modifiedTime: attendedReservation.modifiedTime,
+                    reservedTicket: { dateUsed: attendedReservation.reservedTicket.dateUsed }
+                }
+                : undefined
+        };
+        action4inform = {
+            typeOf: action.typeOf,
+            project: action.project,
+            id: action.id,
+            object: reservation4inform,
+            ...(typeof action.location?.identifier === 'string')
+                ? { location: { identifier: action.location.identifier } }
+                : undefined
+        };
         const modifiedTimeInMilliseconds = moment(attendedReservation.modifiedTime)
             .valueOf();
         const informIdentifier = `${attendedReservation.typeOf}:${attendedReservation.id}:attended:${modifiedTimeInMilliseconds}`;
@@ -64,21 +64,25 @@ function onReservationUsed(attendedReservation, action) {
                 }
             }
             tasks.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: action4inform, recipient: {
+                const informUrl = String(informReservation.recipient?.url);
+                const recipientName = informReservation.recipient?.name;
+                const informReservationAttributes = {
+                    object: action4inform,
+                    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 }, (orderAsAbout !== undefined) ? { about: orderAsAbout } : undefined // add about(2025-02-19~)
-                );
+                    },
+                    identifier: informIdentifier,
+                    ...(orderAsAbout !== undefined) ? { about: orderAsAbout } : undefined // add about(2025-02-19~)
+                };
                 return {
                     project: attendedReservation.project,
                     name: factory.taskName.TriggerWebhook,
@@ -92,8 +96,8 @@ function onReservationUsed(attendedReservation, action) {
             }));
         }
         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~)
-    });
+    };
 }

package/lib/chevre/service/reserve/potentialActions/onReservationsCreated.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.onReservationsCreated = onReservationsCreated;
 const factory = require("../../../factory");
@@ -17,15 +8,14 @@ const factory_1 = require("../factory");
  * 予約作成時イベント
  */
 function onReservationsCreated(params) {
-    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']);
         // create AggregateScreeningEvent task -> migrate to agg(2024-10-29~)
         // 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 = {
@@ -48,21 +38,25 @@ function onReservationsCreated(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,
@@ -77,7 +71,7 @@ function onReservationsCreated(params) {
         }
         // タスク保管
         if (taskAttributes.length > 0) {
-            yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
+            await repos.task.saveMany(taskAttributes, { emitImmediately: true });
         }
-    });
+    };
 }

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

@@ -1,22 +1,12 @@
 "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.searchByOrder = searchByOrder;
 const google_libphonenumber_1 = require("google-libphonenumber");
 const factory = require("../../factory");
 function searchByOrder(params) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const reservationType = params.typeOf;
-        const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+        const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             limit: params.limit,
             page: params.page,
             project: { id: { $eq: params.project.id } },
@@ -32,7 +22,7 @@ function searchByOrder(params) {
                 throw new factory.errors.Internal(`unexpected itemOffered.typeOf ${offer.itemOffered.typeOf}`);
             }
         });
-        const offeredThroughIdentifier = (yield repos.acceptedOffer.distinctValues({
+        const offeredThroughIdentifier = (await repos.acceptedOffer.distinctValues({
             orderNumber: { $in: [params.orderNumber] }
         }, 'acceptedOffers.offeredThrough.identifier')).shift();
         let reservations = [];
@@ -40,7 +30,7 @@ function searchByOrder(params) {
             switch (offeredThroughIdentifier) {
                 // COA対応
                 case factory.service.webAPI.Identifier.COA:
-                    const order = (yield repos.order.projectFields({
+                    const order = (await repos.order.projectFields({
                         limit: 1,
                         page: 1,
                         orderNumbers: [params.orderNumber]
@@ -53,10 +43,10 @@ function searchByOrder(params) {
                     let telNum = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.NATIONAL);
                     // COAでは数字のみ受け付けるので数字以外を除去
                     telNum = telNum.replace(/[^\d]/g, '');
-                    const reservationNumber = (yield repos.acceptedOffer.distinctValues({
+                    const reservationNumber = (await repos.acceptedOffer.distinctValues({
                         orderNumber: { $in: [params.orderNumber] }
                     }, 'acceptedOffers.itemOffered.reservationNumber')).shift();
-                    const superEventLocationBranchCode = (yield repos.acceptedOffer.distinctValues({
+                    const superEventLocationBranchCode = (await repos.acceptedOffer.distinctValues({
                         orderNumber: { $in: [params.orderNumber] }
                     }, 'acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode')).shift();
                     if (typeof reservationNumber !== 'string') {
@@ -65,12 +55,12 @@ function searchByOrder(params) {
                     if (typeof superEventLocationBranchCode !== 'string') {
                         throw new factory.errors.NotFound('acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode');
                     }
-                    const stateReserveResult = yield repos.reserveService.stateReserve({
+                    const stateReserveResult = await repos.reserveService.stateReserve({
                         theaterCode: superEventLocationBranchCode,
                         reserveNum: reservationNumber,
                         telNum
                     });
-                    const listTicket = stateReserveResult === null || stateReserveResult === void 0 ? void 0 : stateReserveResult.listTicket;
+                    const listTicket = stateReserveResult?.listTicket;
                     if (Array.isArray(listTicket)) {
                         reservations = listTicket.map((ticket, key) => {
                             return {
@@ -90,7 +80,7 @@ function searchByOrder(params) {
                     }
                     break;
                 default:
-                    reservations = yield repos.reservation.projectFields({
+                    reservations = await repos.reservation.projectFields({
                         project: { id: { $eq: params.project.id } },
                         typeOf: reservationType,
                         id: { $in: reservationIds }
@@ -98,5 +88,5 @@ function searchByOrder(params) {
             }
         }
         return { reservations };
-    });
+    };
 }

package/lib/chevre/service/reserve/useReservation.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.useReservation = useReservation;
 const createDebug = require("debug");
@@ -18,11 +9,8 @@ const debug = createDebug('chevre-domain:service:reserve:useReservation');
 /**
  * 予約使用
  */
-// tslint:disable-next-line:max-func-body-length
 function useReservation(params) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+    return async (repos) => {
         const reservationId = params.object.id;
         let ticketToken;
         // const ticketToken = params?.instrument?.ticketToken;
@@ -35,13 +23,13 @@ function useReservation(params) {
             }
         }
         else {
-            ticketToken = (_a = params === null || params === void 0 ? void 0 : params.instrument) === null || _a === void 0 ? void 0 : _a.ticketToken;
+            ticketToken = params?.instrument?.ticketToken;
         }
         // if (params.verifyToken === true) {} // タスク作成前に検証済なので検証不要
         // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
-        yield reserveIfNotYet({ object: params.object })(repos);
+        await reserveIfNotYet({ object: params.object })(repos);
         // 予約検索
-        const reservation = yield repos.reservation.projectFieldsById({
+        const reservation = await repos.reservation.projectFieldsById({
             id: reservationId,
             inclusion: ['issuedThrough', 'project', 'reservationFor', 'reservationNumber', 'reservedTicket', 'typeOf']
         });
@@ -57,20 +45,41 @@ function useReservation(params) {
             typeOf: reservation.typeOf,
             issuedThrough: { id: reservation.issuedThrough.id, typeOf: reservation.issuedThrough.typeOf },
             reservationFor: { id: reservation.reservationFor.id, typeOf: reservation.reservationFor.typeOf },
-            reservedTicket: Object.assign(Object.assign({ typeOf: reservedTicket.typeOf, ticketType: Object.assign({ identifier: reservedTicket.ticketType.identifier, typeOf: reservedTicket.ticketType.typeOf }, (typeof reservedTicket.ticketType.id === 'string') ? { id: reservedTicket.ticketType.id } : undefined) }, (typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined), (typeof ((_b = reservedTicket.ticketedSeat) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { ticketedSeat: reservedTicket.ticketedSeat } : undefined)
+            reservedTicket: {
+                typeOf: reservedTicket.typeOf,
+                ticketType: {
+                    identifier: reservedTicket.ticketType.identifier,
+                    typeOf: reservedTicket.ticketType.typeOf,
+                    ...(typeof reservedTicket.ticketType.id === 'string') ? { id: reservedTicket.ticketType.id } : undefined
+                },
+                ...(typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined,
+                ...(typeof reservedTicket.ticketedSeat?.typeOf === 'string') ? { ticketedSeat: reservedTicket.ticketedSeat } : undefined
+            }
         };
         // extend instrument to array(2025-02-18~)
         const instrument = [
-            Object.assign(Object.assign({}, (typeof ticketToken === 'string') ? { ticketToken } : undefined), { typeOf: 'Ticket' }),
+            {
+                // ...(typeof token === 'string') ? { token } : undefined, // discontinue token(2024-10-03~)
+                ...(typeof ticketToken === 'string') ? { ticketToken } : undefined,
+                typeOf: 'Ticket'
+            },
             // support orderAsInstrument(2025-02-18~)
             ...(Array.isArray(params.instrument))
                 ? params.instrument.filter(({ typeOf }) => typeOf === factory.order.OrderType.Order)
                 : []
         ];
-        const actionAttributes = Object.assign({ project: reservation.project, typeOf: factory.actionType.UseAction, agent: params.agent, instrument, object: [reservationAsObject] }, (typeof ((_c = params.location) === null || _c === void 0 ? void 0 : _c.identifier) === 'string')
-            ? { location: { typeOf: factory.placeType.Place, identifier: params.location.identifier } }
-            : undefined);
-        const action = yield repos.action.start(actionAttributes);
+        const actionAttributes = {
+            project: reservation.project,
+            typeOf: factory.actionType.UseAction,
+            agent: params.agent,
+            instrument,
+            object: [reservationAsObject], // どの予約を
+            // どのエントランスで
+            ...(typeof params.location?.identifier === 'string')
+                ? { location: { typeOf: factory.placeType.Place, identifier: params.location.identifier } }
+                : undefined
+        };
+        const action = await repos.action.start(actionAttributes);
         // ひとまず予約数:1に限定する
         if (actionAttributes.object.length !== 1) {
             throw new factory.errors.Argument('object', 'number of using reservations must be 1');
@@ -78,28 +87,32 @@ function useReservation(params) {
         let attendedReservation;
         try {
             // 使用日時と同時更新(2023-01-30~)
-            attendedReservation = yield repos.reservation.attendIfNotAttended({ id: reservationId, now: action.startDate });
+            attendedReservation = await repos.reservation.attendIfNotAttended({ id: reservationId, now: action.startDate });
         }
         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 (__) {
                 // 失敗したら仕方ない
             }
             throw error;
         }
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: {} });
-        yield (0, onReservationUsed_1.onReservationUsed)(attendedReservation, Object.assign(Object.assign({}, actionAttributes), { id: action.id, startDate: action.startDate }))(repos);
-    });
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: {} });
+        await (0, onReservationUsed_1.onReservationUsed)(attendedReservation, {
+            ...actionAttributes,
+            id: action.id,
+            startDate: action.startDate
+        })(repos);
+    };
 }
 function reserveIfNotYet(params) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
+    ) => {
         let reserveTransactions = [];
         if (typeof params.object.id === 'string' && params.object.id.length > 0) {
-            reserveTransactions = yield repos.assetTransaction.search({
+            reserveTransactions = await repos.assetTransaction.search({
                 typeOf: factory.assetTransactionType.Reserve,
                 object: {
                     reservations: { id: { $in: [params.object.id] } }
@@ -108,14 +121,14 @@ function reserveIfNotYet(params) {
             }, ['transactionNumber']);
             debug(reserveTransactions.length, 'reserveTransactions found in reserveIfNotYet. id:', params.object.id, 'reserveTransactions:', JSON.stringify(reserveTransactions));
         }
-        yield Promise.all(reserveTransactions.map((reserveTransaction) => __awaiter(this, void 0, void 0, function* () {
-            yield (0, confirmReservation_1.confirmReservation)({
+        await Promise.all(reserveTransactions.map(async (reserveTransaction) => {
+            await (0, confirmReservation_1.confirmReservation)({
                 // optimize(2024-07-01~)
                 potentialReserveAction: { object: { reservationNumber: reserveTransaction.transactionNumber } },
                 useOnReservationConfirmed: false, // ここでは確定予約の存在を担保すればよいだけ
                 byTask: false
             })(repos);
             debug('confirmReservation processed in reserveIfNotYet. reservationNumber:', reserveTransaction.transactionNumber);
-        })));
-    });
+        }));
+    };
 }

package/lib/chevre/service/reserve/verifyToken4reservation.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.verifyToken4reservation = verifyToken4reservation;
 const factory = require("../../factory");
@@ -15,12 +6,12 @@ const factory = require("../../factory");
  * 予約使用のためのチケットトークンを検証する
  */
 function verifyToken4reservation(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let orderNumber;
         const { ticketToken } = params.ticket;
         let payload;
         if (typeof ticketToken === 'string' && ticketToken.length > 0) {
-            const findValidOneByCodeResult = yield repos.authorization.findValidOneByCode({
+            const findValidOneByCodeResult = await repos.authorization.findValidOneByCode({
                 project: { id: params.project.id },
                 code: ticketToken
             });
@@ -36,7 +27,7 @@ function verifyToken4reservation(params) {
                     throw new factory.errors.NotFound('payload.orderNumber');
                 }
                 // reservationIdを含む注文の存在を確認するだけでよい(2023-01-31~)
-                const order = yield repos.order.findByOrderNumberAndReservationId({
+                const order = await repos.order.findByOrderNumberAndReservationId({
                     project: { id: params.project.id },
                     orderNumber,
                     reservationId: params.reservationId,
@@ -55,6 +46,8 @@ function verifyToken4reservation(params) {
             default:
                 throw new factory.errors.NotImplemented(`Payload type ${payload.typeOf} not implemented`);
         }
-        return Object.assign({}, (typeof orderNumber === 'string') ? { orderNumber } : undefined);
-    });
+        return {
+            ...(typeof orderNumber === 'string') ? { orderNumber } : undefined
+        };
+    };
 }