@chevre/domain 21.2.0-alpha.45 → 21.2.0-alpha.47

package/lib/chevre/repo/action.d.ts

@@ -82,7 +82,18 @@ export declare class MongoRepository {
         typeOf?: T;
         purpose: {
             typeOf: factory.transactionType;
-            id?: string;
+            id: string;
+        };
+        object?: {
+            typeOf?: {
+                $eq?: factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation | factory.action.authorize.paymentMethod.any.ResultType.Payment;
+            };
+            paymentMethodId?: {
+                $eq?: string;
+            };
+        };
+        actionStatus?: {
+            $eq?: factory.actionStatusType;
         };
         sort?: factory.action.ISortOrder;
     }): Promise<IAction<T>[]>;

package/lib/chevre/repo/action.js

@@ -528,32 +528,16 @@ class MongoRepository {
      * 取引に対するアクション検索時などに使用
      */
     searchByPurpose(params) {
-        var _a;
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
-            const conditions = {
-                'purpose.typeOf': {
-                    $exists: true,
-                    $eq: params.purpose.typeOf
-                }
-            };
-            if (params.typeOf !== undefined) {
-                conditions.typeOf = params.typeOf;
-            }
-            if (params.purpose.id !== undefined) {
-                conditions['purpose.id'] = {
-                    $exists: true,
-                    $eq: params.purpose.id
-                };
-            }
-            const query = this.actionModel.find(conditions)
-                .select({ __v: 0, createdAt: 0, updatedAt: 0 });
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.startDate) !== undefined) {
-                query.sort({ startDate: params.sort.startDate });
-            }
-            return query.exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+            return this.search(Object.assign(Object.assign(Object.assign({ purpose: {
+                    id: { $in: [params.purpose.id] },
+                    typeOf: { $in: [params.purpose.typeOf] }
+                }, object: Object.assign(Object.assign({}, (typeof ((_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.typeOf) === null || _b === void 0 ? void 0 : _b.$eq) === 'string')
+                    ? { typeOf: { $eq: params.object.typeOf.$eq } }
+                    : undefined), (typeof ((_d = (_c = params.object) === null || _c === void 0 ? void 0 : _c.paymentMethodId) === null || _d === void 0 ? void 0 : _d.$eq) === 'string')
+                    ? { paymentMethodId: { $eq: params.object.paymentMethodId.$eq } }
+                    : undefined) }, (typeof ((_e = params.actionStatus) === null || _e === void 0 ? void 0 : _e.$eq) === 'string') ? { actionStatus: { $in: [params.actionStatus.$eq] } } : undefined), (typeof params.typeOf === 'string') ? { typeOf: { $eq: params.typeOf } } : undefined), (typeof ((_f = params.sort) === null || _f === void 0 ? void 0 : _f.startDate) === 'number') ? { sort: params.sort } : undefined), [], []);
         });
     }
     /**

package/lib/chevre/repo/assetTransaction.js

@@ -330,10 +330,10 @@ class MongoRepository {
                     // すでに確定済の場合スルー
                 }
                 else if (transaction.status === factory.transactionStatusType.Expired) {
-                    throw new factory.errors.Argument('Transaction id', 'Transaction already expired');
+                    throw new factory.errors.Argument('Transaction id', `Transaction ${transaction.typeOf} ${transaction.transactionNumber} already expired`);
                 }
                 else if (transaction.status === factory.transactionStatusType.Canceled) {
-                    throw new factory.errors.Argument('Transaction id', 'Transaction already canceled');
+                    throw new factory.errors.Argument('Transaction id', `Transaction ${transaction.typeOf} ${transaction.transactionNumber} already canceled`);
                 }
                 else {
                     throw new factory.errors.NotFound(this.transactionModel.modelName);
@@ -558,10 +558,10 @@ class MongoRepository {
                     // すでに中止済の場合スルー
                 }
                 else if (transaction.status === factory.transactionStatusType.Expired) {
-                    throw new factory.errors.Argument('Transaction id', 'Transaction already expired');
+                    throw new factory.errors.Argument('Transaction id', `Transaction ${transaction.typeOf} ${transaction.transactionNumber} already expired`);
                 }
                 else if (transaction.status === factory.transactionStatusType.Confirmed) {
-                    throw new factory.errors.Argument('Transaction id', 'Confirmed transaction unable to cancel');
+                    throw new factory.errors.Argument('Transaction id', `Confirmed transaction ${transaction.typeOf} ${transaction.transactionNumber} unable to cancel`);
                 }
                 else {
                     throw new factory.errors.NotFound(this.transactionModel.modelName);

package/lib/chevre/service/notification.js

@@ -157,9 +157,13 @@ function triggerWebhook(params) {
         while (numberOfTry >= 0) {
             try {
                 numberOfTry += 1;
-                if (numberOfTry > settings_1.MAX_RETRY_COUNT_TRIGGER_WEBHOOK) {
+                if (numberOfTry > settings_1.TRIGGER_WEBHOOK_MAX_RETRY_COUNT) {
                     retry = false;
                 }
+                // retryInterval
+                if (numberOfTry > 1) {
+                    yield sleep(settings_1.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS * (numberOfTry - 1));
+                }
                 yield processInformAction(params)(repos);
                 break;
             }
@@ -175,6 +179,15 @@ function triggerWebhook(params) {
     });
 }
 exports.triggerWebhook = triggerWebhook;
+function sleep(waitTime) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise((resolve) => {
+            setTimeout(() => {
+                resolve();
+            }, waitTime);
+        });
+    });
+}
 function processInformAction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;

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

@@ -102,7 +102,9 @@ 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') {
@@ -112,7 +114,7 @@ function processVoidPayTransaction(params) {
             transaction = (yield repos.transaction.findById({
                 typeOf: params.purpose.typeOf,
                 id: params.purpose.id,
-                inclusion: ['_id', 'typeOf', 'status']
+                inclusion: ['_id', 'typeOf', 'status', 'result.order.paymentMethods']
             }));
         }
         // 承認アクションを取得
@@ -145,6 +147,23 @@ function processVoidPayTransaction(params) {
                 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
@@ -221,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 });
@@ -232,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/settings.d.ts

@@ -1,5 +1,7 @@
 import * as moment from 'moment';
 import * as factory from './factory';
+export declare const TRIGGER_WEBHOOK_MAX_RETRY_COUNT: number;
+export declare const TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS: number;
 export declare const ABORTED_TASKS_WITHOUT_REPORT: string[];
 /**
  * 資産取引保管期間
@@ -32,7 +34,6 @@ export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_NEW_EVENT_AVAILABILITY_KEY_FROM: moment.Moment;
 export declare const INFORM_RESERVATION_TASK_DELAY_IN_SECONDS: number;
-export declare const MAX_RETRY_COUNT_TRIGGER_WEBHOOK: number;
 /**
  * グローバル設定
  */

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.MAX_RETRY_COUNT_TRIGGER_WEBHOOK = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = void 0;
+exports.settings = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -14,6 +14,12 @@ const informReservationUrls = (typeof process.env.INFORM_RESERVATION_URL === 'st
     : [];
 // tslint:disable-next-line:no-magic-numbers
 const triggerWebhookTimeout = (process.env.TRIGGER_WEBHOOK_TIMEOUT !== undefined) ? Number(process.env.TRIGGER_WEBHOOK_TIMEOUT) : 15000;
+exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = (typeof process.env.TRIGGER_WEBHOOK_MAX_RETRY_COUNT === 'string')
+    ? Number(process.env.TRIGGER_WEBHOOK_MAX_RETRY_COUNT)
+    : 0;
+exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = (typeof process.env.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS === 'string')
+    ? Number(process.env.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS)
+    : 0;
 const MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS = (typeof process.env.MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS === 'string')
     ? Number(process.env.MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS)
     // tslint:disable-next-line:no-magic-numbers
@@ -53,9 +59,6 @@ exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = (typeof process.env.USE_NEW_EVENT_
 exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = (typeof process.env.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS === 'string')
     ? Number(process.env.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS)
     : 0;
-exports.MAX_RETRY_COUNT_TRIGGER_WEBHOOK = (typeof process.env.MAX_RETRY_COUNT_TRIGGER_WEBHOOK === 'string')
-    ? Number(process.env.MAX_RETRY_COUNT_TRIGGER_WEBHOOK)
-    : 0;
 /**
  * グローバル設定
  */

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.45"
+  "version": "21.2.0-alpha.47"
 }