@chevre/domain 21.35.0 → 21.36.0-alpha.0

package/lib/chevre/emailMessageBuilder.d.ts

@@ -22,6 +22,7 @@ declare function createReturnOrderMessage(params: {
     order: factory.order.IOrder;
     email?: factory.creativeWork.message.email.ICustomization;
     emailMessage?: factory.creativeWork.message.email.ICreativeWork;
+    index: number;
 }): Promise<ISendableEmailMessage>;
 /**
  * 返金メッセージを作成する

package/lib/chevre/emailMessageBuilder.js

@@ -224,8 +224,8 @@ function createReturnOrderMessage(params) {
                 }];
         return {
             typeOf: factory.creativeWorkType.EmailMessage,
-            identifier: `${about.identifier}:${params.order.orderNumber}`,
-            name: `${about.identifier}:${params.order.orderNumber}`,
+            identifier: `${about.identifier}:${params.order.orderNumber}:${params.index}`,
+            name: `${about.identifier}:${params.order.orderNumber}:${params.index}`,
             sender: sender,
             toRecipient: toRecipient,
             about: about,

package/lib/chevre/service/transaction/placeOrderInProgress/confirm.js

@@ -135,7 +135,7 @@ function confirm(params) {
         yield saveMessagesIfNeeded({
             options: params.options,
             project: { id: transaction.project.id },
-            order: result.order, seller, emailMessages
+            order: { orderNumber, typeOf: factory.order.OrderType.Order }, seller: { id: seller.id }, emailMessages
         })(repos);
         // ステータス変更
         try {
@@ -168,12 +168,11 @@ function saveMessagesIfNeeded(params) {
         if (options.useSaveMessages) {
             if (emailMessages.length > 0) {
                 const { orderNumber, typeOf } = order;
-                debug('saving', emailMessages.length, 'messages...', emailMessages);
                 const saveMessageResult = yield repos.message.upsertByIdentifier(emailMessages.map(({ identifier, name, about, text, toRecipient, sender }) => {
                     return {
                         identifier, name, about, text, toRecipient, sender,
                         project: { id: project.id, typeOf: factory.organizationType.Project },
-                        provider: { id: seller.id, typeOf: seller.typeOf },
+                        provider: { id: seller.id, typeOf: factory.organizationType.Corporation },
                         mainEntity: { orderNumber, typeOf }
                     };
                 }));

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

@@ -3,4 +3,7 @@ export declare function createReturnPaymentMethodActions(params: {
     order: factory.order.IOrder;
     returnOrderActionParams?: factory.transaction.returnOrder.IReturnOrderActionParams;
     transaction: Pick<factory.transaction.returnOrder.ITransaction, 'object'>;
-}): Promise<factory.action.transfer.returnAction.order.IPotentialReturnInvoiceAction[]>;
+}): Promise<{
+    emailMessagesOnReturnInvoice: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
+    returnPaymentMethodActions: factory.action.transfer.returnAction.order.IPotentialReturnInvoiceAction[];
+}>;

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

@@ -27,6 +27,7 @@ function createReturnInvoicePotentialActions(params) {
     var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function* () {
         const order = params.order;
+        const emailMessagesOnReturnEachPaymentMethodId = [];
         const sendEmailMessageOnRefund = [];
         // Eメールカスタマイズの指定を確認
         let emailCustomization;
@@ -49,17 +50,16 @@ function createReturnInvoicePotentialActions(params) {
                 email: emailCustomization,
                 paymentMethodId: params.paymentMethod.paymentMethodId
             });
-            // const sendActionPurpose: factory.action.transfer.send.message.email.IPurpose = {
-            //     typeOf: order.typeOf,
-            //     orderNumber: order.orderNumber,
-            //     price: order.price,
-            //     priceCurrency: order.priceCurrency,
-            //     orderDate: order.orderDate
-            // };
+            emailMessagesOnReturnEachPaymentMethodId.push(emailMessage);
             sendEmailMessageOnRefund.push({
                 // project: order.project, // discontinue(2024-06-26~)
                 // typeOf: factory.actionType.SendAction, // discontinue(2024-06-26~)
-                object: emailMessage
+                // standardize object(2024-06-27~)
+                // object: emailMessage
+                object: {
+                    identifier: emailMessage.identifier,
+                    typeOf: factory.creativeWorkType.EmailMessage
+                }
                 // agent: order.project, // discontinue(2024-06-26~)
                 // recipient: { // discontinue(2024-06-26~)
                 //     typeOf: order.customer.typeOf,
@@ -70,13 +70,16 @@ function createReturnInvoicePotentialActions(params) {
             });
         }
         return {
-            sendEmailMessage: sendEmailMessageOnRefund
+            emailMessagesOnReturnEachPaymentMethodId,
+            potentialActionsOnRefund: {
+                sendEmailMessage: sendEmailMessageOnRefund
+            }
         };
     });
 }
 function createReturnPaymentMethodActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
-        // const order = params.order;
+        const emailMessagesOnReturnInvoice = [];
         const potentialReturnInvoiceActions = [];
         // const returnPaymentMethodPurpose: factory.order.ISimpleOrder = {
         //     typeOf: order.typeOf,
@@ -97,9 +100,10 @@ function createReturnPaymentMethodActions(params) {
                     return paymentMethod.issuedThrough.typeOf !== factory.service.paymentService.PaymentServiceType.MovieTicket;
                 })
                     .map((referencedInvoice) => __awaiter(this, void 0, void 0, function* () {
-                    const potentialActionsOnRefund = yield createReturnInvoicePotentialActions(Object.assign({ paymentMethod: { paymentMethodId: referencedInvoice.paymentMethodId }, order: params.order }, (params.returnOrderActionParams !== undefined)
+                    const { emailMessagesOnReturnEachPaymentMethodId, potentialActionsOnRefund } = yield createReturnInvoicePotentialActions(Object.assign({ paymentMethod: { paymentMethodId: referencedInvoice.paymentMethodId }, order: params.order }, (params.returnOrderActionParams !== undefined)
                         ? { returnOrderActionParams: params.returnOrderActionParams }
                         : undefined));
+                    emailMessagesOnReturnInvoice.push(...emailMessagesOnReturnEachPaymentMethodId);
                     const { paymentStatus } = referencedInvoice, referencedInvoiceAsObject = __rest(referencedInvoice, ["paymentStatus"]);
                     const object = Object.assign(Object.assign({}, referencedInvoiceAsObject), { typeOf: 'Invoice' });
                     // optimize(2024-06-19~)
@@ -119,20 +123,22 @@ function createReturnPaymentMethodActions(params) {
                     // };
                 }))));
         }
-        // MovieTicket決済について
-        potentialReturnInvoiceActions.push(...yield createReturnPaymentMethodIssuedThroughMovieTicketActions(params));
-        return potentialReturnInvoiceActions;
+        // 決済カード決済について
+        const { emailMessagesOnReturnMovieTicket, returnMovieTicketActions } = yield createReturnPaymentMethodIssuedThroughMovieTicketActions(params);
+        emailMessagesOnReturnInvoice.push(...emailMessagesOnReturnMovieTicket);
+        potentialReturnInvoiceActions.push(...returnMovieTicketActions);
+        return { emailMessagesOnReturnInvoice, returnPaymentMethodActions: potentialReturnInvoiceActions };
     });
 }
 exports.createReturnPaymentMethodActions = createReturnPaymentMethodActions;
 /**
- * MovieTicket決済の返却アクションを生成する
+ * 決済カード決済の返却アクションを生成する
  */
 function createReturnPaymentMethodIssuedThroughMovieTicketActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
-        // const order = params.order;
         const returnFeesMovieTicketByTransaction = params.transaction.object.returnPolicy.returnFeesMovieTicket;
-        return Promise.all(params.order.paymentMethods
+        const emailMessagesOnReturnMovieTicket = [];
+        const returnMovieTicketActions = yield Promise.all(params.order.paymentMethods
             .filter((invoice) => {
             return invoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.MovieTicket;
         })
@@ -167,9 +173,10 @@ function createReturnPaymentMethodIssuedThroughMovieTicketActions(params) {
             return returnPaymentMethod;
         })
             .map((referencedInvoice) => __awaiter(this, void 0, void 0, function* () {
-            const potentialActionsOnRefund = yield createReturnInvoicePotentialActions(Object.assign({ paymentMethod: { paymentMethodId: referencedInvoice.paymentMethodId }, order: params.order }, (params.returnOrderActionParams !== undefined)
+            const { emailMessagesOnReturnEachPaymentMethodId, potentialActionsOnRefund } = yield createReturnInvoicePotentialActions(Object.assign({ paymentMethod: { paymentMethodId: referencedInvoice.paymentMethodId }, order: params.order }, (params.returnOrderActionParams !== undefined)
                 ? { returnOrderActionParams: params.returnOrderActionParams }
                 : undefined));
+            emailMessagesOnReturnMovieTicket.push(...emailMessagesOnReturnEachPaymentMethodId);
             const { paymentStatus } = referencedInvoice, referencedInvoiceAsObject = __rest(referencedInvoice, ["paymentStatus"]);
             const object = Object.assign(Object.assign({}, referencedInvoiceAsObject), { typeOf: 'Invoice' });
             // optimize(2024-06-19~)
@@ -194,5 +201,9 @@ function createReturnPaymentMethodIssuedThroughMovieTicketActions(params) {
             //     potentialActions: potentialActionsOnRefund
             // };
         })));
+        return {
+            emailMessagesOnReturnMovieTicket,
+            returnMovieTicketActions
+        };
     });
 }

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

@@ -4,5 +4,8 @@ export declare function createSendEmailMessaegActionsOnReturn(params: {
     order: factory.order.IOrder;
     returnOrderActionParams?: factory.transaction.returnOrder.IReturnOrderActionParams;
     emailMessageOnOrderReturned?: factory.creativeWork.message.email.ICreativeWork;
-}): Promise<IPotentialSendEmailMessageAction[]>;
+}): Promise<{
+    emailMessagesOnReturn: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
+    sendEmailMessaegActionsOnReturn: IPotentialSendEmailMessageAction[];
+}>;
 export {};

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

@@ -11,6 +11,7 @@ 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");
 function createSendEmailMessaegActionsOnReturn(params) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
@@ -23,17 +24,25 @@ function createSendEmailMessaegActionsOnReturn(params) {
         //     orderDate: order.orderDate
         // };
         // 返品後のEメール送信アクション
+        const emailMessagesOnReturn = [];
         const sendEmailMessaegActionsOnReturn = [];
         const sendEmailMessage = (_b = (_a = params.returnOrderActionParams) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.sendEmailMessage;
         if (Array.isArray(sendEmailMessage)) {
-            sendEmailMessaegActionsOnReturn.push(...yield Promise.all(sendEmailMessage.map((sendEmailMessageParams) => __awaiter(this, void 0, void 0, function* () {
-                const emailMessage = yield emailMessageBuilder.createReturnOrderMessage(Object.assign(Object.assign({ order }, (sendEmailMessageParams.object !== undefined) ? { email: sendEmailMessageParams.object } : undefined), (params.emailMessageOnOrderReturned !== undefined)
+            sendEmailMessaegActionsOnReturn.push(...yield Promise.all(sendEmailMessage.map((sendEmailMessageParams, index) => __awaiter(this, void 0, void 0, function* () {
+                const emailMessage = yield emailMessageBuilder.createReturnOrderMessage(Object.assign(Object.assign({ order,
+                    index }, (sendEmailMessageParams.object !== undefined) ? { email: sendEmailMessageParams.object } : undefined), (params.emailMessageOnOrderReturned !== undefined)
                     ? { emailMessage: params.emailMessageOnOrderReturned }
                     : undefined));
+                emailMessagesOnReturn.push(emailMessage);
                 return {
                     // project: order.project, // optimize(2024-06-25~)
                     // typeOf: factory.actionType.SendAction, // optimize(2024-06-25~)
-                    object: emailMessage
+                    // standardize object(2024-06-27~)
+                    // object: emailMessage
+                    object: {
+                        identifier: emailMessage.identifier,
+                        typeOf: factory.creativeWorkType.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~)
@@ -41,7 +50,7 @@ function createSendEmailMessaegActionsOnReturn(params) {
                 };
             }))));
         }
-        return sendEmailMessaegActionsOnReturn;
+        return { emailMessagesOnReturn, sendEmailMessaegActionsOnReturn };
     });
 }
 exports.createSendEmailMessaegActionsOnReturn = createSendEmailMessaegActionsOnReturn;

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

@@ -9,4 +9,7 @@ export declare function createPotentialActions(params: {
     potentialActions?: factory.transaction.returnOrder.IPotentialActionsParams;
     transaction: Pick<factory.transaction.returnOrder.ITransaction, 'agent' | 'object'>;
     emailMessageOnOrderReturned?: factory.creativeWork.message.email.ICreativeWork;
-}): Promise<factory.transaction.returnOrder.IPotentialActions>;
+}): Promise<{
+    emailMessages: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
+    potentialActions: factory.transaction.returnOrder.IPotentialActions;
+}>;

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

@@ -22,6 +22,7 @@ const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
 function createPotentialActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
         let returnOrderActions = [];
+        const emailMessages = [];
         returnOrderActions = yield Promise.all(params.orders.map((order) => __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             let returnOrderParams = (_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.returnOrder;
@@ -31,7 +32,8 @@ function createPotentialActions(params) {
             }
             const returnOrderActionParams = returnOrderParams === null || returnOrderParams === void 0 ? void 0 : returnOrderParams.find((p) => { var _a; return ((_a = p.object) === null || _a === void 0 ? void 0 : _a.orderNumber) === order.orderNumber; });
             // 決済返却アクション
-            const returnPaymentMethodActions = yield (0, returnPaymentMethod_1.createReturnPaymentMethodActions)(Object.assign(Object.assign(Object.assign({}, params), { order }), (returnOrderActionParams !== undefined) ? { returnOrderActionParams } : undefined));
+            const { emailMessagesOnReturnInvoice, returnPaymentMethodActions } = yield (0, returnPaymentMethod_1.createReturnPaymentMethodActions)(Object.assign(Object.assign(Object.assign({}, params), { order }), (returnOrderActionParams !== undefined) ? { returnOrderActionParams } : undefined));
+            emailMessages.push(...emailMessagesOnReturnInvoice);
             // ポイント特典の数だけ、返却アクションを作成
             const returnPointAwardActions = yield (0, returnPointAward_1.createReturnPointAwardActions)(Object.assign(Object.assign({}, params), { order }));
             // onOrderReturnedで生成へ移行(2024-02-04~)
@@ -41,7 +43,8 @@ function createPotentialActions(params) {
             //     moneyTransferAcceptedOffers: params.moneyTransferAcceptedOffers
             // });
             // 返品後のEメール送信アクション
-            const sendEmailMessaegActionsOnReturn = yield (0, sendEmailMessage_1.createSendEmailMessaegActionsOnReturn)(Object.assign(Object.assign(Object.assign({}, params), { order }), (returnOrderActionParams !== undefined) ? { returnOrderActionParams } : undefined));
+            const { emailMessagesOnReturn, sendEmailMessaegActionsOnReturn } = yield (0, sendEmailMessage_1.createSendEmailMessaegActionsOnReturn)(Object.assign(Object.assign(Object.assign({}, params), { order }), (returnOrderActionParams !== undefined) ? { returnOrderActionParams } : undefined));
+            emailMessages.push(...emailMessagesOnReturn);
             const potentialActionsOnReturnOrder = {
                 returnPaymentMethod: returnPaymentMethodActions,
                 // returnMoneyTransfer: returnMoneyTransferActions, // onOrderReturnedで生成へ移行(2024-02-04~)
@@ -83,7 +86,10 @@ function createPotentialActions(params) {
             };
         })));
         return {
-            returnOrder: returnOrderActions
+            emailMessages,
+            potentialActions: {
+                returnOrder: returnOrderActions
+            }
         };
     });
 }

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

@@ -3,6 +3,7 @@ import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOf
 import type { MongoRepository as EmailMessageRepo } from '../../repo/emailMessage';
 import type { MongoRepository as EventRepo } from '../../repo/event';
 import type { MongoRepository as MerchantReturnPolicyRepo } from '../../repo/merchantReturnPolicy';
+import type { MessageRepo } from '../../repo/message';
 import type { MongoRepository as OfferRepo } from '../../repo/offer';
 import type { MongoRepository as OfferItemConditionRepo } from '../../repo/offerItemCondition';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
@@ -45,6 +46,7 @@ declare function confirm(params: factory.transaction.returnOrder.IConfirmParams
 }): (repos: {
     acceptedOffer: AcceptedOfferRepo;
     emailMessage?: EmailMessageRepo;
+    message: MessageRepo;
     order: OrderRepo;
     transaction: TransactionRepo;
 }) => Promise<any>;

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

@@ -13,7 +13,7 @@ exports.exportTasksById = exports.confirm = exports.start = exports.preStart = v
 /**
  * 返品取引サービス
  */
-// import * as createDebug from 'debug';
+const createDebug = require("debug");
 const moment = require("moment-timezone");
 const factory = require("../../factory");
 const factory_1 = require("./returnOrder/exportTasks/factory");
@@ -21,7 +21,7 @@ const potentialActions_1 = require("./returnOrder/potentialActions");
 const preStart_1 = require("./returnOrder/preStart");
 Object.defineProperty(exports, "preStart", { enumerable: true, get: function () { return preStart_1.preStart; } });
 const errorHandler_1 = require("../../errorHandler");
-// const debug = createDebug('chevre-domain:service');
+const debug = createDebug('chevre-domain:service:transaction');
 /**
  * 返品取引開始
  */
@@ -59,6 +59,24 @@ function start(params) {
     });
 }
 exports.start = start;
+function saveMessagesIfNeeded(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const { project, order, emailMessages, seller } = params;
+        if (emailMessages.length > 0) {
+            const { orderNumber } = order;
+            debug('saving', emailMessages.length, 'messages...', JSON.stringify(emailMessages));
+            const saveMessageResult = yield repos.message.upsertByIdentifier(emailMessages.map(({ identifier, name, about, text, toRecipient, sender }) => {
+                return {
+                    identifier, name, about, text, toRecipient, sender,
+                    project: { id: project.id, typeOf: factory.organizationType.Project },
+                    provider: { id: seller.id, typeOf: factory.organizationType.Corporation },
+                    mainEntity: { orderNumber, typeOf: factory.order.OrderType.Order }
+                };
+            }));
+            debug(emailMessages.length, 'messages saved.', saveMessageResult);
+        }
+    });
+}
 /**
  * 取引確定
  */
@@ -83,7 +101,6 @@ function confirm(params) {
         if (transaction.object.order.length !== 1) {
             throw new factory.errors.Argument('object.order', 'number of orders must be 1');
         }
-        // 注文数を1に限定であれば、findByConfirmationNumberに変更できる(2022-04-28~)
         const orders = yield repos.order.search({
             limit: 1,
             page: 1,
@@ -105,7 +122,12 @@ function confirm(params) {
             emailMessageOnOrderReturned = searchEmailMessagesResult.shift();
         }
         const result = {};
-        const potentialActions = yield (0, potentialActions_1.createPotentialActions)(Object.assign(Object.assign({ dateReturned: params.object.order.dateReturned, orders: orders, transaction: transaction }, (params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined), (emailMessageOnOrderReturned !== undefined) ? { emailMessageOnOrderReturned } : undefined));
+        const { emailMessages, potentialActions } = yield (0, potentialActions_1.createPotentialActions)(Object.assign(Object.assign({ dateReturned: params.object.order.dateReturned, orders: orders, transaction: transaction }, (params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined), (emailMessageOnOrderReturned !== undefined) ? { emailMessageOnOrderReturned } : undefined));
+        // save messages(2024-06-27~)
+        yield saveMessagesIfNeeded({
+            project: { id: transaction.project.id },
+            order: { orderNumber: orders[0].orderNumber }, seller: { id: orders[0].seller.id }, emailMessages
+        })(repos);
         // ステータス変更
         yield repos.transaction.confirm({
             typeOf: transaction.typeOf,

package/package.json

@@ -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"
+  "version": "21.36.0-alpha.0"
 }