@chevre/domain 28.1.0-alpha.2 → 28.1.0-alpha.4

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

@@ -69,10 +69,6 @@ interface ITriggerWebhookSettings {
     headerIdentifier?: string;
     retryCountMax?: number;
     retryIntervalInMS?: number;
-    /**
-     * support(2026-10-30~)
-     */
-    googleTargetAudience?: string;
 }
 export interface IWaiterSettings {
     disabled?: boolean;
@@ -193,7 +189,14 @@ interface IHubOnTaskStatusChanged {
 export interface IHubSettings {
     onOrderStatusChanged: IHubOnOrderStatusChanged;
     onReservationStatusChanged: IHubOnReservationStatusChanged;
+    /**
+     * 編集系リソースとタスクの通知設定
+     */
     onTaskStatusChanged: IHubOnTaskStatusChanged;
+    /**
+     * support(2026-10-30~)
+     */
+    googleTargetAudience?: string;
 }
 export interface IIntegrationSettings {
     abortedTasksWithoutReport: string[];
@@ -262,9 +265,6 @@ export interface ISetting {
     onOrderStatusChanged: IOnOrderStatusChanged;
     onReservationStatusChanged?: IOnReservationStatusChanged;
     onTaskStatusChanged?: IOnTaskStatusChanged;
-    onResourceUpdated?: {
-        informResource?: factory.project.IInformParams[];
-    };
     orderNumber?: IOrderNumberSetting;
     project: {
         id: string;

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

@@ -15,7 +15,7 @@ const schemaDefinition = {
     onOrderStatusChanged: mongoose_1.SchemaTypes.Mixed,
     onReservationStatusChanged: mongoose_1.SchemaTypes.Mixed,
     onTaskStatusChanged: mongoose_1.SchemaTypes.Mixed,
-    onResourceUpdated: mongoose_1.SchemaTypes.Mixed,
+    // onResourceUpdated: SchemaTypes.Mixed, // discontinue(2026-11-02~)
     // onTransactionStatusChanged: SchemaTypes.Mixed, // discontinue(2026-06-29~)
     orderNumber: mongoose_1.SchemaTypes.Mixed,
     quota: mongoose_1.SchemaTypes.Mixed,

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

@@ -3,6 +3,7 @@ import { IIntegrationSettings, ISendGridSettings, IHubSettings } from '../mongoo
 interface IDBOptions {
     connection: Connection;
 }
+export { IIntegrationSettings };
 /**
  * 外部連携設定リポジトリ
  */
@@ -24,4 +25,3 @@ export declare class IntegrationSettingRepo {
     addSendGridSettings(params: ISendGridSettings): Promise<import("mongoose").UpdateWriteOpResult>;
     addHubSettings(params: IHubSettings): Promise<import("mongoose").UpdateWriteOpResult>;
 }
-export {};

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

@@ -1,7 +1,7 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import { ISetting, IStorageSettings } from './mongoose/schemas/setting';
 type IKeyOfProjection = Exclude<keyof ISetting, 'jwt' | 'project' | 'waiter' | 'integration'>;
-type IGlobalSetting = Pick<ISetting, 'defaultSenderEmail' | 'onEventChanged' | 'onOrderStatusChanged' | 'onReservationStatusChanged' | 'onResourceUpdated' | 'onTaskStatusChanged' | 'orderNumber' | 'quota' | 'serviceOutputIdentifier' | 'storage' | 'transactionNumber' | 'triggerWebhook' | 'useInformResourceTypes' | 'useMongo4confirmationNumberFrom' | 'useMongo4orderNumberFrom' | 'useMongo4transactionNumberFrom' | 'useMongoAsStockHolder' | 'useMongoAsStockHolderProjects' | 'userPoolIdNew' | 'userPoolIdOld'>;
+type IGlobalSetting = Pick<ISetting, 'defaultSenderEmail' | 'onEventChanged' | 'onOrderStatusChanged' | 'onReservationStatusChanged' | 'onTaskStatusChanged' | 'orderNumber' | 'quota' | 'serviceOutputIdentifier' | 'storage' | 'transactionNumber' | 'triggerWebhook' | 'useInformResourceTypes' | 'useMongo4confirmationNumberFrom' | 'useMongo4orderNumberFrom' | 'useMongo4transactionNumberFrom' | 'useMongoAsStockHolder' | 'useMongoAsStockHolderProjects' | 'userPoolIdNew' | 'userPoolIdOld'>;
 export { IGlobalSetting as ISetting };
 /**
  * 設定リポジトリ

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

@@ -0,0 +1,27 @@
+import { factory } from '../../../factory';
+import type { InformActionRepo } from '../../../repo/action/inform';
+import type { PotentialActionRepo } from '../../../repo/potentialAction';
+import type { ISetting, SettingRepo } from '../../../repo/setting';
+import type { IIntegrationSettings, IntegrationSettingRepo } from '../../../repo/setting/integration';
+interface ITriggerWebhookRepos {
+    actions: {
+        inform: InformActionRepo;
+    };
+    potentialAction: PotentialActionRepo;
+    setting: SettingRepo;
+    integrationSetting: IntegrationSettingRepo;
+}
+declare function processInformAction(params: (factory.task.triggerWebhook.IData | factory.task.informHub.IData) & {
+    project: {
+        id: string;
+    };
+}, settings: Pick<ISetting, 'triggerWebhook'>, options: {
+    integrationSettings?: IIntegrationSettings['hub'];
+    useIAP: boolean;
+}): (repos: {
+    actions: {
+        inform: InformActionRepo;
+    };
+    potentialAction: PotentialActionRepo;
+}) => Promise<void>;
+export { ITriggerWebhookRepos, processInformAction };

package/lib/chevre/service/notification/triggerWebhook/processInformAction.js

@@ -0,0 +1,203 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processInformAction = processInformAction;
+const crypto = __importStar(require("crypto"));
+const http_status_1 = require("http-status");
+const factory_1 = require("../../../factory");
+const getGoogleIdTokenClient_1 = require("./getGoogleIdTokenClient");
+const USERNAME_ARGUMENT_REQUIRED_MESSAGE = 'Missing required key \'Username\' in params';
+function createInformActionAttributes(params) {
+    return async (repos) => {
+        const { about, object, purpose, recipient, project, id, typeOf } = params;
+        // redefine recipient(2025-02-15~)
+        let informRecipient;
+        if (recipient?.typeOf === factory_1.factory.creativeWorkType.WebApplication) {
+            informRecipient = {
+                name: recipient.name,
+                typeOf: recipient.typeOf
+            };
+        }
+        let target;
+        if (typeOf === factory_1.factory.actionType.InformAction && typeof id === 'string' && id !== '') {
+            // find target from potentialAction(2025-02-06~)
+            const potentialInformAction = (await repos.potentialAction.projectFields({
+                limit: 1,
+                page: 1,
+                id: { $eq: id },
+                typeOf: { $eq: typeOf }
+            }, ['target', 'recipient'])).shift();
+            if (potentialInformAction === undefined) {
+                throw new factory_1.factory.errors.NotFound(factory_1.factory.actionType.InformAction);
+            }
+            if (typeof potentialInformAction.recipient?.name === 'string') {
+                informRecipient = { name: potentialInformAction.recipient.name, typeOf: potentialInformAction.recipient.typeOf };
+            }
+            target = potentialInformAction.target;
+        }
+        else {
+            if (params.target?.typeOf === 'EntryPoint') {
+                target = params.target;
+            }
+        }
+        if (informRecipient === undefined) {
+            throw new factory_1.factory.errors.ArgumentNull('recipient');
+        }
+        if (target === undefined) {
+            throw new factory_1.factory.errors.ArgumentNull('target');
+        }
+        return {
+            agent: { id: project.id, typeOf: factory_1.factory.organizationType.Project },
+            object,
+            project: { id: project.id, typeOf: factory_1.factory.organizationType.Project },
+            recipient: informRecipient,
+            typeOf: factory_1.factory.actionType.InformAction,
+            target, // add(2025-02-06~)
+            ...(typeof purpose?.typeOf === 'string') ? { purpose } : undefined,
+            ...(typeof about?.typeOf === 'string') ? { about } : undefined, // add(2025-01-23~)
+        };
+    };
+}
+function signRequest(params) {
+    const { requestBody, timestamp, secretKey } = params;
+    const payload = `${requestBody}${timestamp.toString()}`;
+    return crypto.createHmac('sha256', secretKey)
+        .update(payload)
+        .digest('hex');
+}
+async function makeRequestHeaders(params, options) {
+    const { action, settings, integrationSettings, requestBody } = params;
+    const { useIAP } = options;
+    const secretKey = settings?.triggerWebhook?.secretKey;
+    const headerIdentifier = settings?.triggerWebhook?.headerIdentifier;
+    const googleTargetAudience = integrationSettings?.googleTargetAudience;
+    const timestamp = action.startDate.valueOf();
+    // sign request(2024-10-28~)
+    let signature;
+    if (typeof secretKey === 'string' && secretKey !== ''
+        && typeof headerIdentifier === 'string' && headerIdentifier !== '') {
+        signature = signRequest({ requestBody, timestamp, secretKey });
+    }
+    const headers = new Headers({ 'Content-Type': 'application/json' });
+    if (typeof headerIdentifier === 'string' && headerIdentifier !== '') {
+        headers.append(`X-${headerIdentifier}-Webhook-Timestamp`, String(timestamp));
+        if (typeof signature === 'string') {
+            headers.append(`X-${headerIdentifier}-Webhook-Signature`, signature);
+        }
+    }
+    // support googleAuth(2026-10-30~)
+    if (useIAP) {
+        if (typeof googleTargetAudience === 'string' && googleTargetAudience !== '') {
+            const idTokenClient = await (0, getGoogleIdTokenClient_1.getGoogleIdTokenClient)(googleTargetAudience);
+            // getRequestHeaders() からキャッシュ済みの "Bearer eyJhbG..." を取得
+            const requestHeaders = await idTokenClient.getRequestHeaders();
+            const idToken = requestHeaders.get('authorization'); // "Bearer eyJhbG..."
+            if (typeof idToken === 'string') {
+                // IAPを通過するための認証（Googleが認識するヘッダー）
+                headers.append('Proxy-Authorization', idToken);
+            }
+        }
+    }
+    return headers;
+}
+function processInformAction(params, settings, options) {
+    return async (repos) => {
+        const timeout = settings?.triggerWebhook?.timeout;
+        const { identifier } = params;
+        const informActionAttributes = await createInformActionAttributes(params)(repos);
+        const action = await repos.actions.inform.startInformAction(informActionAttributes);
+        let result = {};
+        try {
+            const urlTemplate = informActionAttributes.target?.urlTemplate;
+            if (typeof urlTemplate === 'string') {
+                const requestBody = JSON.stringify({
+                    data: informActionAttributes.object,
+                    id: action.id, // support informAction ID(2025-02-20~)
+                    // 通知識別子を追加(2024-10-24~)
+                    ...(typeof identifier === 'string' && identifier !== '')
+                        ? { identifier }
+                        : undefined
+                });
+                const headers = await makeRequestHeaders({ action, settings, integrationSettings: options.integrationSettings, requestBody }, options);
+                const res = await fetch(urlTemplate, {
+                    method: 'POST',
+                    headers,
+                    body: requestBody, // body data type must match "Content-Type" header
+                    ...(typeof timeout === 'number')
+                        ? { signal: AbortSignal.timeout(timeout) }
+                        : undefined
+                });
+                let body;
+                try {
+                    body = await res.text();
+                }
+                catch (_error) {
+                    // no op
+                }
+                switch (res.status) {
+                    case http_status_1.status.OK:
+                    case http_status_1.status.CREATED:
+                    case http_status_1.status.ACCEPTED:
+                    case http_status_1.status.NO_CONTENT: {
+                        result = {
+                            statusCode: res.status,
+                            useFetchAPI: true
+                        };
+                        break;
+                    }
+                    default: {
+                        // プロジェクト固有の特別対応
+                        const ignoreUnexpectedResponse = res.status === http_status_1.status.INTERNAL_SERVER_ERROR
+                            && typeof body === 'string'
+                            && body.includes(USERNAME_ARGUMENT_REQUIRED_MESSAGE);
+                        if (!ignoreUnexpectedResponse) {
+                            throw new factory_1.factory.errors.Internal(`statusCode: ${res.status} body: ${body}`);
+                        }
+                    }
+                }
+            }
+        }
+        catch (error) {
+            try {
+                await repos.actions.inform.giveUpInformAction({ typeOf: action.typeOf, id: action.id, error });
+            }
+            catch (__) {
+                // 失敗したら仕方ない
+            }
+            throw error;
+        }
+        await repos.actions.inform.completeInformAction({ typeOf: action.typeOf, id: action.id, result: result });
+    };
+}

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

@@ -1,17 +1,13 @@
 import { factory } from '../../factory';
-import type { InformActionRepo } from '../../repo/action/inform';
-import type { PotentialActionRepo } from '../../repo/potentialAction';
-import type { SettingRepo } from '../../repo/setting';
-interface ITriggerWebhookRepos {
-    actions: {
-        inform: InformActionRepo;
+import { ITriggerWebhookRepos } from './triggerWebhook/processInformAction';
+declare function triggerWebhook(params: factory.task.triggerWebhook.IData & {
+    project: {
+        id: string;
     };
-    potentialAction: PotentialActionRepo;
-    setting: SettingRepo;
-}
-declare function triggerWebhook(params: factory.task.IData<factory.taskName.TriggerWebhook> & {
+}): (repos: ITriggerWebhookRepos) => Promise<void>;
+declare function informHub(params: factory.task.informHub.IData & {
     project: {
         id: string;
     };
 }): (repos: ITriggerWebhookRepos) => Promise<void>;
-export { ITriggerWebhookRepos, triggerWebhook };
+export { ITriggerWebhookRepos, triggerWebhook, informHub };

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

@@ -1,47 +1,15 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.triggerWebhook = triggerWebhook;
-const crypto = __importStar(require("crypto"));
-const http_status_1 = require("http-status");
+exports.informHub = informHub;
 const factory_1 = require("../../factory");
-const getGoogleIdTokenClient_1 = require("./triggerWebhook/getGoogleIdTokenClient");
-const USERNAME_ARGUMENT_REQUIRED_MESSAGE = 'Missing required key \'Username\' in params';
-function triggerWebhook(params) {
+const processInformAction_1 = require("./triggerWebhook/processInformAction");
+function findSettings() {
     return async (repos) => {
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['triggerWebhook']);
+        if (setting === null) {
+            throw new factory_1.factory.errors.NotFound('settings.triggerWebhook');
+        }
         const retryCountMax = setting?.triggerWebhook?.retryCountMax;
         const retryIntervalInMS = setting?.triggerWebhook?.retryIntervalInMS;
         if (typeof retryCountMax !== 'number') {
@@ -50,6 +18,12 @@ function triggerWebhook(params) {
         if (typeof retryIntervalInMS !== 'number') {
             throw new factory_1.factory.errors.NotFound('setting.triggerWebhook.retryIntervalInMS');
         }
+        return { setting, retryCountMax, retryIntervalInMS };
+    };
+}
+function triggerWebhook(params) {
+    return async (repos) => {
+        const { setting, retryCountMax, retryIntervalInMS } = await findSettings()(repos);
         // retryableにする(2023-05-12~)
         let retry = true;
         let numberOfTry = 0;
@@ -63,7 +37,7 @@ function triggerWebhook(params) {
                 if (numberOfTry > 1) {
                     await sleep(retryIntervalInMS * (numberOfTry - 1));
                 }
-                await processInformAction(params, setting)(repos);
+                await (0, processInformAction_1.processInformAction)(params, setting, { useIAP: false })(repos);
                 break;
             }
             catch (error) {
@@ -77,168 +51,41 @@ function triggerWebhook(params) {
         }
     };
 }
-async function sleep(waitTime) {
-    return new Promise((resolve) => {
-        setTimeout(() => {
-            resolve();
-        }, waitTime);
-    });
-}
-function createInformActionAttributes(params) {
-    return async (repos) => {
-        const { about, object, purpose, recipient, project, id, typeOf } = params;
-        // redefine recipient(2025-02-15~)
-        let informRecipient;
-        if (recipient?.typeOf === factory_1.factory.creativeWorkType.WebApplication) {
-            informRecipient = {
-                name: recipient.name,
-                typeOf: recipient.typeOf
-            };
-        }
-        let target;
-        if (typeOf === factory_1.factory.actionType.InformAction && typeof id === 'string' && id !== '') {
-            // find target from potentialAction(2025-02-06~)
-            const potentialInformAction = (await repos.potentialAction.projectFields({
-                limit: 1,
-                page: 1,
-                id: { $eq: id },
-                typeOf: { $eq: typeOf }
-            }, ['target', 'recipient'])).shift();
-            if (potentialInformAction === undefined) {
-                throw new factory_1.factory.errors.NotFound(factory_1.factory.actionType.InformAction);
-            }
-            if (typeof potentialInformAction.recipient?.name === 'string') {
-                informRecipient = { name: potentialInformAction.recipient.name, typeOf: potentialInformAction.recipient.typeOf };
-            }
-            target = potentialInformAction.target;
-        }
-        else {
-            if (params.target?.typeOf === 'EntryPoint') {
-                target = params.target;
-            }
-        }
-        if (informRecipient === undefined) {
-            throw new factory_1.factory.errors.ArgumentNull('recipient');
-        }
-        if (target === undefined) {
-            throw new factory_1.factory.errors.ArgumentNull('target');
-        }
-        return {
-            agent: { id: project.id, typeOf: factory_1.factory.organizationType.Project },
-            object,
-            project: { id: project.id, typeOf: factory_1.factory.organizationType.Project },
-            recipient: informRecipient,
-            typeOf: factory_1.factory.actionType.InformAction,
-            target, // add(2025-02-06~)
-            ...(typeof purpose?.typeOf === 'string') ? { purpose } : undefined,
-            ...(typeof about?.typeOf === 'string') ? { about } : undefined, // add(2025-01-23~)
-        };
-    };
-}
-function signRequest(params) {
-    const { requestBody, timestamp, secretKey } = params;
-    const payload = `${requestBody}${timestamp.toString()}`;
-    return crypto.createHmac('sha256', secretKey)
-        .update(payload)
-        .digest('hex');
-}
-async function makeRequestHeaders(action, options, requestBody) {
-    const secretKey = options?.triggerWebhook?.secretKey;
-    const headerIdentifier = options?.triggerWebhook?.headerIdentifier;
-    const googleTargetAudience = options?.triggerWebhook?.googleTargetAudience;
-    const timestamp = action.startDate.valueOf();
-    // sign request(2024-10-28~)
-    let signature;
-    if (typeof secretKey === 'string' && secretKey !== ''
-        && typeof headerIdentifier === 'string' && headerIdentifier !== '') {
-        signature = signRequest({ requestBody, timestamp, secretKey });
-    }
-    const headers = new Headers({ 'Content-Type': 'application/json' });
-    if (typeof headerIdentifier === 'string' && headerIdentifier !== '') {
-        headers.append(`X-${headerIdentifier}-Webhook-Timestamp`, String(timestamp));
-        if (typeof signature === 'string') {
-            headers.append(`X-${headerIdentifier}-Webhook-Signature`, signature);
-        }
-    }
-    // support googleAuth(2026-10-30~)
-    if (typeof googleTargetAudience === 'string' && googleTargetAudience !== '') {
-        const idTokenClient = await (0, getGoogleIdTokenClient_1.getGoogleIdTokenClient)(googleTargetAudience);
-        // getRequestHeaders() からキャッシュ済みの "Bearer eyJhbG..." を取得
-        const requestHeaders = await idTokenClient.getRequestHeaders();
-        const idToken = requestHeaders.get('authorization'); // "Bearer eyJhbG..."
-        if (typeof idToken === 'string') {
-            // IAPを通過するための認証（Googleが認識するヘッダー）
-            headers.append('Proxy-Authorization', idToken);
-        }
-    }
-    return headers;
-}
-function processInformAction(params, options) {
+function informHub(params) {
     return async (repos) => {
-        const timeout = options?.triggerWebhook?.timeout;
-        const { identifier } = params;
-        const informActionAttributes = await createInformActionAttributes(params)(repos);
-        const action = await repos.actions.inform.startInformAction(informActionAttributes);
-        let result = {};
-        try {
-            const urlTemplate = informActionAttributes.target?.urlTemplate;
-            if (typeof urlTemplate === 'string') {
-                const requestBody = JSON.stringify({
-                    data: informActionAttributes.object,
-                    id: action.id, // support informAction ID(2025-02-20~)
-                    // 通知識別子を追加(2024-10-24~)
-                    ...(typeof identifier === 'string' && identifier !== '')
-                        ? { identifier }
-                        : undefined
-                });
-                const headers = await makeRequestHeaders(action, options, requestBody);
-                const res = await fetch(urlTemplate, {
-                    method: 'POST',
-                    headers,
-                    body: requestBody, // body data type must match "Content-Type" header
-                    ...(typeof timeout === 'number')
-                        ? { signal: AbortSignal.timeout(timeout) }
-                        : undefined
-                });
-                let body;
-                try {
-                    body = await res.text();
-                }
-                catch (_error) {
-                    // no op
+        const { setting, retryCountMax, retryIntervalInMS } = await findSettings()(repos);
+        const hubSettings = await repos.integrationSetting.getByKey('hub');
+        // retryableにする(2023-05-12~)
+        let retry = true;
+        let numberOfTry = 0;
+        while (numberOfTry >= 0) {
+            try {
+                numberOfTry += 1;
+                if (numberOfTry > retryCountMax) {
+                    retry = false;
                 }
-                switch (res.status) {
-                    case http_status_1.status.OK:
-                    case http_status_1.status.CREATED:
-                    case http_status_1.status.ACCEPTED:
-                    case http_status_1.status.NO_CONTENT: {
-                        result = {
-                            statusCode: res.status,
-                            useFetchAPI: true
-                        };
-                        break;
-                    }
-                    default: {
-                        // プロジェクト固有の特別対応
-                        const ignoreUnexpectedResponse = res.status === http_status_1.status.INTERNAL_SERVER_ERROR
-                            && typeof body === 'string'
-                            && body.includes(USERNAME_ARGUMENT_REQUIRED_MESSAGE);
-                        if (!ignoreUnexpectedResponse) {
-                            throw new factory_1.factory.errors.Internal(`statusCode: ${res.status} body: ${body}`);
-                        }
-                    }
+                // retryInterval
+                if (numberOfTry > 1) {
+                    await sleep(retryIntervalInMS * (numberOfTry - 1));
                 }
+                await (0, processInformAction_1.processInformAction)(params, setting, { integrationSettings: hubSettings, useIAP: true })(repos);
+                break;
             }
-        }
-        catch (error) {
-            try {
-                await repos.actions.inform.giveUpInformAction({ typeOf: action.typeOf, id: action.id, error });
-            }
-            catch (__) {
-                // 失敗したら仕方ない
+            catch (error) {
+                if (retry) {
+                    continue;
+                }
+                else {
+                    throw error;
+                }
             }
-            throw error;
         }
-        await repos.actions.inform.completeInformAction({ typeOf: action.typeOf, id: action.id, result: result });
     };
 }
+async function sleep(waitTime) {
+    return new Promise((resolve) => {
+        setTimeout(() => {
+            resolve();
+        }, waitTime);
+    });
+}

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

@@ -1,5 +1,5 @@
 import { notifyAbortedTasksByEmail } from './notification/notifyAbortedTasksByEmail';
 import { notifyByEmail } from './notification/notifyByEmail';
 import { sendEmailMessage } from './notification/sendEmailMessage';
-import { triggerWebhook } from './notification/triggerWebhook';
-export { notifyAbortedTasksByEmail, notifyByEmail, sendEmailMessage, triggerWebhook };
+import { triggerWebhook, informHub } from './notification/triggerWebhook';
+export { notifyAbortedTasksByEmail, notifyByEmail, sendEmailMessage, triggerWebhook, informHub };

package/lib/chevre/service/notification.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.triggerWebhook = exports.sendEmailMessage = exports.notifyByEmail = exports.notifyAbortedTasksByEmail = void 0;
+exports.informHub = exports.triggerWebhook = exports.sendEmailMessage = exports.notifyByEmail = exports.notifyAbortedTasksByEmail = void 0;
 const notifyAbortedTasksByEmail_1 = require("./notification/notifyAbortedTasksByEmail");
 Object.defineProperty(exports, "notifyAbortedTasksByEmail", { enumerable: true, get: function () { return notifyAbortedTasksByEmail_1.notifyAbortedTasksByEmail; } });
 const notifyByEmail_1 = require("./notification/notifyByEmail");
@@ -9,3 +9,4 @@ const sendEmailMessage_1 = require("./notification/sendEmailMessage");
 Object.defineProperty(exports, "sendEmailMessage", { enumerable: true, get: function () { return sendEmailMessage_1.sendEmailMessage; } });
 const triggerWebhook_1 = require("./notification/triggerWebhook");
 Object.defineProperty(exports, "triggerWebhook", { enumerable: true, get: function () { return triggerWebhook_1.triggerWebhook; } });
+Object.defineProperty(exports, "informHub", { enumerable: true, get: function () { return triggerWebhook_1.informHub; } });

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

@@ -5,6 +5,7 @@ import type { PendingReservationRepo } from '../../repo/pendingReservation';
 import type { ProjectRepo } from '../../repo/project';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
+import { IntegrationSettingRepo } from '../../repo/setting/integration';
 import { factory } from '../../factory';
 /**
  * イベント変更時処理
@@ -13,6 +14,7 @@ declare function onEventChanged(params: factory.task.onEventChanged.IData): (rep
     adminEvent: AdminEventRepo;
     event: EventRepo;
     eventSeries: EventSeriesRepo;
+    integrationSetting: IntegrationSettingRepo;
     pendingReservation?: PendingReservationRepo;
     project: ProjectRepo;
     setting: SettingRepo;

package/lib/chevre/service/offer/onEventChanged.js

@@ -14,7 +14,8 @@ const debug = (0, debug_1.default)('chevre-domain:service:offer:onEventChanged')
 function onEventChanged(params) {
     return async (repos) => {
         if (params.id.length > 0) {
-            const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onResourceUpdated', 'onEventChanged', 'useInformResourceTypes']);
+            const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onEventChanged', 'useInformResourceTypes']);
+            const hubSettings = (await repos.integrationSetting.getByKey('hub'));
             const useInformResourceTypes = setting?.useInformResourceTypes;
             const useInform = params.useInform === true
                 && Array.isArray(useInformResourceTypes) && useInformResourceTypes.includes(params.typeOf);
@@ -31,7 +32,7 @@ function onEventChanged(params) {
                     project: { id: params.project.id },
                     ids: params.id,
                     typeOf: params.typeOf
-                }, setting)(repos);
+                }, hubSettings)(repos);
             }
             if (params.useSync === true) {
                 switch (params.typeOf) {
@@ -96,8 +97,8 @@ function createInformTasks(params, setting) {
     // settings: Settings
     ) => {
         let events4inform;
-        // const informEvents = settings.onEventChanged.informEvent;
-        const informEvents = setting?.onResourceUpdated?.informResource;
+        // const informEvents = setting?.onResourceUpdated?.informResource;
+        const informEvents = setting?.onTaskStatusChanged.informTask2hub;
         if (params.typeOf === factory_1.factory.eventType.ScreeningEvent) {
             const screeningEvents4inform = await repos.event.projectEventFields({
                 id: { $in: params.ids }
@@ -206,7 +207,7 @@ function createInformTasks(params, setting) {
                     };
                     informTasks.push({
                         project: event4inform.project,
-                        name: factory_1.factory.taskName.TriggerWebhook,
+                        name: factory_1.factory.taskName.InformHub,
                         status: factory_1.factory.taskStatus.Ready,
                         runsAt: taskRunsAt,
                         remainingNumberOfTries: 10,

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

@@ -0,0 +1,6 @@
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
+import { factory } from '../../factory';
+/**
+ * タスク実行関数
+ */
+export declare function call(params: Pick<factory.task.informHub.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.call = call;
+const inform_1 = require("../../repo/action/inform");
+const potentialAction_1 = require("../../repo/potentialAction");
+const setting_1 = require("../../repo/setting");
+const integration_1 = require("../../repo/setting/integration");
+const notification_1 = require("../notification");
+/**
+ * タスク実行関数
+ */
+function call(params) {
+    return async ({ connection }) => {
+        await (0, notification_1.informHub)({
+            ...params.data,
+            project: { id: params.project.id }
+        })({
+            actions: {
+                inform: new inform_1.InformActionRepo(connection)
+            },
+            potentialAction: new potentialAction_1.PotentialActionRepo(connection),
+            setting: new setting_1.SettingRepo(connection),
+            integrationSetting: new integration_1.IntegrationSettingRepo({ connection })
+        });
+    };
+}

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

@@ -8,6 +8,7 @@ const pendingReservation_1 = require("../../repo/pendingReservation");
 const project_1 = require("../../repo/project");
 const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
+const integration_1 = require("../../repo/setting/integration");
 const onEventChanged_1 = require("../offer/onEventChanged");
 /**
  * タスク実行関数
@@ -19,6 +20,7 @@ function call(params) {
             adminEvent: new adminEvent_1.AdminEventRepo(connection),
             event: new event_1.EventRepo(connection),
             eventSeries: new eventSeries_1.EventSeriesRepo(connection),
+            integrationSetting: new integration_1.IntegrationSettingRepo({ connection }),
             pendingReservation: new pendingReservation_1.PendingReservationRepo(connection),
             project: new project_1.ProjectRepo(connection),
             setting: new setting_1.SettingRepo(connection),

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

@@ -1,14 +1,14 @@
 import { factory } from '../../../factory';
 import type { OfferRepo } from '../../../repo/offer/unitPriceInCatalog';
-import type { ISetting } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
+import type { IIntegrationSettings } from '../../../repo/setting/integration';
 export declare function createInformOfferTasks(params: {
     project: {
         id: string;
     };
     ids: string[];
     typeOf: factory.offerType.AggregateOffer;
-}, setting: Pick<ISetting, 'onResourceUpdated'> | null): (repos: {
+}, setting?: IIntegrationSettings['hub']): (repos: {
     offer: OfferRepo;
     task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/task/onResourceUpdated/onAggregateOfferUpdated.js

@@ -7,7 +7,8 @@ function createInformOfferTasks(params, setting) {
         if (params.ids.length === 0) {
             return;
         }
-        const informResources = setting?.onResourceUpdated?.informResource;
+        // const informResources = setting?.onResourceUpdated?.informResource;
+        const informResources = setting?.onTaskStatusChanged.informTask2hub;
         const offers = await repos.offer.findUnitPriceOffers({
             id: { $in: params.ids }
         }, {
@@ -39,7 +40,7 @@ function createInformOfferTasks(params, setting) {
                     };
                     informTasks.push({
                         project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
-                        name: factory_1.factory.taskName.TriggerWebhook,
+                        name: factory_1.factory.taskName.InformHub,
                         status: factory_1.factory.taskStatus.Ready,
                         runsAt: taskRunsAt,
                         remainingNumberOfTries: 10,

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

@@ -1,8 +1,8 @@
 import { factory } from '../../../factory';
 import type { POSRepo } from '../../../repo/place/pos';
 import type { MovieTheaterRepo } from '../../../repo/place/movieTheater';
-import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
+import type { IntegrationSettingRepo } from '../../../repo/setting/integration';
 export declare function createInformHasPOSTasks(params: {
     project: {
         id: string;
@@ -19,6 +19,6 @@ export declare function createInformHasPOSTasks(params: {
 }): (repos: {
     pos: POSRepo;
     movieTheater: MovieTheaterRepo;
-    setting: SettingRepo;
     task: TaskRepo;
+    integrationSetting: IntegrationSettingRepo;
 }) => Promise<void>;

package/lib/chevre/service/task/onResourceUpdated/onHasPOSUpdated.js

@@ -7,8 +7,9 @@ function createInformHasPOSTasks(params) {
         // if (params.ids.length !== 1) {
         //     throw new factory.errors.Argument('id', 'id.length must be 1');
         // }
-        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onResourceUpdated']);
-        const informResources = setting?.onResourceUpdated?.informResource;
+        // const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onResourceUpdated']) as Pick<ISetting, 'onResourceUpdated'> | null;
+        // const informResources = setting?.onResourceUpdated?.informResource;
+        const informResources = (await repos.integrationSetting.getByKey('hub'))?.onTaskStatusChanged.informTask2hub;
         const movieTheaters = await repos.movieTheater.projectFields({
             limit: 1,
             page: 1,
@@ -57,7 +58,7 @@ function createInformHasPOSTasks(params) {
                         };
                         informTasks.push({
                             project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
-                            name: factory_1.factory.taskName.TriggerWebhook,
+                            name: factory_1.factory.taskName.InformHub,
                             status: factory_1.factory.taskStatus.Ready,
                             runsAt: taskRunsAt,
                             remainingNumberOfTries: 10,

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

@@ -2,8 +2,9 @@ import { factory } from '../../../factory';
 import type { AggregateOfferRepo } from '../../../repo/aggregateOffer';
 import type { OfferCatalogRepo } from '../../../repo/offerCatalog';
 import type { OfferCatalogItemRepo } from '../../../repo/offerCatalogItem';
-import type { ISetting, SettingRepo } from '../../../repo/setting';
+import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
+import type { IIntegrationSettings } from '../../../repo/setting/integration';
 export declare function createInformOfferCatalogTasks(params: {
     project: {
         id: string;
@@ -11,7 +12,7 @@ export declare function createInformOfferCatalogTasks(params: {
     ids: string[];
     typeOf: factory.offerCatalog.IOfferCatalog['typeOf'];
     isOfferCatalogItem: boolean;
-}, setting: Pick<ISetting, 'onResourceUpdated'> | null): (repos: {
+}, setting?: IIntegrationSettings['hub']): (repos: {
     offerCatalog: OfferCatalogRepo;
     offerCatalogItem: OfferCatalogItemRepo;
     setting: SettingRepo;

package/lib/chevre/service/task/onResourceUpdated/onOfferCatalogUpdated.js

@@ -18,8 +18,8 @@ function createInformOfferCatalogTasks(params, setting) {
         else {
             offerCatalogs = await repos.offerCatalog.projectFields({ id: { $in: params.ids } }, ['identifier', 'name', 'numberOfItems', 'project', 'typeOf']);
         }
-        // const informResources = settings.onResourceUpdated.informResource;
-        const informResources = setting?.onResourceUpdated?.informResource;
+        // const informResources = setting?.onResourceUpdated?.informResource;
+        const informResources = setting?.onTaskStatusChanged.informTask2hub;
         const offerCatalogs4inform = offerCatalogs.map(({ id, typeOf, name, identifier, project, numberOfItems }) => {
             return { id, typeOf, name, identifier, project, numberOfItems };
         });
@@ -45,7 +45,7 @@ function createInformOfferCatalogTasks(params, setting) {
                     };
                     informTasks.push({
                         project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
-                        name: factory_1.factory.taskName.TriggerWebhook,
+                        name: factory_1.factory.taskName.InformHub,
                         status: factory_1.factory.taskStatus.Ready,
                         runsAt: taskRunsAt,
                         remainingNumberOfTries: 10,

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

@@ -21,6 +21,7 @@ const screeningRoom_1 = require("../../repo/place/screeningRoom");
 const product_1 = require("../../repo/product");
 const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
+const integration_1 = require("../../repo/setting/integration");
 const onAggregateOfferUpdated_1 = require("./onResourceUpdated/onAggregateOfferUpdated");
 // import { onCategoryCodeUpdated } from './onResourceUpdated/onCategoryCodeUpdated';
 const onHasPOSUpdated_1 = require("./onResourceUpdated/onHasPOSUpdated");
@@ -39,6 +40,7 @@ function call(params) {
             entranceGate: new entranceGate_1.EntranceGateRepo(connection, { id: '' }), // 先の処理で明示的に指定される
             event: new event_1.EventRepo(connection),
             eventSeries: new eventSeries_1.EventSeriesRepo(connection),
+            integrationSetting: new integration_1.IntegrationSettingRepo({ connection }),
             pos: new pos_1.POSRepo(connection, { id: '' }), // 先の処理で明示的に指定される
             member: new member_1.MemberRepo(connection),
             movieTheater: new movieTheater_1.MovieTheaterRepo(connection),
@@ -63,7 +65,8 @@ function onResourceUpdated(params) {
             // await onResourceDeleted(params)(repos);
         }
         else {
-            const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onResourceUpdated', 'useInformResourceTypes']);
+            const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['useInformResourceTypes']);
+            const hubSettings = (await repos.integrationSetting.getByKey('hub'));
             const useInformResourceTypes = setting?.useInformResourceTypes;
             const useInform = params.useInform === true
                 && Array.isArray(useInformResourceTypes) && useInformResourceTypes.includes(params.typeOf);
@@ -75,50 +78,50 @@ function onResourceUpdated(params) {
                             project: { id: params.project.id },
                             ids: params.id,
                             typeOf: params.typeOf
-                        }, setting)(repos);
+                        }, hubSettings)(repos);
                         break;
                     case factory_1.factory.creativeWorkType.Movie:
                         await createInformMovieTasks({
                             project: { id: params.project.id },
                             ids: params.id,
                             typeOf: params.typeOf
-                        }, setting)(repos);
+                        }, hubSettings)(repos);
                         break;
                     case factory_1.factory.product.ProductType.EventService:
                         await createInformProductTasks({
                             project: { id: params.project.id },
                             ids: params.id,
                             typeOf: params.typeOf
-                        }, setting)(repos);
+                        }, hubSettings)(repos);
                         break;
                     case 'CategoryCode':
                         await createInformCategoryCodeTasks({
                             project: { id: params.project.id },
                             ids: params.id,
                             typeOf: params.typeOf
-                        }, setting)(repos);
+                        }, hubSettings)(repos);
                         break;
                     case factory_1.factory.placeType.MovieTheater:
                         await createInformMovieTheaterTasks({
                             project: { id: params.project.id },
                             ids: params.id,
                             typeOf: params.typeOf
-                        }, setting)(repos);
+                        }, hubSettings)(repos);
                         break;
                     // ルーム通知に対応(2026-01-16~)
                     case factory_1.factory.placeType.ScreeningRoom:
-                        await createInformRoomTasks(params, setting)(repos);
+                        await createInformRoomTasks(params, hubSettings)(repos);
                         break;
                     // 入場ゲート通知に対応(2026-01-17~)
                     case factory_1.factory.placeType.EntranceGate:
-                        await createInformEntranceGateTasks(params, setting)(repos);
+                        await createInformEntranceGateTasks(params, hubSettings)(repos);
                         break;
                     case 'AccountTitle':
                         await createInformAccountTitleTasks({
                             project: { id: params.project.id },
                             ids: params.id,
                             typeOf: params.typeOf
-                        }, setting)(repos);
+                        }, hubSettings)(repos);
                         break;
                     case 'POS':
                         await (0, onHasPOSUpdated_1.createInformHasPOSTasks)({
@@ -133,7 +136,7 @@ function onResourceUpdated(params) {
                             project: { id: params.project.id },
                             ids: params.id,
                             typeOf: params.typeOf
-                        }, setting)(repos);
+                        }, hubSettings)(repos);
                         break;
                     case 'OfferCatalog':
                         await (0, onOfferCatalogUpdated_1.createInformOfferCatalogTasks)({
@@ -141,7 +144,7 @@ function onResourceUpdated(params) {
                             ids: params.id,
                             typeOf: params.typeOf,
                             isOfferCatalogItem: params.isOfferCatalogItem === true
-                        }, setting)(repos);
+                        }, hubSettings)(repos);
                         break;
                     default:
                     // no op
@@ -184,8 +187,8 @@ function onResourceUpdated(params) {
 function createInformNoteTasks(params, setting) {
     return async (repos) => {
         const notes4inform = await repos.note.findNotes({ id: { $in: params.ids } }, ['about', 'identifier', 'project', 'text', 'typeOf', 'version']);
-        // const informResources = settings.onResourceUpdated.informResource;
-        const informResources = setting?.onResourceUpdated?.informResource;
+        // const informResources = setting?.onResourceUpdated?.informResource;
+        const informResources = setting?.onTaskStatusChanged.informTask2hub;
         if (notes4inform.length > 0) {
             const taskRunsAt = new Date();
             const informTasks = [];
@@ -210,7 +213,7 @@ function createInformNoteTasks(params, setting) {
                     };
                     informTasks.push({
                         project: project,
-                        name: factory_1.factory.taskName.TriggerWebhook,
+                        name: factory_1.factory.taskName.InformHub,
                         status: factory_1.factory.taskStatus.Ready,
                         runsAt: taskRunsAt,
                         remainingNumberOfTries: 10,
@@ -234,8 +237,8 @@ function createInformMovieTasks(params, setting) {
             'additionalProperty', 'datePublished', 'duration', 'identifier', 'name', 'project',
             'typeOf', 'distributor', 'contentRating', 'headline', 'thumbnailUrl'
         ]);
-        // const informResources = settings.onResourceUpdated.informResource;
-        const informResources = setting?.onResourceUpdated?.informResource;
+        // const informResources = setting?.onResourceUpdated?.informResource;
+        const informResources = setting?.onTaskStatusChanged.informTask2hub;
         if (movies4inform.length > 0) {
             const taskRunsAt = new Date();
             const informTasks = [];
@@ -258,7 +261,7 @@ function createInformMovieTasks(params, setting) {
                     };
                     informTasks.push({
                         project: movie4inform.project,
-                        name: factory_1.factory.taskName.TriggerWebhook,
+                        name: factory_1.factory.taskName.InformHub,
                         status: factory_1.factory.taskStatus.Ready,
                         runsAt: taskRunsAt,
                         remainingNumberOfTries: 10,
@@ -284,8 +287,8 @@ function createInformProductTasks(params, setting) {
         }, ['additionalProperty', 'description', 'name', 'productID', 'project', 'typeOf', 'serviceType']
         // []
         );
-        // const informResources = settings.onResourceUpdated.informResource;
-        const informResources = setting?.onResourceUpdated?.informResource;
+        // const informResources = setting?.onResourceUpdated?.informResource;
+        const informResources = setting?.onTaskStatusChanged.informTask2hub;
         if (products4inform.length > 0) {
             const taskRunsAt = new Date();
             const informTasks = [];
@@ -308,7 +311,7 @@ function createInformProductTasks(params, setting) {
                     };
                     informTasks.push({
                         project: product4inform.project,
-                        name: factory_1.factory.taskName.TriggerWebhook,
+                        name: factory_1.factory.taskName.InformHub,
                         status: factory_1.factory.taskStatus.Ready,
                         runsAt: taskRunsAt,
                         remainingNumberOfTries: 10,
@@ -333,7 +336,8 @@ function createInformCategoryCodeTasks(params, setting) {
             // ひとまずDistributorTypeのみ
             inCodeSet: { identifier: { $eq: factory_1.factory.categoryCode.CategorySetIdentifier.DistributorType } }
         }, ['name', 'additionalProperty', 'project', 'typeOf', 'codeValue', 'inCodeSet']);
-        const informResources = setting?.onResourceUpdated?.informResource;
+        // const informResources = setting?.onResourceUpdated?.informResource;
+        const informResources = setting?.onTaskStatusChanged.informTask2hub;
         if (categoryCodes4inform.length > 0) {
             const taskRunsAt = new Date();
             const informTasks = [];
@@ -356,7 +360,7 @@ function createInformCategoryCodeTasks(params, setting) {
                     };
                     informTasks.push({
                         project: categoryCode4inform.project,
-                        name: factory_1.factory.taskName.TriggerWebhook,
+                        name: factory_1.factory.taskName.InformHub,
                         status: factory_1.factory.taskStatus.Ready,
                         runsAt: taskRunsAt,
                         remainingNumberOfTries: 10,
@@ -381,7 +385,8 @@ function createInformMovieTheaterTasks(params, setting) {
         if (params.ids.length === 0) {
             return;
         }
-        const informResources = setting?.onResourceUpdated?.informResource;
+        // const informResources = setting?.onResourceUpdated?.informResource;
+        const informResources = setting?.onTaskStatusChanged.informTask2hub;
         const movieTheaters = await repos.movieTheater.projectFields({
             // limit: 1,
             // page: 1,
@@ -433,7 +438,7 @@ function createInformMovieTheaterTasks(params, setting) {
                     };
                     informTasks.push({
                         project: movieTheater4inform.project,
-                        name: factory_1.factory.taskName.TriggerWebhook,
+                        name: factory_1.factory.taskName.InformHub,
                         status: factory_1.factory.taskStatus.Ready,
                         runsAt: taskRunsAt,
                         remainingNumberOfTries: 10,
@@ -453,8 +458,8 @@ function createInformRoomTasks(params, setting) {
     return async (repos
     // settings: Settings
     ) => {
-        // const informResources = settings.onResourceUpdated.informResource;
-        const informResources = setting?.onResourceUpdated?.informResource;
+        // const informResources = setting?.onResourceUpdated?.informResource;
+        const informResources = setting?.onTaskStatusChanged.informTask2hub;
         if (Array.isArray(params.branchCode) && params.branchCode.length > 0) {
             // ルームを検索
             const rooms = (await repos.screeningRoom.findRooms({
@@ -494,7 +499,7 @@ function createInformRoomTasks(params, setting) {
                         };
                         informTasks.push({
                             project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
-                            name: factory_1.factory.taskName.TriggerWebhook,
+                            name: factory_1.factory.taskName.InformHub,
                             status: factory_1.factory.taskStatus.Ready,
                             runsAt: taskRunsAt,
                             remainingNumberOfTries: 10,
@@ -513,7 +518,8 @@ function createInformRoomTasks(params, setting) {
 }
 function createInformEntranceGateTasks(params, setting) {
     return async (repos) => {
-        const informResources = setting?.onResourceUpdated?.informResource;
+        // const informResources = setting?.onResourceUpdated?.informResource;
+        const informResources = setting?.onTaskStatusChanged.informTask2hub;
         if (Array.isArray(params.identifier) && params.identifier.length > 0) {
             // 入場ゲートを検索
             repos.entranceGate.setOperatorId({ id: params.containedInPlace.id });
@@ -551,7 +557,7 @@ function createInformEntranceGateTasks(params, setting) {
                     };
                     informTasks.push({
                         project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
-                        name: factory_1.factory.taskName.TriggerWebhook,
+                        name: factory_1.factory.taskName.InformHub,
                         status: factory_1.factory.taskStatus.Ready,
                         runsAt: taskRunsAt,
                         remainingNumberOfTries: 10,
@@ -574,8 +580,8 @@ function createInformAccountTitleTasks(params, setting) {
         if (params.ids.length !== 1) {
             throw new factory_1.factory.errors.Argument('id', 'id.length must be 1');
         }
-        // const informResources = settings.onResourceUpdated.informResource;
-        const informResources = setting?.onResourceUpdated?.informResource;
+        // const informResources = setting?.onResourceUpdated?.informResource;
+        const informResources = setting?.onTaskStatusChanged.informTask2hub;
         const accountTitle = await repos.adminAccountTitleCategory.findAccountTitleCategorAsNotification({
             id: params.ids[0],
             projectId: params.project.id
@@ -606,7 +612,7 @@ function createInformAccountTitleTasks(params, setting) {
                     };
                     informTasks.push({
                         project: accountTitle4inform.project,
-                        name: factory_1.factory.taskName.TriggerWebhook,
+                        name: factory_1.factory.taskName.InformHub,
                         status: factory_1.factory.taskStatus.Ready,
                         runsAt: taskRunsAt,
                         remainingNumberOfTries: 10,

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

@@ -4,6 +4,7 @@ exports.call = call;
 const inform_1 = require("../../repo/action/inform");
 const potentialAction_1 = require("../../repo/potentialAction");
 const setting_1 = require("../../repo/setting");
+const integration_1 = require("../../repo/setting/integration");
 const notification_1 = require("../notification");
 /**
  * タスク実行関数
@@ -18,7 +19,8 @@ function call(params) {
                 inform: new inform_1.InformActionRepo(connection)
             },
             potentialAction: new potentialAction_1.PotentialActionRepo(connection),
-            setting: new setting_1.SettingRepo(connection)
+            setting: new setting_1.SettingRepo(connection),
+            integrationSetting: new integration_1.IntegrationSettingRepo({ connection })
         });
     };
 }

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "11.2.0-alpha.0",
+    "@chevre/factory": "11.2.0-alpha.1",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -89,5 +89,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "28.1.0-alpha.2"
+  "version": "28.1.0-alpha.4"
 }