@chevre/domain 22.9.0-alpha.73 → 22.9.0-alpha.75

package/example/src/chevre/notifyAbortedTasksByEmail.ts

@@ -0,0 +1,56 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
+    const sendGridCredentials = await chevre.credentials.SendGrid.createInstance({
+        apiKey: <string>process.env.SENDGRID_API_KEY,
+        alert: {
+            sender: {
+                name: 'xxx',
+                email: 'xxx'
+            },
+            toRecipient: [
+                { email: 'xxx' }
+            ]
+        }
+    });
+    const chevreSettings = new chevre.settings.Settings(<any>{
+        abortedTasksWithoutReport: [
+            chevre.factory.taskName.ImportEventCapacitiesFromCOA,
+            chevre.factory.taskName.ImportEventsFromCOA,
+            chevre.factory.taskName.ImportOffersFromCOA
+        ]
+    });
+
+    const result = await (await chevre.service.task.createService()).notifyAbortedTasksByEmail({
+        dateAbortedGte: moment()
+            // tslint:disable-next-line:no-magic-numbers
+            .add(-10, 'days')
+            .toDate()
+    })(
+        {
+            task: taskRepo
+        },
+        chevreSettings,
+        {
+            sendGrid: sendGridCredentials
+        }
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(result, { depth: null });
+}
+
+main()
+    .then(console.log)
+    .catch((error) => {
+        // tslint:disable-next-line:no-null-keyword
+        console.dir(error, { depth: null });
+    });

package/example/src/chevre/notifyByEmail.ts

@@ -1,5 +1,4 @@
 // tslint:disable:no-console
-import * as moment from 'moment';
 import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
@@ -9,7 +8,6 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
     const sendGridCredentials = await chevre.credentials.SendGrid.createInstance({
         apiKey: <string>process.env.SENDGRID_API_KEY,
         alert: {
@@ -22,24 +20,13 @@ async function main() {
             ]
         }
     });
-    const chevreSettings = new chevre.settings.Settings(<any>{
-        abortedTasksWithoutReport: [
-            chevre.factory.taskName.ImportEventCapacitiesFromCOA,
-            chevre.factory.taskName.ImportEventsFromCOA,
-            chevre.factory.taskName.ImportOffersFromCOA
-        ]
-    });
 
-    const result = await (await chevre.service.task.createService()).notifyAbortedTasksByEmail({
-        dateAbortedGte: moment()
-            // tslint:disable-next-line:no-magic-numbers
-            .add(-10, 'days')
-            .toDate()
+    const result = await (await chevre.service.notification.createService()).notifyByEmail({
+        subject: 'sample',
+        content: 'sample',
+        logLevel: 'error'
     })(
-        {
-            task: taskRepo
-        },
-        chevreSettings,
+        {},
         {
             sendGrid: sendGridCredentials
         }

package/example/src/chevre/sendEmailMessage.ts

@@ -0,0 +1,60 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
+    const messageRepo = await chevre.repository.Message.createInstance(mongoose.connection);
+    const projectRepo = await chevre.repository.Project.createInstance(mongoose.connection);
+    const sendGridCredentials = await chevre.credentials.SendGrid.createInstance({
+        apiKey: <string>process.env.SENDGRID_API_KEY
+    });
+
+    const result = await (await chevre.service.notification.createService()).sendEmailMessage({
+        agent: { id: project.id, typeOf: chevre.factory.organizationType.Project },
+        object: {
+            text: 'sample',
+            toRecipient: [{
+                name: 'sample',
+                email: 'xxx'
+            }],
+            typeOf: chevre.factory.creativeWorkType.EmailMessage,
+            sender: {
+                name: 'xxx',
+                email: 'xxx'
+            },
+            about: {
+                identifier: <any>'sample',
+                name: 'sample',
+                typeOf: 'Thing'
+            }
+        },
+        project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
+        purpose: <any>{},
+        recipient: { id: 'xxx', typeOf: chevre.factory.creativeWorkType.WebApplication },
+        typeOf: chevre.factory.actionType.SendAction
+    })(
+        {
+            action: actionRepo,
+            message: messageRepo,
+            project: projectRepo
+        },
+        {
+            sendGrid: sendGridCredentials
+        }
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(result, { depth: null });
+}
+
+main()
+    .then(console.log)
+    .catch((error) => {
+        // tslint:disable-next-line:no-null-keyword
+        console.dir(error, { depth: null });
+    });

package/example/src/chevre/sendGrid/filterEmailActivity.ts

@@ -11,13 +11,11 @@ async function main() {
         // "limit": 10
     };
 
-    const request = {
+    client.request({
         url: `/v3/messages`,
         method: 'GET',
         qs: queryParams
-    };
-
-    client.request(request)
+    })
         .then(([response, body]) => {
             console.log(response.statusCode);
             console.log(response.body, body);

package/lib/chevre/service/notification.js

@@ -13,7 +13,11 @@ exports.lineNotify = lineNotify;
 exports.notifyByEmail = notifyByEmail;
 exports.sendEmailMessage = sendEmailMessage;
 exports.triggerWebhook = triggerWebhook;
-const sgMail = require("@sendgrid/mail");
+/**
+ * 通知サービス
+ */
+const client_1 = require("@sendgrid/client");
+// import * as sgMail from '@sendgrid/mail';
 const crypto = require("crypto");
 const http_status_1 = require("http-status");
 const util = require("util");
@@ -51,7 +55,7 @@ function sendEmailMessage(params) {
             if (typeof apiKey !== 'string') {
                 throw new factory.errors.Internal('API Key not found');
             }
-            sgMail.setApiKey(apiKey);
+            // sgMail.setApiKey(apiKey); // fix(2025-03-14~)
             let emailMessage;
             if (typeof params.object.text === 'string') {
                 emailMessage = params.object;
@@ -107,14 +111,28 @@ function sendEmailMessage(params) {
                     actionId: action.id,
                     projectId: project.id
                 } });
-            // mlutiple recipients対応(2023-03-06~)
-            const response = yield sgMail.sendMultiple(msg);
+            // reimplement using Client(2025-03-14~)
+            // const response = await sgMail.sendMultiple(msg);
+            const sgClient = new client_1.Client();
+            sgClient.setApiKey(apiKey);
+            // const response = await sgMail.sendMultiple(msg);
+            const response = yield sgClient.request({
+                body: {
+                    content: [{ type: 'text/plain', value: msg.text }],
+                    from: msg.from,
+                    personalizations: [{ to: msg.to }],
+                    subject: msg.subject,
+                    custom_args: msg.customArgs
+                },
+                method: 'POST',
+                url: '/v3/mail/send'
+            });
             // check the response.
             if (response[0].statusCode !== http_status_1.ACCEPTED) {
                 throw new factory.errors.Internal(`sendgrid request not accepted. response is ${util.inspect(response)}`);
             }
-            const { statusCode, statusMessage } = response[0];
-            result = { statusCode, statusMessage };
+            const { statusCode } = response[0];
+            result = { statusCode };
             recipe = (0, factory_1.createSendEmailMessageRecipe)({
                 mailData: msg,
                 afterMedia: result,
@@ -155,7 +173,6 @@ function notifyByEmail(params
             if (typeof apiKey !== 'string') {
                 throw new factory.errors.Internal('API Key not found');
             }
-            sgMail.setApiKey(apiKey);
             const senderName = (_b = (_a = credentials.sendGrid.alert) === null || _a === void 0 ? void 0 : _a.sender) === null || _b === void 0 ? void 0 : _b.name;
             const senderEmail = (_d = (_c = credentials.sendGrid.alert) === null || _c === void 0 ? void 0 : _c.sender) === null || _d === void 0 ? void 0 : _d.email;
             const toRecipientEmail = (Array.isArray((_e = credentials.sendGrid.alert) === null || _e === void 0 ? void 0 : _e.toRecipient))
@@ -227,14 +244,27 @@ function notifyByEmail(params
                     // actionId: action.id,
                     // projectId: project.id
                 } });
-            // mlutiple recipients対応(2023-03-06~)
-            const response = yield sgMail.sendMultiple(msg);
+            const sgClient = new client_1.Client();
+            sgClient.setApiKey(apiKey);
+            // const response = await sgMail.sendMultiple(msg);
+            const response = yield sgClient.request({
+                body: {
+                    content: [{ type: 'text/plain', value: msg.text }],
+                    from: msg.from,
+                    personalizations: [{ to: msg.to }],
+                    subject: msg.subject,
+                    custom_args: msg.customArgs
+                },
+                method: 'POST',
+                url: '/v3/mail/send'
+            });
             // check the response.
             if (response[0].statusCode !== http_status_1.ACCEPTED) {
                 throw new factory.errors.Internal(`sendgrid request not accepted. response is ${util.inspect(response)}`);
             }
-            const { statusCode, statusMessage } = response[0];
-            result = { statusCode, statusMessage };
+            const { statusCode } = response[0];
+            // const statusMessage = response[1];
+            result = { statusCode };
         }
         catch (error) {
             throw error;

package/package.json

@@ -15,6 +15,7 @@
     "@cinerino/sdk": "10.21.0-alpha.24",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
+    "@sendgrid/client": "8.1.4",
     "@sendgrid/mail": "6.4.0",
     "@surfrock/sdk": "1.4.0-alpha.1",
     "cdigit": "2.6.7",
@@ -112,5 +113,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.9.0-alpha.73"
+  "version": "22.9.0-alpha.75"
 }