@chevre/domain 21.2.0-alpha.40 → 21.2.0-alpha.41

package/lib/chevre/service/notification.js

@@ -150,6 +150,32 @@ ${content}`;
 exports.report2developers = report2developers;
 const USERNAME_ARGUMENT_REQUIRED_MESSAGE = 'Missing required key \'Username\' in params';
 function triggerWebhook(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // retryableにする(2023-05-12~)
+        let retry = true;
+        let numberOfTry = 0;
+        while (numberOfTry >= 0) {
+            try {
+                numberOfTry += 1;
+                if (numberOfTry > settings_1.MAX_RETRY_COUNT_TRIGGER_WEBHOOK) {
+                    retry = false;
+                }
+                yield processInformAction(params)(repos);
+                break;
+            }
+            catch (error) {
+                if (retry) {
+                    continue;
+                }
+                else {
+                    throw error;
+                }
+            }
+        }
+    });
+}
+exports.triggerWebhook = triggerWebhook;
+function processInformAction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         // アクション開始
@@ -215,4 +241,3 @@ function triggerWebhook(params) {
         yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
     });
 }
-exports.triggerWebhook = triggerWebhook;

package/lib/chevre/service/reserve/potentialActions/onReservationCanceled.js

@@ -19,7 +19,6 @@ const settings_1 = require("../../../settings");
 const offer_1 = require("../../offer");
 const factory_1 = require("../factory");
 const informReservations = settings_1.settings.onReservationStatusChanged.informReservation;
-const INFORM_TASK_DELAY_IN_SECONDS = 30;
 /**
  * 予約取消後のアクション
  */
@@ -51,7 +50,7 @@ function onReservationCanceled(canceledReservations, useInformReservation) {
                 if (Array.isArray(informReservations)) {
                     // やや遅延させる(確定通知が未達の可能性を考慮して)
                     const informTaskRunsAt = moment(now)
-                        .add(INFORM_TASK_DELAY_IN_SECONDS, 'seconds')
+                        .add(settings_1.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS, 'seconds')
                         .toDate();
                     const reservations4inform = canceledReservations.map((r) => {
                         return {

package/lib/chevre/service/reserve/potentialActions/onReservationCheckedIn.js

@@ -19,7 +19,6 @@ const settings_1 = require("../../../settings");
 const offer_1 = require("../../offer");
 const factory_1 = require("../factory");
 const informReservations = settings_1.settings.onReservationStatusChanged.informReservation;
-const INFORM_TASK_DELAY_IN_SECONDS = 30;
 // tslint:disable-next-line:max-func-body-length
 function onReservationCheckedIn(params) {
     // tslint:disable-next-line:max-func-body-length
@@ -31,7 +30,7 @@ function onReservationCheckedIn(params) {
         if (Array.isArray(informReservations)) {
             // やや遅延させる(確定通知が未達の可能性を考慮して)
             const informTaskRunsAt = moment(params.now)
-                .add(INFORM_TASK_DELAY_IN_SECONDS, 'seconds')
+                .add(settings_1.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS, 'seconds')
                 .toDate();
             informReservations.forEach((informReservation) => {
                 var _a;

package/lib/chevre/service/reserve/potentialActions/onReservationUsed.js

@@ -19,7 +19,6 @@ const settings_1 = require("../../../settings");
 const offer_1 = require("../../offer");
 const factory_1 = require("../factory");
 const informReservations = settings_1.settings.onReservationStatusChanged.informReservation;
-const INFORM_TASK_DELAY_IN_SECONDS = 30;
 /**
  * 予約使用
  */
@@ -32,7 +31,7 @@ function onReservationUsed(action, attendedReservation) {
         if (Array.isArray(informReservations)) {
             // やや遅延させる(確定通知が未達の可能性を考慮して)
             const informTaskRunsAt = moment(now)
-                .add(INFORM_TASK_DELAY_IN_SECONDS, 'seconds')
+                .add(settings_1.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS, 'seconds')
                 .toDate();
             const reservation4inform = {
                 typeOf: attendedReservation.typeOf,

package/lib/chevre/settings.d.ts

@@ -31,6 +31,8 @@ export declare const DEFAULT_TASKS_EXPORT_AGENT_NAME: string;
 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.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.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;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -50,6 +50,12 @@ exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_PAY_ASSET_TR
 exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = (typeof process.env.USE_NEW_EVENT_AVAILABILITY_KEY_FROM === 'string')
     ? moment(process.env.USE_NEW_EVENT_AVAILABILITY_KEY_FROM)
     : moment('2023-08-31T15:00:00Z');
+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.40"
+  "version": "21.2.0-alpha.41"
 }