@chevre/domain 21.20.0-alpha.26 → 21.20.0-alpha.27

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDelivered.d.ts

@@ -1,5 +1,5 @@
-import type { MongoRepository as TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
+import type { MongoRepository as TaskRepo } from '../../../repo/task';
 type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf' | 'potentialActions'>;
 declare function onOrderDelivered(params: {
     order: Pick<factory.order.IOrder, 'id' | 'customer' | 'orderDate' | 'orderNumber' | 'project' | 'typeOf'> & {

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

@@ -14,8 +14,8 @@ exports.onOrderDelivered = void 0;
  * 注文ステータス変更時処理
  */
 const createDebug = require("debug");
-const util = require("util");
 const factory = require("../../../factory");
+const createSendEmailMessageTaskIfNotExist_1 = require("./onOrderProcessing/createSendEmailMessageTaskIfNotExist");
 const factory_1 = require("./onOrderDelivered/factory");
 const debug = createDebug('chevre-domain:service:order');
 function onOrderDelivered(params) {
@@ -39,9 +39,7 @@ function onOrderDelivered(params) {
         yield repos.task.saveMany(tasks, { emitImmediately: true });
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderDelivered:
-                yield createSendEmailMessageTaskIfNotExist({
-                    potentialActions: sendOrderPotentialActions
-                })(repos);
+                yield (0, createSendEmailMessageTaskIfNotExist_1.createSendEmailMessageTaskIfNotExist)({ potentialActions: sendOrderPotentialActions })(repos);
                 break;
             default:
                 throw new factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
@@ -49,29 +47,3 @@ function onOrderDelivered(params) {
     });
 }
 exports.onOrderDelivered = onOrderDelivered;
-function createSendEmailMessageTaskIfNotExist(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const sendEmailMessageActions = (_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.sendEmailMessage;
-        const now = new Date();
-        if (Array.isArray(sendEmailMessageActions)) {
-            yield Promise.all(sendEmailMessageActions.map((sendEmailMessageAction, index) => __awaiter(this, void 0, void 0, function* () {
-                const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', sendEmailMessageAction.project.id, factory.taskName.SendEmailMessage, sendEmailMessageAction.purpose.typeOf, sendEmailMessageAction.purpose.orderNumber, factory.orderStatus.OrderDelivered, index);
-                const sendEmailMessageTask = {
-                    identifier: taskIdentifier,
-                    project: sendEmailMessageAction.project,
-                    name: factory.taskName.SendEmailMessage,
-                    status: factory.taskStatus.Ready,
-                    runsAt: now,
-                    remainingNumberOfTries: 10,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: {
-                        actionAttributes: sendEmailMessageAction
-                    }
-                };
-                yield repos.task.createIfNotExistByIdentifier(sendEmailMessageTask, { emitImmediately: true });
-            })));
-        }
-    });
-}

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/createSendEmailMessageTaskIfNotExist.d.ts

@@ -0,0 +1,8 @@
+import type { MongoRepository as TaskRepo } from '../../../../repo/task';
+import * as factory from '../../../../factory';
+declare function createSendEmailMessageTaskIfNotExist(params: {
+    potentialActions?: factory.action.transfer.send.order.IPotentialActions;
+}): (repos: {
+    task: TaskRepo;
+}) => Promise<void>;
+export { createSendEmailMessageTaskIfNotExist };

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

@@ -0,0 +1,41 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createSendEmailMessageTaskIfNotExist = void 0;
+const util = require("util");
+const factory = require("../../../../factory");
+function createSendEmailMessageTaskIfNotExist(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const sendEmailMessageActions = (_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.sendEmailMessage;
+        const now = new Date();
+        if (Array.isArray(sendEmailMessageActions)) {
+            yield Promise.all(sendEmailMessageActions.map((sendEmailMessageAction, index) => __awaiter(this, void 0, void 0, function* () {
+                const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', sendEmailMessageAction.project.id, factory.taskName.SendEmailMessage, sendEmailMessageAction.purpose.typeOf, sendEmailMessageAction.purpose.orderNumber, factory.orderStatus.OrderProcessing, index);
+                const sendEmailMessageTask = {
+                    identifier: taskIdentifier,
+                    project: sendEmailMessageAction.project,
+                    name: factory.taskName.SendEmailMessage,
+                    status: factory.taskStatus.Ready,
+                    runsAt: now,
+                    remainingNumberOfTries: 10,
+                    numberOfTried: 0,
+                    executionResults: [],
+                    data: {
+                        actionAttributes: sendEmailMessageAction
+                    }
+                };
+                yield repos.task.createIfNotExistByIdentifier(sendEmailMessageTask, { emitImmediately: true });
+            })));
+        }
+    });
+}
+exports.createSendEmailMessageTaskIfNotExist = createSendEmailMessageTaskIfNotExist;

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

@@ -17,14 +17,17 @@ const createDebug = require("debug");
 const util = require("util");
 const factory = require("../../../factory");
 const order_1 = require("../../../factory/order");
+const settings_1 = require("../../../settings");
+const createSendEmailMessageTaskIfNotExist_1 = require("./onOrderProcessing/createSendEmailMessageTaskIfNotExist");
 const factory_1 = require("./onOrderProcessing/factory");
 const debug = createDebug('chevre-domain:service:order');
 const USE_CONFIRM_REGISTER_SERVICE_TRANSACTION = process.env.USE_CONFIRM_REGISTER_SERVICE_TRANSACTION === '1';
 function onOrderProcessing(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks = [];
+        const sendOrderPotentialActions = (_e = (_d = (_c = (_b = (_a = params.placeOrderTransaction) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.potentialActions) === null || _d === void 0 ? void 0 : _d.sendOrder) === null || _e === void 0 ? void 0 : _e.potentialActions;
         const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
         const simpleOrder = {
             typeOf: params.order.typeOf,
@@ -55,8 +58,12 @@ function onOrderProcessing(params) {
                 // 冗長なconfirmReserveTransactionタスク作成を回避(2023-08-25~)
                 yield createConfirmReserveTransactionTasksIfNotExist(params.order, simpleOrder)(repos);
                 yield createGivePointAwardTaskIfNotExist({
-                    potentialActions: (_c = (_b = (_a = params.placeOrderTransaction) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.potentialActions
+                    potentialActions: (_h = (_g = (_f = params.placeOrderTransaction) === null || _f === void 0 ? void 0 : _f.potentialActions) === null || _g === void 0 ? void 0 : _g.order) === null || _h === void 0 ? void 0 : _h.potentialActions
                 })(repos);
+                // OrderProcessingにおけるEメール送信に対応(2024-01-17~)
+                if (settings_1.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING) {
+                    yield (0, createSendEmailMessageTaskIfNotExist_1.createSendEmailMessageTaskIfNotExist)({ potentialActions: sendOrderPotentialActions })(repos);
+                }
                 break;
             default:
         }

package/lib/chevre/settings.d.ts

@@ -40,6 +40,7 @@ export declare const USE_OPTIMIZE_TICKET_OFFER: boolean;
 export declare const USE_FETCH_API: boolean;
 export declare const USE_INFORM_ORDER_IN_TRANSIT: boolean;
 export declare const USE_INFORM_ACCEPTED_OFFERS_ON_ORDER_PROCESSING: boolean;
+export declare const USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING: boolean;
 export declare const MONGO_MAX_TIME_MS: number;
 export declare const MONGO_READ_PREFERENCE: string;
 export declare const MONGO_AUTO_INDEX: boolean;

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.DELIVER_ORDER_LIMIT = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_INFORM_ACCEPTED_OFFERS_ON_ORDER_PROCESSING = exports.USE_INFORM_ORDER_IN_TRANSIT = exports.USE_FETCH_API = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.MAX_NUM_CREDIT_CARD_PAYMENT_METHOD = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.DELIVER_ORDER_LIMIT = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = exports.USE_INFORM_ACCEPTED_OFFERS_ON_ORDER_PROCESSING = exports.USE_INFORM_ORDER_IN_TRANSIT = exports.USE_FETCH_API = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.MAX_NUM_CREDIT_CARD_PAYMENT_METHOD = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
     ? process.env.INFORM_TRANSACTION_URL.split(' ')
@@ -64,6 +64,7 @@ exports.USE_OPTIMIZE_TICKET_OFFER = process.env.USE_OPTIMIZE_TICKET_OFFER === '1
 exports.USE_FETCH_API = process.env.USE_FETCH_API === '1';
 exports.USE_INFORM_ORDER_IN_TRANSIT = process.env.USE_INFORM_ORDER_IN_TRANSIT === '1';
 exports.USE_INFORM_ACCEPTED_OFFERS_ON_ORDER_PROCESSING = process.env.USE_INFORM_ACCEPTED_OFFERS_ON_ORDER_PROCESSING === '1';
+exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = process.env.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING === '1';
 exports.MONGO_MAX_TIME_MS = (typeof process.env.MONGO_MAX_TIME_MS === 'string')
     ? Number(process.env.MONGO_MAX_TIME_MS)
     // tslint:disable-next-line:no-magic-numbers

package/package.json

@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.20.0-alpha.26"
+  "version": "21.20.0-alpha.27"
 }