@chevre/domain 21.7.0-alpha.15 → 21.7.0-alpha.17

package/lib/chevre/repo/project.d.ts

@@ -50,6 +50,7 @@ export declare class MongoRepository {
         logo?: string;
         name?: string;
         settings?: {
+            sendEmailMessage?: factory.project.ISendEmailMessageSettings;
             sendgridApiKey?: string;
         };
         subscription?: {

package/lib/chevre/repo/project.js

@@ -142,13 +142,19 @@ class MongoRepository {
         });
     }
     findByIdAndIUpdate(params) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.projectModel.findOneAndUpdate({ _id: params.id }, Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ updatedAt: new Date() }, (typeof params.alternateName === 'string' && params.alternateName.length > 0)
+            yield this.projectModel.findOneAndUpdate({ _id: params.id }, Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ updatedAt: new Date() }, (typeof params.alternateName === 'string' && params.alternateName.length > 0)
                 ? { alternateName: params.alternateName }
-                : undefined), (typeof params.name === 'string' && params.name.length > 0) ? { name: params.name } : undefined), (typeof params.logo === 'string' && params.logo.length > 0) ? { logo: params.logo } : undefined), (typeof ((_a = params.settings) === null || _a === void 0 ? void 0 : _a.sendgridApiKey) === 'string')
+                : undefined), (typeof params.name === 'string' && params.name.length > 0) ? { name: params.name } : undefined), (typeof params.logo === 'string' && params.logo.length > 0) ? { logo: params.logo } : undefined), (typeof ((_c = (_b = (_a = params.settings) === null || _a === void 0 ? void 0 : _a.sendEmailMessage) === null || _b === void 0 ? void 0 : _b.sender) === null || _c === void 0 ? void 0 : _c.email) === 'string')
+                ? {
+                    'settings.sendEmailMessage': {
+                        sender: { email: params.settings.sendEmailMessage.sender.email }
+                    }
+                }
+                : undefined), (typeof ((_d = params.settings) === null || _d === void 0 ? void 0 : _d.sendgridApiKey) === 'string')
                 ? { 'settings.sendgridApiKey': params.settings.sendgridApiKey }
-                : undefined), (typeof ((_b = params.subscription) === null || _b === void 0 ? void 0 : _b.useEventServiceAsProduct) === 'boolean')
+                : undefined), (typeof ((_e = params.subscription) === null || _e === void 0 ? void 0 : _e.useEventServiceAsProduct) === 'boolean')
                 ? { 'subscription.useEventServiceAsProduct': params.subscription.useEventServiceAsProduct }
                 : undefined), { 
                 // ↓customerUserPoolは廃止

package/lib/chevre/service/notification.js

@@ -24,8 +24,9 @@ const debug = createDebug('chevre-domain:service');
  * https://sendgrid.com/docs/API_Reference/Web_API_v3/Mail/errors.html
  */
 function sendEmailMessage(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         const project = yield repos.project.findById({
             id: params.project.id,
             inclusion: ['_id', 'settings'],
@@ -45,6 +46,15 @@ function sendEmailMessage(params) {
             }
             sgMail.setApiKey(apiKey);
             const emailMessage = params.object;
+            const emailMessageFrom = {
+                name: emailMessage.sender.name,
+                email: emailMessage.sender.email
+            };
+            // プロジェクト設定対応(2023-08-21~)
+            const senderEmailByProjectSettings = (_d = (_c = (_b = project.settings) === null || _b === void 0 ? void 0 : _b.sendEmailMessage) === null || _c === void 0 ? void 0 : _c.sender) === null || _d === void 0 ? void 0 : _d.email;
+            if (typeof senderEmailByProjectSettings === 'string' && senderEmailByProjectSettings.length > 0) {
+                emailMessageFrom.email = senderEmailByProjectSettings;
+            }
             let subject;
             // 互換性維持対応として、String型に対応
             if (typeof emailMessage.about === 'string') {
@@ -52,7 +62,7 @@ function sendEmailMessage(params) {
                     subject = String(emailMessage.about);
                 }
             }
-            else if (typeof ((_b = emailMessage.about) === null || _b === void 0 ? void 0 : _b.name) === 'string') {
+            else if (typeof ((_e = emailMessage.about) === null || _e === void 0 ? void 0 : _e.name) === 'string') {
                 if (emailMessage.about.name.length > 0) {
                     subject = emailMessage.about.name;
                 }
@@ -69,10 +79,7 @@ function sendEmailMessage(params) {
                         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), { 
+            const msg = Object.assign(Object.assign(Object.assign({ to: emailDatas, from: emailMessageFrom }, (typeof subject === 'string') ? { subject } : undefined), (String(emailMessage.text).length > 0) ? { text: String(emailMessage.text) } : undefined), { 
                 // html: '<strong>and easy to do anywhere, even with Node.js</strong>',
                 // categories: ['Transactional', 'My category'],
                 // 送信予定を追加することもできるが、タスクの実行予定日時でコントロールする想定

package/lib/chevre/service/order/onOrderStatusChanged/factory.js

@@ -338,6 +338,14 @@ function createOnPlaceOrderTasksByTransaction(params) {
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (potentialActions.sendOrder !== undefined) {
+            const sendOrderTaskData = {
+                project: potentialActions.sendOrder.project,
+                object: Object.assign(Object.assign({}, potentialActions.sendOrder.object), { confirmationNumber: params.object.confirmationNumber })
+                // 廃止(2023-08-21~)
+                // ...(potentialActions.sendOrder.potentialActions !== undefined)
+                //     ? { potentialActions: potentialActions.sendOrder.potentialActions }
+                //     : undefined
+            };
             const sendOrderTask = {
                 project: potentialActions.sendOrder.project,
                 name: factory.taskName.SendOrder,
@@ -346,9 +354,7 @@ function createOnPlaceOrderTasksByTransaction(params) {
                 remainingNumberOfTries: 10,
                 numberOfTried: 0,
                 executionResults: [],
-                data: Object.assign({ project: potentialActions.sendOrder.project, object: Object.assign(Object.assign({}, potentialActions.sendOrder.object), { confirmationNumber: params.object.confirmationNumber }) }, (potentialActions.sendOrder.potentialActions !== undefined)
-                    ? { potentialActions: potentialActions.sendOrder.potentialActions }
-                    : undefined)
+                data: sendOrderTaskData
             };
             taskAttributes.push(sendOrderTask);
         }

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js

@@ -130,6 +130,17 @@ function createTasks(params) {
                 throw new factory.errors.NotFound('Transaction Result');
             }
             const orderActionAttributes = potentialActions.order;
+            const placeOrderTaskData = {
+                project: orderActionAttributes.project,
+                object: {
+                    confirmationNumber: orderFromTransaction.confirmationNumber,
+                    orderNumber: orderActionAttributes.object.orderNumber
+                }
+                // 廃止(2023-08-21~)
+                // ...(orderActionAttributes.potentialActions !== undefined)
+                //     ? { potentialActions: orderActionAttributes.potentialActions }
+                //     : undefined
+            };
             const placeOrderTaskAttributes = {
                 project: transaction.project,
                 name: factory.taskName.PlaceOrder,
@@ -138,12 +149,7 @@ function createTasks(params) {
                 remainingNumberOfTries: 10,
                 numberOfTried: 0,
                 executionResults: [],
-                data: Object.assign({ project: orderActionAttributes.project, object: {
-                        confirmationNumber: orderFromTransaction.confirmationNumber,
-                        orderNumber: orderActionAttributes.object.orderNumber
-                    } }, (orderActionAttributes.potentialActions !== undefined)
-                    ? { potentialActions: orderActionAttributes.potentialActions }
-                    : undefined)
+                data: placeOrderTaskData
             };
             taskAttributes.push(placeOrderTaskAttributes);
             break;

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.326.0-alpha.0",
+    "@chevre/factory": "4.326.0-alpha.2",
     "@cinerino/sdk": "3.165.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.7.0-alpha.15"
+  "version": "21.7.0-alpha.17"
 }