@chevre/domain 24.1.0-alpha.37 → 24.1.0-alpha.38

package/lib/chevre/emailMessageBuilder.js

@@ -93,9 +93,7 @@ async function createEmailMessageAbout(params) {
     }
     return about;
 }
-function createEmailMessageSender(params, 
-// settings: Settings
-setting) {
+function createEmailMessageSender(params, setting) {
     if (typeof setting.defaultSenderEmail !== 'string') {
         throw new factory_1.factory.errors.NotFound('setting.defaultSenderEmail');
     }
@@ -113,9 +111,7 @@ setting) {
 /**
  * 注文配送メッセージを作成する
  */
-async function createSendOrderMessage(params, 
-// settings: Settings
-setting) {
+async function createSendOrderMessage(params, setting) {
     const emailMessageText = await createEmailMessageText({
         order: params.order,
         email: params.email,
@@ -169,9 +165,7 @@ setting) {
 /**
  * 注文返品メッセージを作成する
  */
-async function createReturnOrderMessage(params, 
-// settings: Settings
-setting) {
+async function createReturnOrderMessage(params, setting) {
     const emailMessageText = await createEmailMessageText({
         order: params.order,
         email: params.email,
@@ -225,9 +219,7 @@ setting) {
 /**
  * 返金メッセージを作成する
  */
-async function createRefundMessage(params, 
-// settings: Settings
-setting) {
+async function createRefundMessage(params, setting) {
     const emailMessageText = await createEmailMessageText({
         order: params.order,
         email: params.email

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

@@ -1,14 +1,12 @@
 import { SendGridCredentials } from '../credentials/sendGrid';
 import type { IExecuteSettings as IMinimumExecuteSettings, INextFunction, IReadyTask, IRunningTask } from '../eventEmitter/task';
 import { factory } from '../factory';
-import type { IntegrationSettingRepo as Settings } from '../repo/setting/integration';
 import type { AggregationSettings } from '../taskSettings';
 interface ICredentialSettings {
     sendGrid: SendGridCredentials;
 }
 interface IExecuteSettings extends IMinimumExecuteSettings {
     credentials: ICredentialSettings;
-    settings: Settings;
     aggregationSettings?: AggregationSettings;
 }
 type IOperation<T> = (settings: IExecuteSettings) => Promise<T>;

package/lib/chevre/service/task.js

@@ -17,6 +17,7 @@ const debug = (0, debug_1.default)('chevre-domain:service:task');
 function executeById(params, next) {
     return async (settings) => {
         const taskRepo = new (await import('../repo/task.js')).TaskRepo(settings.connection);
+        const integrationSettingRepo = new (await import('../repo/setting/integration.js')).IntegrationSettingRepo({ connection: settings.connection });
         const { id, status, executor, expires } = params;
         let task = null;
         try {
@@ -34,7 +35,10 @@ function executeById(params, next) {
         }
         // タスクがなければ終了
         if (task !== null) {
-            await (0, taskHandler_1.executeTask)(task, (typeof next === 'function') ? next : undefined)(settings, {
+            await (0, taskHandler_1.executeTask)(task, (typeof next === 'function') ? next : undefined)({
+                ...settings,
+                settings: integrationSettingRepo
+            }, {
                 executeById: true,
                 executeByName: false
             });
@@ -44,6 +48,7 @@ function executeById(params, next) {
 function executeOneIfExists(params) {
     return async (settings) => {
         const taskRepo = new (await import('../repo/task.js')).TaskRepo(settings.connection);
+        const integrationSettingRepo = new (await import('../repo/setting/integration.js')).IntegrationSettingRepo({ connection: settings.connection });
         // 未実行のタスクを取得
         let task = null;
         try {
@@ -61,7 +66,10 @@ function executeOneIfExists(params) {
         }
         // タスクがなければ終了
         if (task !== null) {
-            await (0, taskHandler_1.executeTask)(task)(settings, {
+            await (0, taskHandler_1.executeTask)(task)({
+                ...settings,
+                settings: integrationSettingRepo
+            }, {
                 executeById: false,
                 executeByName: (typeof params.name?.$eq === 'string')
             });

package/lib/chevre/taskSettings.d.ts

@@ -1,7 +1,7 @@
 import type { SendGridCredentials } from './credentials/sendGrid';
 import type { IExecuteSettings as IMinimumExecuteSettings } from './eventEmitter/task';
 import { factory } from './factory';
-import type { IntegrationSettingRepo as Settings } from './repo/setting/integration';
+import type { IntegrationSettingRepo } from './repo/setting/integration';
 interface IOnOrderStatusChanged {
     informOrder2hub?: factory.project.IInformParams[];
 }
@@ -39,7 +39,10 @@ interface ICredentialSettings {
 }
 interface IExecuteSettings extends IMinimumExecuteSettings {
     credentials: ICredentialSettings;
-    settings: Settings;
+    /**
+     * 外部連携設定リポジトリ
+     */
+    settings: IntegrationSettingRepo;
     aggregationSettings?: AggregationSettings;
 }
 interface IExecuteOptions {

package/package.json

@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.1.0-alpha.37"
+  "version": "24.1.0-alpha.38"
 }