@chevre/domain 21.2.0-alpha.8 → 21.2.0-alpha.80

package/lib/chevre/service/assetTransaction/moneyTransfer.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 pecorinoapi = require("../../pecorinoapi");
 // import { RedisRepository as TransactionNumberRepo } from '../../repo/transactionNumber';
 const MoneyTransferService = require("../moneyTransfer");
@@ -360,27 +359,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') {
@@ -430,7 +408,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/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.js

@@ -272,16 +272,22 @@ function processAuthorizeCreditCard(params, transaction, paymentServiceId) {
 }
 function processAuthorizeMovieTicket(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay) {
     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)(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 +399,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 +455,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");
 /**
@@ -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,7 @@ type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservat
 export { IAcceptedAddOn };
 export declare function createStartParams(params: factory.assetTransaction.reserve.IStartParamsWithoutDetail & {
     reservationNumber: string;
+    disablePendingReservations: boolean;
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.Reserve>;
 /**
  * ポイント特典を作成する
@@ -70,8 +71,11 @@ 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;
+    order?: Pick<factory.order.IOrder, 'orderNumber' | 'customer' | 'typeOf'>;
+}): {
+    potentialActions: factory.assetTransaction.reserve.IPotentialActions;
+    reservationPackage?: factory.action.reserve.IReservationPackageAsObject;
+};
 export declare function createPendingReservationAction(params: {
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
 }): factory.action.cancel.reservation.IAttributes[];

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

@@ -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, 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,
@@ -448,6 +448,7 @@ function createPotentialActions(params) {
     // 予約アクション属性作成
     const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
     let reserveActionAttributes = [];
+    let reservationPackage;
     if (pendingReservations.length > 0) {
         // ReservationPackageに対応(2022-12-22~)
         let underName;
@@ -467,7 +468,9 @@ function createPotentialActions(params) {
                 underName
             }));
         });
-        const reservationPackage = Object.assign({ reservationFor, reservationNumber: pendingReservations[0].reservationNumber, reservationStatus: pendingReservations[0].reservationStatus, 
+        reservationPackage = Object.assign({ 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);
@@ -484,7 +487,10 @@ function createPotentialActions(params) {
             }];
     }
     return {
-        reserve: reserveActionAttributes
+        potentialActions: {
+            reserve: reserveActionAttributes
+        },
+        reservationPackage
     };
 }
 exports.createPotentialActions = createPotentialActions;
@@ -503,15 +509,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,30 +526,30 @@ 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;
@@ -566,7 +568,9 @@ 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,

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

@@ -62,6 +62,7 @@ interface IConfirmRepo {
     task: TaskRepo;
 }
 export type IConfirmOperation<T> = (repos: IConfirmRepo) => Promise<T>;
+type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 type IStartParams = factory.assetTransaction.reserve.IStartParamsWithoutDetail & {
     /**
      * 承認アクションを介した場合に検索済のイベント
@@ -94,7 +95,12 @@ type IStartParams = factory.assetTransaction.reserve.IStartParamsWithoutDetail &
 /**
  * 取引開始
  */
-export declare function start(params: IStartParams): IStartOperation<factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>>;
+export declare function start(params: IStartParams & {
+    disablePendingReservations: boolean;
+}): IStartOperation<{
+    transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
+    objectSubReservations: IObjectSubReservation[];
+}>;
 /**
  * 取引確定
  */

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

@@ -63,9 +63,10 @@ function start(params) {
         catch (error) {
             throw error;
         }
+        let objectSubReservations = [];
         // 指定があれば予約追加
         if (typeof ((_d = params.object.reservationFor) === null || _d === void 0 ? void 0 : _d.id) === 'string') {
-            transaction = yield addReservations({
+            const addReservationsResult = yield addReservations({
                 id: transaction.id,
                 object: params.object,
                 event,
@@ -74,8 +75,10 @@ function start(params) {
                 availableAtOrFrom: { id: (_e = params.availableAtOrFrom) === null || _e === void 0 ? void 0 : _e.id },
                 validateAppliesToMovieTicket: params.validateAppliesToMovieTicket
             })(repos);
+            transaction = addReservationsResult.transaction;
+            objectSubReservations = addReservationsResult.objectSubReservations;
         }
-        return transaction;
+        return { transaction, objectSubReservations };
     });
 }
 exports.start = start;
@@ -132,6 +135,20 @@ function addReservations(params) {
         })(repos);
         // 予約イベント最適化
         const reservationFor = (0, factory_1.createReservationFor)(event);
+        // const minimizedObjectSubReservations: factory.assetTransaction.reserve.IMinimizedObjectSubReservation[] =
+        //     objectSubReservations.map((r) => {
+        //         return {
+        //             id: r.id,
+        //             typeOf: r.typeOf,
+        //             reservedTicket: {
+        //                 ticketType: r.reservedTicket.ticketType,
+        //                 ...(typeof r.reservedTicket.ticketedSeat?.typeOf === 'string')
+        //                     ? { ticketedSeat: r.reservedTicket.ticketedSeat }
+        //                     : undefined
+        //             },
+        //             ...(Array.isArray(r.subReservation)) ? { subReservation: r.subReservation } : undefined
+        //         };
+        //     });
         // 取引に予約追加
         let lockedOfferRateLimitKeys = [];
         try {
@@ -140,12 +157,11 @@ function addReservations(params) {
                 typeOf: factory.assetTransactionType.Reserve,
                 id: transaction.id,
                 object: {
-                    project: transaction.project,
                     acceptedOffer: acceptedOffers4transactionObject,
                     reservationFor,
                     // subReservationにreservationForを保管しない(2021-10-19～)
-                    subReservation: objectSubReservations,
-                    typeOf: factory.reservationType.ReservationPackage
+                    subReservation: objectSubReservations
+                    // subReservation: minimizedObjectSubReservations
                 }
             });
         }
@@ -164,11 +180,13 @@ function addReservations(params) {
             reservations: objectSubReservations,
             transaction: transaction
         })(repos);
-        // 予約作成(insertManyで実装)
-        yield repos.reservation.createMany({ reservationFor, reservations: objectSubReservations });
-        // 予約作成後処理
+        if (transaction.object.disablePendingReservations !== true) {
+            // 予約作成(insertManyで実装)
+            yield repos.reservation.createMany({ reservationFor, reservations: objectSubReservations });
+        }
+        // ストックホルダー処理(stockHolderで残席数を集計しているので必要)
         yield onReservationsCreated({ event })(repos);
-        return transaction;
+        return { transaction, objectSubReservations };
     });
 }
 /**
@@ -680,6 +698,7 @@ function onReservationsCreated(params) {
  */
 function confirm(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         let transaction;
         // 取引存在確認
         if (typeof params.id === 'string') {
@@ -698,17 +717,14 @@ function confirm(params) {
             throw new factory.errors.ArgumentNull('Transaction ID or Transaction Number');
         }
         const order = yield fixOrderAsPurpose(params, transaction)(repos);
-        const potentialActions = (0, factory_1.createPotentialActions)(Object.assign(Object.assign({}, params), { transaction: transaction, order }));
+        const { potentialActions, reservationPackage } = (0, factory_1.createPotentialActions)(Object.assign(Object.assign({}, params), { transaction: transaction, order }));
         // 取引確定
         const result = {};
-        yield repos.assetTransaction.confirm({
-            typeOf: factory.assetTransactionType.Reserve,
-            id: transaction.id,
-            result: result,
-            potentialActions: (settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING)
+        yield repos.assetTransaction.confirm(Object.assign({ typeOf: factory.assetTransactionType.Reserve, id: transaction.id, result: result, potentialActions: (settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING)
                 ? { reserve: [] }
-                : potentialActions
-        });
+                : potentialActions }, (typeof ((_a = reservationPackage === null || reservationPackage === void 0 ? void 0 : reservationPackage.underName) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
+            ? { object: { underName: reservationPackage.underName } }
+            : undefined));
         if (settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING) {
             // sync対応(2023-01-13~)
             yield (0, confirmReservation_1.confirmReservation)(potentialActions.reserve)(repos);
@@ -732,7 +748,7 @@ function fixOrderAsPurpose(params, transaction) {
                 project: { id: { $eq: transaction.project.id } },
                 confirmationNumbers: [payPurposeConfirmationNumber],
                 orderNumbers: [payPurposeOrderNumber]
-            });
+            }, { customer: 1, orderNumber: 1, typeOf: 1 });
             order = orders.shift();
             if (order === undefined) {
                 throw new factory.errors.NotFound('Order as purpose');
@@ -773,27 +789,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);
         switch (transaction.status) {
             case factory.transactionStatusType.Confirmed:
                 // tslint:disable-next-line:no-single-line-block-comment
@@ -860,7 +855,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.d.ts

@@ -3,7 +3,6 @@
  */
 import * as factory from '../factory';
 import { MongoRepository as AssetTransactionRepo } from '../repo/assetTransaction';
-import { MongoRepository as ProjectRepo } from '../repo/project';
 import { MongoRepository as TaskRepo } from '../repo/task';
 import * as CancelReservationTransactionService from './assetTransaction/cancelReservation';
 import * as MoneyTransferTransactionService from './assetTransaction/moneyTransfer';
@@ -29,8 +28,13 @@ export declare function exportTasks<T extends factory.assetTransactionType>(para
     typeOf?: {
         $in: T[];
     };
+    id?: string;
+    tasksExportAction?: {
+        agent: {
+            name: string;
+        };
+    };
 }): (repos: {
-    project: ProjectRepo;
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
 }) => Promise<{

package/lib/chevre/service/assetTransaction.js

@@ -20,6 +20,7 @@ const PayTransactionService = require("./assetTransaction/pay");
 const RefundTransactionService = require("./assetTransaction/refund");
 const RegisterServiceTransactionService = require("./assetTransaction/registerService");
 const ReserveTransactionService = require("./assetTransaction/reserve");
+const settings_1 = require("../settings");
 exports.cancelReservation = CancelReservationTransactionService;
 exports.moneyTransfer = MoneyTransferTransactionService;
 exports.pay = PayTransactionService;
@@ -31,11 +32,14 @@ exports.reserve = ReserveTransactionService;
  */
 function exportTasks(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.assetTransaction.startExportTasks({
-            // project: params.project,
-            typeOf: params.typeOf,
-            status: params.status
-        });
+        var _a;
+        const transaction = yield repos.assetTransaction.startExportTasks(Object.assign({ typeOf: params.typeOf, status: params.status, tasksExportAction: {
+                agent: {
+                    name: (typeof ((_a = params.tasksExportAction) === null || _a === void 0 ? void 0 : _a.agent.name) === 'string')
+                        ? params.tasksExportAction.agent.name
+                        : settings_1.DEFAULT_TASKS_EXPORT_AGENT_NAME
+                }
+            } }, (typeof params.id === 'string') ? { id: params.id } : undefined));
         if (transaction === null) {
             return;
         }

package/lib/chevre/service/event.js

@@ -127,7 +127,7 @@ function importFromCOA(params) {
             })(repos);
             savedScreeningEventSeriesCount = savedEventsCount;
             try {
-                // イベントごとに永続化トライ
+                // イベント永続化
                 const screeningEvents = yield saveScreeningEvents({
                     locationBranchCode: params.locationBranchCode,
                     movieTheater: movieTheater,
@@ -154,6 +154,8 @@ function importFromCOA(params) {
                 // "message": "ESOCKETTIMEDOUT",
                 if (error.name === 'COAServiceError') {
                     if (error.message === 'ESOCKETTIMEDOUT') {
+                        // tslint:disable-next-line:no-console
+                        console.error('saveScreeningEvents throwed an error', error.name, error.message);
                         throwsError = false;
                     }
                 }

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

@@ -12,7 +12,7 @@ function task2lineNotify(params) {
     const lastExecutionResult = (task.executionResults.length > 0) ? task.executionResults.slice(-1)[0] : undefined;
     let lastError = lastExecutionResult === null || lastExecutionResult === void 0 ? void 0 : lastExecutionResult.error;
     if (typeof lastError === 'string') {
-        lastError = { message: lastError };
+        lastError = { message: lastError, name: 'Error' };
     }
     const lastMessage = `${String(lastError === null || lastError === void 0 ? void 0 : lastError.name)} ${String(lastError === null || lastError === void 0 ? void 0 : lastError.message)}`;
     const content = `project:${(_a = task.project) === null || _a === void 0 ? void 0 : _a.id}
@@ -38,7 +38,7 @@ function tasks2lineNotify(params) {
         const lastExecutionResult = (task.executionResults.length > 0) ? task.executionResults.slice(-1)[0] : undefined;
         let lastError = lastExecutionResult === null || lastExecutionResult === void 0 ? void 0 : lastExecutionResult.error;
         if (typeof lastError === 'string') {
-            lastError = { message: lastError };
+            lastError = { message: lastError, name: 'Error' };
         }
         const lastMessage = `${String(lastError === null || lastError === void 0 ? void 0 : lastError.name)} ${String(lastError === null || lastError === void 0 ? void 0 : lastError.message)}`;
         return `project:${(_a = task.project) === null || _a === void 0 ? void 0 : _a.id}

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

@@ -1,7 +1,9 @@
 import * as factory from '../factory';
 import { MongoRepository as ActionRepo } from '../repo/action';
 import { MongoRepository as ProjectRepo } from '../repo/project';
-export type Operation<T> = () => Promise<T>;
+export type Operation<T> = (repos: {
+    accessToken: string;
+}) => Promise<T>;
 /**
  * Eメールメッセージを送信する
  * https://sendgrid.com/docs/API_Reference/Web_API_v3/Mail/errors.html