@chevre/domain 21.2.0-alpha.6 → 21.2.0-alpha.61

package/lib/chevre/service/offer/event/voidTransaction.js

@@ -26,8 +26,13 @@ exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
  */
 function voidTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const transaction = yield repos.transaction.findById({
+            typeOf: params.purpose.typeOf,
+            id: params.purpose.id,
+            inclusion: ['_id', 'typeOf', 'status']
+        });
         // 座席仮予約アクション検索
-        const authorizeActions = yield repos.action.searchByPurpose({
+        let authorizeActions = yield repos.action.searchByPurpose({
             typeOf: factory.actionType.AuthorizeAction,
             purpose: {
                 typeOf: params.purpose.typeOf,
@@ -36,6 +41,17 @@ function voidTransaction(params) {
         })
             .then((actions) => actions
             .filter((a) => a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation));
+        switch (transaction.status) {
+            case factory.transactionStatusType.InProgress:
+                throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
+            // 確定取引に対応(2023-05-07~)
+            case factory.transactionStatusType.Confirmed:
+                // アクションステータスを検証する
+                authorizeActions = authorizeActions.filter((a) => a.actionStatus !== factory.actionStatusType.CompletedActionStatus);
+                break;
+            default:
+            // no op
+        }
         yield Promise.all(authorizeActions.map((action) => __awaiter(this, void 0, void 0, function* () {
             yield repos.action.cancel({ typeOf: action.typeOf, id: action.id });
             switch (action.instrument.identifier) {

package/lib/chevre/service/offer.js

@@ -186,7 +186,7 @@ function createAggregateScreeningEventIfNotExist(params) {
             }
         }
         if (aggregateTasks.length > 0) {
-            yield repos.task.saveMany(aggregateTasks);
+            yield repos.task.saveMany(aggregateTasks, { emitImmediately: true });
         }
     });
 }

package/lib/chevre/service/order/deleteOrder.js

@@ -18,7 +18,14 @@ const factory = require("../../factory");
  */
 function deleteOrder(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const order = params.object;
+        const orders = yield repos.order.search({
+            orderNumbers: [params.object.orderNumber]
+        });
+        const order = orders.shift();
+        if (order === undefined) {
+            // すでに削除済
+            return;
+        }
         // 注文アイテムの予約を削除
         yield deleteReservationsByOrder(order)(repos);
         // 所有権削除
@@ -63,13 +70,6 @@ function deleteOwnershipInfosByOrder(order) {
                 // 所有期限切れのもの(ownedThroughの存在しないものは削除してはいけない)
                 ownedThrough: { $lt: now }
             });
-            // await repos.ownershipInfo.ownershipInfoModel.deleteMany({
-            //     'project.id': { $eq: order.project.id },
-            //     identifier: { $in: ownershipIdentifiers },
-            //     // 所有期限切れのもの(ownedThroughの存在しないものは削除してはいけない)
-            //     ownedThrough: { $exists: true, $lt: now }
-            // })
-            //     .exec();
         }
     });
 }

package/lib/chevre/service/order/onOrderStatusChanged/factory.js

@@ -26,32 +26,10 @@ function getOrderWithToken(params) {
         if (typeof credentials_1.credentials.hub.clientId !== 'string') {
             return params.order;
         }
-        // 冗長な個人情報をマスク(最低限の情報に)
-        // const customer4orderToken: factory.order.ISimpleCustomer =
-        //     (params.order.customer.typeOf === factory.organizationType.Organization)
-        //         ? {
-        //             id: params.order.customer.id,
-        //             name: '****',
-        //             // project: params.order.customer.project,
-        //             typeOf: params.order.customer.typeOf
-        //         }
-        //         : {
-        //             id: params.order.customer.id,
-        //             typeOf: params.order.customer.typeOf
-        //         };
-        // const seller4orderToken: Omit<factory.order.ISeller, 'name'> = {
-        //     id: params.order.seller.id,
-        //     typeOf: params.order.seller.typeOf
-        // };
         // 最適化(2023-01-31~)
         const order4token = {
             typeOf: params.order.typeOf,
-            // seller: seller4orderToken,
-            // customer: customer4orderToken,
             orderNumber: params.order.orderNumber
-            // price: params.order.price,
-            // priceCurrency: params.order.priceCurrency,
-            // orderDate: params.order.orderDate
         };
         const token = yield new Promise((resolve, reject) => {
             // 所有権を暗号化する
@@ -163,20 +141,31 @@ const ORDER_STORAGE_PERIOD_IN_DAYS = (typeof process.env.ORDER_STORAGE_PERIOD_IN
     // tslint:disable-next-line:no-magic-numbers
     365;
 function createDeleteTasks(order) {
-    return [{
-            project: order.project,
-            name: factory.taskName.DeleteOrder,
-            status: factory.taskStatus.Ready,
-            runsAt: moment(order.orderDate)
-                .add(ORDER_STORAGE_PERIOD_IN_DAYS, 'days')
-                .toDate(),
-            remainingNumberOfTries: 10,
-            numberOfTried: 0,
-            executionResults: [],
-            data: {
-                object: order
-            }
-        }];
+    if (settings_1.USE_DELETE_ORDER_TASK) {
+        return [{
+                project: order.project,
+                name: factory.taskName.DeleteOrder,
+                status: factory.taskStatus.Ready,
+                runsAt: moment(order.orderDate)
+                    .add(ORDER_STORAGE_PERIOD_IN_DAYS, 'days')
+                    .toDate(),
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: {
+                    object: {
+                        confirmationNumber: order.confirmationNumber,
+                        orderDate: order.orderDate,
+                        orderNumber: order.orderNumber,
+                        project: order.project,
+                        typeOf: order.typeOf
+                    }
+                }
+            }];
+    }
+    else {
+        return [];
+    }
 }
 exports.createDeleteTasks = createDeleteTasks;
 function createConfirmReservationActionObject4ChevreByOrder(params) {

package/lib/chevre/service/order/onOrderStatusChanged.js

@@ -89,7 +89,7 @@ function onOrderStatusChanged(params) {
                 break;
             default:
         }
-        yield repos.task.saveMany(tasks);
+        yield repos.task.saveMany(tasks, { emitImmediately: true });
     });
 }
 exports.onOrderStatusChanged = onOrderStatusChanged;

package/lib/chevre/service/order/placeOrder.js

@@ -269,6 +269,6 @@ function onPlaceOrder(params) {
             }
         }
         // タスク保管
-        yield repos.task.saveMany(taskAttributes);
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }

package/lib/chevre/service/order/returnOrder.js

@@ -204,10 +204,6 @@ function onReturn(returnActionAttributes) {
             }
         }
         // タスク保管
-        // saveManyに変更(2023-02-01~)
-        yield repos.task.saveMany(taskAttributes);
-        // await Promise.all(taskAttributes.map(async (taskAttribute) => {
-        //     return repos.task.save(taskAttribute);
-        // }));
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }

package/lib/chevre/service/order/sendOrder.js

@@ -178,6 +178,6 @@ function onSend(params) {
             }
         }
         // タスク保管
-        yield repos.task.saveMany(taskAttributes);
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }

package/lib/chevre/service/payment/any/onPaid.js

@@ -46,7 +46,7 @@ function onPaid(payAction) {
             }));
         }
         // タスク保管
-        return repos.task.saveMany(taskAttributes);
+        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.onPaid = onPaid;

package/lib/chevre/service/payment/any/onRefund.js

@@ -92,7 +92,7 @@ function onRefund(refundAction) {
             }));
         }
         // タスク保管
-        return repos.task.saveMany(taskAttributes);
+        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.onRefund = onRefund;

package/lib/chevre/service/payment/any.js

@@ -52,10 +52,18 @@ exports.voidPayTransaction = voidPayTransaction;
 function invalidatePaymentUrl(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e;
+        if (params.purpose.typeOf !== factory.transactionType.PlaceOrder) {
+            throw new factory.errors.Argument('purpose.typeOf', `must be ${factory.transactionType.PlaceOrder}`);
+        }
         const transaction = yield repos.transaction.findById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
         });
+        // 確定取引に対応(2023-05-03~)
+        if (transaction.status === factory.transactionStatusType.Confirmed) {
+            // no op
+            return;
+        }
         const paymentMethodIdByPaymentUrl = (_a = transaction.object.paymentMethods) === null || _a === void 0 ? void 0 : _a.paymentMethodId;
         const paymentMethodType = (_b = transaction.object.paymentMethods) === null || _b === void 0 ? void 0 : _b.typeOf;
         if (typeof paymentMethodIdByPaymentUrl === 'string' && paymentMethodIdByPaymentUrl.length > 0
@@ -70,12 +78,10 @@ function invalidatePaymentUrl(params) {
                         ? transaction.seller.name
                         : String((_c = transaction.seller.name) === null || _c === void 0 ? void 0 : _c.ja),
                     id: transaction.seller.id
-                    // project: transaction.seller.project
                 },
                 recipient: { typeOf: transaction.agent.typeOf, name: transaction.agent.name },
                 object: [{
                         typeOf: factory.service.paymentService.PaymentServiceType.CreditCard,
-                        // tslint:disable-next-line:max-line-length
                         id: (_e = (_d = transaction.object.paymentMethods) === null || _d === void 0 ? void 0 : _d.issuedThrough) === null || _e === void 0 ? void 0 : _e.id,
                         paymentMethod: {
                             additionalProperty: [],
@@ -96,17 +102,20 @@ exports.invalidatePaymentUrl = invalidatePaymentUrl;
  * apiもしくはタスクから決済承認を取り消す
  */
 function processVoidPayTransaction(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
         let transaction;
         // アクションID指定の場合、進行中取引検証(2023-02-24~)
         if (typeof params.id === 'string') {
             transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id });
         }
         else {
-            transaction = yield repos.transaction.findById({
+            transaction = (yield repos.transaction.findById({
                 typeOf: params.purpose.typeOf,
-                id: params.purpose.id
-            });
+                id: params.purpose.id,
+                inclusion: ['_id', 'typeOf', 'status', 'result.order.paymentMethods']
+            }));
         }
         // 承認アクションを取得
         let authorizeActions;
@@ -122,7 +131,7 @@ function processVoidPayTransaction(params) {
             const authorizeActionsOnTransaction = yield repos.action.searchByPurpose({
                 typeOf: factory.actionType.AuthorizeAction,
                 purpose: {
-                    typeOf: factory.transactionType.PlaceOrder,
+                    typeOf: transaction.typeOf,
                     id: transaction.id
                 }
             });
@@ -131,12 +140,37 @@ function processVoidPayTransaction(params) {
                 return ((_a = a.object) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment
                     && ((_b = a.instrument) === null || _b === void 0 ? void 0 : _b.identifier) === factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre;
             });
+            switch (transaction.status) {
+                case factory.transactionStatusType.InProgress:
+                    throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
+                // 確定取引に対応(2023-05-03~)
+                case factory.transactionStatusType.Confirmed:
+                    // アクションステータスを検証する
+                    authorizeActions = authorizeActions.filter((a) => a.actionStatus !== factory.actionStatusType.CompletedActionStatus);
+                    if (transaction.typeOf === factory.transactionType.PlaceOrder) {
+                        const paymentMethodIds = (_b = (_a = transaction.result) === null || _a === void 0 ? void 0 : _a.order) === null || _b === void 0 ? void 0 : _b.paymentMethods.map((p) => {
+                            return p.paymentMethodId;
+                        });
+                        if (!Array.isArray(paymentMethodIds)) {
+                            throw new factory.errors.Argument('Transaction', `${transaction.id} must have result.order.paymentMethods`);
+                        }
+                        if (paymentMethodIds.length > 0) {
+                            authorizeActions = authorizeActions.filter((a) => {
+                                // paymentMethodIdが存在しない、あるいは、注文のpaymentMethodIdsに含まれなければ、アクション取消対象
+                                const paymentMethodIdByAction = a.object.paymentMethodId;
+                                const includedInOrder = typeof paymentMethodIdByAction === 'string'
+                                    && paymentMethodIds.includes(paymentMethodIdByAction);
+                                return !includedInOrder;
+                            });
+                        }
+                    }
+                    break;
+                default:
+                // no op
+            }
         }
         const errors = [];
         for (const action of authorizeActions) {
-            // 直列にゆっくり処理する場合↓
-            // tslint:disable-next-line:no-magic-numbers
-            // await new Promise((resolve) => setTimeout(() => { resolve(); }, 1000));
             // 失敗するケースがあっても、残りが少なくとも処理されるようにエラーハンドリング
             try {
                 // 取引が存在すれば中止
@@ -194,7 +228,7 @@ function publishPaymentUrl(params) {
             paymentUrl: result.paymentUrl,
             issuedThrough: { id: (typeof startParams.object.id === 'string') ? startParams.object.id : '' }
         };
-        yield repos.transaction.findByIdAndUpdate({
+        yield repos.transaction.findByIdAndUpdateInProgress({
             id: transaction.id,
             update: { $set: { 'object.paymentMethods': paymentMethodByPaymentUrl } }
         });
@@ -206,6 +240,7 @@ exports.publishPaymentUrl = publishPaymentUrl;
  * 決済承認
  */
 function authorize(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         const transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id });
@@ -217,6 +252,21 @@ function authorize(params) {
             const paymentMethodIdByTransaction = (_a = transaction.object.paymentMethods) === null || _a === void 0 ? void 0 : _a.paymentMethodId;
             if (params.object.paymentMethodId === paymentMethodIdByTransaction) {
                 transactionNumber = params.object.paymentMethodId;
+                // 既に承認済であれば何もしない(2023-05-15~)
+                const existingCompletedAuthorizeActions = yield repos.action.searchByPurpose({
+                    typeOf: factory.actionType.AuthorizeAction,
+                    purpose: { id: transaction.id, typeOf: transaction.typeOf },
+                    actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus },
+                    object: {
+                        paymentMethodId: { $eq: transactionNumber },
+                        typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment }
+                    },
+                    sort: { startDate: factory.sortType.Ascending }
+                });
+                const existingCompletedAuthorizeAction = existingCompletedAuthorizeActions.shift();
+                if (existingCompletedAuthorizeAction !== undefined) {
+                    return existingCompletedAuthorizeAction;
+                }
             }
             else {
                 // 取引にないpaymentMethodIdの指定はクライアントエラー

package/lib/chevre/service/payment/movieTicket/validation.d.ts

@@ -6,10 +6,11 @@ import { MongoRepository as EventRepo } from '../../../repo/event';
 import { MongoRepository as ProductRepo } from '../../../repo/product';
 import { MongoRepository as ProjectRepo } from '../../../repo/project';
 import { MongoRepository as SellerRepo } from '../../../repo/seller';
-import { ICheckResult } from './checkByIdentifier';
 export declare function validateMovieTicket(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, useCheckMovieTicketBeforePay: boolean): (repos: {
     event: EventRepo;
     product: ProductRepo;
     project: ProjectRepo;
     seller: SellerRepo;
-}) => Promise<ICheckResult | undefined>;
+}) => Promise<{
+    accountsReceivablesByServiceType: factory.assetTransaction.pay.IAccountsReceivableByServiceType[];
+}>;

package/lib/chevre/service/payment/movieTicket/validation.js

@@ -15,8 +15,8 @@ exports.validateMovieTicket = void 0;
  */
 const factory = require("../../../factory");
 const checkByIdentifier_1 = require("./checkByIdentifier");
-// tslint:disable-next-line:max-func-body-length
 function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBeforePay) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
         const movieTickets = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.movieTickets;
@@ -54,7 +54,7 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
         }
         // オプション追加(2023-03-06~)
         if (!useCheckMovieTicketBeforePay) {
-            return;
+            return { accountsReceivablesByServiceType: [] };
         }
         const checkResult = yield (0, checkByIdentifier_1.checkByIdentifier)({
             movieTickets: movieTickets,
@@ -62,24 +62,16 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
             screeningEvent: screeningEvent,
             paymentServiceId
         })(repos);
-        // checkResult.movieTicketsへの依存排除(2023-03-24~)
-        // 要求に対して十分かどうか検証する
-        // const availableMovieTickets = checkResult.movieTickets.filter((t) => t.amount?.validThrough === undefined);
-        // 総数が足りているか(券種ごとに枚数検証を実行するので不要)
-        // if (availableMovieTickets.length < movieTickets.length) {
-        //     throw new factory.errors.Argument(
-        //         'movieTickets',
-        //         `${movieTickets.length - availableMovieTickets.length} movie tickets short`
-        //     );
-        // }
+        const accountsReceivablesByServiceType = [];
         // 券種ごとに枚数が足りているか
         const serviceTypes = [...new Set(movieTickets.map((t) => t.serviceType))];
         serviceTypes.forEach((serviceType) => {
-            var _a, _b, _c;
+            var _a, _b;
             const requiredMovieTicketsCountByServiceType = movieTickets.filter((t) => t.serviceType === serviceType).length;
             let availableMovieTicketsCountByServiceType = 0;
             const ykknInfos = (_b = (_a = checkResult.purchaseNumberAuthResult.knyknrNoInfoOut) === null || _a === void 0 ? void 0 : _a.find((knyknrNoInfoOut) => knyknrNoInfoOut.knyknrNo === movieTicketIdentifiers[0])) === null || _b === void 0 ? void 0 : _b.ykknInfo;
-            const ykknKnshbtsmiNum = (_c = ykknInfos === null || ykknInfos === void 0 ? void 0 : ykknInfos.find((ykknInfo) => ykknInfo.ykknshTyp === serviceType)) === null || _c === void 0 ? void 0 : _c.ykknKnshbtsmiNum;
+            const ykknInfoOfServiceType = ykknInfos === null || ykknInfos === void 0 ? void 0 : ykknInfos.find((ykknInfo) => ykknInfo.ykknshTyp === serviceType);
+            const ykknKnshbtsmiNum = ykknInfoOfServiceType === null || ykknInfoOfServiceType === void 0 ? void 0 : ykknInfoOfServiceType.ykknKnshbtsmiNum;
             if (typeof ykknKnshbtsmiNum === 'string') {
                 availableMovieTicketsCountByServiceType = Number(ykknKnshbtsmiNum);
             }
@@ -87,18 +79,13 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
                 const shortNumber = requiredMovieTicketsCountByServiceType - availableMovieTicketsCountByServiceType;
                 throw new factory.errors.Argument('movieTickets', `${shortNumber} movie tickets by service type ${serviceType} short`);
             }
-            // const availableMovieTicketsByServiceType = availableMovieTickets.filter((t) => t.serviceType === serviceType);
-            // if (availableMovieTicketsByServiceType.length < requiredMovieTicketsCountByServiceType) {
-            //     const shortNumber = requiredMovieTicketsCountByServiceType - availableMovieTicketsByServiceType.length;
-            //     throw new factory.errors.Argument(
-            //         'movieTickets',
-            //         `${shortNumber} movie tickets by service type ${serviceType} short`
-            //     );
-            // }
+            // checkResultから計上金額を取得
+            const accountsReceivableByResponse = ykknInfoOfServiceType === null || ykknInfoOfServiceType === void 0 ? void 0 : ykknInfoOfServiceType.kijUnip;
+            accountsReceivablesByServiceType.push(Object.assign({ serviceType }, (typeof accountsReceivableByResponse === 'string')
+                ? { accountsReceivable: Number(accountsReceivableByResponse) }
+                : undefined));
         });
-        // checkはするが保管は保留(2023-03-09~)
-        return;
-        // return checkResult;
+        return { accountsReceivablesByServiceType };
     });
 }
 exports.validateMovieTicket = validateMovieTicket;

package/lib/chevre/service/payment/movieTicket.d.ts

@@ -42,7 +42,7 @@ declare function checkMovieTicket(params: factory.action.check.paymentMethod.mov
 }>;
 interface IAuthorizeResult {
     accountId: string;
-    checkResult?: ICheckResult;
+    accountsReceivablesByServiceType: factory.assetTransaction.pay.IAccountsReceivableByServiceType[];
     payAction: factory.action.trade.pay.IAction;
 }
 /**

package/lib/chevre/service/payment/movieTicket.js

@@ -106,11 +106,12 @@ function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBef
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         let accountId;
-        let checkResult;
         let payAction;
+        let accountsReceivablesByServiceType = [];
         try {
             // MovieTicket決済の場合、認証
-            checkResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId, useCheckMovieTicketBeforePay)(repos);
+            const validateMovieTicketResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId, useCheckMovieTicketBeforePay)(repos);
+            accountsReceivablesByServiceType = validateMovieTicketResult.accountsReceivablesByServiceType;
             const paymentMethod = transaction.object.paymentMethod;
             const paymentMethodType = String(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.typeOf);
             const additionalProperty = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.additionalProperty;
@@ -141,7 +142,7 @@ function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBef
         catch (error) {
             throw (0, errorHandler_1.handleMvtkReserveError)(error);
         }
-        return { accountId, checkResult, payAction };
+        return { accountId, payAction, accountsReceivablesByServiceType };
     });
 }
 exports.authorize = authorize;

package/lib/chevre/service/product.js

@@ -77,10 +77,6 @@ function onRegistered(actionAttributes, __) {
             }
         }
         // タスク保管
-        // saveManyに変更(2023-02-01~)
-        yield repos.task.saveMany(taskAttributes);
-        // await Promise.all(taskAttributes.map(async (taskAttribute) => {
-        //     return repos.task.save(taskAttribute);
-        // }));
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }

package/lib/chevre/service/report/telemetry.d.ts

@@ -148,19 +148,15 @@ export interface ISellerFlowTransactionResult {
     /**
      * イベントまでの合計残り時間(ミリ秒)
      */
-    totalTimeLeftUntilEventInMilliseconds: number;
     /**
      * イベントまでの最大残り時間(ミリ秒)
      */
-    maxTimeLeftUntilEventInMilliseconds: number;
     /**
      * イベントまでの最小残り時間(ミリ秒)
      */
-    minTimeLeftUntilEventInMilliseconds: number;
     /**
      * イベントまでの平均残り時間(ミリ秒)
      */
-    averageTimeLeftUntilEventInMilliseconds: number;
     /**
      * 取引の合計金額(yen)
      */
@@ -180,15 +176,12 @@ export interface ISellerFlowTransactionResult {
     /**
      * アクション数合計値(成立取引)
      */
-    totalNumberOfActionsOnConfirmed: number;
     /**
      * 最大アクション数(成立取引)
      */
-    maxNumberOfActionsOnConfirmed: number;
     /**
      * 最小アクション数(成立取引)
      */
-    minNumberOfActionsOnConfirmed: number;
     /**
      * 注文アイテム数合計値
      */
@@ -205,10 +198,6 @@ export interface ISellerFlowTransactionResult {
      * 平均注文アイテム数
      */
     averageNumberOfOrderItems: number;
-    /**
-     * 平均アクション数(成立取引)
-     */
-    averageNumberOfActionsOnConfirmed: number;
 }
 /**
  * 販売者が対象のフローデータ

package/lib/chevre/service/report/telemetry.js

@@ -247,17 +247,12 @@ function createSellerFlowTransactionResult(measuredFrom, measuredThrough, seller
         const maxRequiredTimeInMilliseconds = requiredTimesConfirmed.reduce((a, b) => Math.max(a, b), 0);
         const minRequiredTimeInMilliseconds = requiredTimesConfirmed.reduce((a, b) => Math.min(a, b), (numberOfTransactionsConfirmed > 0) ? requiredTimesConfirmed[0] : 0);
         const averageRequiredTimeInMilliseconds = (numberOfTransactionsConfirmed > 0) ? totalRequiredTimeInMilliseconds / numberOfTransactionsConfirmed : 0;
-        // イベントまでの残り時間算出(イベント開始日時と成立日時の差)
-        const timesLeftUntilEvent = confirmedTransactions.map((transaction) => {
-            // 座席予約は必ず存在する
-            const seatReservation = transaction.object.authorizeActions.find((action) => action.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);
-            return moment(seatReservation.object.event.startDate)
-                .diff(moment(transaction.endDate), 'milliseconds');
-        });
-        const totalTimeLeftUntilEventInMilliseconds = timesLeftUntilEvent.reduce((a, b) => a + b, 0);
-        const maxTimeLeftUntilEventInMilliseconds = timesLeftUntilEvent.reduce((a, b) => Math.max(a, b), 0);
-        const minTimeLeftUntilEventInMilliseconds = timesLeftUntilEvent.reduce((a, b) => Math.min(a, b), (numberOfTransactionsConfirmed > 0) ? timesLeftUntilEvent[0] : 0);
-        const averageTimeLeftUntilEventInMilliseconds = (numberOfTransactionsConfirmed > 0) ? totalTimeLeftUntilEventInMilliseconds / numberOfTransactionsConfirmed : 0;
+        // const totalTimeLeftUntilEventInMilliseconds = timesLeftUntilEvent.reduce((a, b) => a + b, 0);
+        // const maxTimeLeftUntilEventInMilliseconds = timesLeftUntilEvent.reduce((a, b) => Math.max(a, b), 0);
+        // const minTimeLeftUntilEventInMilliseconds =
+        //     timesLeftUntilEvent.reduce((a, b) => Math.min(a, b), (numberOfTransactionsConfirmed > 0) ? timesLeftUntilEvent[0] : 0);
+        // const averageTimeLeftUntilEventInMilliseconds =
+        //     (numberOfTransactionsConfirmed > 0) ? totalTimeLeftUntilEventInMilliseconds / numberOfTransactionsConfirmed : 0;
         // 金額算出
         const amounts = confirmedTransactions.map((transaction) => transaction.result.order.price);
         const totalAmount = amounts.reduce((a, b) => a + b, 0);
@@ -265,11 +260,13 @@ function createSellerFlowTransactionResult(measuredFrom, measuredThrough, seller
         const minAmount = amounts.reduce((a, b) => Math.min(a, b), (numberOfTransactionsConfirmed > 0) ? amounts[0] : 0);
         const averageAmount = (numberOfTransactionsConfirmed > 0) ? totalAmount / numberOfTransactionsConfirmed : 0;
         // アクション数集計
-        const numbersOfActions = confirmedTransactions.map((t) => t.object.authorizeActions.length);
-        const totalNumberOfActions = numbersOfActions.reduce((a, b) => a + b, 0);
-        const maxNumberOfActions = numbersOfActions.reduce((a, b) => Math.max(a, b), 0);
-        const minNumberOfActions = numbersOfActions.reduce((a, b) => Math.min(a, b), (numberOfTransactionsConfirmed > 0) ? numbersOfActions[0] : 0);
-        const averageNumberOfActions = (numberOfTransactionsConfirmed > 0) ? totalNumberOfActions / numberOfTransactionsConfirmed : 0;
+        // const numbersOfActions = confirmedTransactions.map((t) => t.object.authorizeActions.length);
+        // const totalNumberOfActions = numbersOfActions.reduce((a, b) => a + b, 0);
+        // const maxNumberOfActions = numbersOfActions.reduce((a, b) => Math.max(a, b), 0);
+        // const minNumberOfActions = numbersOfActions.reduce(
+        //     (a, b) => Math.min(a, b), (numberOfTransactionsConfirmed > 0) ? numbersOfActions[0] : 0
+        // );
+        // const averageNumberOfActions = (numberOfTransactionsConfirmed > 0) ? totalNumberOfActions / numberOfTransactionsConfirmed : 0;
         // 期限切れ取引数
         const numberOfTransactionsExpired = expiredTransactions.length;
         const expiredTransactionIds = expiredTransactions.map((transaction) => transaction.id);
@@ -284,18 +281,18 @@ function createSellerFlowTransactionResult(measuredFrom, measuredThrough, seller
                 maxRequiredTimeInMilliseconds: maxRequiredTimeInMilliseconds,
                 minRequiredTimeInMilliseconds: minRequiredTimeInMilliseconds,
                 averageRequiredTimeInMilliseconds: parseFloat(averageRequiredTimeInMilliseconds.toFixed(1)),
-                totalTimeLeftUntilEventInMilliseconds: totalTimeLeftUntilEventInMilliseconds,
-                maxTimeLeftUntilEventInMilliseconds: maxTimeLeftUntilEventInMilliseconds,
-                minTimeLeftUntilEventInMilliseconds: minTimeLeftUntilEventInMilliseconds,
-                averageTimeLeftUntilEventInMilliseconds: averageTimeLeftUntilEventInMilliseconds,
+                // totalTimeLeftUntilEventInMilliseconds: totalTimeLeftUntilEventInMilliseconds,
+                // maxTimeLeftUntilEventInMilliseconds: maxTimeLeftUntilEventInMilliseconds,
+                // minTimeLeftUntilEventInMilliseconds: minTimeLeftUntilEventInMilliseconds,
+                // averageTimeLeftUntilEventInMilliseconds: averageTimeLeftUntilEventInMilliseconds,
                 totalAmount: totalAmount,
                 maxAmount: maxAmount,
                 minAmount: minAmount,
                 averageAmount: parseFloat(averageAmount.toFixed(1)),
-                totalNumberOfActionsOnConfirmed: totalNumberOfActions,
-                maxNumberOfActionsOnConfirmed: maxNumberOfActions,
-                minNumberOfActionsOnConfirmed: minNumberOfActions,
-                averageNumberOfActionsOnConfirmed: parseFloat(averageNumberOfActions.toFixed(1)),
+                // totalNumberOfActionsOnConfirmed: totalNumberOfActions,
+                // maxNumberOfActionsOnConfirmed: maxNumberOfActions,
+                // minNumberOfActionsOnConfirmed: minNumberOfActions,
+                // averageNumberOfActionsOnConfirmed: parseFloat(averageNumberOfActions.toFixed(1)),
                 // tslint:disable-next-line:no-suspicious-comment
                 totalNumberOfOrderItems: 0,
                 // tslint:disable-next-line:no-suspicious-comment

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

@@ -144,7 +144,6 @@ function cancelPendingReservation(actionAttributesList) {
                 // canceledReservationId: canceledReservation?.id
                 );
                 yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
-                // await onReservationCanceledByAction(actionAttributes)({ task: repos.task });
                 if (actionObject.typeOf === factory.reservationType.ReservationPackage) {
                     // 最新のconfirmedReservationsを検索
                     canceledReservations = yield repos.reservation.search({
@@ -297,7 +296,6 @@ function cancelReservation(actionAttributesList) {
                 // canceledReservationId: canceledReservation?.id
                 );
                 yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
-                // await onReservationCanceledByAction(actionAttributes)({ task: repos.task });
                 let canceledReservations = [];
                 if (actionAttributes.object.typeOf === factory.reservationType.ReservationPackage) {
                     const reservationNumber = actionAttributes.object.reservationNumber;

package/lib/chevre/service/reserve/potentialActions/onReservationCanceled.d.ts

@@ -4,9 +4,6 @@ type IEventReservation = factory.reservation.IReservation<factory.reservationTyp
 /**
  * 予約取消後のアクション
  */
-export declare function onReservationCanceledByAction(actionAttributes: factory.action.cancel.reservation.IAttributes): (repos: {
-    task: TaskRepo;
-}) => Promise<void>;
 export declare function onReservationCanceled(canceledReservations: IEventReservation[], useInformReservation: boolean): (repos: {
     task: TaskRepo;
 }) => Promise<void>;