@chevre/domain 28.1.0-alpha.5 → 28.1.0-alpha.6

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

@@ -42,7 +42,7 @@ interface IQuotaSettings {
     placeOrderExpiresInSecondsMax?: number;
     placeOrderExpiresInSecondsMin?: number;
 }
-interface ITriggerWebhookSettings {
+export interface ITriggerWebhookSettings {
     /**
      * リクエストタイムアウト
      */
@@ -109,16 +109,6 @@ export interface ITransactionNumberSetting {
      */
     version: string;
 }
-export interface IServiceOutputIdentifierSetting {
-    /**
-     * fpe暗号鍵
-     */
-    fpeSecret: string;
-    /**
-     * "1"
-     */
-    version: string;
-}
 interface ICOAIntegrationSettings {
     timeoutReserve: number;
     timeoutMaster: number;
@@ -222,6 +212,10 @@ export interface IIntegrationSettings {
      * 2026-11-02~
      */
     agg?: IAggSettings;
+    /**
+     * 通知設定
+     */
+    triggerWebhook?: ITriggerWebhookSettings;
     useExperimentalFeature: boolean;
 }
 /**
@@ -274,13 +268,8 @@ export interface ISetting {
         typeOf: factory.organizationType.Project;
     };
     quota?: IQuotaSettings;
-    serviceOutputIdentifier?: IServiceOutputIdentifierSetting;
     storage?: IStorageSettings;
     transactionNumber?: ITransactionNumberSetting;
-    /**
-     * 通知設定
-     */
-    triggerWebhook?: ITriggerWebhookSettings;
     useInformResourceTypes?: string[];
     userPoolIdOld?: string;
     userPoolIdNew?: string;

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

@@ -17,15 +17,15 @@ const schemaDefinition = {
         onOrderStatusChanged: mongoose_1.SchemaTypes.Mixed,
         onReservationStatusChanged: mongoose_1.SchemaTypes.Mixed,
         onTaskStatusChanged: mongoose_1.SchemaTypes.Mixed,
+        triggerWebhook: 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,
-    serviceOutputIdentifier: mongoose_1.SchemaTypes.Mixed,
+    // serviceOutputIdentifier: SchemaTypes.Mixed, // discontinue(2026-11-03~)
     storage: mongoose_1.SchemaTypes.Mixed,
     transactionNumber: mongoose_1.SchemaTypes.Mixed,
-    triggerWebhook: mongoose_1.SchemaTypes.Mixed,
     useInformResourceTypes: [String],
     userPoolIdOld: String,
     userPoolIdNew: String,

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

@@ -4,8 +4,7 @@ import { factory } from '../../../factory';
 declare enum DataCatalogIdentifier {
     confirmationNumber = "confirmationNumber",
     transactionNumber = "transactionNumber",
-    orderNumber = "orderNumber",
-    serviceOutputIdentifier = "serviceOutputIdentifier"
+    orderNumber = "orderNumber"
 }
 interface IDataCatalog {
     identifier: DataCatalogIdentifier;

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

@@ -10,7 +10,7 @@ var DataCatalogIdentifier;
     DataCatalogIdentifier["confirmationNumber"] = "confirmationNumber";
     DataCatalogIdentifier["transactionNumber"] = "transactionNumber";
     DataCatalogIdentifier["orderNumber"] = "orderNumber";
-    DataCatalogIdentifier["serviceOutputIdentifier"] = "serviceOutputIdentifier";
+    // serviceOutputIdentifier = 'serviceOutputIdentifier' // discontinue(2026-11-03~)
 })(DataCatalogIdentifier || (exports.DataCatalogIdentifier = DataCatalogIdentifier = {}));
 const modelName = 'TransactionNumber';
 exports.modelName = modelName;

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

@@ -25,4 +25,5 @@ export declare class IntegrationSettingRepo {
     addSendGridSettings(params: ISendGridSettings): Promise<import("mongoose").UpdateWriteOpResult>;
     addHubSettings(params: IHubSettings): Promise<import("mongoose").UpdateWriteOpResult>;
     migrateAggSettings(): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
+    migrateTriggerWebhookSettings(): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
 }

package/lib/chevre/repo/setting/integration.js

@@ -129,5 +129,27 @@ class IntegrationSettingRepo {
             return updateResult;
         }
     }
+    async migrateTriggerWebhookSettings() {
+        const oldSetting = await this.settingModel.findOne({ 'project.id': { $eq: '*' } }, { triggerWebhook: 1 })
+            .lean()
+            .exec();
+        if (oldSetting?.triggerWebhook !== undefined) {
+            console.dir(oldSetting.triggerWebhook, { depth: null });
+            const updateResult = await this.settingModel.updateOne({ 'project.id': { $eq: '*' } }, {
+                $set: { 'integration.triggerWebhook': oldSetting.triggerWebhook }
+            })
+                .exec();
+            // const unsetResult = await this.settingModel.updateOne(
+            //     { 'project.id': { $eq: '*' } },
+            //     {
+            //         $unset: {
+            //             triggerWebhook: 1,
+            //         }
+            //     }
+            // )
+            //     .exec();
+            return updateResult;
+        }
+    }
 }
 exports.IntegrationSettingRepo = IntegrationSettingRepo;

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' | 'orderNumber' | 'quota' | 'serviceOutputIdentifier' | 'storage' | 'transactionNumber' | 'triggerWebhook' | 'useInformResourceTypes' | 'useMongo4confirmationNumberFrom' | 'useMongo4orderNumberFrom' | 'useMongo4transactionNumberFrom' | 'useMongoAsStockHolder' | 'useMongoAsStockHolderProjects' | 'userPoolIdNew' | 'userPoolIdOld'>;
+type IGlobalSetting = Pick<ISetting, 'defaultSenderEmail' | 'orderNumber' | 'quota' | 'storage' | 'transactionNumber' | 'useInformResourceTypes' | 'useMongo4confirmationNumberFrom' | 'useMongo4orderNumberFrom' | 'useMongo4transactionNumberFrom' | 'useMongoAsStockHolder' | 'useMongoAsStockHolderProjects' | 'userPoolIdNew' | 'userPoolIdOld'>;
 export { IGlobalSetting as ISetting };
 /**
  * 設定リポジトリ

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

@@ -1,21 +1,19 @@
 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: {
+}, settings: IIntegrationSettings['triggerWebhook'], options: {
     integrationSettings?: IIntegrationSettings['hub'];
     useIAP: boolean;
 }): (repos: {

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

@@ -100,8 +100,8 @@ function signRequest(params) {
 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 secretKey = settings?.secretKey;
+    const headerIdentifier = settings?.headerIdentifier;
     const googleTargetAudience = integrationSettings?.googleTargetAudience;
     const timestamp = action.startDate.valueOf();
     // sign request(2024-10-28~)
@@ -134,7 +134,7 @@ async function makeRequestHeaders(params, options) {
 }
 function processInformAction(params, settings, options) {
     return async (repos) => {
-        const timeout = settings?.triggerWebhook?.timeout;
+        const timeout = settings?.timeout;
         const { identifier } = params;
         const informActionAttributes = await createInformActionAttributes(params)(repos);
         const action = await repos.actions.inform.startInformAction(informActionAttributes);

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

@@ -6,12 +6,12 @@ const factory_1 = require("../../factory");
 const processInformAction_1 = require("./triggerWebhook/processInformAction");
 function findSettings() {
     return async (repos) => {
-        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['triggerWebhook']);
-        if (setting === null) {
+        const setting = await repos.integrationSetting.getByKey('triggerWebhook');
+        if (setting === undefined) {
             throw new factory_1.factory.errors.NotFound('settings.triggerWebhook');
         }
-        const retryCountMax = setting?.triggerWebhook?.retryCountMax;
-        const retryIntervalInMS = setting?.triggerWebhook?.retryIntervalInMS;
+        const retryCountMax = setting?.retryCountMax;
+        const retryIntervalInMS = setting?.retryIntervalInMS;
         if (typeof retryCountMax !== 'number') {
             throw new factory_1.factory.errors.NotFound('setting.triggerWebhook.retryCountMax');
         }

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

@@ -3,7 +3,6 @@ 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");
 /**
@@ -19,7 +18,6 @@ function call(params) {
                 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/triggerWebhook.js

@@ -3,7 +3,6 @@ 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");
 /**
@@ -19,7 +18,6 @@ function call(params) {
                 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/package.json

@@ -89,5 +89,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "28.1.0-alpha.5"
+  "version": "28.1.0-alpha.6"
 }