@chevre/domain 21.2.0-alpha.13 → 21.2.0-alpha.131

package/lib/chevre/service/assetTransaction/pay/account/validation.js

@@ -28,7 +28,7 @@ function validateAccount(params) {
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        const seller = yield repos.seller.findById({ id: sellerId });
+        const seller = yield repos.seller.findById({ id: sellerId }, ['paymentAccepted'], []);
         const paymentAccepted = (_d = seller.paymentAccepted) === null || _d === void 0 ? void 0 : _d.some((a) => a.paymentMethodType === paymentMethodType);
         if (paymentAccepted !== true) {
             throw new factory.errors.Argument('recipient', `payment not accepted`);

package/lib/chevre/service/assetTransaction/pay/potentialActions.js

@@ -126,8 +126,9 @@ function createPayObjectServiceOutput(params) {
             if (Array.isArray(movieTickets)) {
                 paymentServiceOutput = movieTickets.map((movieTicket) => {
                     var _a;
+                    const amount = movieTicket2amount(transaction, movieTicket);
                     const reservation4invoice = movieTicket2reservation4invoice(movieTicket, order, String(paymentMethodType));
-                    return Object.assign({ identifier: movieTicket.identifier }, (typeof ((_a = reservation4invoice.priceSpecification) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
+                    return Object.assign(Object.assign({ identifier: movieTicket.identifier }, (typeof (amount === null || amount === void 0 ? void 0 : amount.value) === 'number') ? { amount } : undefined), (typeof ((_a = reservation4invoice.priceSpecification) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
                         ? {
                             serviceOutput: reservation4invoice
                         }
@@ -140,6 +141,21 @@ function createPayObjectServiceOutput(params) {
     }
     return paymentServiceOutput;
 }
+function movieTicket2amount(transaction, movieTicket) {
+    var _a;
+    let amount;
+    const accountsReceivables = transaction.object.accountsReceivablesByServiceType;
+    if (Array.isArray(accountsReceivables)) {
+        const accountsReceivable = (_a = accountsReceivables.find((a) => a.serviceType === movieTicket.serviceType)) === null || _a === void 0 ? void 0 : _a.accountsReceivable;
+        if (typeof accountsReceivable === 'number') {
+            amount = {
+                typeOf: 'MonetaryAmount',
+                value: accountsReceivable
+            };
+        }
+    }
+    return amount;
+}
 function reservationPriceComponent2invoicePriceComponent(component) {
     var _a;
     const accounting = (typeof ((_a = component.accounting) === null || _a === void 0 ? void 0 : _a.accountsReceivable) === 'number')

package/lib/chevre/service/assetTransaction/pay.d.ts

@@ -96,7 +96,11 @@ export declare function check(params: factory.action.check.paymentMethod.movieTi
 /**
  * 取引開始
  */
-export declare function start(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, useCheckMovieTicketBeforePay: boolean): IStartOperation<factory.assetTransaction.pay.ITransaction>;
+export declare function start(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, options: {
+    useCheckMovieTicketBeforePay: boolean;
+    useCheckByIdentifierIfNotYet: boolean;
+    searchTrade4accountId: boolean;
+}): IStartOperation<factory.assetTransaction.pay.ITransaction>;
 /**
  * 取引確定
  */

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

@@ -42,7 +42,7 @@ function publishPaymentUrl(params) {
         let result;
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.CreditCard:
-                const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId)(repos);
+                const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, false)(repos);
                 const acsUrl = authorizeResult.execTranResult.acsUrl;
                 if (typeof acsUrl !== 'string' || acsUrl.length === 0) {
                     throw new factory.errors.ServiceUnavailable('Payment URL unable to publish');
@@ -106,7 +106,7 @@ exports.check = check;
 /**
  * 取引開始
  */
-function start(params, useCheckMovieTicketBeforePay) {
+function start(params, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         // 金額をfix
@@ -137,11 +137,12 @@ function start(params, useCheckMovieTicketBeforePay) {
                 transaction = yield processAuthorizeAccount(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id))(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.CreditCard:
-                transaction = yield processAuthorizeCreditCard(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id))(repos);
+                transaction =
+                    yield processAuthorizeCreditCard(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), options.searchTrade4accountId)(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.MovieTicket:
                 transaction =
-                    yield processAuthorizeMovieTicket(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), useCheckMovieTicketBeforePay)(repos);
+                    yield processAuthorizeMovieTicket(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), options.useCheckMovieTicketBeforePay, options.useCheckByIdentifierIfNotYet)(repos);
                 break;
             default:
                 throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
@@ -193,7 +194,7 @@ function fixPaymentService(params) {
                     project: { id: { $eq: params.project.id } },
                     typeOf: { $eq: paymentServiceType },
                     id: { $eq: paymentServiceId }
-                });
+                }, [], []);
                 paymentService = paymentServices.shift();
                 if (paymentService === undefined) {
                     throw new factory.errors.NotFound('PaymentService');
@@ -209,7 +210,7 @@ function validateSeller(params) {
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        const seller = yield repos.seller.findById({ id: sellerId });
+        const seller = yield repos.seller.findById({ id: sellerId }, ['paymentAccepted'], []);
         const paymentMethodType = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.typeOf;
         if (typeof paymentMethodType !== 'string') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
@@ -253,9 +254,9 @@ function processAuthorizeAccount(params, transaction, paymentServiceId) {
         })(repos);
     });
 }
-function processAuthorizeCreditCard(params, transaction, paymentServiceId) {
+function processAuthorizeCreditCard(params, transaction, paymentServiceId, searchTrade4accountId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId)(repos);
+        const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, searchTrade4accountId)(repos);
         return saveAuthorizeResult({
             id: transaction.id,
             update: {
@@ -270,18 +271,24 @@ function processAuthorizeCreditCard(params, transaction, paymentServiceId) {
         })(repos);
     });
 }
-function processAuthorizeMovieTicket(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay) {
+function processAuthorizeMovieTicket(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const { accountId, checkResult, payAction } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay)(repos);
+        const { accountId, payAction, accountsReceivablesByServiceType } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet)(repos);
         return saveAuthorizeResult({
             id: transaction.id,
-            update: Object.assign({ 'object.accountId': accountId, 'object.paymentMethod.accountId': accountId, 'object.payAction': payAction }, (checkResult !== undefined) ? { 'object.checkResult': checkResult } : undefined)
+            update: {
+                'object.accountId': accountId,
+                'object.paymentMethod.accountId': accountId,
+                'object.payAction': payAction,
+                // 認証レスポンスより計上金額を保管(2023-05-15~)
+                'object.accountsReceivablesByServiceType': accountsReceivablesByServiceType
+            }
         })(repos);
     });
 }
 function saveAuthorizeResult(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        return repos.assetTransaction.findByIdAndUpdate(params);
+        return repos.assetTransaction.findByIdAndUpdateInProgress(params);
     });
 }
 /**
@@ -393,27 +400,6 @@ function exportTasksById(params) {
         });
         const potentialActions = transaction.potentialActions;
         const taskAttributes = [];
-        // 資産取引削除タスクを作成
-        const deleteTransactionTask = {
-            project: transaction.project,
-            name: factory.taskName.DeleteAssetTransaction,
-            status: factory.taskStatus.Ready,
-            runsAt: moment(transaction.endDate)
-                .add(settings_1.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS, 'days')
-                .toDate(),
-            remainingNumberOfTries: 3,
-            numberOfTried: 0,
-            executionResults: [],
-            data: {
-                object: {
-                    project: transaction.project,
-                    id: transaction.id,
-                    transactionNumber: transaction.transactionNumber,
-                    typeOf: transaction.typeOf
-                }
-            }
-        };
-        taskAttributes.push(deleteTransactionTask);
         // タスク実行日時バッファの指定があれば調整
         let taskRunsAt = new Date();
         if (typeof params.runsTasksAfterInSeconds === 'number') {
@@ -470,7 +456,7 @@ function exportTasksById(params) {
             default:
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
-        return repos.task.saveMany(taskAttributes);
+        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

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

@@ -15,7 +15,6 @@ exports.exportTasksById = exports.cancel = exports.confirm = exports.start = voi
  */
 const moment = require("moment");
 const factory = require("../../factory");
-const settings_1 = require("../../settings");
 const factory_1 = require("./refund/factory");
 const potentialActions_1 = require("./refund/potentialActions");
 /**
@@ -92,7 +91,7 @@ function fixPaymentService(params) {
                     project: { id: { $eq: params.payAction.project.id } },
                     typeOf: { $eq: params.paymentServiceType },
                     id: { $eq: paymentServiceId }
-                });
+                }, [], []);
                 paymentService = paymentServices.shift();
                 if (paymentService === undefined) {
                     throw new factory.errors.NotFound('PaymentService');
@@ -160,27 +159,6 @@ function exportTasksById(params) {
         });
         const potentialActions = transaction.potentialActions;
         const taskAttributes = [];
-        // 資産取引削除タスクを作成
-        const deleteTransactionTask = {
-            project: transaction.project,
-            name: factory.taskName.DeleteAssetTransaction,
-            status: factory.taskStatus.Ready,
-            runsAt: moment(transaction.endDate)
-                .add(settings_1.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS, 'days')
-                .toDate(),
-            remainingNumberOfTries: 3,
-            numberOfTried: 0,
-            executionResults: [],
-            data: {
-                object: {
-                    project: transaction.project,
-                    id: transaction.id,
-                    transactionNumber: transaction.transactionNumber,
-                    typeOf: transaction.typeOf
-                }
-            }
-        };
-        taskAttributes.push(deleteTransactionTask);
         // タスク実行日時バッファの指定があれば調整
         let taskRunsAt = new Date();
         if (typeof params.runsTasksAfterInSeconds === 'number') {
@@ -218,7 +196,7 @@ function exportTasksById(params) {
             default:
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
-        return repos.task.saveMany(taskAttributes);
+        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

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

@@ -13,10 +13,8 @@ exports.exportTasksById = exports.cancel = exports.confirm = exports.start = voi
 /**
  * サービス登録取引サービス
  */
-const moment = require("moment");
 const pecorinoapi = require("../../pecorinoapi");
 const factory = require("../../factory");
-const settings_1 = require("../../settings");
 const searchProductOffers_1 = require("../offer/product/searchProductOffers");
 const factory_1 = require("./registerService/factory");
 const potentialActions_1 = require("./registerService/potentialActions");
@@ -230,27 +228,6 @@ function exportTasksById(params) {
         });
         const potentialActions = transaction.potentialActions;
         const taskAttributes = [];
-        // 資産取引削除タスクを作成
-        const deleteTransactionTask = {
-            project: transaction.project,
-            name: factory.taskName.DeleteAssetTransaction,
-            status: factory.taskStatus.Ready,
-            runsAt: moment(transaction.endDate)
-                .add(settings_1.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS, 'days')
-                .toDate(),
-            remainingNumberOfTries: 3,
-            numberOfTried: 0,
-            executionResults: [],
-            data: {
-                object: {
-                    project: transaction.project,
-                    id: transaction.id,
-                    transactionNumber: transaction.transactionNumber,
-                    typeOf: transaction.typeOf
-                }
-            }
-        };
-        taskAttributes.push(deleteTransactionTask);
         const taskRunsAt = new Date();
         switch (transaction.status) {
             case factory.transactionStatusType.Confirmed:
@@ -301,8 +278,7 @@ function exportTasksById(params) {
             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)));
+        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

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

@@ -4,6 +4,8 @@ type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservat
 export { IAcceptedAddOn };
 export declare function createStartParams(params: factory.assetTransaction.reserve.IStartParamsWithoutDetail & {
     reservationNumber: string;
+    disablePendingReservations: boolean;
+    useHoldStockByTransactionNumber: boolean;
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.Reserve>;
 /**
  * ポイント特典を作成する
@@ -45,6 +47,11 @@ export declare function createAdditionalTicketText(params: {
 }): string | undefined;
 export type IUnitPriceSpecification = factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.UnitPriceSpecification>;
 export declare function createReservationFor(params: factory.event.screeningEvent.IEvent | factory.event.event.IEvent): factory.assetTransaction.reserve.IReservationFor;
+export declare function createIssuedThrough(params: {
+    reservationFor: factory.event.screeningEvent.IEvent | factory.event.event.IEvent;
+}): {
+    issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
+};
 export declare function createReservation(params: {
     project: {
         id: string;
@@ -53,7 +60,6 @@ export declare function createReservation(params: {
     id: string;
     reserveDate: Date;
     agent: factory.assetTransaction.reserve.IAgent;
-    broker?: factory.reservation.IBroker<factory.reservationType.EventReservation>;
     reservationNumber: string;
     reservationFor: factory.event.screeningEvent.IEvent | factory.event.event.IEvent;
     reservedTicket: factory.reservation.ITicket;
@@ -70,8 +76,12 @@ export declare function createReservation(params: {
 }): IObjectSubReservation;
 export declare function createPotentialActions(params: factory.assetTransaction.reserve.IConfirmParams & {
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
-    order?: factory.order.IOrder;
-}): factory.assetTransaction.reserve.IPotentialActions;
-export declare function createPendingReservationAction(params: {
+    order?: Pick<factory.order.IOrder, 'orderNumber' | 'customer' | 'typeOf'>;
+}): {
+    potentialActions: factory.assetTransaction.reserve.IPotentialActions;
+    reservationPackage?: factory.action.reserve.IReservationPackageAsObject;
+    underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+};
+export declare function createCancelPendingReservationAction(params: {
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
-}): factory.action.cancel.reservation.IAttributes[];
+}): factory.action.cancel.reservation.IAttributes | undefined;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createPendingReservationAction = exports.createPotentialActions = exports.createReservation = exports.createReservationFor = exports.createAdditionalTicketText = exports.createAdditionalProperty = exports.validateAppliesToMovieTicket = exports.createReservedTicket = exports.createPointAward = exports.createStartParams = void 0;
+exports.createCancelPendingReservationAction = exports.createPotentialActions = exports.createReservation = exports.createIssuedThrough = exports.createReservationFor = exports.createAdditionalTicketText = exports.createAdditionalProperty = exports.validateAppliesToMovieTicket = exports.createReservedTicket = exports.createPointAward = exports.createStartParams = void 0;
 /**
  * 予約取引ファクトリー
  */
@@ -12,8 +12,8 @@ function createStartParams(params) {
     var _a;
     const reservationNumber = params.reservationNumber;
     const reservationPackage = Object.assign({ 
-        // clientUser: params.object.clientUser,
-        project: params.project, reservationNumber: reservationNumber, typeOf: factory.reservationType.ReservationPackage }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined);
+        // project: params.project,
+        reservationNumber: reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, disablePendingReservations: params.disablePendingReservations, useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, typeOf: factory.reservationType.ReservationPackage }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined);
     return {
         project: { id: params.project.id, typeOf: factory.organizationType.Project },
         typeOf: factory.assetTransactionType.Reserve,
@@ -356,23 +356,8 @@ function optimizeReservationSuperEvent(params) {
         ? { headline: superEvent.headline }
         : undefined);
 }
-// tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-function createReservation(params) {
-    var _a, _b, _c, _d, _e;
-    // 適用メンバーシップ確認
-    validateEligibleMembershipType({
-        availableOffer: params.availableOffer,
-        programMembershipUsed: params.programMembershipUsed
-    });
-    // 適用MovieTicketのidentifier指定を必須化(2022-06-02~)
-    if (params.validateAppliesToMovieTicket) {
-        validateAppliesToMovieTicket({
-            availableOffer: params.availableOffer,
-            appliesToMovieTicket: params.appliesToMovieTicket
-        });
-    }
-    // priceを最適化
-    const price4reservation = (0, price_1.createPrice)(params);
+function createIssuedThrough(params) {
+    var _a;
     const eventOffers = params.reservationFor.offers;
     // offersは必ず存在するはず
     if (eventOffers === undefined) {
@@ -393,7 +378,67 @@ function createReservation(params) {
         const issuedThrough = Object.assign({ typeOf: factory.product.ProductType.EventService, 
             // 興行IDを追加(2022-09-08~)
             id: eventOffers.itemOffered.id, availableChannel }, (typeof (serviceTypeOfIssuedThrough === null || serviceTypeOfIssuedThrough === void 0 ? void 0 : serviceTypeOfIssuedThrough.typeOf) === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : 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, reservationNumber: params.reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, reservedTicket: params.reservedTicket, 
+        return {
+            issuedThrough
+        };
+    }
+    else {
+        const issuedThrough = Object.assign({ typeOf: factory.product.ProductType.Transportation, 
+            // 興行IDを追加(2022-09-08~)
+            id: eventOffers.itemOffered.id, availableChannel }, (typeof (serviceTypeOfIssuedThrough === null || serviceTypeOfIssuedThrough === void 0 ? void 0 : serviceTypeOfIssuedThrough.typeOf) === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined);
+        return {
+            issuedThrough
+        };
+    }
+}
+exports.createIssuedThrough = createIssuedThrough;
+// tslint:disable-next-line:cyclomatic-complexity max-func-body-length
+function createReservation(params) {
+    var _a, _b;
+    // 適用メンバーシップ確認
+    validateEligibleMembershipType({
+        availableOffer: params.availableOffer,
+        programMembershipUsed: params.programMembershipUsed
+    });
+    // 適用MovieTicketのidentifier指定を必須化(2022-06-02~)
+    if (params.validateAppliesToMovieTicket) {
+        validateAppliesToMovieTicket({
+            availableOffer: params.availableOffer,
+            appliesToMovieTicket: params.appliesToMovieTicket
+        });
+    }
+    // priceを最適化
+    const price4reservation = (0, price_1.createPrice)(params);
+    // const eventOffers = <factory.event.screeningEvent.IOffer | undefined>params.reservationFor.offers;
+    // // offersは必ず存在するはず
+    // if (eventOffers === undefined) {
+    //     throw new factory.errors.NotFound('reservationFor.offers');
+    // }
+    // const serviceTypeOfIssuedThrough: factory.reservation.eventReservation.IServiceTypeOfIssuedThrough | undefined
+    //     = (typeof eventOffers.itemOffered.serviceType?.codeValue === 'string')
+    //         ? {
+    //             codeValue: eventOffers.itemOffered.serviceType.codeValue,
+    //             inCodeSet: {
+    //                 typeOf: 'CategoryCodeSet',
+    //                 identifier: factory.categoryCode.CategorySetIdentifier.ServiceType
+    //             },
+    //             typeOf: 'CategoryCode'
+    //         }
+    //         : undefined;
+    // const availableChannel: factory.reservation.IServiceChannel = eventOffers.itemOffered.availableChannel;
+    if (params.reservationFor.typeOf === factory.eventType.ScreeningEvent) {
+        // const issuedThrough: factory.reservation.eventReservation.IIssuedThrough = {
+        //     typeOf: factory.product.ProductType.EventService,
+        //     // 興行IDを追加(2022-09-08~)
+        //     id: eventOffers.itemOffered.id,
+        //     availableChannel,
+        //     // issuedThrough.serviceTypeを連携
+        //     ...(typeof serviceTypeOfIssuedThrough?.typeOf === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined
+        // };
+        return Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.reservationType.EventReservation, id: params.id, 
+            // reservationPackage保管に移行(2023-06-06~)
+            // 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: {
                 typeOf: params.agent.typeOf,
@@ -409,15 +454,23 @@ function createReservation(params) {
                     };
                 })
             }
-            : 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')
+            : undefined), (typeof ((_a = params.programMembershipUsed) === null || _a === void 0 ? void 0 : _a.identifier) === 'string')
             ? { programMembershipUsed: params.programMembershipUsed }
             : undefined);
     }
     else {
-        const issuedThrough = Object.assign({ typeOf: factory.product.ProductType.Transportation, 
-            // 興行IDを追加(2022-09-08~)
-            id: eventOffers.itemOffered.id, availableChannel }, (typeof (serviceTypeOfIssuedThrough === null || serviceTypeOfIssuedThrough === void 0 ? void 0 : serviceTypeOfIssuedThrough.typeOf) === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined);
-        return Object.assign(Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.reservationType.BusReservation, 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, underName: {
+        // const issuedThrough: factory.reservation.busReservation.IIssuedThrough = {
+        //     typeOf: factory.product.ProductType.Transportation,
+        //     // 興行IDを追加(2022-09-08~)
+        //     id: eventOffers.itemOffered.id,
+        //     availableChannel,
+        //     // issuedThrough.serviceTypeを連携
+        //     ...(typeof serviceTypeOfIssuedThrough?.typeOf === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined
+        // };
+        return Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.reservationType.BusReservation, id: params.id, 
+            // reservationPackage保管に移行(2023-06-06~)
+            // 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, 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))
@@ -431,7 +484,7 @@ function createReservation(params) {
                     };
                 })
             }
-            : undefined), (typeof ((_d = params.broker) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string') ? { broker: params.broker } : undefined), (typeof ((_e = params.programMembershipUsed) === null || _e === void 0 ? void 0 : _e.identifier) === 'string')
+            : undefined), (typeof ((_b = params.programMembershipUsed) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
             ? { programMembershipUsed: params.programMembershipUsed }
             : undefined);
     }
@@ -448,9 +501,10 @@ function createPotentialActions(params) {
     // 予約アクション属性作成
     const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
     let reserveActionAttributes = [];
+    let reservationPackage;
+    let underName;
     if (pendingReservations.length > 0) {
         // ReservationPackageに対応(2022-12-22~)
-        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 });
@@ -467,10 +521,18 @@ function createPotentialActions(params) {
                 underName
             }));
         });
-        const reservationPackage = Object.assign({ reservationFor, reservationNumber: pendingReservations[0].reservationNumber, reservationStatus: pendingReservations[0].reservationStatus, 
+        reservationPackage = {
+            reservationFor,
+            reservationNumber: transaction.object.reservationNumber,
+            reservationStatus: (typeof params.transaction.object.reservationStatus === 'string')
+                ? params.transaction.object.reservationStatus
+                : factory.reservationStatusType.ReservationPending,
             // 不要なので廃止(2023-01-19~)
             // subReservation: pendingReservations,
-            typeOf: factory.reservationType.ReservationPackage }, (typeof (underName === null || underName === void 0 ? void 0 : underName.typeOf) === 'string') ? { underName } : undefined);
+            typeOf: factory.reservationType.ReservationPackage
+            // 廃止(2023-05-31~)→予約取引から取得に変更
+            // ...(typeof underName?.typeOf === 'string') ? { underName } : undefined
+        };
         reserveActionAttributes = [{
                 project: transaction.project,
                 typeOf: factory.actionType.ReserveAction,
@@ -484,7 +546,11 @@ function createPotentialActions(params) {
             }];
     }
     return {
-        reserve: reserveActionAttributes
+        potentialActions: {
+            reserve: reserveActionAttributes
+        },
+        reservationPackage,
+        underName
     };
 }
 exports.createPotentialActions = createPotentialActions;
@@ -503,15 +569,11 @@ function createReservationUnderName(params) {
  */
 function ordre2reservationUnderName(params) {
     return {
-        // 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;
+    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 moneyTransfer = [];
     // ポイント特典があれば適用
@@ -524,38 +586,38 @@ function createMoneyTransferActions(params) {
             typeOf: (typeof ((_f = params.reservation.reservedTicket.issuedBy) === null || _f === void 0 ? void 0 : _f.typeOf) === 'string')
                 ? params.reservation.reservedTicket.issuedBy.typeOf
                 : params.transaction.typeOf,
-            name: (typeof ((_h = (_g = params.reservation.reservedTicket) === null || _g === void 0 ? void 0 : _g.issuedBy) === null || _h === void 0 ? void 0 : _h.name) === 'string')
+            name: (typeof ((_g = params.reservation.reservedTicket.issuedBy) === null || _g === void 0 ? void 0 : _g.name) === 'string')
                 ? params.reservation.reservedTicket.issuedBy.name
                 : params.transaction.id
         };
         const toLocation = {
             identifier: pointAwardToLocationIdentifier,
             typeOf: factory.permit.PermitType.Permit,
-            issuedThrough: { id: String((_k = (_j = pointAward.toLocation) === null || _j === void 0 ? void 0 : _j.issuedThrough) === null || _k === void 0 ? void 0 : _k.id) }
+            issuedThrough: { id: String((_j = (_h = pointAward.toLocation) === null || _h === void 0 ? void 0 : _h.issuedThrough) === null || _j === void 0 ? void 0 : _j.id) }
         };
         const recipient = {
-            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
+            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
                 : factory.personType.Person,
-            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
+            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
                 : '',
-            name: String((_q = params.underName) === null || _q === void 0 ? void 0 : _q.name)
+            name: String((_p = params.underName) === null || _p === void 0 ? void 0 : _p.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
-            }, purpose: Object.assign({ typeOf: params.transaction.typeOf, id: params.transaction.id }, (typeof ((_r = pointAward.purpose) === null || _r === void 0 ? void 0 : _r.identifier) === 'string') ? { identifier: pointAward.purpose.identifier } : undefined), amount: {
+            }, 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: {
                 typeOf: 'MonetaryAmount',
-                value: (_s = pointAward.amount) === null || _s === void 0 ? void 0 : _s.value,
-                currency: (_t = pointAward.amount) === null || _t === void 0 ? void 0 : _t.currency
+                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));
     }
     return moneyTransfer;
 }
-function createPendingReservationAction(params) {
+function createCancelPendingReservationAction(params) {
     const transaction = params.transaction;
     const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
-    let cancelActionAttributes = [];
+    let cancelActionAttributes;
     if (pendingReservations.length > 0) {
         const reservationFor = transaction.object.reservationFor;
         if (reservationFor === undefined) {
@@ -566,17 +628,19 @@ function createPendingReservationAction(params) {
             typeOf: factory.reservationType.ReservationPackage,
             reservationNumber: transaction.transactionNumber,
             reservationFor: { typeOf: reservationFor.typeOf, id: String(reservationFor.id) },
-            reservationStatus: pendingReservations[0].reservationStatus
+            reservationStatus: (typeof params.transaction.object.reservationStatus === 'string')
+                ? params.transaction.object.reservationStatus
+                : factory.reservationStatusType.ReservationPending
+        };
+        cancelActionAttributes = {
+            project: transaction.project,
+            typeOf: factory.actionType.CancelAction,
+            purpose: { typeOf: transaction.typeOf, id: transaction.id },
+            agent: transaction.project,
+            object: reservationPackage,
+            potentialActions: {}
         };
-        cancelActionAttributes = [{
-                project: transaction.project,
-                typeOf: factory.actionType.CancelAction,
-                purpose: { typeOf: transaction.typeOf, id: transaction.id },
-                agent: transaction.project,
-                object: reservationPackage,
-                potentialActions: {}
-            }];
     }
     return cancelActionAttributes;
 }
-exports.createPendingReservationAction = createPendingReservationAction;
+exports.createCancelPendingReservationAction = createCancelPendingReservationAction;