@chevre/domain 20.4.0 → 20.6.0

package/example/src/chevre/createManyEventsIfNotExist.ts

@@ -175,10 +175,6 @@ async function main() {
                                 typeOf: 'CategoryCodeSet',
                                 identifier: chevre.factory.categoryCode.CategorySetIdentifier.ServiceType
                             },
-                            project: {
-                                typeOf: chevre.factory.organizationType.Project,
-                                id: 'cinerino'
-                            },
                             typeOf: 'CategoryCode'
                         }
                     },

package/example/src/chevre/sendEmailMessage.ts

@@ -0,0 +1,81 @@
+// 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) };
+const SENDER_EMAIL = String(process.env.SENDER_EMAIL);
+const RECIPIENT_EMAIL = String(process.env.RECIPIENT_EMAIL);
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const actionRepo = new chevre.repository.Action(mongoose.connection);
+    const projectRepo = new chevre.repository.Project(mongoose.connection);
+
+    await chevre.service.notification.sendEmailMessage({
+        project: {
+            typeOf: chevre.factory.organizationType.Project,
+            id: project.id
+        },
+        typeOf: chevre.factory.actionType.SendAction,
+        object: {
+            typeOf: chevre.factory.creativeWorkType.EmailMessage,
+            identifier: 'SendOrder-CIN1-3970498-5700993',
+            name: 'SendOrder-CIN1-3970498-5700993',
+            sender: {
+                typeOf: 'Corporation',
+                name: 'sample sender ',
+                email: SENDER_EMAIL
+            },
+            toRecipient: [
+                {
+                    typeOf: 'WebApplication',
+                    name: 'sample recipient 2',
+                    email: RECIPIENT_EMAIL
+                }
+            ],
+            about: {
+                typeOf: 'Thing',
+                identifier: chevre.factory.creativeWork.message.email.AboutIdentifier.OnOrderSent,
+                name: 'sample about'
+            },
+            text: 'sample text'
+        },
+        agent: {
+            typeOf: chevre.factory.organizationType.Project,
+            id: project.id
+        },
+        recipient: {
+            typeOf: chevre.factory.creativeWorkType.WebApplication,
+            id: 'xxxx',
+            name: 'sample recipient'
+        },
+        purpose: {
+            typeOf: chevre.factory.order.OrderType.Order,
+            seller: {
+                id: '59d20831e53ebc2b4e774466',
+                name: 'seller name',
+                typeOf: chevre.factory.organizationType.Corporation
+            },
+            customer: {
+                typeOf: chevre.factory.creativeWorkType.WebApplication,
+                id: 'xxxx',
+                name: '****'
+            },
+            orderNumber: 'CIN1-3970498-5700993',
+            price: 0,
+            priceCurrency: chevre.factory.priceCurrency.JPY,
+            orderDate: moment('2023-03-06T01:02:58.866Z')
+                .toDate()
+        }
+    })({
+        action: actionRepo,
+        project: projectRepo
+    });
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/lib/chevre/emailMessageBuilder.js

@@ -124,7 +124,7 @@ function createEmailMessageSender(params) {
  * 注文配送メッセージを作成する
  */
 function createSendOrderMessage(params) {
-    var _a, _b, _c, _d;
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const emailMessageText = yield createEmailMessageText({
             order: params.order,
@@ -142,16 +142,30 @@ function createSendOrderMessage(params) {
         if (defaultToRecipientEmail === undefined) {
             throw new factory.errors.Argument('order', 'order.customer.email undefined');
         }
+        const defaultRecipientName = `${params.order.customer.familyName} ${params.order.customer.givenName}`;
         const sender = createEmailMessageSender(params);
-        const toRecipient = {
-            typeOf: params.order.customer.typeOf,
-            name: (typeof ((_b = (_a = params.email) === null || _a === void 0 ? void 0 : _a.toRecipient) === null || _b === void 0 ? void 0 : _b.name) === 'string')
-                ? params.email.toRecipient.name
-                : `${params.order.customer.familyName} ${params.order.customer.givenName}`,
-            email: (typeof ((_d = (_c = params.email) === null || _c === void 0 ? void 0 : _c.toRecipient) === null || _d === void 0 ? void 0 : _d.email) === 'string')
-                ? params.email.toRecipient.email
-                : defaultToRecipientEmail
-        };
+        const toRecipientCustomization = (_a = params.email) === null || _a === void 0 ? void 0 : _a.toRecipient;
+        const toRecipient = (Array.isArray(toRecipientCustomization))
+            ? toRecipientCustomization.map((customizedRecipient) => {
+                return {
+                    typeOf: params.order.customer.typeOf,
+                    name: (typeof customizedRecipient.name === 'string')
+                        ? customizedRecipient.name
+                        : defaultRecipientName,
+                    email: (typeof customizedRecipient.email === 'string')
+                        ? customizedRecipient.email
+                        : defaultToRecipientEmail
+                };
+            })
+            : [{
+                    typeOf: params.order.customer.typeOf,
+                    name: (typeof (toRecipientCustomization === null || toRecipientCustomization === void 0 ? void 0 : toRecipientCustomization.name) === 'string')
+                        ? toRecipientCustomization.name
+                        : defaultRecipientName,
+                    email: (typeof (toRecipientCustomization === null || toRecipientCustomization === void 0 ? void 0 : toRecipientCustomization.email) === 'string')
+                        ? toRecipientCustomization.email
+                        : defaultToRecipientEmail
+                }];
         return {
             typeOf: factory.creativeWorkType.EmailMessage,
             identifier: `SendOrder-${params.order.orderNumber}`,
@@ -168,7 +182,7 @@ exports.createSendOrderMessage = createSendOrderMessage;
  * 注文返品メッセージを作成する
  */
 function createReturnOrderMessage(params) {
-    var _a, _b, _c, _d;
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const emailMessageText = yield createEmailMessageText({
             order: params.order,
@@ -186,16 +200,30 @@ function createReturnOrderMessage(params) {
         if (defaultToRecipientEmail === undefined) {
             throw new factory.errors.Argument('order', 'order.customer.email undefined');
         }
+        const defaultRecipientName = `${params.order.customer.familyName} ${params.order.customer.givenName}`;
         const sender = createEmailMessageSender(params);
-        const toRecipient = {
-            typeOf: params.order.customer.typeOf,
-            name: (typeof ((_b = (_a = params.email) === null || _a === void 0 ? void 0 : _a.toRecipient) === null || _b === void 0 ? void 0 : _b.name) === 'string')
-                ? params.email.toRecipient.name
-                : `${params.order.customer.familyName} ${params.order.customer.givenName}`,
-            email: (typeof ((_d = (_c = params.email) === null || _c === void 0 ? void 0 : _c.toRecipient) === null || _d === void 0 ? void 0 : _d.email) === 'string')
-                ? params.email.toRecipient.email
-                : defaultToRecipientEmail
-        };
+        const toRecipientCustomization = (_a = params.email) === null || _a === void 0 ? void 0 : _a.toRecipient;
+        const toRecipient = (Array.isArray(toRecipientCustomization))
+            ? toRecipientCustomization.map((customizedRecipient) => {
+                return {
+                    typeOf: params.order.customer.typeOf,
+                    name: (typeof customizedRecipient.name === 'string')
+                        ? customizedRecipient.name
+                        : defaultRecipientName,
+                    email: (typeof customizedRecipient.email === 'string')
+                        ? customizedRecipient.email
+                        : defaultToRecipientEmail
+                };
+            })
+            : [{
+                    typeOf: params.order.customer.typeOf,
+                    name: (typeof (toRecipientCustomization === null || toRecipientCustomization === void 0 ? void 0 : toRecipientCustomization.name) === 'string')
+                        ? toRecipientCustomization.name
+                        : defaultRecipientName,
+                    email: (typeof (toRecipientCustomization === null || toRecipientCustomization === void 0 ? void 0 : toRecipientCustomization.email) === 'string')
+                        ? toRecipientCustomization.email
+                        : defaultToRecipientEmail
+                }];
         return {
             typeOf: factory.creativeWorkType.EmailMessage,
             identifier: `ReturnOrder-${params.order.orderNumber}`,
@@ -212,7 +240,7 @@ exports.createReturnOrderMessage = createReturnOrderMessage;
  * 返金メッセージを作成する
  */
 function createRefundMessage(params) {
-    var _a, _b, _c, _d;
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const emailMessageText = yield createEmailMessageText({
             order: params.order,
@@ -228,16 +256,30 @@ function createRefundMessage(params) {
         if (defaultToRecipientEmail === undefined) {
             throw new factory.errors.Argument('order', 'order.customer.email undefined');
         }
+        const defaultRecipientName = `${params.order.customer.familyName} ${params.order.customer.givenName}`;
         const sender = createEmailMessageSender(params);
-        const toRecipient = {
-            typeOf: params.order.customer.typeOf,
-            name: (typeof ((_b = (_a = params.email) === null || _a === void 0 ? void 0 : _a.toRecipient) === null || _b === void 0 ? void 0 : _b.name) === 'string')
-                ? params.email.toRecipient.name
-                : `${params.order.customer.familyName} ${params.order.customer.givenName}`,
-            email: (typeof ((_d = (_c = params.email) === null || _c === void 0 ? void 0 : _c.toRecipient) === null || _d === void 0 ? void 0 : _d.email) === 'string')
-                ? params.email.toRecipient.email
-                : defaultToRecipientEmail
-        };
+        const toRecipientCustomization = (_a = params.email) === null || _a === void 0 ? void 0 : _a.toRecipient;
+        const toRecipient = (Array.isArray(toRecipientCustomization))
+            ? toRecipientCustomization.map((customizedRecipient) => {
+                return {
+                    typeOf: params.order.customer.typeOf,
+                    name: (typeof customizedRecipient.name === 'string')
+                        ? customizedRecipient.name
+                        : defaultRecipientName,
+                    email: (typeof customizedRecipient.email === 'string')
+                        ? customizedRecipient.email
+                        : defaultToRecipientEmail
+                };
+            })
+            : [{
+                    typeOf: params.order.customer.typeOf,
+                    name: (typeof (toRecipientCustomization === null || toRecipientCustomization === void 0 ? void 0 : toRecipientCustomization.name) === 'string')
+                        ? toRecipientCustomization.name
+                        : defaultRecipientName,
+                    email: (typeof (toRecipientCustomization === null || toRecipientCustomization === void 0 ? void 0 : toRecipientCustomization.email) === 'string')
+                        ? toRecipientCustomization.email
+                        : defaultToRecipientEmail
+                }];
         return {
             typeOf: factory.creativeWorkType.EmailMessage,
             identifier: `RefundOrder-${params.order.orderNumber}`,

package/lib/chevre/repo/comment.js

@@ -78,7 +78,7 @@ class MongoRepository {
     }
     create(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const creatingDoc = Object.assign({ about: params.about, author: params.author, dateCreated: new Date(), project: params.project, text: params.text, typeOf: factory.creativeWorkType.Comment }, (Array.isArray(params.additionalProperty)) ? { additionalProperty: params.additionalProperty } : undefined);
+            const creatingDoc = Object.assign(Object.assign({ about: params.about, author: params.author, dateCreated: new Date(), project: params.project, text: params.text, typeOf: factory.creativeWorkType.Comment }, (Array.isArray(params.additionalProperty)) ? { additionalProperty: params.additionalProperty } : undefined), (Array.isArray(params.mentions)) ? { mentions: params.mentions } : undefined);
             const doc = yield this.commentModel.create(creatingDoc);
             return doc.toObject();
         });

package/lib/chevre/repo/mongoose/model/comments.js

@@ -21,6 +21,7 @@ const schema = new mongoose.Schema({
     commentCount: { type: Number, default: 0 },
     dateCreated: Date,
     dateModified: Date,
+    mentions: [mongoose.SchemaTypes.Mixed],
     text: {
         type: String,
         required: true

package/lib/chevre/service/notification.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.triggerWebhook = exports.report2developers = exports.sendEmailMessage = void 0;
-// tslint:disable-next-line:no-require-imports
 const sgMail = require("@sendgrid/mail");
 const createDebug = require("debug");
 const http_status_1 = require("http-status");
@@ -54,10 +53,19 @@ function sendEmailMessage(params) {
                     subject = emailMessage.about.name;
                 }
             }
-            const msg = Object.assign(Object.assign(Object.assign({ to: {
-                    name: emailMessage.toRecipient.name,
-                    email: emailMessage.toRecipient.email
-                }, from: {
+            const emailDatas = (Array.isArray(emailMessage.toRecipient))
+                ? emailMessage.toRecipient.map((toRecipient) => {
+                    return {
+                        name: toRecipient.name,
+                        email: toRecipient.email
+                    };
+                })
+                // Arrayでない時期への互換性維持対応
+                : [{
+                        name: emailMessage.toRecipient.name,
+                        email: emailMessage.toRecipient.email
+                    }];
+            const msg = Object.assign(Object.assign(Object.assign({ to: emailDatas, from: {
                     name: emailMessage.sender.name,
                     email: emailMessage.sender.email
                 } }, (typeof subject === 'string') ? { subject } : undefined), (String(emailMessage.text).length > 0) ? { text: String(emailMessage.text) } : undefined), { 
@@ -71,12 +79,15 @@ function sendEmailMessage(params) {
                     actionId: action.id,
                     projectId: project.id
                 } });
-            const response = yield sgMail.send(msg);
+            // mlutiple recipients対応(2023-03-06~)
+            // const response = await sgMail.send(msg);
+            const response = yield sgMail.sendMultiple(msg);
             // check the response.
             if (response[0].statusCode !== http_status_1.ACCEPTED) {
                 throw new Error(`sendgrid request not accepted. response is ${util.inspect(response)}`);
             }
-            result = response[0].body;
+            const { statusCode, statusMessage } = response[0];
+            result = { statusCode, statusMessage };
         }
         catch (error) {
             // actionにエラー結果を追加

package/lib/chevre/service/payment/movieTicket.js

@@ -28,7 +28,7 @@ const onRefund_1 = require("./any/onRefund");
  */
 function checkMovieTicket(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         // 決済方法区分
         const paymentMethodType = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.paymentMethod.typeOf;
         const paymentServiceId = (_b = params.object[0]) === null || _b === void 0 ? void 0 : _b.id;
@@ -36,12 +36,7 @@ function checkMovieTicket(params) {
         if (!Array.isArray(movieTickets)) {
             throw new factory.errors.Argument('object.movieTickets must be an array');
         }
-        const actionAttributes = {
-            project: params.project,
-            typeOf: factory.actionType.CheckAction,
-            agent: params.agent,
-            object: params.object
-        };
+        const actionAttributes = Object.assign({ project: params.project, typeOf: factory.actionType.CheckAction, agent: params.agent, object: params.object }, (typeof ((_d = params.purpose) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string') ? { purpose: params.purpose } : undefined);
         const action = yield repos.action.start(actionAttributes);
         let checkResult;
         try {
@@ -62,8 +57,8 @@ function checkMovieTicket(params) {
                 id: eventIds[0]
             });
             // ショップ情報取得
-            const seller = yield repos.seller.findById({ id: (_d = params.object[0]) === null || _d === void 0 ? void 0 : _d.seller.id });
-            const paymentAccepted = (_e = seller.paymentAccepted) === null || _e === void 0 ? void 0 : _e.some((a) => a.paymentMethodType === paymentMethodType);
+            const seller = yield repos.seller.findById({ id: (_e = params.object[0]) === null || _e === void 0 ? void 0 : _e.seller.id });
+            const paymentAccepted = (_f = seller.paymentAccepted) === null || _f === void 0 ? void 0 : _f.some((a) => a.paymentMethodType === paymentMethodType);
             if (paymentAccepted !== true) {
                 throw new factory.errors.Argument('transactionId', 'payment not accepted');
             }

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.295.0",
-    "@cinerino/sdk": "3.144.2",
+    "@chevre/factory": "4.298.0",
+    "@cinerino/sdk": "3.146.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.4.0"
+  "version": "20.6.0"
 }