@chevre/domain 22.7.0-alpha.4 → 22.7.0-alpha.6

package/example/src/chevre/aggregateAllEvents2.ts

@@ -44,12 +44,6 @@ export async function aggregateScreeningEvent() {
                         sendGrid: await chevre.credentials.SendGrid.createInstance({ apiKey: 'xxx' })
                     },
                     settings: new chevre.settings.Settings({
-                        notification: {
-                            timeout: 1000,
-                            useFetchAPI: true,
-                            secretKey: 'xx',
-                            headerIdentifier: 'xx'
-                        },
                         deliverOrderLimit: 1,
                         abortedTasksWithoutReport: [],
                         coa: { timeout: 1000 },

package/example/src/chevre/createEventBySchedule.ts

@@ -24,12 +24,6 @@ async function main() {
                 sendGrid: await chevre.credentials.SendGrid.createInstance({ apiKey: 'xxx' })
             },
             settings: new chevre.settings.Settings({
-                notification: {
-                    timeout: 1000,
-                    useFetchAPI: true,
-                    secretKey: 'xx',
-                    headerIdentifier: 'xx'
-                },
                 deliverOrderLimit: 1,
                 abortedTasksWithoutReport: [],
                 coa: { timeout: 1000 },

package/example/src/chevre/findSetting.ts

@@ -25,7 +25,7 @@ async function main() {
 
     const settingRepo = await chevre.repository.Setting.createInstance(mongoose.connection);
 
-    const result = await settingRepo.findOne({}, ['quota']);
+    const result = await settingRepo.findOne({}, ['triggerWebhook']);
     // tslint:disable-next-line:no-null-keyword
     console.dir(result, { depth: null });
 
@@ -53,11 +53,13 @@ async function main() {
         const updateResult = await settingRepo.updateByProject(
             { project: { id: { $eq: '*' } } },
             {
-                quota: {
-                    codeExpiresInSecondsDefault: 600,
-                    codeExpiresInSecondsMax: 8035200,
-                    placeOrderExpiresInSecondsMax: 3600,
-                    placeOrderExpiresInSecondsMin: 60
+                triggerWebhook: {
+                    timeout: 15000,
+                    useFetchAPI: true,
+                    secretKey: String(process.env.TRIGGER_WEBHOOK_SECRET_KEY),
+                    headerIdentifier: String(process.env.TRIGGER_WEBHOOK_HEADER_IDENTIFIER),
+                    retryCountMax: 2,
+                    retryIntervalInMS: 1000
                 }
             }
         );

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

@@ -382,15 +382,15 @@ export declare class ActionRepo {
         object: any;
         error?: any;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
+        typeOf: factory.actionType;
+        result?: any;
+        recipient?: import("@chevre/factory/lib/action").IParticipant | undefined;
         agent: import("@chevre/factory/lib/action").IParticipant;
         purpose?: import("@chevre/factory/lib/action").IPurpose | undefined;
-        typeOf: factory.actionType;
         targetCollection?: any;
         potentialActions?: any;
         instrument?: any;
-        recipient?: import("@chevre/factory/lib/action").IParticipant | undefined;
         location?: any;
-        result?: any;
         endDate?: Date | undefined;
         sameAs?: import("@chevre/factory/lib/action").ISameAs | undefined;
         startDate: Date;
@@ -405,15 +405,15 @@ export declare class ActionRepo {
         object: any;
         error?: any;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
+        typeOf: factory.actionType;
+        result?: any;
+        recipient?: import("@chevre/factory/lib/action").IParticipant | undefined;
         agent: import("@chevre/factory/lib/action").IParticipant;
         purpose?: import("@chevre/factory/lib/action").IPurpose | undefined;
-        typeOf: factory.actionType;
         targetCollection?: any;
         potentialActions?: any;
         instrument?: any;
-        recipient?: import("@chevre/factory/lib/action").IParticipant | undefined;
         location?: any;
-        result?: any;
         endDate?: Date | undefined;
         sameAs?: import("@chevre/factory/lib/action").ISameAs | undefined;
         startDate: Date;
@@ -430,15 +430,15 @@ export declare class ActionRepo {
         object: any;
         error?: any;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
+        typeOf: factory.actionType;
+        result?: any;
+        recipient?: import("@chevre/factory/lib/action").IParticipant | undefined;
         agent: import("@chevre/factory/lib/action").IParticipant;
         purpose?: import("@chevre/factory/lib/action").IPurpose | undefined;
-        typeOf: factory.actionType;
         targetCollection?: any;
         potentialActions?: any;
         instrument?: any;
-        recipient?: import("@chevre/factory/lib/action").IParticipant | undefined;
         location?: any;
-        result?: any;
         endDate?: Date | undefined;
         sameAs?: import("@chevre/factory/lib/action").ISameAs | undefined;
         startDate: Date;
@@ -453,15 +453,15 @@ export declare class ActionRepo {
         object: any;
         error?: any;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
+        typeOf: factory.actionType;
+        result?: any;
+        recipient?: import("@chevre/factory/lib/action").IParticipant | undefined;
         agent: import("@chevre/factory/lib/action").IParticipant;
         purpose?: import("@chevre/factory/lib/action").IPurpose | undefined;
-        typeOf: factory.actionType;
         targetCollection?: any;
         potentialActions?: any;
         instrument?: any;
-        recipient?: import("@chevre/factory/lib/action").IParticipant | undefined;
         location?: any;
-        result?: any;
         endDate?: Date | undefined;
         sameAs?: import("@chevre/factory/lib/action").ISameAs | undefined;
         startDate: Date;

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

@@ -126,7 +126,7 @@ export declare class AssetTransactionRepo {
         status: {
             $in: factory.transactionStatusType[];
         };
-    }): Promise<Pick<import("@chevre/factory/lib/assetTransaction/cancelReservation").ITransaction | import("@chevre/factory/lib/assetTransaction/moneyTransfer").ITransaction | import("@chevre/factory/lib/assetTransaction/pay").ITransaction | import("@chevre/factory/lib/assetTransaction/refund").ITransaction | import("@chevre/factory/lib/assetTransaction/registerService").ITransaction | import("@chevre/factory/lib/assetTransaction/reserve").ITransaction, "id" | "status" | "typeOf">[]>;
+    }): Promise<Pick<import("@chevre/factory/lib/assetTransaction/cancelReservation").ITransaction | import("@chevre/factory/lib/assetTransaction/moneyTransfer").ITransaction | import("@chevre/factory/lib/assetTransaction/pay").ITransaction | import("@chevre/factory/lib/assetTransaction/refund").ITransaction | import("@chevre/factory/lib/assetTransaction/registerService").ITransaction | import("@chevre/factory/lib/assetTransaction/reserve").ITransaction, "id" | "typeOf" | "status">[]>;
     /**
      * set task status exported by transaction id
      * IDでタスクをエクスポート済に変更する

package/lib/chevre/repo/mongoose/schemas/setting.d.ts

@@ -48,6 +48,23 @@ interface IQuotaSettings {
     placeOrderExpiresInSecondsMax?: number;
     placeOrderExpiresInSecondsMin?: number;
 }
+export interface ITriggerWebhookSettings {
+    /**
+     * リクエストタイムアウト
+     */
+    timeout?: number;
+    useFetchAPI?: boolean;
+    /**
+     * 通知署名の鍵
+     */
+    secretKey?: string;
+    /**
+     * 固有署名ヘッダー識別子
+     */
+    headerIdentifier?: string;
+    retryCountMax?: number;
+    retryIntervalInMS?: number;
+}
 export interface ISetting {
     defaultSenderEmail?: string;
     onEventChanged?: IOnEventChanged;
@@ -63,6 +80,10 @@ export interface ISetting {
     };
     quota?: IQuotaSettings;
     storage?: IStorageSettings;
+    /**
+     * 通知設定
+     */
+    triggerWebhook?: ITriggerWebhookSettings;
     useInformResourceTypes?: string[];
     userPoolIdOld?: string;
     userPoolIdNew?: string;

package/lib/chevre/repo/mongoose/schemas/setting.js

@@ -16,6 +16,7 @@ const schemaDefinition = {
     onTransactionStatusChanged: mongoose_1.SchemaTypes.Mixed,
     quota: mongoose_1.SchemaTypes.Mixed,
     storage: mongoose_1.SchemaTypes.Mixed,
+    triggerWebhook: mongoose_1.SchemaTypes.Mixed,
     useInformResourceTypes: [String],
     userPoolIdOld: String,
     userPoolIdNew: String

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

@@ -102,8 +102,8 @@ export declare class SellerRepo {
     getCursor(conditions: FilterQuery<factory.seller.ISeller>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, {
         url?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
-        name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
         typeOf: factory.organizationType.Corporation;
+        name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
         location?: import("@chevre/factory/lib/place").IPlace | undefined;
         hasMerchantReturnPolicy?: factory.seller.IHasMerchantReturnPolicy | undefined;
         makesOffer?: factory.seller.IMakesOffer[] | undefined;
@@ -114,8 +114,8 @@ export declare class SellerRepo {
     }> & {
         url?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
-        name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
         typeOf: factory.organizationType.Corporation;
+        name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
         location?: import("@chevre/factory/lib/place").IPlace | undefined;
         hasMerchantReturnPolicy?: factory.seller.IHasMerchantReturnPolicy | undefined;
         makesOffer?: factory.seller.IMakesOffer[] | undefined;
@@ -128,8 +128,8 @@ export declare class SellerRepo {
     }, QueryOptions<import("mongoose").Document<unknown, {}, {
         url?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
-        name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
         typeOf: factory.organizationType.Corporation;
+        name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
         location?: import("@chevre/factory/lib/place").IPlace | undefined;
         hasMerchantReturnPolicy?: factory.seller.IHasMerchantReturnPolicy | undefined;
         makesOffer?: factory.seller.IMakesOffer[] | undefined;
@@ -140,8 +140,8 @@ export declare class SellerRepo {
     }> & {
         url?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
-        name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
         typeOf: factory.organizationType.Corporation;
+        name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
         location?: import("@chevre/factory/lib/place").IPlace | undefined;
         hasMerchantReturnPolicy?: factory.seller.IHasMerchantReturnPolicy | undefined;
         makesOffer?: factory.seller.IMakesOffer[] | undefined;

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

@@ -23,9 +23,9 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import type { Connection } from 'mongoose';
-import { ISetting } from './mongoose/schemas/setting';
+import { ISetting, ITriggerWebhookSettings } from './mongoose/schemas/setting';
 type IKeyOfProjection = keyof ISetting;
-export { ISetting };
+export { ISetting, ITriggerWebhookSettings };
 /**
  * 設定リポジトリ
  */
@@ -46,5 +46,5 @@ export declare class SettingRepo {
                 $eq: string;
             };
         };
-    }, update: Pick<ISetting, 'onEventChanged' | 'onReservationStatusChanged' | 'onResourceUpdated' | 'defaultSenderEmail' | 'useInformResourceTypes' | 'userPoolIdNew' | 'userPoolIdOld' | 'storage' | 'quota'>): Promise<import("mongoose").UpdateWriteOpResult>;
+    }, update: Pick<ISetting, 'onEventChanged' | 'onReservationStatusChanged' | 'onResourceUpdated' | 'defaultSenderEmail' | 'useInformResourceTypes' | 'userPoolIdNew' | 'userPoolIdOld' | 'storage' | 'quota' | 'triggerWebhook'>): Promise<import("mongoose").UpdateWriteOpResult>;
 }

package/lib/chevre/repo/setting.js

@@ -49,9 +49,9 @@ class SettingRepo {
     }
     updateByProject(filter, update) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { onEventChanged, onReservationStatusChanged, onResourceUpdated, defaultSenderEmail, useInformResourceTypes, userPoolIdNew, userPoolIdOld, storage, quota } = update;
+            const { onEventChanged, onReservationStatusChanged, onResourceUpdated, defaultSenderEmail, useInformResourceTypes, userPoolIdNew, userPoolIdOld, storage, quota, triggerWebhook } = update;
             return this.settingModel.updateOne({ 'project.id': { $eq: filter.project.id.$eq } }, {
-                $set: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (onEventChanged !== undefined) ? { onEventChanged } : undefined), (onReservationStatusChanged !== undefined) ? { onReservationStatusChanged } : undefined), (onResourceUpdated !== undefined) ? { onResourceUpdated } : undefined), (defaultSenderEmail !== undefined) ? { defaultSenderEmail } : undefined), (useInformResourceTypes !== undefined) ? { useInformResourceTypes } : undefined), (userPoolIdNew !== undefined) ? { userPoolIdNew } : undefined), (userPoolIdOld !== undefined) ? { userPoolIdOld } : undefined), (storage !== undefined) ? { storage } : undefined), (quota !== undefined) ? { quota } : undefined)
+                $set: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (onEventChanged !== undefined) ? { onEventChanged } : undefined), (onReservationStatusChanged !== undefined) ? { onReservationStatusChanged } : undefined), (onResourceUpdated !== undefined) ? { onResourceUpdated } : undefined), (defaultSenderEmail !== undefined) ? { defaultSenderEmail } : undefined), (useInformResourceTypes !== undefined) ? { useInformResourceTypes } : undefined), (userPoolIdNew !== undefined) ? { userPoolIdNew } : undefined), (userPoolIdOld !== undefined) ? { userPoolIdOld } : undefined), (storage !== undefined) ? { storage } : undefined), (quota !== undefined) ? { quota } : undefined), (triggerWebhook !== undefined) ? { triggerWebhook } : undefined)
             })
                 .exec();
         });

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

@@ -184,8 +184,10 @@ export declare class TaskRepo {
         };
     }): Promise<number>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, {
-        identifier?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
+        expires?: Date | undefined;
+        data: any;
+        identifier?: string | undefined;
         name: factory.taskName;
         status: factory.taskStatus;
         runsAt: Date;
@@ -194,12 +196,12 @@ export declare class TaskRepo {
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
         executor?: import("@chevre/factory/lib/task").IExecutor | undefined;
-        data: any;
         dateAborted?: Date | undefined;
-        expires?: Date | undefined;
     }> & {
-        identifier?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
+        expires?: Date | undefined;
+        data: any;
+        identifier?: string | undefined;
         name: factory.taskName;
         status: factory.taskStatus;
         runsAt: Date;
@@ -208,14 +210,14 @@ export declare class TaskRepo {
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
         executor?: import("@chevre/factory/lib/task").IExecutor | undefined;
-        data: any;
         dateAborted?: Date | undefined;
-        expires?: Date | undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, {
-        identifier?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
+        expires?: Date | undefined;
+        data: any;
+        identifier?: string | undefined;
         name: factory.taskName;
         status: factory.taskStatus;
         runsAt: Date;
@@ -224,12 +226,12 @@ export declare class TaskRepo {
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
         executor?: import("@chevre/factory/lib/task").IExecutor | undefined;
-        data: any;
         dateAborted?: Date | undefined;
-        expires?: Date | undefined;
     }> & {
-        identifier?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
+        expires?: Date | undefined;
+        data: any;
+        identifier?: string | undefined;
         name: factory.taskName;
         status: factory.taskStatus;
         runsAt: Date;
@@ -238,9 +240,7 @@ export declare class TaskRepo {
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
         executor?: import("@chevre/factory/lib/task").IExecutor | undefined;
-        data: any;
         dateAborted?: Date | undefined;
-        expires?: Date | undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     }>>;

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

@@ -158,7 +158,7 @@ export declare class TransactionRepo {
         status: {
             $in: factory.transactionStatusType[];
         };
-    }): Promise<Pick<import("@chevre/factory/lib/transaction/moneyTransfer").ITransaction | import("@chevre/factory/lib/transaction/placeOrder").ITransaction | import("@chevre/factory/lib/transaction/returnOrder").ITransaction, "id" | "status" | "typeOf">[]>;
+    }): Promise<Pick<import("@chevre/factory/lib/transaction/moneyTransfer").ITransaction | import("@chevre/factory/lib/transaction/placeOrder").ITransaction | import("@chevre/factory/lib/transaction/returnOrder").ITransaction, "id" | "typeOf" | "status">[]>;
     /**
      * set task status exported by transaction id
      * IDでタスクをエクスポート済に変更する

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

@@ -1,11 +1,13 @@
 import { LINENotifyCredentials } from '../credentials/lineNotify';
 import { SendGridCredentials } from '../credentials/sendGrid';
 import * as factory from '../factory';
-import { IWebhookSettings } from '../settings';
 import type { ActionRepo } from '../repo/action';
 import type { MessageRepo } from '../repo/message';
 import type { ProjectRepo } from '../repo/project';
-type ILineNotifyOperation<T> = (repos: {}, credentials: {
+import type { SettingRepo } from '../repo/setting';
+type ILineNotifyOperation<T> = (repos: {
+    setting: SettingRepo;
+}, credentials: {
     lineNotify: LINENotifyCredentials;
 }) => Promise<T>;
 /**
@@ -30,15 +32,13 @@ declare function lineNotify({ subject, content, imageThumbnail, imageFullsize, l
     imageThumbnail?: string;
     imageFullsize?: string;
     logLevel: LineNotifyLogLevel;
-}, options: {
-    timeout: number;
-    useFetchAPI: boolean;
 }): ILineNotifyOperation<void>;
 declare function triggerWebhook(params: factory.task.IData<factory.taskName.TriggerWebhook> & {
     project: {
         id: string;
     };
-}, options: IWebhookSettings): (repos: {
+}): (repos: {
     action: ActionRepo;
+    setting: SettingRepo;
 }) => Promise<void>;
 export { lineNotify, sendEmailMessage, triggerWebhook };

package/lib/chevre/service/notification.js

@@ -122,9 +122,21 @@ function sendEmailMessage(params) {
 }
 exports.sendEmailMessage = sendEmailMessage;
 const MAX_LINE_NOTIFY_SUBJECT_LENGTH = 100;
-function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel }, options) {
-    return (__, credentials) => __awaiter(this, void 0, void 0, function* () {
-        const { timeout, useFetchAPI } = options;
+function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel }
+// options: {
+//     timeout: number;
+//     useFetchAPI: boolean;
+// }
+) {
+    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        // const { timeout, useFetchAPI } = options;
+        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['triggerWebhook']);
+        const timeout = (_a = setting === null || setting === void 0 ? void 0 : setting.triggerWebhook) === null || _a === void 0 ? void 0 : _a.timeout;
+        const useFetchAPI = ((_b = setting === null || setting === void 0 ? void 0 : setting.triggerWebhook) === null || _b === void 0 ? void 0 : _b.useFetchAPI) === true;
+        if (typeof timeout !== 'number') {
+            throw new factory.errors.NotFound('setting.triggerWebhook.timeout');
+        }
         const LINE_NOTIFY_URL = credentials.lineNotify.url;
         if (typeof LINE_NOTIFY_URL !== 'string') {
             throw new factory.errors.Internal('Environment variable LINE_NOTIFY_URL not set');
@@ -189,24 +201,36 @@ function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel
 }
 exports.lineNotify = lineNotify;
 const USERNAME_ARGUMENT_REQUIRED_MESSAGE = 'Missing required key \'Username\' in params';
-const TRIGGER_WEBHOOK_MAX_RETRY_COUNT = 2;
-const TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = 1000;
-function triggerWebhook(params, options) {
+// const TRIGGER_WEBHOOK_MAX_RETRY_COUNT = 2;
+// const TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = 1000;
+function triggerWebhook(params
+// options: IWebhookSettings
+) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['triggerWebhook']);
+        const retryCountMax = (_a = setting === null || setting === void 0 ? void 0 : setting.triggerWebhook) === null || _a === void 0 ? void 0 : _a.retryCountMax;
+        const retryIntervalInMS = (_b = setting === null || setting === void 0 ? void 0 : setting.triggerWebhook) === null || _b === void 0 ? void 0 : _b.retryIntervalInMS;
+        if (typeof retryCountMax !== 'number') {
+            throw new factory.errors.NotFound('setting.triggerWebhook.retryCountMax');
+        }
+        if (typeof retryIntervalInMS !== 'number') {
+            throw new factory.errors.NotFound('setting.triggerWebhook.retryIntervalInMS');
+        }
         // retryableにする(2023-05-12~)
         let retry = true;
         let numberOfTry = 0;
         while (numberOfTry >= 0) {
             try {
                 numberOfTry += 1;
-                if (numberOfTry > TRIGGER_WEBHOOK_MAX_RETRY_COUNT) {
+                if (numberOfTry > retryCountMax) {
                     retry = false;
                 }
                 // retryInterval
                 if (numberOfTry > 1) {
-                    yield sleep(TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS * (numberOfTry - 1));
+                    yield sleep(retryIntervalInMS * (numberOfTry - 1));
                 }
-                yield processInformAction(params, options)(repos);
+                yield processInformAction(params, setting)(repos);
                 break;
             }
             catch (error) {
@@ -245,12 +269,16 @@ function signRequest(params) {
 function processInformAction(params, options) {
     // tslint:disable-next-line:cyclomatic-complexity
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const { timeout, useFetchAPI, secretKey, headerIdentifier } = options;
+        var _a, _b, _c, _d, _e, _f;
+        // const { timeout, useFetchAPI, secretKey, headerIdentifier } = options;
+        const timeout = (_a = options === null || options === void 0 ? void 0 : options.triggerWebhook) === null || _a === void 0 ? void 0 : _a.timeout;
+        const useFetchAPI = ((_b = options === null || options === void 0 ? void 0 : options.triggerWebhook) === null || _b === void 0 ? void 0 : _b.useFetchAPI) === true;
+        const secretKey = (_c = options === null || options === void 0 ? void 0 : options.triggerWebhook) === null || _c === void 0 ? void 0 : _c.secretKey;
+        const headerIdentifier = (_d = options === null || options === void 0 ? void 0 : options.triggerWebhook) === null || _d === void 0 ? void 0 : _d.headerIdentifier;
         const action = yield repos.action.start(createInformActionAttributes(params));
         let result = {};
         try {
-            if (typeof ((_a = params.recipient) === null || _a === void 0 ? void 0 : _a.url) === 'string') {
+            if (typeof ((_e = params.recipient) === null || _e === void 0 ? void 0 : _e.url) === 'string') {
                 const url = params.recipient.url;
                 const requestBody = JSON.stringify(Object.assign({ data: params.object }, (typeof params.identifier === 'string' && params.identifier !== '')
                     ? { identifier: params.identifier }
@@ -307,7 +335,7 @@ function processInformAction(params, options) {
         catch (error) {
             let throwsError = true;
             // プロジェクト固有の特別対応
-            if (error.statusCode === http_status_1.INTERNAL_SERVER_ERROR && ((_b = error.body) === null || _b === void 0 ? void 0 : _b.message) === USERNAME_ARGUMENT_REQUIRED_MESSAGE) {
+            if (error.statusCode === http_status_1.INTERNAL_SERVER_ERROR && ((_f = error.body) === null || _f === void 0 ? void 0 : _f.message) === USERNAME_ARGUMENT_REQUIRED_MESSAGE) {
                 throwsError = false;
             }
             if (throwsError) {

package/lib/chevre/service/offer/product.d.ts

@@ -68,7 +68,7 @@ export declare function search(params: {
     productOffer: ProductOfferRepo;
 }) => Promise<{
     offers: factory.product.ITicketOffer[];
-    product: Pick<factory.product.IProduct, "id" | "project" | "name" | "typeOf" | "description" | "serviceType" | "serviceOutput" | "productID">;
+    product: Pick<factory.product.IProduct, "id" | "project" | "typeOf" | "name" | "description" | "serviceType" | "serviceOutput" | "productID">;
 }>;
 export type IAuthorizeOfferAction = factory.action.authorize.offer.product.IAction;
 /**

package/lib/chevre/service/task/triggerWebhook.js

@@ -11,16 +11,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const action_1 = require("../../repo/action");
+const setting_1 = require("../../repo/setting");
 const notification_1 = require("../notification");
 /**
  * タスク実行関数
  */
 function call(params) {
-    return ({ connection, settings }) => __awaiter(this, void 0, void 0, function* () {
-        const { notification } = settings;
-        const { timeout, useFetchAPI, secretKey, headerIdentifier } = notification;
-        yield (0, notification_1.triggerWebhook)(Object.assign(Object.assign({}, params.data), { project: { id: params.project.id } }), { timeout, useFetchAPI, secretKey, headerIdentifier })({
-            action: new action_1.ActionRepo(connection)
+    return ({ connection }) => __awaiter(this, void 0, void 0, function* () {
+        // const { notification } = settings;
+        // const { timeout, useFetchAPI, secretKey, headerIdentifier } = notification;
+        yield (0, notification_1.triggerWebhook)(Object.assign(Object.assign({}, params.data), { project: { id: params.project.id } }))({
+            action: new action_1.ActionRepo(connection),
+            setting: new setting_1.SettingRepo(connection)
         });
     });
 }

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

@@ -4,6 +4,7 @@ import { JWTCredentials } from '../credentials/jwt';
 import { LINENotifyCredentials } from '../credentials/lineNotify';
 import { SendGridCredentials } from '../credentials/sendGrid';
 import * as factory from '../factory';
+import type { SettingRepo } from '../repo/setting';
 import type { IExecutableTask, IExecutableTaskKeys, TaskRepo } from '../repo/task';
 import { Settings } from '../settings';
 import { AggregationSettings } from '../settings/aggregation';
@@ -29,6 +30,7 @@ interface IExecuteOptions {
     executeByName: boolean;
 }
 type TaskOperation<T> = (repos: {
+    setting: SettingRepo;
     task: TaskRepo;
 }, settings: Settings, credentials: {
     lineNotify: LINENotifyCredentials;

package/lib/chevre/service/task.js

@@ -172,7 +172,9 @@ function abort(params) {
             yield notification.lineNotify({
                 subject: message.subject, content: message.content,
                 logLevel: 'error'
-            }, { timeout: settings.notification.timeout, useFetchAPI: settings.notification.useFetchAPI })({}, credentials);
+            }
+            // { timeout, useFetchAPI }
+            )(repos, credentials);
         }
     });
 }
@@ -192,7 +194,9 @@ function notifyAbortedTasks(params) {
             yield notification.lineNotify({
                 subject: message.subject, content: message.content,
                 logLevel: 'error'
-            }, { timeout: settings.notification.timeout, useFetchAPI: settings.notification.useFetchAPI })({}, credentials);
+            }
+            // { timeout, useFetchAPI }
+            )(repos, credentials);
         }
     });
 }

package/lib/chevre/settings.d.ts

@@ -1,19 +1,4 @@
 import { AggregationSettings, ICallableTaskOperation, ICallResult, IOperationExecute } from './settings/aggregation';
-interface IWebhookSettings {
-    /**
-     * リクエストタイムアウト
-     */
-    timeout: number;
-    useFetchAPI: boolean;
-    /**
-     * 通知署名の鍵
-     */
-    secretKey?: string;
-    /**
-     * 固有署名ヘッダー識別子
-     */
-    headerIdentifier?: string;
-}
 interface ISurfrockSettings {
     /**
      * 着券時タイムアウト
@@ -47,7 +32,6 @@ interface IOptions {
     };
     movieticketReserve: ISurfrockSettings;
     useExperimentalFeature: boolean;
-    notification: IWebhookSettings;
 }
 /**
  * domain settings
@@ -69,10 +53,9 @@ declare class Settings {
     /**
      * 通知設定
      */
-    readonly notification: IWebhookSettings;
     constructor(options: IOptions);
 }
 export declare const MONGO_MAX_TIME_MS: number;
 export declare const MONGO_READ_PREFERENCE: string;
 export declare const MONGO_AUTO_INDEX: boolean;
-export { AggregationSettings, Settings, ICallableTaskOperation, ICallResult, IOperationExecute, IWebhookSettings };
+export { AggregationSettings, Settings, ICallableTaskOperation, ICallResult, IOperationExecute };

package/lib/chevre/settings.js

@@ -7,22 +7,20 @@ Object.defineProperty(exports, "AggregationSettings", { enumerable: true, get: f
  * domain settings
  */
 class Settings {
+    /**
+     * 通知設定
+     */
+    // public readonly notification: IWebhookSettings; // migrate to SettingRepo(2024-12-11~)
     constructor(options) {
-        const { abortedTasksWithoutReport, numTryConfirmReserveTransaction, 
-        // transaction,
-        deliverOrderLimit, coa, gmo, movieticketReserve, 
-        // useAssetTransactionSyncProcessing,
-        useExperimentalFeature, notification } = options;
+        const { abortedTasksWithoutReport, numTryConfirmReserveTransaction, deliverOrderLimit, coa, gmo, movieticketReserve, useExperimentalFeature } = options;
         this.abortedTasksWithoutReport = abortedTasksWithoutReport;
         this.numTryConfirmReserveTransaction = numTryConfirmReserveTransaction;
-        // this.transaction = transaction;
         this.deliverOrderLimit = deliverOrderLimit;
         this.coa = coa;
         this.gmo = gmo;
         this.movieticketReserve = movieticketReserve;
-        // this.useAssetTransactionSyncProcessing = useAssetTransactionSyncProcessing;
         this.useExperimentalFeature = useExperimentalFeature;
-        this.notification = notification;
+        // this.notification = notification;
     }
 }
 exports.Settings = Settings;

package/package.json

@@ -108,5 +108,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.7.0-alpha.4"
+  "version": "22.7.0-alpha.6"
 }