@chevre/domain 28.0.0-alpha.38 → 28.0.0-alpha.39

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

@@ -3,6 +3,7 @@ import type { SendEmailMessageActionRepo } from '../../repo/action/sendEmailMess
 import type { MessageRepo } from '../../repo/message';
 import type { ProjectRepo } from '../../repo/project';
 import type { IntegrationSettingRepo } from '../../repo/setting/integration';
+import type { SettingRepo } from '../../repo/setting';
 /**
  * https://sendgrid.com/docs/API_Reference/Web_API_v3/Mail/errors.html
  */
@@ -17,5 +18,6 @@ declare function sendEmailMessage(params: factory.task.sendEmailMessage.IActionA
     message: MessageRepo;
     project: ProjectRepo;
     integrationSetting: IntegrationSettingRepo;
+    setting: SettingRepo;
 }) => Promise<void>;
 export { sendEmailMessage };

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

@@ -41,9 +41,14 @@ function createMailData(params) {
                 project: { id: project.id }
             });
         }
+        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']);
+        if (typeof setting?.defaultSenderEmail !== 'string') {
+            throw new factory_1.factory.errors.NotFound('setting.defaultSenderEmail');
+        }
         const emailMessageFrom = {
             name: emailMessage.sender.name,
-            email: emailMessage.sender.email
+            // email: emailMessage.sender.email // 指定されたsenderEmailを適用しない(2026-10-19~)
+            email: setting.defaultSenderEmail // 強制的にグローバル設定を適用(2026-10-19~)
         };
         // プロジェクト設定対応(2023-08-21~)
         const senderEmailByProjectSettings = project.settings?.sendEmailMessage?.sender?.email;

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

@@ -5,6 +5,7 @@ const sendEmailMessage_1 = require("../../repo/action/sendEmailMessage");
 const message_1 = require("../../repo/message");
 const project_1 = require("../../repo/project");
 const integration_1 = require("../../repo/setting/integration");
+const setting_1 = require("../../repo/setting");
 const notification_1 = require("../notification");
 /**
  * タスク実行関数
@@ -18,7 +19,8 @@ function call(params) {
             actions: { sendEmailMessage: new sendEmailMessage_1.SendEmailMessageActionRepo(connection) },
             message: new message_1.MessageRepo(connection),
             project: new project_1.ProjectRepo(connection),
-            integrationSetting: new integration_1.IntegrationSettingRepo({ connection })
+            integrationSetting: new integration_1.IntegrationSettingRepo({ connection }),
+            setting: new setting_1.SettingRepo(connection)
         });
     };
 }

package/package.json

@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "28.0.0-alpha.38"
+  "version": "28.0.0-alpha.39"
 }