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

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

@@ -8,6 +8,7 @@ const moment = require("moment");
 const factory = require("../../../factory");
 const accountTransactionIdentifier_1 = require("../../../factory/accountTransactionIdentifier");
 const price_1 = require("./factory/price");
+const USE_RESERVATION_PACKAGE_AS_OBJECT = process.env.USE_RESERVATION_PACKAGE_AS_OBJECT === '1';
 function createStartParams(params) {
     var _a;
     const reservationNumber = params.reservationNumber;
@@ -60,21 +61,6 @@ function createPointAward(params) {
     return pointAward;
 }
 exports.createPointAward = createPointAward;
-// function createPointAwardPurposeIdentifier(params: {
-//     assetTransaction: { typeOf: factory.assetTransactionType };
-//     project: { id: string };
-//     reservation: { id: string };
-//     toLocation: { identifier: string };
-// }): string {
-//     return util.format(
-//         '%s:%s:%s:%s:%s',
-//         params.project.id,
-//         'givePointAward',
-//         params.assetTransaction.typeOf,
-//         params.reservation.id,
-//         params.toLocation.identifier
-//     );
-// }
 function createReservedTicket(params) {
     var _a, _b, _c;
     let acceptedTicketedSeat;
@@ -131,10 +117,10 @@ function createReservedTicket(params) {
     }
     const ticketType = createTicketType({ availableOffer: params.availableOffer });
     const issuedBy = createIssuedBy({ acceptedOffer: params.acceptedOffer, availableOffer: params.availableOffer });
-    return Object.assign({ dateIssued: params.dateIssued, issuedBy, priceCurrency: factory.priceCurrency.JPY, ticketType, typeOf: 'Ticket', underName: {
-            typeOf: params.transaction.agent.typeOf,
-            name: params.transaction.agent.name
-        } }, (ticketedSeat !== undefined)
+    return Object.assign({ dateIssued: params.dateIssued, issuedBy,
+        // 不要なので廃止(2022-12-19~)
+        // priceCurrency: factory.priceCurrency.JPY,
+        ticketType, typeOf: 'Ticket' }, (ticketedSeat !== undefined)
         ? { ticketedSeat: ticketedSeat }
         : {});
 }
@@ -145,10 +131,14 @@ exports.createReservedTicket = createReservedTicket;
 function createTicketType(params) {
     var _a;
     const availableOffer = params.availableOffer;
-    return Object.assign(Object.assign(Object.assign(Object.assign({ description: availableOffer.description, id: availableOffer.id, identifier: availableOffer.identifier, name: availableOffer.name, priceCurrency: availableOffer.priceCurrency, 
+    return Object.assign(Object.assign(Object.assign(Object.assign({ description: availableOffer.description, id: availableOffer.id, identifier: availableOffer.identifier, name: availableOffer.name, 
+        // 不要なので廃止(2022-12-17~)
+        // priceCurrency: availableOffer.priceCurrency,
         // priceSpecificationを最適化(accounting不要)
         // accounting: { typeOf: "Accounting", … }
-        project: availableOffer.project, typeOf: availableOffer.typeOf }, (Array.isArray(availableOffer.additionalProperty)) ? { additionalProperty: availableOffer.additionalProperty } : undefined), (typeof ((_a = availableOffer.category) === null || _a === void 0 ? void 0 : _a.codeValue) === 'string') ? { category: availableOffer.category } : undefined), (typeof availableOffer.color === 'string') ? { color: availableOffer.color } : undefined), (availableOffer.validRateLimit !== undefined) ? { validRateLimit: availableOffer.validRateLimit } : undefined);
+        // 不要なので廃止(2022-12-17~)
+        // project: availableOffer.project,
+        typeOf: availableOffer.typeOf }, (Array.isArray(availableOffer.additionalProperty)) ? { additionalProperty: availableOffer.additionalProperty } : undefined), (typeof ((_a = availableOffer.category) === null || _a === void 0 ? void 0 : _a.codeValue) === 'string') ? { category: availableOffer.category } : undefined), (typeof availableOffer.color === 'string') ? { color: availableOffer.color } : undefined), (availableOffer.validRateLimit !== undefined) ? { validRateLimit: availableOffer.validRateLimit } : undefined);
 }
 function createIssuedBy(params) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -340,9 +330,13 @@ function createAdditionalTicketText(params) {
 }
 exports.createAdditionalTicketText = createAdditionalTicketText;
 function createReservationFor(params) {
-    return Object.assign({ endDate: params.endDate, eventStatus: params.eventStatus, id: params.id, location: params.location, name: params.name, project: params.project, startDate: params.startDate, 
-        // 最適化(2022-05-31~)
-        superEvent: optimizeReservationSuperEvent(params), typeOf: params.typeOf }, (params.doorTime instanceof Date)
+    return Object.assign({ endDate: params.endDate, 
+        // 不要なので廃止(2022-12-19~)
+        // eventStatus: params.eventStatus,
+        id: params.id, location: params.location, name: params.name, 
+        // 不要なので廃止(2022-12-19~)
+        // project: params.project,
+        startDate: params.startDate, superEvent: optimizeReservationSuperEvent(params), typeOf: params.typeOf }, (params.doorTime instanceof Date)
         ? { doorTime: params.doorTime }
         : undefined);
 }
@@ -351,7 +345,10 @@ function optimizeReservationSuperEvent(params) {
     const superEvent = params.superEvent;
     return Object.assign(Object.assign({ additionalProperty: (Array.isArray(superEvent.additionalProperty))
             ? superEvent.additionalProperty
-            : [], id: superEvent.id, kanaName: superEvent.kanaName, location: superEvent.location, name: superEvent.name, project: superEvent.project, soundFormat: superEvent.soundFormat, typeOf: superEvent.typeOf, videoFormat: superEvent.videoFormat, workPerformed: superEvent.workPerformed }, (superEvent.description !== undefined)
+            : [], id: superEvent.id, kanaName: superEvent.kanaName, location: superEvent.location, name: superEvent.name, 
+        // 不要なので廃止(2022-12-19~)
+        // project: superEvent.project,
+        soundFormat: superEvent.soundFormat, typeOf: superEvent.typeOf, videoFormat: superEvent.videoFormat, workPerformed: superEvent.workPerformed }, (superEvent.description !== undefined)
         ? { description: superEvent.description }
         : undefined), (superEvent.headline !== undefined)
         ? { headline: superEvent.headline }
@@ -390,14 +387,31 @@ function createReservation(params) {
         }
         : undefined;
     const issuedThrough = Object.assign(Object.assign({ typeOf: factory.product.ProductType.EventService }, (typeof (serviceTypeOfIssuedThrough === null || serviceTypeOfIssuedThrough === void 0 ? void 0 : serviceTypeOfIssuedThrough.typeOf) === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined), (typeof eventOffers.itemOffered.id === 'string') ? { id: eventOffers.itemOffered.id } : undefined);
-    return Object.assign(Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.reservationType.EventReservation, id: params.id, issuedThrough, additionalProperty: params.additionalProperty, bookingTime: params.reserveDate, modifiedTime: params.reserveDate, numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, 
-        // reservationFor,
-        reservationNumber: params.reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, reservedTicket: params.reservedTicket, underName: params.agent, checkedIn: false, attended: false }, (typeof params.additionalTicketText === 'string') ? { additionalTicketText: params.additionalTicketText } : undefined), (Array.isArray(params.subReservation)) ? { subReservation: params.subReservation } : undefined), (typeof ((_b = params.broker) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { broker: params.broker } : undefined), (typeof ((_c = params.programMembershipUsed) === null || _c === void 0 ? void 0 : _c.identifier) === 'string')
+    return Object.assign(Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.reservationType.EventReservation, id: params.id, issuedThrough, additionalProperty: params.additionalProperty, bookingTime: params.reserveDate, modifiedTime: params.reserveDate, numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, reservationNumber: params.reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, reservedTicket: params.reservedTicket, 
+        // 最適化(2022-12-19~)
+        // underName: params.agent,
+        underName: {
+            typeOf: params.agent.typeOf,
+            name: params.agent.name
+        }, checkedIn: false, attended: false }, (typeof params.additionalTicketText === 'string') ? { additionalTicketText: params.additionalTicketText } : undefined), (Array.isArray(params.subReservation))
+        ? {
+            subReservation: params.subReservation.map((r) => {
+                return {
+                    reservedTicket: {
+                        ticketedSeat: r.reservedTicket.ticketedSeat,
+                        typeOf: 'Ticket'
+                    }
+                };
+            })
+        }
+        : undefined), (typeof ((_b = params.broker) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { broker: params.broker } : undefined), (typeof ((_c = params.programMembershipUsed) === null || _c === void 0 ? void 0 : _c.identifier) === 'string')
         ? { programMembershipUsed: params.programMembershipUsed }
         : undefined);
 }
 exports.createReservation = createReservation;
+// tslint:disable-next-line:max-func-body-length
 function createPotentialActions(params) {
+    var _a;
     const transaction = params.transaction;
     const reservationFor = transaction.object.reservationFor;
     if (reservationFor === undefined) {
@@ -405,113 +419,103 @@ function createPotentialActions(params) {
     }
     // 予約アクション属性作成
     const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
-    const reserveActionAttributes = pendingReservations.map((reservation) => {
-        var _a, _b;
-        const eventReservation = Object.assign(Object.assign({}, reservation), { reservationFor });
-        if (params.object !== undefined) {
-            // 予約属性の指定があれば上書き
-            const confirmingReservation = params.object.reservations.find((r) => r.id === eventReservation.id);
-            if (confirmingReservation !== undefined) {
-                // additionalTicketText指定を廃止(2022-05-23~)
-                // if (typeof confirmingReservation.additionalTicketText === 'string') {
-                //     eventReservation.additionalTicketText = confirmingReservation.additionalTicketText;
-                // }
-                // additionalProperty指定を廃止(2022-05-23~)
-                // 追加特性の指定があれば、元の追加特性にマージ
-                // if (Array.isArray(confirmingReservation.additionalProperty)) {
-                //     eventReservation.additionalProperty = [
-                //         ...(Array.isArray(eventReservation.additionalProperty)) ? eventReservation.additionalProperty : [],
-                //         ...confirmingReservation.additionalProperty
-                //     ];
-                // }
-                if (confirmingReservation.underName !== undefined) {
-                    eventReservation.underName = confirmingReservation.underName;
-                    eventReservation.reservedTicket.underName = confirmingReservation.underName;
-                }
-                if (confirmingReservation.reservedTicket !== undefined) {
-                    // ticketToken指定を廃止(2022-05-23~)
-                    // if (typeof confirmingReservation.reservedTicket.ticketToken === 'string') {
-                    //     eventReservation.reservedTicket.ticketToken = confirmingReservation.reservedTicket.ticketToken;
-                    // }
-                    if (confirmingReservation.reservedTicket.issuedBy !== undefined) {
-                        eventReservation.reservedTicket.issuedBy = confirmingReservation.reservedTicket.issuedBy;
-                    }
-                    // reservedTicket.underName指定を廃止(2022-05-23~)
-                    // if (confirmingReservation.reservedTicket.underName !== undefined) {
-                    //     eventReservation.reservedTicket.underName = confirmingReservation.reservedTicket.underName;
-                    // }
-                }
+    let reserveActionAttributes = [];
+    if (pendingReservations.length > 0) {
+        // ReservationPackageに対応(2022-12-22~)
+        if (USE_RESERVATION_PACKAGE_AS_OBJECT) {
+            let underName;
+            // purpose:Orderの指定があれば、underName,issuedByを調整(2022-05-23~)
+            if (typeof ((_a = params.order) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
+                const ordre2reservationUnderNameResult = ordre2reservationUnderName({ order: params.order });
+                underName = ordre2reservationUnderNameResult.underName;
             }
+            const moneyTransferActions = [];
+            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; });
+                moneyTransferActions.push(...createMoneyTransferActions({
+                    acceptedOffer: acceptedOffer4reservation,
+                    reservation,
+                    transaction: params.transaction,
+                    underName
+                }));
+            });
+            const reservationPackage = Object.assign({ reservationFor, reservationNumber: pendingReservations[0].reservationNumber, reservationStatus: pendingReservations[0].reservationStatus, subReservation: pendingReservations, typeOf: factory.reservationType.ReservationPackage }, (typeof (underName === null || underName === void 0 ? void 0 : underName.typeOf) === 'string') ? { underName } : undefined);
+            reserveActionAttributes = [{
+                    project: transaction.project,
+                    typeOf: factory.actionType.ReserveAction,
+                    // result: {},
+                    object: reservationPackage,
+                    agent: transaction.project,
+                    potentialActions: {
+                        moneyTransfer: moneyTransferActions
+                    },
+                    purpose: { typeOf: transaction.typeOf, id: transaction.id }
+                }];
         }
-        // purpose:Orderの指定があれば、underName,issuedByを調整(2022-05-23~)
-        if (typeof ((_a = params.order) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
-            const ordre2reservationUnderNameResult = ordre2reservationUnderName({ order: params.order });
-            eventReservation.underName = ordre2reservationUnderNameResult.underName;
-            eventReservation.reservedTicket.underName = ordre2reservationUnderNameResult.underName;
-            eventReservation.reservedTicket.issuedBy = ordre2reservationUnderNameResult.issuedBy;
+        else {
+            reserveActionAttributes = pendingReservations.map((reservation) => {
+                var _a, _b;
+                const eventReservation = Object.assign(Object.assign({}, reservation), { reservationFor });
+                // purpose:Orderの指定があれば、underName,issuedByを調整(2022-05-23~)
+                if (typeof ((_a = params.order) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
+                    const ordre2reservationUnderNameResult = ordre2reservationUnderName({ order: params.order });
+                    eventReservation.underName = ordre2reservationUnderNameResult.underName;
+                    // 不要なので廃止(2022-12-19~)
+                    // eventReservation.reservedTicket.underName = ordre2reservationUnderNameResult.underName;
+                    // 不要なので廃止(2022-12-23~)
+                    // eventReservation.reservedTicket.issuedBy = ordre2reservationUnderNameResult.issuedBy;
+                }
+                const acceptedOffer4reservation = (_b = transaction.object.acceptedOffer) === null || _b === void 0 ? void 0 : _b.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 moneyTransfer = createMoneyTransferActions({
+                    acceptedOffer: acceptedOffer4reservation,
+                    reservation: eventReservation,
+                    transaction: params.transaction,
+                    underName: eventReservation.underName
+                });
+                return {
+                    project: transaction.project,
+                    typeOf: factory.actionType.ReserveAction,
+                    // result: {},
+                    object: eventReservation,
+                    agent: transaction.project,
+                    potentialActions: {
+                        moneyTransfer: moneyTransfer
+                    },
+                    purpose: { typeOf: transaction.typeOf, id: transaction.id }
+                };
+            });
         }
-        // const informReservationActions: factory.action.reserve.IInformReservation[] = [];
-        const acceptedOffer4reservation = (_b = transaction.object.acceptedOffer) === null || _b === void 0 ? void 0 : _b.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 moneyTransfer = createMoneyTransferActions({
-            acceptedOffer: acceptedOffer4reservation,
-            reservation: eventReservation,
-            transaction: params.transaction
-        });
-        return {
-            project: transaction.project,
-            typeOf: factory.actionType.ReserveAction,
-            result: {},
-            object: eventReservation,
-            // プロジェクトに変更(2022-05-26~)
-            agent: transaction.project,
-            potentialActions: {
-                moneyTransfer: moneyTransfer
-                // informReservation: informReservationActions
-            },
-            purpose: {
-                typeOf: transaction.typeOf,
-                id: transaction.id
-            }
-        };
-    });
+    }
     return {
         reserve: reserveActionAttributes
     };
 }
 exports.createPotentialActions = createPotentialActions;
 function createReservationUnderNameIdentifier(params) {
-    const order = params.order;
-    const customer = order.customer;
     // 予約のunderName.identifierを決定する
     return [
-        { name: 'orderNumber', value: order.orderNumber },
-        // 不要なので廃止(2022-05-24~)
-        // { name: 'transaction', value: params.transaction.id },
-        // ↓legacy-reservationの印刷アウトプットで使用(2022-02-09廃止)
-        // { name: 'paymentMethod', value: paymentMethodNames },
-        ...(Array.isArray(customer.identifier)) ? customer.identifier : []
+        { name: 'orderNumber', value: params.order.orderNumber },
+        ...(Array.isArray(params.order.customer.identifier)) ? params.order.customer.identifier : []
     ];
 }
 function createReservationUnderName(params) {
-    // 予約のunderName.identifierを決定する
-    const defaultUnderNameIdentifiers = createReservationUnderNameIdentifier({ order: params.order });
-    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ identifier: defaultUnderNameIdentifiers, name: String(params.order.customer.name), typeOf: params.order.customer.typeOf }, (typeof params.order.customer.address === 'string') ? { address: params.order.customer.address } : undefined), (typeof params.order.customer.age === 'string') ? { age: params.order.customer.age } : undefined), (typeof params.order.customer.email === 'string') ? { email: params.order.customer.email } : undefined), (typeof params.order.customer.familyName === 'string') ? { familyName: params.order.customer.familyName } : undefined), (typeof params.order.customer.gender === 'string') ? { gender: params.order.customer.gender } : undefined), (typeof params.order.customer.givenName === 'string') ? { givenName: params.order.customer.givenName } : undefined), (typeof params.order.customer.id === 'string') ? { id: params.order.customer.id } : undefined), (typeof params.order.customer.telephone === 'string') ? { telephone: params.order.customer.telephone } : undefined), (typeof params.order.customer.url === 'string') ? { url: params.order.customer.url } : undefined);
+    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ identifier: createReservationUnderNameIdentifier({ order: params.order }), name: String(params.order.customer.name), typeOf: params.order.customer.typeOf }, (typeof params.order.customer.address === 'string') ? { address: params.order.customer.address } : undefined), (typeof params.order.customer.age === 'string') ? { age: params.order.customer.age } : undefined), (typeof params.order.customer.email === 'string') ? { email: params.order.customer.email } : undefined), (typeof params.order.customer.familyName === 'string') ? { familyName: params.order.customer.familyName } : undefined), (typeof params.order.customer.gender === 'string') ? { gender: params.order.customer.gender } : undefined), (typeof params.order.customer.givenName === 'string') ? { givenName: params.order.customer.givenName } : undefined), (typeof params.order.customer.id === 'string') ? { id: params.order.customer.id } : undefined), (typeof params.order.customer.telephone === 'string') ? { telephone: params.order.customer.telephone } : undefined), (typeof params.order.customer.url === 'string') ? { url: params.order.customer.url } : undefined);
 }
 /**
  * 注文者情報を予約者情報へ変換する
  */
 function ordre2reservationUnderName(params) {
     return {
-        issuedBy: {
-            typeOf: params.order.seller.typeOf,
-            name: params.order.seller.name
-        },
+        // issuedBy: {
+        //     typeOf: params.order.seller.typeOf,
+        //     name: params.order.seller.name
+        // },
         underName: createReservationUnderName({ order: params.order })
     };
 }
 function createMoneyTransferActions(params) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
-    // return [];
     const pointAward = (_b = (_a = params.acceptedOffer) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.pointAward;
     const moneyTransfer = [];
     // ポイント特典があれば適用
@@ -534,13 +538,13 @@ function createMoneyTransferActions(params) {
             issuedThrough: { id: String((_k = (_j = pointAward.toLocation) === null || _j === void 0 ? void 0 : _j.issuedThrough) === null || _k === void 0 ? void 0 : _k.id) }
         };
         const recipient = {
-            typeOf: (typeof ((_l = params.reservation.underName) === null || _l === void 0 ? void 0 : _l.typeOf) === 'string')
-                ? (_m = params.reservation.underName) === null || _m === void 0 ? void 0 : _m.typeOf
+            typeOf: (typeof ((_l = params.underName) === null || _l === void 0 ? void 0 : _l.typeOf) === 'string')
+                ? (_m = params.underName) === null || _m === void 0 ? void 0 : _m.typeOf
                 : factory.personType.Person,
-            id: (typeof ((_o = params.reservation.underName) === null || _o === void 0 ? void 0 : _o.id) === 'string')
-                ? (_p = params.reservation.underName) === null || _p === void 0 ? void 0 : _p.id
+            id: (typeof ((_o = params.underName) === null || _o === void 0 ? void 0 : _o.id) === 'string')
+                ? (_p = params.underName) === null || _p === void 0 ? void 0 : _p.id
                 : '',
-            name: String((_q = params.reservation.underName) === null || _q === void 0 ? void 0 : _q.name)
+            name: String((_q = params.underName) === null || _q === void 0 ? void 0 : _q.name)
         };
         moneyTransfer.push(Object.assign(Object.assign({ project: params.transaction.project, typeOf: factory.actionType.MoneyTransfer, agent: params.transaction.project, recipient, object: {
                 typeOf: factory.account.transactionType.Deposit

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

@@ -20,6 +20,7 @@ const OfferService = require("../offer");
 const cancelReservation_1 = require("../reserve/cancelReservation");
 const settings_1 = require("../../settings");
 const factory_1 = require("./reserve/factory");
+const USE_RESERVATION_PACKAGE_AS_OBJECT = process.env.USE_RESERVATION_PACKAGE_AS_OBJECT === '1';
 /**
  * 取引開始
  */
@@ -148,9 +149,6 @@ function addReservations(params) {
         // 予約作成(insertManyで実装)
         yield repos.reservation.createMany({ reservationFor, reservations: objectSubReservations });
         // 予約作成後処理
-        // await Promise.all(objectSubReservations.map(async (r) => {
-        //     await onReservationCreated(transaction, r)(repos);
-        // }));
         yield onReservationsCreated({ event })(repos);
         return transaction;
     });
@@ -528,22 +526,6 @@ function processLockSeats(params) {
         }
     });
 }
-/**
- * 予約作成時イベント
- */
-// function onReservationCreated(
-//     __1: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>,
-//     __2: IObjectSubReservation
-// ) {
-//     return async (repos: {
-//         task: TaskRepo;
-//     }) => {
-//         // const now = new Date();
-//         const taskAttributes: factory.task.IAttributes<factory.taskName>[] = [];
-//         // タスク保管
-//         await repos.task.saveMany(taskAttributes);
-//     };
-// }
 /**
  * 予約作成時イベント
  */
@@ -628,47 +610,55 @@ function cancel(params) {
             transactionNumber: params.transactionNumber
         });
         // 本来非同期でタスクが実行されるが、同期的に仮予約取消が実行されていないと、サービス利用側が困る可能性があるので、
-        // 一応同期的にもcancelPendingReservationを実行しておく
+        // 同期的にもcancelPendingReservationを実行しておく
         try {
             const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
+            let cancelActionAttributes = [];
             if (pendingReservations.length > 0) {
                 const reservationFor = transaction.object.reservationFor;
                 if (reservationFor === undefined) {
                     throw new factory.errors.NotFound('transaction.object.reservationFor');
                 }
-                const actionAttributes = pendingReservations.map((reservation) => {
-                    var _a;
-                    const eventReservation = Object.assign(Object.assign({}, reservation), { reservationFor });
-                    // const informReservationActions: factory.action.reserve.IInformReservation[] = [];
-                    return {
-                        project: transaction.project,
-                        typeOf: factory.actionType.CancelAction,
-                        purpose: {
-                            typeOf: transaction.typeOf,
-                            id: transaction.id
-                        },
-                        // プロジェクトに変更(2022-05-26~)
-                        agent: transaction.project,
-                        // 最適化(2022-06-06~)
-                        object: {
-                            typeOf: eventReservation.typeOf,
-                            id: eventReservation.id,
-                            issuedThrough: {
-                                typeOf: (_a = eventReservation.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf
-                            },
-                            reservationFor: {
-                                typeOf: eventReservation.reservationFor.typeOf,
-                                id: eventReservation.reservationFor.id
-                            },
-                            reservationNumber: eventReservation.reservationNumber,
-                            reservationStatus: eventReservation.reservationStatus
-                        },
-                        potentialActions: {
-                        // informReservation: informReservationActions
-                        }
+                // ReservationPackageに対応(2022-12-23~)
+                if (USE_RESERVATION_PACKAGE_AS_OBJECT) {
+                    const reservationPackage = {
+                        typeOf: factory.reservationType.ReservationPackage,
+                        reservationNumber: transaction.transactionNumber,
+                        reservationFor: { typeOf: reservationFor.typeOf, id: reservationFor.id },
+                        reservationStatus: pendingReservations[0].reservationStatus
                     };
-                });
-                yield (0, cancelReservation_1.cancelPendingReservation)(actionAttributes)(repos);
+                    cancelActionAttributes = [{
+                            project: transaction.project,
+                            typeOf: factory.actionType.CancelAction,
+                            purpose: { typeOf: transaction.typeOf, id: transaction.id },
+                            agent: transaction.project,
+                            object: reservationPackage,
+                            potentialActions: {}
+                        }];
+                }
+                else {
+                    cancelActionAttributes = pendingReservations.map((reservation) => {
+                        var _a;
+                        return {
+                            project: transaction.project,
+                            typeOf: factory.actionType.CancelAction,
+                            purpose: { typeOf: transaction.typeOf, id: transaction.id },
+                            agent: transaction.project,
+                            object: {
+                                typeOf: reservation.typeOf,
+                                id: reservation.id,
+                                issuedThrough: {
+                                    typeOf: (_a = reservation.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf
+                                },
+                                reservationFor: { typeOf: reservationFor.typeOf, id: reservationFor.id },
+                                reservationNumber: reservation.reservationNumber,
+                                reservationStatus: reservation.reservationStatus
+                            },
+                            potentialActions: {}
+                        };
+                    });
+                }
+                yield (0, cancelReservation_1.cancelPendingReservation)(cancelActionAttributes)(repos);
             }
         }
         catch (error) {
@@ -737,45 +727,29 @@ function exportTasksById(params) {
             case factory.transactionStatusType.Canceled:
             case factory.transactionStatusType.Expired:
                 const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
+                let cancelActionAttributes = [];
                 if (pendingReservations.length > 0) {
                     const reservationFor = transaction.object.reservationFor;
                     if (reservationFor === undefined) {
                         throw new factory.errors.NotFound('transaction.object.reservationFor');
                     }
-                    const actionAttributes = pendingReservations.map((reservation) => {
-                        var _a;
-                        const eventReservation = Object.assign(Object.assign({}, reservation), { reservationFor });
-                        // const informReservationActions: factory.action.reserve.IInformReservation[] = [];
-                        return {
-                            project: transaction.project,
-                            typeOf: factory.actionType.CancelAction,
-                            purpose: {
-                                typeOf: transaction.typeOf,
-                                id: transaction.id
-                            },
-                            // プロジェクトに変更(2022-05-26~)
-                            agent: transaction.project,
-                            // 最適化(2022-06-06~)
-                            object: {
-                                typeOf: eventReservation.typeOf,
-                                id: eventReservation.id,
-                                issuedThrough: {
-                                    typeOf: (_a = eventReservation.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf
-                                },
-                                reservationFor: {
-                                    typeOf: eventReservation.reservationFor.typeOf,
-                                    id: eventReservation.reservationFor.id
-                                },
-                                reservationNumber: eventReservation.reservationNumber,
-                                reservationStatus: eventReservation.reservationStatus
-                            },
-                            potentialActions: {
-                            // informReservation: informReservationActions
-                            }
+                    // ReservationPackageに対応(2022-12-23~)
+                    if (USE_RESERVATION_PACKAGE_AS_OBJECT) {
+                        const reservationPackage = {
+                            typeOf: factory.reservationType.ReservationPackage,
+                            reservationNumber: transaction.transactionNumber,
+                            reservationFor: { typeOf: reservationFor.typeOf, id: reservationFor.id },
+                            reservationStatus: pendingReservations[0].reservationStatus
                         };
-                    });
-                    const cancelPendingReservationTasks = actionAttributes.map((a) => {
-                        return {
+                        cancelActionAttributes = [{
+                                project: transaction.project,
+                                typeOf: factory.actionType.CancelAction,
+                                purpose: { typeOf: transaction.typeOf, id: transaction.id },
+                                agent: transaction.project,
+                                object: reservationPackage,
+                                potentialActions: {}
+                            }];
+                        const cancelPendingReservationTask = {
                             project: transaction.project,
                             name: factory.taskName.CancelPendingReservation,
                             status: factory.taskStatus.Ready,
@@ -784,18 +758,54 @@ function exportTasksById(params) {
                             numberOfTried: 0,
                             executionResults: [],
                             data: {
-                                actionAttributes: [a]
+                                actionAttributes: cancelActionAttributes
                             }
                         };
-                    });
-                    taskAttributes.push(...cancelPendingReservationTasks);
+                        taskAttributes.push(cancelPendingReservationTask);
+                    }
+                    else {
+                        cancelActionAttributes = pendingReservations.map((reservation) => {
+                            var _a;
+                            return {
+                                project: transaction.project,
+                                typeOf: factory.actionType.CancelAction,
+                                purpose: { typeOf: transaction.typeOf, id: transaction.id },
+                                agent: transaction.project,
+                                object: {
+                                    typeOf: reservation.typeOf,
+                                    id: reservation.id,
+                                    issuedThrough: {
+                                        typeOf: (_a = reservation.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf
+                                    },
+                                    reservationFor: { typeOf: reservationFor.typeOf, id: reservationFor.id },
+                                    reservationNumber: reservation.reservationNumber,
+                                    reservationStatus: reservation.reservationStatus
+                                },
+                                potentialActions: {}
+                            };
+                        });
+                        const cancelPendingReservationTasks = cancelActionAttributes.map((a) => {
+                            return {
+                                project: transaction.project,
+                                name: factory.taskName.CancelPendingReservation,
+                                status: factory.taskStatus.Ready,
+                                runsAt: new Date(),
+                                remainingNumberOfTries: 10,
+                                numberOfTried: 0,
+                                executionResults: [],
+                                data: {
+                                    actionAttributes: [a]
+                                }
+                            };
+                        });
+                        taskAttributes.push(...cancelPendingReservationTasks);
+                    }
                 }
                 break;
             default:
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
         return repos.task.saveMany(taskAttributes);
-        // return Promise.all(taskAttributes.map(async (a) => repos.task.save(a)));
     });
 }
 exports.exportTasksById = exportTasksById;

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

@@ -63,7 +63,8 @@ function createAcquiredFrom(params) {
     // 最低限の情報に絞る
     const seller = params.order.seller;
     return {
-        project: { typeOf: params.order.project.typeOf, id: params.order.project.id },
+        // 最適化(2022-11-15~)
+        // project: { typeOf: params.order.project.typeOf, id: params.order.project.id },
         id: seller.id,
         typeOf: seller.typeOf,
         name: (typeof seller.name === 'string')