@chevre/domain 23.2.0-alpha.61 → 23.2.0-alpha.63

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

@@ -1,13 +1,4 @@
 "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.onOrderInTransit = onOrderInTransit;
 /**
@@ -17,24 +8,24 @@ const createDebug = require("debug");
 const factory = require("../../../factory");
 const debug = createDebug('chevre-domain:service:order');
 function onOrderInTransit(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos, settings) => {
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderInTransit:
                 // 冗長なsendOrderタスク作成を回避(2023-08-25~)
-                yield createSendOrderTaskIfNotExist({
+                await createSendOrderTaskIfNotExist({
                     order: params.order
                 })(repos, settings);
                 // 取引確定時にコードを発行していればタスク作成(2024-02-06~)
-                yield createOnAuthorizationCreatedTask(params.order)(repos);
+                await createOnAuthorizationCreatedTask(params.order)(repos);
                 break;
             default:
                 throw new factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
         }
-    });
+    };
 }
 function createSendOrderTaskIfNotExist(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos, settings) => {
         const now = new Date();
         // const maskedCustomer = createMaskedCustomer({ customer: params.order.customer }, { noProfile: true });
         const simpleOrder = {
@@ -51,13 +42,20 @@ function createSendOrderTaskIfNotExist(params) {
             // priceCurrency: params.order.priceCurrency,
             orderDate: params.order.orderDate
         };
-        const sendOrderObject = Object.assign(Object.assign({}, simpleOrder), { acceptedOffers: {
+        const sendOrderObject = {
+            ...simpleOrder,
+            acceptedOffers: {
                 limit: settings.deliverOrderLimit,
                 page: 1 // page1から配送
-            } });
+            }
+        };
         const sendOrderTaskData = {
             project: params.order.project,
-            object: Object.assign(Object.assign({}, sendOrderObject), { confirmationNumber: params.order.confirmationNumber, previousOrderStatus: params.order.orderStatus })
+            object: {
+                ...sendOrderObject,
+                confirmationNumber: params.order.confirmationNumber,
+                previousOrderStatus: params.order.orderStatus
+            }
         };
         const taskIdentifier = `${sendOrderTaskData.project.id}:${factory.taskName.SendOrder}:${sendOrderTaskData.object.typeOf}:${sendOrderTaskData.object.orderNumber}`;
         const sendOrderTask = {
@@ -74,23 +72,22 @@ function createSendOrderTaskIfNotExist(params) {
         };
         debug('processing createSendOrderTaskIfNotExist...', sendOrderTask);
         // await repos.task.createSendOrderTaskIfNotExist(sendOrderTask, { emitImmediately: true });
-        yield repos.task.createIfNotExistByAlternateName(sendOrderTask, { emitImmediately: true });
-    });
+        await repos.task.createIfNotExistByAlternateName(sendOrderTask, { emitImmediately: true });
+    };
 }
 function createOnAuthorizationCreatedTask(order) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const placeOrderTransaction = (yield repos.transaction.projectFields({
+    return async (repos) => {
+        const placeOrderTransaction = (await repos.transaction.projectFields({
             limit: 1,
             page: 1,
             typeOf: factory.transactionType.PlaceOrder,
             object: { orderNumber: { $eq: order.orderNumber } },
             inclusion: ['result']
         })).shift();
-        const codeFromTransaction = (_a = placeOrderTransaction === null || placeOrderTransaction === void 0 ? void 0 : placeOrderTransaction.result) === null || _a === void 0 ? void 0 : _a.code;
+        const codeFromTransaction = placeOrderTransaction?.result?.code;
         if (typeof codeFromTransaction === 'string') {
             const taskRunsAt = new Date();
-            const taskIdentifier = `${order.project.id}:${factory.taskName.OnAuthorizationCreated}:${factory.transactionType.PlaceOrder}:${placeOrderTransaction === null || placeOrderTransaction === void 0 ? void 0 : placeOrderTransaction.id}`;
+            const taskIdentifier = `${order.project.id}:${factory.taskName.OnAuthorizationCreated}:${factory.transactionType.PlaceOrder}:${placeOrderTransaction?.id}`;
             const task = {
                 alternateName: taskIdentifier,
                 identifier: taskIdentifier,
@@ -107,7 +104,7 @@ function createOnAuthorizationCreatedTask(order) {
                 },
                 project: { id: order.project.id, typeOf: factory.organizationType.Project }
             };
-            yield repos.task.createIfNotExistByAlternateName(task, { emitImmediately: true });
+            await repos.task.createIfNotExistByAlternateName(task, { emitImmediately: true });
         }
-    });
+    };
 }

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

@@ -1,13 +1,4 @@
 "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.onOrderPaymentDue = onOrderPaymentDue;
 /**
@@ -18,7 +9,7 @@ const factory = require("../../../factory");
 // import { createMaskedCustomer } from '../../../factory/order';
 const debug = createDebug('chevre-domain:service:order');
 function onOrderPaymentDue(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks = [];
         // const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
@@ -39,27 +30,27 @@ function onOrderPaymentDue(params) {
             // OrderPaymentDueを追加(2023-08-23~)
             case factory.orderStatus.OrderPaymentDue:
                 tasks = [
-                    ...yield createConfirmPayTransactionTasks(params.order, simpleOrder)(repos),
+                    ...await createConfirmPayTransactionTasks(params.order, simpleOrder)(repos),
                     ...createCreateAccountingReportTask(params.order) // 経理レポート作成タスク(2024-02-02~)
                 ];
                 break;
             default:
                 throw new factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
         }
-        yield repos.task.saveMany(tasks, { emitImmediately: true });
-    });
+        await repos.task.saveMany(tasks, { emitImmediately: true });
+    };
 }
 function createConfirmPayTransactionTasks(order, simpleOrder) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const taskRunsAt = new Date();
         const tasks = [];
-        yield Promise.all(order.paymentMethods.map((invoice) => __awaiter(this, void 0, void 0, function* () {
+        await Promise.all(order.paymentMethods.map(async (invoice) => {
             // PaymentAutomaticallyAppliedであれば、自動決済処理を実行(2023-08-24~)
             if (invoice.paymentStatus !== factory.paymentStatusType.PaymentAutomaticallyApplied) {
                 return;
             }
             // 冗長なタスク作成を回避
-            const existingTasks = yield repos.task.projectFields({
+            const existingTasks = await repos.task.projectFields({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: order.project.id } },
@@ -80,7 +71,10 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
                     typeOf: factory.actionType.ConfirmAction,
                     object: [{ typeOf: factory.assetTransactionType.Pay, transactionNumber: invoice.paymentMethodId }],
                     agent: order.project,
-                    purpose: Object.assign(Object.assign({}, simpleOrder), { confirmationNumber: order.confirmationNumber }),
+                    purpose: {
+                        ...simpleOrder,
+                        confirmationNumber: order.confirmationNumber
+                    },
                     // 廃止(2024-03-12~)
                     // instrument: {
                     //     typeOf: factory.assetTransactionType.Pay, // 産取引化(2024-03-11~)
@@ -101,9 +95,9 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
                     data
                 });
             }
-        })));
+        }));
         return tasks;
-    });
+    };
 }
 function createCreateAccountingReportTask(order) {
     const taskRunsAt = new Date();

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

@@ -1,23 +1,14 @@
 "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 = createSendEmailMessageTaskIfNotExist;
 const util = require("util");
 const factory = require("../../../../factory");
 function createSendEmailMessageTaskIfNotExist(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const sendEmailMessageActions = params.sendEmailMessage;
         const now = new Date();
         if (Array.isArray(sendEmailMessageActions)) {
-            yield Promise.all(sendEmailMessageActions.map((sendEmailMessageAction, index) => __awaiter(this, void 0, void 0, function* () {
+            await Promise.all(sendEmailMessageActions.map(async (sendEmailMessageAction, index) => {
                 const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', params.order.project.id, factory.taskName.SendEmailMessage, params.order.typeOf, params.order.orderNumber, factory.orderStatus.OrderProcessing, index);
                 const simpleOrder = {
                     typeOf: params.order.typeOf,
@@ -47,8 +38,8 @@ function createSendEmailMessageTaskIfNotExist(params) {
                     executionResults: [],
                     data: { actionAttributes }
                 };
-                yield repos.task.createIfNotExistByAlternateName(sendEmailMessageTask, { emitImmediately: true });
-            })));
+                await repos.task.createIfNotExistByAlternateName(sendEmailMessageTask, { emitImmediately: true });
+            }));
         }
-    });
+    };
 }

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

@@ -9,9 +9,8 @@ const factory = require("../../../../factory");
 const reservedAgentIdentifireNames_1 = require("../../../../factory/reservedAgentIdentifireNames");
 const ASTERISK_CHARACTER = '*';
 function createInformProcessingOrderTasks(order, setting) {
-    var _a;
     const taskRunsAt = new Date();
-    const informOrder = (_a = setting === null || setting === void 0 ? void 0 : setting.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
+    const informOrder = setting?.onOrderStatusChanged?.informOrder;
     const informTasks = [];
     const order4inform = creteProcessingOrderAsNotification(order);
     const informIdentifier = `${factory.order.OrderType.Order}:${order4inform.orderNumber}:${order4inform.orderStatus}`;
@@ -19,15 +18,14 @@ function createInformProcessingOrderTasks(order, setting) {
         let recipientId = '';
         recipientId = order.customer.id;
         informOrder.forEach((informOrderParams) => {
-            var _a, _b;
-            if (typeof ((_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url) === 'string') {
+            if (typeof informOrderParams.recipient?.url === 'string') {
                 const informActionAttributes = {
                     about: { orderNumber: order.orderNumber, typeOf: factory.order.OrderType.Order },
                     object: order4inform,
                     recipient: {
                         // url: informOrderParams.recipient.url, // discontinue(2025-02-13~)
                         id: recipientId,
-                        name: (_b = informOrderParams.recipient) === null || _b === void 0 ? void 0 : _b.name,
+                        name: informOrderParams.recipient?.name,
                         typeOf: factory.creativeWorkType.WebApplication
                     },
                     target: {
@@ -58,17 +56,23 @@ const MASKED_PROFILE = '****';
  * 個人情報のマスクされたカスタマーを作成する
  */
 function createMaskedCustomer(order) {
-    return Object.assign(Object.assign({}, order.customer), { 
+    return {
+        ...order.customer,
         // ↓identifierも隠蔽
-        identifier: [], 
+        identifier: [],
         // ↓additionalPropertyも隠蔽
-        additionalProperty: [], email: MASKED_PROFILE, telephone: MASKED_PROFILE, name: MASKED_PROFILE, familyName: MASKED_PROFILE, givenName: MASKED_PROFILE });
+        additionalProperty: [],
+        email: MASKED_PROFILE,
+        telephone: MASKED_PROFILE,
+        name: MASKED_PROFILE,
+        familyName: MASKED_PROFILE,
+        givenName: MASKED_PROFILE
+    };
 }
 function creteProcessingOrderAsNotification(order) {
     const { id, project, typeOf, seller, price, priceCurrency, confirmationNumber, orderNumber, numAcceptedOffers, orderDate, orderStatus } = order;
     // in case of [id not found](2025-02-23~)
     if (typeof id !== 'string' || id === '') {
-        // tslint:disable-next-line:no-console
         console.error('creteProcessingOrderAsNotification: unexpected order found.', JSON.stringify(order));
         throw new factory.errors.Internal('order.id must be string');
     }
@@ -78,19 +82,25 @@ function creteProcessingOrderAsNotification(order) {
         confirmationNumber, orderNumber, numAcceptedOffers, orderStatus, orderDate,
         acceptedOffers: [], // OrderProcessingでは通知しない(2024-01-24~)
         // mask
-        customer: Object.assign(Object.assign({}, createMaskedCustomer(order)), { additionalProperty: (Array.isArray(order.customer.additionalProperty)) ? order.customer.additionalProperty : [], 
+        customer: {
+            ...createMaskedCustomer(order),
+            additionalProperty: (Array.isArray(order.customer.additionalProperty)) ? order.customer.additionalProperty : [],
             // identifierは必要
             // 予約語を隠蔽(2022-12-24~)
             identifier: (Array.isArray(order.customer.identifier))
                 ? order.customer.identifier.filter((p) => {
                     return !reservedAgentIdentifireNames_1.RESERVED_AGENT_IDENTIFIER_NAMES.includes(p.name);
                 })
-                : [] }),
+                : []
+        },
         // paymentMethodsに関してもmask(2022-05-30~)
         paymentMethods: order.paymentMethods.map((p) => {
-            return Object.assign(Object.assign({}, p), (typeof p.accountId === 'string' && p.accountId.length > 0)
-                ? { accountId: ASTERISK_CHARACTER.repeat(p.accountId.length) }
-                : undefined);
+            return {
+                ...p,
+                ...(typeof p.accountId === 'string' && p.accountId.length > 0)
+                    ? { accountId: ASTERISK_CHARACTER.repeat(p.accountId.length) }
+                    : undefined
+            };
         })
     };
 }

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

@@ -1,13 +1,4 @@
 "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.processOrder = processOrder;
 /**
@@ -19,7 +10,7 @@ const factory = require("../../../../factory");
 const factory_1 = require("./factory");
 const debug = createDebug('chevre-domain:service:order');
 function processOrder(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const simpleOrder = {
             typeOf: params.order.typeOf,
             // seller: {
@@ -34,20 +25,20 @@ function processOrder(params) {
             orderDate: params.order.orderDate
         };
         if (params.order.itemOfferedTypeOf === factory.actionType.MoneyTransfer) {
-            yield createConfirmMoneyTransferTasksIfNotExist(params.order, simpleOrder)(repos);
+            await createConfirmMoneyTransferTasksIfNotExist(params.order, simpleOrder)(repos);
         }
         else if (params.order.itemOfferedTypeOf === factory.reservationType.BusReservation
             || params.order.itemOfferedTypeOf === factory.reservationType.EventReservation) {
             // 冗長なconfirmReserveTransactionタスク作成を回避(2023-08-25~)
-            yield createConfirmReserveTransactionTasksIfNotExist(params.order, simpleOrder, params.options)(repos);
+            await createConfirmReserveTransactionTasksIfNotExist(params.order, simpleOrder, params.options)(repos);
         }
         else if (params.order.itemOfferedTypeOf === factory.permit.PermitType.Permit) {
-            yield createConfirmRegisterServiceTasksIfNotExist(params.order, simpleOrder)(repos);
+            await createConfirmRegisterServiceTasksIfNotExist(params.order, simpleOrder)(repos);
         }
-    });
+    };
 }
 function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder, options) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const { numTryConfirmReserveTransaction } = options;
         const taskRunsAt = new Date();
         const taskRunsAt4coa = new Date();
@@ -58,7 +49,7 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder, opti
         else {
             confirmObjects = (0, factory_1.createConfirmReservationActionObject4ChevreByOrder)({ order });
         }
-        yield Promise.all(confirmObjects.map((confirmObject) => __awaiter(this, void 0, void 0, function* () {
+        await Promise.all(confirmObjects.map(async (confirmObject) => {
             const data = {
                 // project: order.project, // discontinue(2025-08-20~)
                 typeOf: factory.actionType.ConfirmAction,
@@ -80,28 +71,28 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder, opti
                 executionResults: [],
                 data
             };
-            yield repos.task.createIfNotExistByAlternateName(confirmReserveTransactionTask, { emitImmediately: true });
+            await repos.task.createIfNotExistByAlternateName(confirmReserveTransactionTask, { emitImmediately: true });
             if (options.force === true) {
-                const existingTask = yield repos.task.findByIdentifier({
+                const existingTask = await repos.task.findByIdentifier({
                     identifier: taskIdentifier,
                     name: confirmReserveTransactionTask.name,
                     project: { id: confirmReserveTransactionTask.project.id }
                 });
-                if (typeof (existingTask === null || existingTask === void 0 ? void 0 : existingTask.id) === 'string') {
-                    const retryResult = yield repos.task.retryForciblyIfAborted({
+                if (typeof existingTask?.id === 'string') {
+                    const retryResult = await repos.task.retryForciblyIfAborted({
                         id: existingTask.id,
                         remainingNumberOfTries: numTryConfirmReserveTransaction
                     });
                     debug('retryResult:', retryResult, 'taskIdentifier:', taskIdentifier);
                 }
             }
-        })));
-    });
+        }));
+    };
 }
 function createConfirmMoneyTransferTasksIfNotExist(order, simpleOrder) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const taskRunsAt = new Date();
-        yield Promise.all(order.serialNumbers.map((moneyTransferTransactionNumber) => __awaiter(this, void 0, void 0, function* () {
+        await Promise.all(order.serialNumbers.map(async (moneyTransferTransactionNumber) => {
             const data = {
                 project: order.project,
                 typeOf: factory.actionType.ConfirmAction,
@@ -126,14 +117,14 @@ function createConfirmMoneyTransferTasksIfNotExist(order, simpleOrder) {
                 executionResults: [],
                 data
             };
-            yield repos.task.createIfNotExistByAlternateName(confirmMoneyTransferTransactionTask, { emitImmediately: true });
-        })));
-    });
+            await repos.task.createIfNotExistByAlternateName(confirmMoneyTransferTransactionTask, { emitImmediately: true });
+        }));
+    };
 }
 function createConfirmRegisterServiceTasksIfNotExist(order, simpleOrder) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const taskRunsAt = new Date();
-        yield Promise.all(order.serialNumbers.map((registerServiceTransactionNumber) => __awaiter(this, void 0, void 0, function* () {
+        await Promise.all(order.serialNumbers.map(async (registerServiceTransactionNumber) => {
             const data = {
                 project: order.project,
                 typeOf: factory.actionType.ConfirmAction,
@@ -158,7 +149,7 @@ function createConfirmRegisterServiceTasksIfNotExist(order, simpleOrder) {
                 executionResults: [],
                 data
             };
-            yield repos.task.createIfNotExistByAlternateName(confirmRegisterServiceTask, { emitImmediately: true });
-        })));
-    });
+            await repos.task.createIfNotExistByAlternateName(confirmRegisterServiceTask, { emitImmediately: true });
+        }));
+    };
 }

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

@@ -1,13 +1,4 @@
 "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.processOrder = void 0;
 exports.onOrderProcessing = onOrderProcessing;
@@ -22,14 +13,13 @@ const processOrder_1 = require("./onOrderProcessing/processOrder");
 Object.defineProperty(exports, "processOrder", { enumerable: true, get: function () { return processOrder_1.processOrder; } });
 const debug = createDebug('chevre-domain:service:order');
 function onOrderProcessing(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
-        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
+    return async (repos, settings) => {
+        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
         const { numTryConfirmReserveTransaction } = settings;
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks = [];
         let creatingCheckResourceTask;
-        const sendEmailMessageByOnOrderProcessing = (_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.onOrderProcessing) === null || _d === void 0 ? void 0 : _d.sendEmailMessage;
+        const sendEmailMessageByOnOrderProcessing = params.placeOrderTransaction?.potentialActions?.order?.onOrderProcessing?.sendEmailMessage;
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderProcessing:
                 tasks = (0, factory_1.createInformProcessingOrderTasks)(params.order, setting);
@@ -38,14 +28,14 @@ function onOrderProcessing(params) {
             default:
                 throw new factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
         }
-        yield repos.task.saveMany(tasks, { emitImmediately: true });
+        await repos.task.saveMany(tasks, { emitImmediately: true });
         // uniqueness of CheckResource task(2025-03-29~)
         if (creatingCheckResourceTask !== undefined) {
-            yield repos.task.createIfNotExistByAlternateName(creatingCheckResourceTask, { emitImmediately: true });
+            await repos.task.createIfNotExistByAlternateName(creatingCheckResourceTask, { emitImmediately: true });
         }
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderProcessing:
-                yield (0, processOrder_1.processOrder)({
+                await (0, processOrder_1.processOrder)({
                     order: params.order,
                     options: {
                         force: false,
@@ -53,7 +43,7 @@ function onOrderProcessing(params) {
                     }
                 })(repos);
                 // OrderProcessingにおけるEメール送信に対応(2024-01-17~)
-                yield (0, createSendEmailMessageTaskIfNotExist_1.createSendEmailMessageTaskIfNotExist)({
+                await (0, createSendEmailMessageTaskIfNotExist_1.createSendEmailMessageTaskIfNotExist)({
                     sendEmailMessage: [
                         ...(Array.isArray(sendEmailMessageByOnOrderProcessing)) ? sendEmailMessageByOnOrderProcessing : []
                     ],
@@ -62,5 +52,5 @@ function onOrderProcessing(params) {
                 break;
             default:
         }
-    });
+    };
 }

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

@@ -4,9 +4,8 @@ exports.createInformTasks = createInformTasks;
 exports.createOnOrderReturnedTasksByTransaction = createOnOrderReturnedTasksByTransaction;
 const factory = require("../../../../factory");
 function createInformTasks(order, returnOrderAction, setting) {
-    var _a, _b;
     const taskRunsAt = new Date();
-    const informOrder = (_a = setting === null || setting === void 0 ? void 0 : setting.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
+    const informOrder = setting?.onOrderStatusChanged?.informOrder;
     // const useInformReturnAction = (<any>setting)?.onOrderStatusChanged?.useInformReturnAction === true; // discontinue(2025-07-01~)
     const informTasks = [];
     const informIdentifier = `${factory.order.OrderType.Order}:${order.orderNumber}:${factory.orderStatus.OrderReturned}`;
@@ -19,19 +18,18 @@ function createInformTasks(order, returnOrderAction, setting) {
     if (Array.isArray(informOrder) && informOrder.length > 0) {
         let recipientId = '';
         recipientId = order.customer.id;
-        if (typeof ((_b = order.returner) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
+        if (typeof order.returner?.id === 'string') {
             recipientId = order.returner.id;
         }
         informOrder.forEach((informOrderParams) => {
-            var _a, _b;
-            if (typeof ((_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url) === 'string') {
+            if (typeof informOrderParams.recipient?.url === 'string') {
                 const informActionAttributes = {
                     about: { orderNumber: order.orderNumber, typeOf: factory.order.OrderType.Order },
                     object: informObject,
                     recipient: {
                         // url: informOrderParams.recipient.url, // discontinue(2025-02-13~)
                         id: recipientId,
-                        name: (_b = informOrderParams.recipient) === null || _b === void 0 ? void 0 : _b.name,
+                        name: informOrderParams.recipient?.name,
                         typeOf: factory.creativeWorkType.WebApplication
                     },
                     target: {
@@ -59,7 +57,10 @@ function createInformTasks(order, returnOrderAction, setting) {
 }
 function createReturnAction4inform(returnOrderAction) {
     const { id, instrument, object, project, typeOf } = returnOrderAction;
-    return Object.assign({ id, object, project, typeOf }, (Array.isArray(instrument)) ? { instrument } : undefined);
+    return {
+        id, object, project, typeOf,
+        ...(Array.isArray(instrument)) ? { instrument } : undefined
+    };
 }
 // function createOrder4inform(
 //     order: IReturnedOrder
@@ -101,7 +102,7 @@ function createOnOrderReturnedTasksByTransaction(params) {
     //     ));
     // }
     // ポイント特典返却タスク
-    const returnPointAwardAttributes = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.returnPointAward;
+    const returnPointAwardAttributes = potentialActions?.returnPointAward;
     if (Array.isArray(returnPointAwardAttributes)) {
         taskAttributes.push(...returnPointAwardAttributes.map((a) => {
             return {
@@ -116,7 +117,7 @@ function createOnOrderReturnedTasksByTransaction(params) {
             };
         }));
     }
-    const sendEmailMessageAttributes = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.sendEmailMessage;
+    const sendEmailMessageAttributes = potentialActions?.sendEmailMessage;
     if (Array.isArray(sendEmailMessageAttributes)) {
         const simpleOrder = {
             typeOf: params.order.typeOf,