@chevre/domain 20.2.0-alpha.2 → 20.2.0-alpha.21

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -120,9 +120,16 @@ exports.aggregateByEvent = aggregateByEvent;
  */
 function findLocation(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         let movieTheater;
         try {
-            movieTheater = yield repos.place.findById({ id: params.event.superEvent.location.id });
+            if (params.event.typeOf === factory.eventType.ScreeningEvent) {
+                movieTheater = yield repos.place.findById({ id: params.event.superEvent.location.id });
+            }
+            else {
+                const movieTheaterId = String((_a = params.event.offers) === null || _a === void 0 ? void 0 : _a.itemOffered.availableChannel.serviceLocation.containedInPlace.id);
+                movieTheater = yield repos.place.findById({ id: movieTheaterId });
+            }
         }
         catch (error) {
             let throwsError = true;
@@ -223,22 +230,29 @@ function aggregateReservationByOffer(params) {
         let reservationCount4offer;
         let attendeeCount4offer;
         let checkInCount4offer;
+        let reservationType = factory.reservationType.EventReservation;
+        if (params.event.typeOf === factory.eventType.Event) {
+            reservationType = factory.reservationType.BusReservation;
+        }
         reservationCount4offer = yield repos.reservation.count({
-            typeOf: factory.reservationType.EventReservation,
-            reservationFor: { ids: [params.event.id] },
+            typeOf: reservationType,
+            // reservationFor: { ids: [params.event.id] },
+            reservationFor: { id: { $eq: params.event.id } },
             reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
             reservedTicket: { ticketType: { ids: [params.offer.id] } }
         });
         attendeeCount4offer = yield repos.reservation.count({
-            typeOf: factory.reservationType.EventReservation,
-            reservationFor: { ids: [params.event.id] },
+            typeOf: reservationType,
+            // reservationFor: { ids: [params.event.id] },
+            reservationFor: { id: { $eq: params.event.id } },
             reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
             reservedTicket: { ticketType: { ids: [params.offer.id] } },
             attended: true
         });
         checkInCount4offer = yield repos.reservation.count({
-            typeOf: factory.reservationType.EventReservation,
-            reservationFor: { ids: [params.event.id] },
+            typeOf: reservationType,
+            // reservationFor: { ids: [params.event.id] },
+            reservationFor: { id: { $eq: params.event.id } },
             reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
             reservedTicket: { ticketType: { ids: [params.offer.id] } },
             checkedIn: true
@@ -390,9 +404,14 @@ function aggregateReservationByEvent(params) {
         let attendeeCount;
         let checkInCount;
         let reservationCount;
+        let reservationType = factory.reservationType.EventReservation;
+        if (params.event.typeOf === factory.eventType.Event) {
+            reservationType = factory.reservationType.BusReservation;
+        }
         reservationCount = yield repos.reservation.count({
-            typeOf: factory.reservationType.EventReservation,
-            reservationFor: { ids: [params.event.id] },
+            typeOf: reservationType,
+            // reservationFor: { ids: [params.event.id] },
+            reservationFor: { id: { $eq: params.event.id } },
             reservationStatuses: [factory.reservationStatusType.ReservationConfirmed]
         });
         // maximumAttendeeCapacityを決定
@@ -421,14 +440,16 @@ function aggregateReservationByEvent(params) {
             }
         }
         attendeeCount = yield repos.reservation.count({
-            typeOf: factory.reservationType.EventReservation,
-            reservationFor: { ids: [params.event.id] },
+            typeOf: reservationType,
+            // reservationFor: { ids: [params.event.id] },
+            reservationFor: { id: { $eq: params.event.id } },
             // reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
             attended: true
         });
         checkInCount = yield repos.reservation.count({
-            typeOf: factory.reservationType.EventReservation,
-            reservationFor: { ids: [params.event.id] },
+            typeOf: reservationType,
+            // reservationFor: { ids: [params.event.id] },
+            reservationFor: { id: { $eq: params.event.id } },
             // reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
             checkedIn: true
         });

package/lib/chevre/service/aggregation/system.d.ts

@@ -0,0 +1,74 @@
+import { MongoRepository as ActionRepo } from '../../repo/action';
+import { MongoRepository as AggregationRepo } from '../../repo/aggregation';
+import { MongoRepository as OrderRepo } from '../../repo/order';
+import { MongoRepository as ReservationRepo } from '../../repo/reservation';
+import { MongoRepository as TransactionRepo } from '../../repo/transaction';
+/**
+ * 注文取引集計
+ */
+declare function aggregatePlaceOrder(params: {
+    aggregationDays: number;
+    excludedProjectId?: string;
+    clientIds?: string[];
+}): (repos: {
+    agregation: AggregationRepo;
+    transaction: TransactionRepo;
+}) => Promise<void>;
+/**
+ * 興行オファー承認アクション集計
+ */
+declare function aggregateAuthorizeEventServiceOfferAction(params: {
+    aggregationDays: number;
+    excludedProjectId?: string;
+}): (repos: {
+    agregation: AggregationRepo;
+    action: ActionRepo;
+}) => Promise<void>;
+/**
+ * 決済承認アクション集計
+ */
+declare function aggregateAuthorizePaymentAction(params: {
+    aggregationDays: number;
+    excludedProjectId?: string;
+}): (repos: {
+    agregation: AggregationRepo;
+    action: ActionRepo;
+}) => Promise<void>;
+declare function aggregateAuthorizeOrderAction(params: {
+    aggregationDays: number;
+    excludedProjectId?: string;
+}): (repos: {
+    agregation: AggregationRepo;
+    action: ActionRepo;
+}) => Promise<void>;
+/**
+ * 使用アクション集計
+ */
+declare function aggregateUseAction(params: {
+    aggregationDays: number;
+    excludedProjectId?: string;
+}): (repos: {
+    agregation: AggregationRepo;
+    action: ActionRepo;
+}) => Promise<void>;
+/**
+ * 注文集計
+ */
+declare function aggregateOrder(params: {
+    aggregationDays: number;
+    excludedProjectId?: string;
+}): (repos: {
+    agregation: AggregationRepo;
+    order: OrderRepo;
+}) => Promise<void>;
+/**
+ * 予約集計
+ */
+declare function aggregateReservation(params: {
+    aggregationDays: number;
+    excludedProjectId?: string;
+}): (repos: {
+    agregation: AggregationRepo;
+    reservation: ReservationRepo;
+}) => Promise<void>;
+export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregateOrder, aggregatePlaceOrder, aggregateReservation, aggregateUseAction };

package/lib/chevre/service/aggregation/system.js

@@ -0,0 +1,266 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.aggregateUseAction = exports.aggregateReservation = exports.aggregatePlaceOrder = exports.aggregateOrder = exports.aggregateAuthorizePaymentAction = exports.aggregateAuthorizeOrderAction = exports.aggregateAuthorizeEventServiceOfferAction = void 0;
+const createDebug = require("debug");
+const moment = require("moment-timezone");
+const factory = require("../../factory");
+const aggregation_1 = require("../../repo/aggregation");
+const debug = createDebug('chevre-domain:service:aggregation:system');
+/**
+ * 注文取引集計
+ */
+function aggregatePlaceOrder(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const aggregateDate = new Date();
+        const aggregateDuration = moment.duration(1, 'days')
+            .toISOString();
+        let i = -1;
+        while (i < params.aggregationDays) {
+            i += 1;
+            const startFrom = moment()
+                // .tz('Asia/Tokyo')
+                .add(-i, 'days')
+                .startOf('day')
+                .toDate();
+            const startThrough = moment()
+                // .tz('Asia/Tokyo')
+                .add(-i, 'days')
+                .endOf('day')
+                .toDate();
+            const aggregateResult = yield repos.transaction.aggregatePlaceOrder({
+                project: { id: { $ne: params.excludedProjectId } },
+                startFrom,
+                startThrough,
+                typeOf: factory.transactionType.PlaceOrder
+            });
+            debug('aggregatePlaceOrder:result', aggregateResult, (_a = aggregateResult.statuses[0]) === null || _a === void 0 ? void 0 : _a.aggregation.percentilesDuration, startFrom);
+            const aggregateResultsByClientId = [];
+            if (Array.isArray(params.clientIds)) {
+                for (const clientId of params.clientIds) {
+                    aggregateResultsByClientId.push({
+                        clientId,
+                        aggregation: yield repos.transaction.aggregatePlaceOrder({
+                            project: { id: { $ne: params.excludedProjectId } },
+                            startFrom,
+                            startThrough,
+                            typeOf: factory.transactionType.PlaceOrder,
+                            clientId
+                        })
+                    });
+                }
+            }
+            yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregatePlaceOrder, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: startFrom, aggregateDate, aggregationByClient: aggregateResultsByClientId }, aggregateResult));
+        }
+    });
+}
+exports.aggregatePlaceOrder = aggregatePlaceOrder;
+/**
+ * 興行オファー承認アクション集計
+ */
+function aggregateAuthorizeEventServiceOfferAction(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const aggregateDate = new Date();
+        const aggregateDuration = moment.duration(1, 'days')
+            .toISOString();
+        let i = -1;
+        while (i < params.aggregationDays) {
+            i += 1;
+            const startFrom = moment()
+                // .tz('Asia/Tokyo')
+                .add(-i, 'days')
+                .startOf('day')
+                .toDate();
+            const startThrough = moment()
+                // .tz('Asia/Tokyo')
+                .add(-i, 'days')
+                .endOf('day')
+                .toDate();
+            const aggregateResult = yield repos.action.aggregateAuthorizeEventServiceOfferAction({
+                project: { id: { $ne: params.excludedProjectId } },
+                startFrom,
+                startThrough,
+                typeOf: factory.actionType.AuthorizeAction
+            });
+            debug('aggregateAuthorizeEventServiceOfferAction:result', aggregateResult, (_a = aggregateResult.statuses[0]) === null || _a === void 0 ? void 0 : _a.aggregation.percentilesDuration, startFrom);
+            yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregateAuthorizeEventServiceOfferAction, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: startFrom, aggregateDate }, aggregateResult));
+        }
+    });
+}
+exports.aggregateAuthorizeEventServiceOfferAction = aggregateAuthorizeEventServiceOfferAction;
+/**
+ * 決済承認アクション集計
+ */
+function aggregateAuthorizePaymentAction(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const aggregateDate = new Date();
+        const aggregateDuration = moment.duration(1, 'days')
+            .toISOString();
+        let i = -1;
+        while (i < params.aggregationDays) {
+            i += 1;
+            const startFrom = moment()
+                // .tz('Asia/Tokyo')
+                .add(-i, 'days')
+                .startOf('day')
+                .toDate();
+            const startThrough = moment()
+                // .tz('Asia/Tokyo')
+                .add(-i, 'days')
+                .endOf('day')
+                .toDate();
+            const aggregateResult = yield repos.action.aggregateAuthorizePaymentAction({
+                project: { id: { $ne: params.excludedProjectId } },
+                startFrom,
+                startThrough,
+                typeOf: factory.actionType.AuthorizeAction
+            });
+            debug('aggregateAuthorizePaymentAction:result', aggregateResult, (_a = aggregateResult.statuses[0]) === null || _a === void 0 ? void 0 : _a.aggregation.percentilesDuration, startFrom);
+            yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregateAuthorizePaymentAction, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: startFrom, aggregateDate }, aggregateResult));
+        }
+    });
+}
+exports.aggregateAuthorizePaymentAction = aggregateAuthorizePaymentAction;
+function aggregateAuthorizeOrderAction(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const aggregateDate = new Date();
+        const aggregateDuration = moment.duration(1, 'days')
+            .toISOString();
+        let i = -1;
+        while (i < params.aggregationDays) {
+            i += 1;
+            const startFrom = moment()
+                // .tz('Asia/Tokyo')
+                .add(-i, 'days')
+                .startOf('day')
+                .toDate();
+            const startThrough = moment()
+                // .tz('Asia/Tokyo')
+                .add(-i, 'days')
+                .endOf('day')
+                .toDate();
+            const aggregateResult = yield repos.action.aggregateAuthorizeOrderAction({
+                project: { id: { $ne: params.excludedProjectId } },
+                startFrom,
+                startThrough,
+                typeOf: factory.actionType.AuthorizeAction
+            });
+            debug('aggregateAuthorizeOrderAction:result', aggregateResult, (_a = aggregateResult.statuses[0]) === null || _a === void 0 ? void 0 : _a.aggregation.percentilesDuration, startFrom);
+            yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregateAuthorizeOrderAction, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: startFrom, aggregateDate }, aggregateResult));
+        }
+    });
+}
+exports.aggregateAuthorizeOrderAction = aggregateAuthorizeOrderAction;
+/**
+ * 使用アクション集計
+ */
+function aggregateUseAction(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const aggregateDate = new Date();
+        const aggregateDuration = moment.duration(1, 'days')
+            .toISOString();
+        let i = -1;
+        while (i < params.aggregationDays) {
+            i += 1;
+            const startFrom = moment()
+                // .tz('Asia/Tokyo')
+                .add(-i, 'days')
+                .startOf('day')
+                .toDate();
+            const startThrough = moment()
+                // .tz('Asia/Tokyo')
+                .add(-i, 'days')
+                .endOf('day')
+                .toDate();
+            const aggregateResult = yield repos.action.aggregateUseAction({
+                project: { id: { $ne: params.excludedProjectId } },
+                startFrom,
+                startThrough,
+                typeOf: factory.actionType.UseAction
+            });
+            debug('aggregateUseAction:result', aggregateResult, (_a = aggregateResult.statuses[0]) === null || _a === void 0 ? void 0 : _a.aggregation.percentilesDuration, startFrom);
+            yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregateUseAction, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: startFrom, aggregateDate }, aggregateResult));
+        }
+    });
+}
+exports.aggregateUseAction = aggregateUseAction;
+/**
+ * 注文集計
+ */
+function aggregateOrder(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const aggregateDate = new Date();
+        const aggregateDuration = moment.duration(1, 'days')
+            .toISOString();
+        let i = -1;
+        while (i < params.aggregationDays) {
+            i += 1;
+            const orderDateFrom = moment()
+                // .tz('Asia/Tokyo')
+                .add(-i, 'days')
+                .startOf('day')
+                .toDate();
+            const orderDateThrough = moment()
+                // .tz('Asia/Tokyo')
+                .add(-i, 'days')
+                .endOf('day')
+                .toDate();
+            const aggregateResult = yield repos.order.aggregateOrder({
+                orderDate: {
+                    $gte: orderDateFrom,
+                    $lte: orderDateThrough
+                }
+            });
+            debug('aggregateOrder:result', aggregateResult);
+            yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregateOrder, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: orderDateFrom, aggregateDate }, aggregateResult));
+        }
+    });
+}
+exports.aggregateOrder = aggregateOrder;
+/**
+ * 予約集計
+ */
+function aggregateReservation(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const aggregateDate = new Date();
+        const aggregateDuration = moment.duration(1, 'days')
+            .toISOString();
+        let i = -1;
+        while (i < params.aggregationDays) {
+            i += 1;
+            const bookingFrom = moment()
+                // .tz('Asia/Tokyo')
+                .add(-i, 'days')
+                .startOf('day')
+                .toDate();
+            const bookingThrough = moment()
+                // .tz('Asia/Tokyo')
+                .add(-i, 'days')
+                .endOf('day')
+                .toDate();
+            // i日前の予約検索
+            const reservationCount = yield repos.reservation.count({
+                typeOf: factory.reservationType.EventReservation,
+                reservationStatus: { $eq: factory.reservationStatusType.ReservationConfirmed },
+                bookingFrom,
+                bookingThrough
+            });
+            const aggregateResult = { reservationCount };
+            yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregateReservation, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: bookingFrom, aggregateDate }, aggregateResult));
+        }
+    });
+}
+exports.aggregateReservation = aggregateReservation;

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

@@ -3,5 +3,7 @@
  */
 import * as EventAggregation from './aggregation/event';
 import * as ProjectAggregation from './aggregation/project';
+import * as SystemAggregation from './aggregation/system';
 export import event = EventAggregation;
 export import project = ProjectAggregation;
+export import system = SystemAggregation;

package/lib/chevre/service/aggregation.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.project = exports.event = void 0;
+exports.system = exports.project = exports.event = void 0;
 /**
  * 集計サービス
  */
 const EventAggregation = require("./aggregation/event");
 const ProjectAggregation = require("./aggregation/project");
+const SystemAggregation = require("./aggregation/system");
 exports.event = EventAggregation;
 exports.project = ProjectAggregation;
+exports.system = SystemAggregation;

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

@@ -11,13 +11,10 @@ function createPayActions(params) {
     if (payObject !== undefined) {
         const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order);
         const simpleOrder = {
-            // project: params.order.project,
             typeOf: params.order.typeOf,
             seller: params.order.seller,
             // mask
             customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
-            // IOrderへ移行(2022-11-17~)
-            // confirmationNumber: params.order.confirmationNumber,
             orderNumber: params.order.orderNumber,
             price: params.order.price,
             priceCurrency: params.order.priceCurrency,
@@ -162,7 +159,8 @@ function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType)
                 }
             });
         }
-        return o.itemOffered.typeOf === factory.reservationType.EventReservation
+        return (o.itemOffered.typeOf === factory.reservationType.EventReservation
+            || o.itemOffered.typeOf === factory.reservationType.BusReservation)
             && mvtkUnitPriceSpec !== undefined
             && o.itemOffered.reservationFor.id === movieTicket.serviceOutput.reservationFor.id
             && ((_d = o.itemOffered.reservedTicket.ticketedSeat) === null || _d === void 0 ? void 0 : _d.seatNumber) === movieTicket.serviceOutput.reservedTicket.ticketedSeat.seatNumber

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

@@ -25,13 +25,28 @@ export interface IStartOperationRepos {
     task: TaskRepo;
 }
 export declare type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
-export declare type ICancelOperation<T> = (repos: {
+export interface ICancelRepos {
+    action: ActionRepo;
+    accountingReport: AccountingReportRepo;
     assetTransaction: AssetTransactionRepo;
-}) => Promise<T>;
-export declare type IConfirmOperation<T> = (repos: {
+    product: ProductRepo;
+    project: ProjectRepo;
+    seller: SellerRepo;
+    task: TaskRepo;
+}
+export declare type ICancelOperation<T> = (repos: ICancelRepos) => Promise<T>;
+export interface IConfirmRepos {
+    action: ActionRepo;
+    accountingReport: AccountingReportRepo;
     assetTransaction: AssetTransactionRepo;
+    event: EventRepo;
     order: OrderRepo;
-}) => Promise<T>;
+    product: ProductRepo;
+    project: ProjectRepo;
+    seller: SellerRepo;
+    task: TaskRepo;
+}
+export declare type IConfirmOperation<T> = (repos: IConfirmRepos) => Promise<T>;
 export declare type IExportTasksOperation<T> = (repos: {
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;

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

@@ -13,6 +13,7 @@ exports.searchGMOTrade = exports.exportTasksById = exports.cancel = exports.conf
 const moment = require("moment");
 const factory = require("../../factory");
 const settings_1 = require("../../settings");
+const payment_1 = require("../payment");
 const CreditCardPayment = require("../payment/creditCard");
 const MovieTicketPayment = require("../payment/movieTicket");
 const PaymentCardPayment = require("../payment/paymentCard");
@@ -307,8 +308,19 @@ function confirm(params) {
             typeOf: factory.assetTransactionType.Pay,
             id: transaction.id,
             result: {},
-            potentialActions: potentialActions
+            // sync対応(2023-01-14~)
+            potentialActions: (settings_1.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING)
+                ? { pay: [] }
+                : potentialActions
         });
+        // sync対応(2023-01-14~)
+        if (settings_1.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING) {
+            if (Array.isArray(potentialActions.pay)) {
+                for (const payAction of potentialActions.pay) {
+                    yield (0, payment_1.pay)(payAction)(repos);
+                }
+            }
+        }
     });
 }
 exports.confirm = confirm;
@@ -341,11 +353,23 @@ function fixOrderAsPurpose(params, transaction) {
  */
 function cancel(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        yield repos.assetTransaction.cancel({
+        const transaction = yield repos.assetTransaction.cancel({
             typeOf: factory.assetTransactionType.Pay,
             id: params.id,
             transactionNumber: params.transactionNumber
         });
+        // sync対応(2023-01-14~)
+        if (settings_1.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING) {
+            const payTransactionAsObject = {
+                project: transaction.project,
+                typeOf: transaction.typeOf,
+                id: transaction.id,
+                transactionNumber: transaction.transactionNumber,
+                object: transaction.object,
+                recipient: transaction.recipient
+            };
+            yield (0, payment_1.voidPayment)({ object: payTransactionAsObject })(repos);
+        }
     });
 }
 exports.cancel = cancel;
@@ -353,6 +377,7 @@ exports.cancel = cancel;
  * 取引のタスク出力
  */
 function exportTasksById(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const transaction = yield repos.assetTransaction.findById({
             typeOf: factory.assetTransactionType.Pay,
@@ -388,42 +413,50 @@ function exportTasksById(params) {
                 .add(params.runsTasksAfterInSeconds, 'seconds')
                 .toDate();
         }
+        const payTransactionAsObject = {
+            project: transaction.project,
+            typeOf: transaction.typeOf,
+            id: transaction.id,
+            transactionNumber: transaction.transactionNumber,
+            object: transaction.object,
+            recipient: transaction.recipient
+        };
+        const voidPaymentTasks = {
+            project: transaction.project,
+            name: factory.taskName.VoidPayment,
+            status: factory.taskStatus.Ready,
+            runsAt: taskRunsAt,
+            remainingNumberOfTries: 10,
+            numberOfTried: 0,
+            executionResults: [],
+            data: { object: payTransactionAsObject }
+        };
         switch (transaction.status) {
             case factory.transactionStatusType.Confirmed:
-                // tslint:disable-next-line:no-single-line-block-comment
-                /* istanbul ignore else */
-                if (potentialActions !== undefined) {
-                    // tslint:disable-next-line:no-single-line-block-comment
-                    /* istanbul ignore else */
-                    if (potentialActions.pay !== undefined) {
-                        const payTasks = potentialActions.pay.map((a) => {
-                            return {
-                                project: transaction.project,
-                                name: factory.taskName.Pay,
-                                status: factory.taskStatus.Ready,
-                                runsAt: taskRunsAt,
-                                remainingNumberOfTries: 10,
-                                numberOfTried: 0,
-                                executionResults: [],
-                                data: a
-                            };
-                        });
-                        taskAttributes.push(...payTasks);
-                    }
+                const payActions = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.pay;
+                if (Array.isArray(payActions) && payActions.length > 0) {
+                    const payTasks = payActions.map((a) => {
+                        return {
+                            project: transaction.project,
+                            name: factory.taskName.Pay,
+                            status: factory.taskStatus.Ready,
+                            runsAt: taskRunsAt,
+                            remainingNumberOfTries: 10,
+                            numberOfTried: 0,
+                            executionResults: [],
+                            data: a
+                        };
+                    });
+                    taskAttributes.push(...payTasks);
                 }
                 break;
             case factory.transactionStatusType.Canceled:
+                // sync対応(2023-01-14~)
+                if (!settings_1.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING) {
+                    taskAttributes.push(voidPaymentTasks);
+                }
+                break;
             case factory.transactionStatusType.Expired:
-                const voidPaymentTasks = {
-                    project: transaction.project,
-                    name: factory.taskName.VoidPayment,
-                    status: factory.taskStatus.Ready,
-                    runsAt: taskRunsAt,
-                    remainingNumberOfTries: 10,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: { object: transaction }
-                };
                 taskAttributes.push(voidPaymentTasks);
                 break;
             default:

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

@@ -70,4 +70,7 @@ export declare function createPotentialActions(params: factory.assetTransaction.
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
     order?: factory.order.IOrder;
 }): factory.assetTransaction.reserve.IPotentialActions;
+export declare function createPendingReservationAction(params: {
+    transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
+}): factory.action.cancel.reservation.IAttributes[];
 export {};