@chevre/domain 21.35.0-alpha.28 → 21.35.0-alpha.29

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

@@ -9,7 +9,11 @@ type ILineNotifyOperation<T> = (repos: {
  * Eメールメッセージを送信する
  * https://sendgrid.com/docs/API_Reference/Web_API_v3/Mail/errors.html
  */
-declare function sendEmailMessage(params: factory.action.transfer.send.message.email.IAttributes): (repos: {
+declare function sendEmailMessage(params: factory.task.sendEmailMessage.IActionAttributes & {
+    sameAs?: {
+        id: string;
+    };
+}): (repos: {
     action: ActionRepo;
     message: MessageRepo;
     project: ProjectRepo;

package/lib/chevre/service/notification.js

@@ -17,6 +17,11 @@ const util = require("util");
 const credentials_1 = require("../credentials");
 const settings_1 = require("../settings");
 const factory = require("../factory");
+function createSendEmailMessageActionAttributes(params) {
+    var _a;
+    const { agent, object, project, purpose, recipient, typeOf } = params;
+    return Object.assign({ agent, object, project, purpose, recipient, typeOf }, (typeof ((_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined);
+}
 /**
  * Eメールメッセージを送信する
  * https://sendgrid.com/docs/API_Reference/Web_API_v3/Mail/errors.html
@@ -30,8 +35,7 @@ function sendEmailMessage(params) {
             inclusion: ['_id', 'settings'],
             exclusion: []
         });
-        // アクション開始
-        const action = yield repos.action.start(params);
+        const action = yield repos.action.start(createSendEmailMessageActionAttributes(params));
         let result = {};
         try {
             let apiKey = credentials_1.credentials.sendGrid.apiKey;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/createSendEmailMessageTaskIfNotExist.js

@@ -33,7 +33,7 @@ function createSendEmailMessageTaskIfNotExist(params) {
                     object: sendEmailMessageAction.object,
                     agent: params.order.project,
                     recipient: { typeOf: params.order.customer.typeOf, id: params.order.customer.id },
-                    potentialActions: {},
+                    // potentialActions: {}, // discontinue(2024-06-25~)
                     purpose: simpleOrder
                 };
                 const sendEmailMessageTask = {

package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned/factory.d.ts

@@ -5,6 +5,7 @@ declare function createInformTasks(order: IReturnedOrder): factory.task.IAttribu
  * 注文返品後のアクション
  */
 declare function createOnOrderReturnedTasksByTransaction(params: {
+    order: Pick<factory.order.IOrder, 'project' | 'typeOf' | 'orderNumber' | 'customer' | 'price' | 'priceCurrency' | 'orderDate'>;
     potentialActions?: factory.action.transfer.returnAction.order.IPotentialActions;
 }): (import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
 export { createInformTasks, createOnOrderReturnedTasksByTransaction };

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

@@ -92,9 +92,25 @@ function createOnOrderReturnedTasksByTransaction(params) {
     }
     const sendEmailMessageAttributes = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.sendEmailMessage;
     if (Array.isArray(sendEmailMessageAttributes)) {
+        const simpleOrder = {
+            typeOf: params.order.typeOf,
+            orderNumber: params.order.orderNumber,
+            price: params.order.price,
+            priceCurrency: params.order.priceCurrency,
+            orderDate: params.order.orderDate
+        };
         sendEmailMessageAttributes.forEach((s) => {
+            const actionAttributes = {
+                project: params.order.project,
+                typeOf: factory.actionType.SendAction,
+                object: s.object,
+                agent: params.order.project,
+                recipient: { typeOf: params.order.customer.typeOf, id: params.order.customer.id },
+                // potentialActions: {}, // discontinue(2024-06-25~)
+                purpose: simpleOrder
+            };
             const sendEmailMessageTask = {
-                project: s.project,
+                project: params.order.project,
                 name: factory.taskName.SendEmailMessage,
                 status: factory.taskStatus.Ready,
                 runsAt: now,
@@ -102,7 +118,7 @@ function createOnOrderReturnedTasksByTransaction(params) {
                 numberOfTried: 0,
                 executionResults: [],
                 data: {
-                    actionAttributes: s
+                    actionAttributes
                 }
             };
             taskAttributes.push(sendEmailMessageTask);

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

@@ -56,7 +56,7 @@ function onOrderReturned(params) {
                     // 決済取引返却タスクを作成(2022-06-09~)
                     ...createReturnPayTransactionTasks({ orderNumber: params.order.orderNumber, project: params.order.project }, params.returnOrderTransaction),
                     // 取引のpotentialActionsを適用(2023-08-19~)
-                    ...(0, factory_1.createOnOrderReturnedTasksByTransaction)({ potentialActions: potentialActionsByTransaction }),
+                    ...(0, factory_1.createOnOrderReturnedTasksByTransaction)({ order: params.order, potentialActions: potentialActionsByTransaction }),
                     ...(itemOfferedTypeOfs[0] === factory.actionType.MoneyTransfer)
                         ? createReturnMoneyTransferTasks(Object.assign(Object.assign({}, params.order), { serialNumbers }), simpleOrder)
                         : []

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

@@ -1,6 +1,6 @@
-import type { IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
 import * as factory from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.sendEmailMessage.IData): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.sendEmailMessage.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -17,9 +17,10 @@ const NotificationService = require("../notification");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        yield NotificationService.sendEmailMessage(data.actionAttributes)({
+        yield NotificationService.sendEmailMessage(Object.assign(Object.assign({}, params.data.actionAttributes), { sameAs: { id: params.id } // タスクIDを関連付け(2024-06-25~)
+         }))({
             action: new action_1.MongoRepository(settings.connection),
             message: new message_1.MessageRepo(settings.connection),
             project: new project_1.MongoRepository(settings.connection)

package/lib/chevre/service/task.js

@@ -115,6 +115,7 @@ function execute(task) {
                 case factory.taskName.ConfirmReserveTransaction:
                 case factory.taskName.ReturnPayTransaction:
                 case factory.taskName.ReturnReserveTransaction:
+                case factory.taskName.SendEmailMessage:
                     callResult = yield call(task)(settings, options);
                     break;
                 default:

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPaymentMethod.js

@@ -65,7 +65,7 @@ function createReturnInvoicePotentialActions(params) {
                     typeOf: order.customer.typeOf,
                     id: order.customer.id
                 },
-                potentialActions: {},
+                // potentialActions: {}, // discontinue(2024-06-25~)
                 purpose: sendActionPurpose
             });
         }

package/lib/chevre/service/transaction/returnOrder/potentialActions/sendEmailMessage.d.ts

@@ -1,6 +1,8 @@
 import * as factory from '../../../../factory';
+type IPotentialSendEmailMessageAction = factory.action.transfer.returnAction.order.IPotentialSendEmailMessageAction;
 export declare function createSendEmailMessaegActionsOnReturn(params: {
     order: factory.order.IOrder;
     returnOrderActionParams?: factory.transaction.returnOrder.IReturnOrderActionParams;
     emailMessageOnOrderReturned?: factory.creativeWork.message.email.ICreativeWork;
-}): Promise<factory.action.transfer.send.message.email.IAttributes[]>;
+}): Promise<IPotentialSendEmailMessageAction[]>;
+export {};

package/lib/chevre/service/transaction/returnOrder/potentialActions/sendEmailMessage.js

@@ -11,26 +11,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSendEmailMessaegActionsOnReturn = void 0;
 const emailMessageBuilder = require("../../../../emailMessageBuilder");
-const factory = require("../../../../factory");
-// import { createMaskedCustomer } from '../../../../factory/order';
 function createSendEmailMessaegActionsOnReturn(params) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         const order = params.order;
-        const sendActionPurpose = {
-            typeOf: order.typeOf,
-            // seller: {
-            //     id: order.seller.id,
-            //     typeOf: order.seller.typeOf,
-            //     name: order.seller.name
-            // }, // 廃止(2024-03-06~)
-            // mask
-            // customer: createMaskedCustomer(order, { noProfile: true }), // 廃止(2024-03-06~)
-            orderNumber: order.orderNumber,
-            price: order.price,
-            priceCurrency: order.priceCurrency,
-            orderDate: order.orderDate
-        };
+        // const sendActionPurpose: factory.action.transfer.send.message.email.IPurpose = {
+        //     typeOf: order.typeOf,
+        //     orderNumber: order.orderNumber,
+        //     price: order.price,
+        //     priceCurrency: order.priceCurrency,
+        //     orderDate: order.orderDate
+        // };
         // 返品後のEメール送信アクション
         const sendEmailMessaegActionsOnReturn = [];
         const sendEmailMessage = (_b = (_a = params.returnOrderActionParams) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.sendEmailMessage;
@@ -40,17 +31,13 @@ function createSendEmailMessaegActionsOnReturn(params) {
                     ? { emailMessage: params.emailMessageOnOrderReturned }
                     : undefined));
                 return {
-                    project: order.project,
-                    typeOf: factory.actionType.SendAction,
-                    object: emailMessage,
-                    agent: order.project,
-                    recipient: {
-                        typeOf: order.customer.typeOf,
-                        id: order.customer.id
-                        // name: String(order.customer.name)
-                    },
-                    potentialActions: {},
-                    purpose: sendActionPurpose
+                    // project: order.project, // optimize(2024-06-25~)
+                    // typeOf: factory.actionType.SendAction, // optimize(2024-06-25~)
+                    object: emailMessage
+                    // agent: order.project, // optimize(2024-06-25~)
+                    // recipient: { typeOf: order.customer.typeOf, id: order.customer.id }, // optimize(2024-06-25~)
+                    // potentialActions: {} // optimize(2024-06-25~)
+                    // purpose: sendActionPurpose // optimize(2024-06-25~)
                 };
             }))));
         }

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.375.0-alpha.20",
+    "@chevre/factory": "4.375.0-alpha.21",
     "@cinerino/sdk": "7.3.0-alpha.2",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.35.0-alpha.28"
+  "version": "21.35.0-alpha.29"
 }