@chevre/domain 24.1.0-alpha.40 → 24.1.0-alpha.41

package/lib/chevre/index.d.ts

@@ -1,4 +1,3 @@
-import * as credentials from './credentials';
 import * as errorHandler from './errorHandler';
 import * as eventEmitter from './eventEmitter';
 import { factory } from './factory';
@@ -6,4 +5,4 @@ import * as repository from './repository';
 import * as service from './service';
 import * as settings from './settings';
 import * as taskSettings from './taskSettings';
-export { credentials, errorHandler, eventEmitter, factory, repository, service, settings, taskSettings };
+export { errorHandler, eventEmitter, factory, repository, service, settings, taskSettings };

package/lib/chevre/index.js

@@ -33,9 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.taskSettings = exports.settings = exports.service = exports.repository = exports.factory = exports.eventEmitter = exports.errorHandler = exports.credentials = void 0;
-const credentials = __importStar(require("./credentials"));
-exports.credentials = credentials;
+exports.taskSettings = exports.settings = exports.service = exports.repository = exports.factory = exports.eventEmitter = exports.errorHandler = void 0;
 const errorHandler = __importStar(require("./errorHandler"));
 exports.errorHandler = errorHandler;
 const eventEmitter = __importStar(require("./eventEmitter"));

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

@@ -178,6 +178,21 @@ interface ISurfrockSettings {
      */
     credentialsExpireInSeconds?: number;
 }
+export interface ISendGridAlert {
+    sender?: {
+        name: string;
+        email: string;
+    };
+    toRecipient?: [
+        {
+            email: string;
+        }
+    ];
+}
+export interface ISendGridSettings {
+    apiKey: string;
+    alert?: ISendGridAlert;
+}
 export interface IIntegrationSettings {
     abortedTasksWithoutReport: string[];
     numTryConfirmReserveTransaction: number;
@@ -185,6 +200,11 @@ export interface IIntegrationSettings {
     coa: ICOAIntegrationSettings;
     gmo: IGMOIntegrationSettings;
     movieticketReserve: ISurfrockSettings;
+    /**
+     * SendGrid認証情報
+     * 2026-05-29~
+     */
+    sendGrid?: ISendGridSettings;
     useExperimentalFeature: boolean;
 }
 export interface ISetting {

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

@@ -1,5 +1,5 @@
 import type { Connection } from 'mongoose';
-import { IIntegrationSettings } from '../mongoose/schemas/setting';
+import { IIntegrationSettings, ISendGridSettings } from '../mongoose/schemas/setting';
 interface IDBOptions {
     connection: Connection;
 }
@@ -21,5 +21,6 @@ export declare class IntegrationSettingRepo {
      * 設定名称から設定を参照する
      */
     getByKey<T extends keyof IIntegrationSettings>(key: T): Promise<IIntegrationSettings[T]>;
+    addSendGridSettings(params: ISendGridSettings): Promise<import("mongoose").UpdateWriteOpResult>;
 }
 export {};

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

@@ -82,5 +82,13 @@ class IntegrationSettingRepo {
         const settings = await this.getAllSettings();
         return settings[key];
     }
+    async addSendGridSettings(params) {
+        return this.settingModel.updateOne({ 'project.id': { $eq: '*' } }, {
+            $set: {
+                'integration.sendGrid': params
+            }
+        })
+            .exec();
+    }
 }
 exports.IntegrationSettingRepo = IntegrationSettingRepo;

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

@@ -1,6 +1,5 @@
-import { SendGridCredentials } from '../../credentials/sendGrid';
 import type { TaskRepo } from '../../repo/task';
-import type { IntegrationSettingRepo as Settings } from '../../repo/setting/integration';
+import type { IntegrationSettingRepo } from '../../repo/setting/integration';
 /**
  * 中止されたタスクリストをEメールで通知する
  * add(2025-03-13~)
@@ -9,7 +8,6 @@ declare function notifyAbortedTasksByEmail(params: {
     dateAbortedGte: Date;
 }): (repos: {
     task: TaskRepo;
-}, settings: Settings, credentials: {
-    sendGrid: SendGridCredentials;
+    integrationSetting: IntegrationSettingRepo;
 }) => Promise<void>;
 export { notifyAbortedTasksByEmail };

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

@@ -14,8 +14,8 @@ const debug = (0, debug_1.default)('chevre-domain:service:notification');
  * add(2025-03-13~)
  */
 function notifyAbortedTasksByEmail(params) {
-    return async (repos, settings, credentials) => {
-        const abortedTasksWithoutReport = await settings.getByKey('abortedTasksWithoutReport');
+    return async (repos) => {
+        const abortedTasksWithoutReport = await repos.integrationSetting.getByKey('abortedTasksWithoutReport');
         const abortedTasks = await repos.task.projectFields({
             status: { $eq: factory_1.factory.taskStatus.Aborted },
             dateAborted: { $gte: params.dateAbortedGte },
@@ -30,7 +30,7 @@ function notifyAbortedTasksByEmail(params) {
             const notifyResult = await (0, notifyByEmail_1.notifyByEmail)({
                 subject: message.subject, content: message.content,
                 logLevel: 'error'
-            })({}, credentials);
+            })(repos);
             debug('notifyResult:', notifyResult);
         }
     };

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

@@ -1,10 +1,10 @@
-import { SendGridCredentials } from '../../credentials/sendGrid';
+import type { IntegrationSettingRepo } from '../../repo/setting/integration';
 declare function notifyByEmail(params: {
     subject: string;
     content: string;
     logLevel: LineNotifyLogLevel;
-}): (__: Record<string, never>, credentials: {
-    sendGrid: SendGridCredentials;
+}): (repos: {
+    integrationSetting: IntegrationSettingRepo;
 }) => Promise<{
     result: import("@chevre/factory/lib/chevre/action/transfer/send/message/email").IResult;
 }>;

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

@@ -6,20 +6,21 @@ const http_status_1 = require("http-status");
 const util_1 = require("util");
 const factory_1 = require("../../factory");
 function notifyByEmail(params) {
-    return async (__, credentials) => {
+    return async (repos) => {
         const { logLevel } = params;
         const shortSubject = params.subject;
         const message = (0, util_1.format)('\n%s\n%s\n%s\n%s\n%s\n\n%s', `[${logLevel}] ${shortSubject}`, `now:${(new Date()).toISOString()}`, `pid:${process.pid}`, `GAE_APPLICATION:${process.env.GAE_APPLICATION}`, 
         // `GAE_INSTANCE:${process.env.GAE_INSTANCE}`,
         `GAE_SERVICE:${process.env.GAE_SERVICE}`, params.content);
-        const apiKey = credentials.sendGrid.apiKey;
+        const sendGridSettings = await repos.integrationSetting.getByKey('sendGrid');
+        const apiKey = sendGridSettings?.apiKey;
         if (typeof apiKey !== 'string') {
             throw new factory_1.factory.errors.Internal('API Key not found');
         }
-        const senderName = credentials.sendGrid.alert?.sender?.name;
-        const senderEmail = credentials.sendGrid.alert?.sender?.email;
-        const toRecipientEmail = (Array.isArray(credentials.sendGrid.alert?.toRecipient))
-            ? credentials.sendGrid.alert?.toRecipient.at(0)?.email
+        const senderName = sendGridSettings?.alert?.sender?.name;
+        const senderEmail = sendGridSettings?.alert?.sender?.email;
+        const toRecipientEmail = (Array.isArray(sendGridSettings?.alert?.toRecipient))
+            ? sendGridSettings.alert?.toRecipient.at(0)?.email
             : undefined;
         if (typeof senderName !== 'string') {
             throw new factory_1.factory.errors.Internal('senderName not found');

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

@@ -1,8 +1,8 @@
-import { SendGridCredentials } from '../../credentials/sendGrid';
 import { factory } from '../../factory';
 import type { ActionRepo } from '../../repo/action';
 import type { MessageRepo } from '../../repo/message';
 import type { ProjectRepo } from '../../repo/project';
+import type { IntegrationSettingRepo } from '../../repo/setting/integration';
 /**
  * https://sendgrid.com/docs/API_Reference/Web_API_v3/Mail/errors.html
  */
@@ -14,7 +14,6 @@ declare function sendEmailMessage(params: factory.task.sendEmailMessage.IActionA
     action: ActionRepo;
     message: MessageRepo;
     project: ProjectRepo;
-}, credentials: {
-    sendGrid: SendGridCredentials;
+    integrationSetting: IntegrationSettingRepo;
 }) => Promise<void>;
 export { sendEmailMessage };

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

@@ -15,12 +15,13 @@ function createSendEmailMessageActionAttributes(params) {
     };
 }
 function createMailData(params) {
-    return async (repos, credentials) => {
+    return async (repos) => {
         const project = await repos.project.findById({
             id: params.project.id,
             inclusion: ['settings']
         });
-        let apiKey = credentials.sendGrid.apiKey;
+        const sendGridSettings = await repos.integrationSetting.getByKey('sendGrid');
+        let apiKey = sendGridSettings?.apiKey;
         // プロジェクト固有のSendGrid設定があれば、そちらを使用
         if (typeof project.settings?.sendgridApiKey === 'string' && project.settings.sendgridApiKey.length > 0) {
             apiKey = project.settings.sendgridApiKey;
@@ -71,8 +72,8 @@ function createMailData(params) {
  * https://sendgrid.com/docs/API_Reference/Web_API_v3/Mail/errors.html
  */
 function sendEmailMessage(params) {
-    return async (repos, credentials) => {
-        const { mailData, emailMessage, apiKey } = await createMailData(params)(repos, credentials);
+    return async (repos) => {
+        const { mailData, emailMessage, apiKey } = await createMailData(params)(repos);
         // add recipe(2025-03-12~)
         let recipe = (0, factory_2.createSendEmailMessageRecipe)({
             mailData,

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

@@ -4,19 +4,21 @@ exports.call = call;
 const action_1 = require("../../repo/action");
 const message_1 = require("../../repo/message");
 const project_1 = require("../../repo/project");
+const integration_1 = require("../../repo/setting/integration");
 const notification_1 = require("../notification");
 /**
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, credentials }) => {
+    return async ({ connection }) => {
         await (0, notification_1.sendEmailMessage)({
             ...params.data.actionAttributes,
             sameAs: { id: params.id } // タスクIDを関連付け(2024-06-25~)
         })({
             action: new action_1.ActionRepo(connection),
             message: new message_1.MessageRepo(connection),
-            project: new project_1.ProjectRepo(connection)
-        }, credentials);
+            project: new project_1.ProjectRepo(connection),
+            integrationSetting: new integration_1.IntegrationSettingRepo({ connection })
+        });
     };
 }

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

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

package/lib/chevre/taskSettings.d.ts

@@ -1,4 +1,3 @@
-import type { SendGridCredentials } from './credentials/sendGrid';
 import type { IExecuteSettings as IMinimumExecuteSettings } from './eventEmitter/task';
 import { factory } from './factory';
 import type { IntegrationSettingRepo } from './repo/setting/integration';
@@ -34,11 +33,7 @@ declare class AggregationSettings {
     readonly onTaskStatusChanged: IOnTaskStatusChanged;
     constructor(options: IOptions);
 }
-interface ICredentialSettings {
-    sendGrid: SendGridCredentials;
-}
 interface IExecuteSettings extends IMinimumExecuteSettings {
-    credentials: ICredentialSettings;
     /**
      * 外部連携設定リポジトリ
      */

package/package.json

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

package/lib/chevre/credentials/sendGrid.d.ts

@@ -1,24 +0,0 @@
-interface IAlert {
-    sender?: {
-        name: string;
-        email: string;
-    };
-    toRecipient?: [
-        {
-            email: string;
-        }
-    ];
-}
-interface IOptions {
-    apiKey: string;
-    alert?: IAlert;
-}
-/**
- * SendGrid認証情報
- */
-declare class SendGridCredentials {
-    readonly apiKey: string;
-    readonly alert?: IAlert;
-    constructor(options: IOptions);
-}
-export { SendGridCredentials };

package/lib/chevre/credentials/sendGrid.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SendGridCredentials = void 0;
-/**
- * SendGrid認証情報
- */
-class SendGridCredentials {
-    apiKey;
-    alert;
-    constructor(options) {
-        const { apiKey, alert } = options;
-        this.apiKey = apiKey;
-        if (alert !== undefined) {
-            this.alert = alert;
-        }
-    }
-}
-exports.SendGridCredentials = SendGridCredentials;

package/lib/chevre/credentials.d.ts

@@ -1,8 +0,0 @@
-/**
- * 外部サービス認証情報
- */
-import type { SendGridCredentials } from './credentials/sendGrid';
-export type SendGrid = SendGridCredentials;
-export declare namespace SendGrid {
-    function createInstance(...params: ConstructorParameters<typeof SendGridCredentials>): Promise<SendGridCredentials>;
-}

package/lib/chevre/credentials.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SendGrid = void 0;
-var SendGrid;
-(function (SendGrid) {
-    let cred;
-    async function createInstance(...params) {
-        if (cred === undefined) {
-            cred = (await import('./credentials/sendGrid.js')).SendGridCredentials;
-        }
-        return new cred(...params);
-    }
-    SendGrid.createInstance = createInstance;
-})(SendGrid || (exports.SendGrid = SendGrid = {}));