@chevre/domain 24.0.0-alpha.7 → 24.0.0-alpha.71

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

@@ -1,38 +1,15 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSendEmailMessageTaskIfNotExist = createSendEmailMessageTaskIfNotExist;
-const util = __importStar(require("util"));
-const factory = __importStar(require("../../../../factory"));
+const util_1 = require("util");
+const factory_1 = require("../../../../factory");
 function createSendEmailMessageTaskIfNotExist(params) {
     return async (repos) => {
         const sendEmailMessageActions = params.sendEmailMessage;
         const now = new Date();
         if (Array.isArray(sendEmailMessageActions)) {
             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 taskIdentifier = (0, util_1.format)('%s:%s:%s:%s:%s:%s', params.order.project.id, factory_1.factory.taskName.SendEmailMessage, params.order.typeOf, params.order.orderNumber, factory_1.factory.orderStatus.OrderProcessing, index);
                 const simpleOrder = {
                     typeOf: params.order.typeOf,
                     orderNumber: params.order.orderNumber,
@@ -42,7 +19,7 @@ function createSendEmailMessageTaskIfNotExist(params) {
                 };
                 const actionAttributes = {
                     project: params.order.project,
-                    typeOf: factory.actionType.SendAction,
+                    typeOf: factory_1.factory.actionType.SendAction,
                     object: sendEmailMessageAction.object,
                     agent: params.order.project,
                     recipient: { typeOf: params.order.customer.typeOf, id: params.order.customer.id },
@@ -53,8 +30,8 @@ function createSendEmailMessageTaskIfNotExist(params) {
                     alternateName: taskIdentifier,
                     identifier: taskIdentifier,
                     project: params.order.project,
-                    name: factory.taskName.SendEmailMessage,
-                    status: factory.taskStatus.Ready,
+                    name: factory_1.factory.taskName.SendEmailMessage,
+                    status: factory_1.factory.taskStatus.Ready,
                     runsAt: now, // なるはやで実行
                     remainingNumberOfTries: 10,
                     numberOfTried: 0,

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

@@ -1,4 +1,4 @@
-import * as factory from '../../../../factory';
+import { factory } from '../../../../factory';
 import type { ISetting } from '../../../../repo/setting';
 type IProcessingOrder = Pick<factory.order.IOrder, 'id' | 'orderNumber' | 'broker' | 'confirmationNumber' | 'customer' | 'dateReturned' | 'name' | 'orderDate' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'previousOrderStatus' | 'price' | 'priceCurrency' | 'project' | 'returner' | 'seller' | 'typeOf'> & {
     id: string;

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

@@ -1,34 +1,11 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createInformProcessingOrderTasks = createInformProcessingOrderTasks;
 exports.createCheckResourceTask = createCheckResourceTask;
 exports.createConfirmReservationActionObject4ChevreByOrder = createConfirmReservationActionObject4ChevreByOrder;
 exports.createConfirmReservationActionObject4COAByOrder = createConfirmReservationActionObject4COAByOrder;
-const util = __importStar(require("util"));
-const factory = __importStar(require("../../../../factory"));
+const util_1 = require("util");
+const factory_1 = require("../../../../factory");
 const reservedAgentIdentifireNames_1 = require("../../../../factory/reservedAgentIdentifireNames");
 const ASTERISK_CHARACTER = '*';
 function createInformProcessingOrderTasks(order, setting) {
@@ -36,24 +13,24 @@ function createInformProcessingOrderTasks(order, setting) {
     const informOrder = setting?.onOrderStatusChanged?.informOrder;
     const informTasks = [];
     const order4inform = creteProcessingOrderAsNotification(order);
-    const informIdentifier = `${factory.order.OrderType.Order}:${order4inform.orderNumber}:${order4inform.orderStatus}`;
+    const informIdentifier = `${factory_1.factory.order.OrderType.Order}:${order4inform.orderNumber}:${order4inform.orderStatus}`;
     if (Array.isArray(informOrder) && informOrder.length > 0) {
         let recipientId = '';
         recipientId = order.customer.id;
         informOrder.forEach((informOrderParams) => {
             if (typeof informOrderParams.recipient?.url === 'string') {
                 const informActionAttributes = {
-                    about: { orderNumber: order.orderNumber, typeOf: factory.order.OrderType.Order },
+                    about: { orderNumber: order.orderNumber, typeOf: factory_1.factory.order.OrderType.Order },
                     object: order4inform,
                     recipient: {
                         // url: informOrderParams.recipient.url, // discontinue(2025-02-13~)
                         id: recipientId,
                         name: informOrderParams.recipient?.name,
-                        typeOf: factory.creativeWorkType.WebApplication
+                        typeOf: factory_1.factory.creativeWorkType.WebApplication
                     },
                     target: {
                         httpMethod: 'POST',
-                        encodingType: factory.encodingFormat.Application.json,
+                        encodingType: factory_1.factory.encodingFormat.Application.json,
                         typeOf: 'EntryPoint',
                         urlTemplate: informOrderParams.recipient.url
                     },
@@ -61,8 +38,8 @@ function createInformProcessingOrderTasks(order, setting) {
                 };
                 informTasks.push({
                     project: order.project,
-                    name: factory.taskName.TriggerWebhook,
-                    status: factory.taskStatus.Ready,
+                    name: factory_1.factory.taskName.TriggerWebhook,
+                    status: factory_1.factory.taskStatus.Ready,
                     runsAt: taskRunsAt,
                     remainingNumberOfTries: 10,
                     numberOfTried: 0,
@@ -97,7 +74,7 @@ function creteProcessingOrderAsNotification(order) {
     // in case of [id not found](2025-02-23~)
     if (typeof id !== 'string' || id === '') {
         console.error('creteProcessingOrderAsNotification: unexpected order found.', JSON.stringify(order));
-        throw new factory.errors.Internal('order.id must be string');
+        throw new factory_1.factory.errors.Internal('order.id must be string');
     }
     return {
         id, // ↓hub側で使用している可能性もあるので念のため
@@ -133,12 +110,12 @@ function createConfirmReservationActionObject4ChevreByOrder(params) {
         const purpose = {
             confirmationNumber: params.order.confirmationNumber,
             orderNumber: params.order.orderNumber,
-            typeOf: factory.order.OrderType.Order
+            typeOf: factory_1.factory.order.OrderType.Order
         };
         return {
             potentialActions: { reserve: { purpose } },
             transactionNumber: reservationNumber,
-            typeOf: factory.assetTransactionType.Reserve
+            typeOf: factory_1.factory.assetTransactionType.Reserve
         };
     });
 }
@@ -149,7 +126,7 @@ function createConfirmReservationActionObject4COAByOrder(params) {
         return {
             optimized: true,
             transactionNumber: reservationNumber,
-            typeOf: factory.assetTransactionType.COAReserveTransaction
+            typeOf: factory_1.factory.assetTransactionType.COAReserveTransaction
         };
     });
 }
@@ -161,15 +138,15 @@ function createCheckResourceTask(order) {
             typeOf: order.typeOf
         },
         // project: order.project,
-        typeOf: factory.actionType.CheckAction
+        typeOf: factory_1.factory.actionType.CheckAction
     };
-    const taskIdentifier = util.format('%s:%s:%s:%s', order.project.id, factory.taskName.CheckResource, order.typeOf, order.orderNumber);
+    const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s', order.project.id, factory_1.factory.taskName.CheckResource, order.typeOf, order.orderNumber);
     return {
         alternateName: taskIdentifier, // add identifier(2025-03-29~)
         identifier: taskIdentifier, // add identifier(2025-03-29~)
         project: order.project,
-        name: factory.taskName.CheckResource,
-        status: factory.taskStatus.Ready,
+        name: factory_1.factory.taskName.CheckResource,
+        status: factory_1.factory.taskStatus.Ready,
         runsAt,
         remainingNumberOfTries: 10,
         numberOfTried: 0,

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

@@ -1,5 +1,5 @@
 import type { TaskRepo } from '../../../../repo/task';
-import * as factory from '../../../../factory';
+import { factory } from '../../../../factory';
 import { IProcessingOrder } from './factory';
 declare function processOrder(params: {
     order: Pick<IProcessingOrder, 'confirmationNumber' | 'orderDate' | 'orderNumber' | 'project' | 'typeOf'> & {

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

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -31,9 +8,9 @@ exports.processOrder = processOrder;
  * 注文処理時処理
  */
 const debug_1 = __importDefault(require("debug"));
-const util = __importStar(require("util"));
-const factory = __importStar(require("../../../../factory"));
-const factory_1 = require("./factory");
+const util_1 = require("util");
+const factory_1 = require("../../../../factory");
+const factory_2 = require("./factory");
 const debug = (0, debug_1.default)('chevre-domain:service:order');
 function processOrder(params) {
     return async (repos) => {
@@ -50,15 +27,14 @@ function processOrder(params) {
             // priceCurrency: params.order.priceCurrency,
             orderDate: params.order.orderDate
         };
-        if (params.order.itemOfferedTypeOf === factory.actionType.MoneyTransfer) {
-            await createConfirmMoneyTransferTasksIfNotExist(params.order, simpleOrder)(repos);
-        }
-        else if (params.order.itemOfferedTypeOf === factory.reservationType.BusReservation
-            || params.order.itemOfferedTypeOf === factory.reservationType.EventReservation) {
+        // if (params.order.itemOfferedTypeOf === factory.actionType.MoneyTransfer) {
+        //     await createConfirmMoneyTransferTasksIfNotExist(params.order, simpleOrder)(repos);
+        // } else 
+        if (params.order.itemOfferedTypeOf === factory_1.factory.reservationType.EventReservation) {
             // 冗長なconfirmReserveTransactionタスク作成を回避(2023-08-25~)
             await createConfirmReserveTransactionTasksIfNotExist(params.order, simpleOrder, params.options)(repos);
         }
-        else if (params.order.itemOfferedTypeOf === factory.permit.PermitType.Permit) {
+        else if (params.order.itemOfferedTypeOf === factory_1.factory.permit.PermitType.Permit) {
             await createConfirmRegisterServiceTasksIfNotExist(params.order, simpleOrder)(repos);
         }
     };
@@ -69,29 +45,29 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder, opti
         const taskRunsAt = new Date();
         const taskRunsAt4coa = new Date();
         let confirmObjects;
-        if (order.offeredThroughIdentifier === factory.service.webAPI.Identifier.COA) {
-            confirmObjects = (0, factory_1.createConfirmReservationActionObject4COAByOrder)({ order });
+        if (order.offeredThroughIdentifier === factory_1.factory.service.webAPI.Identifier.COA) {
+            confirmObjects = (0, factory_2.createConfirmReservationActionObject4COAByOrder)({ order });
         }
         else {
-            confirmObjects = (0, factory_1.createConfirmReservationActionObject4ChevreByOrder)({ order });
+            confirmObjects = (0, factory_2.createConfirmReservationActionObject4ChevreByOrder)({ order });
         }
         await Promise.all(confirmObjects.map(async (confirmObject) => {
             const data = {
                 // project: order.project, // discontinue(2025-08-20~)
-                typeOf: factory.actionType.ConfirmAction,
+                typeOf: factory_1.factory.actionType.ConfirmAction,
                 object: confirmObject,
                 // agent: order.project, // discontinue(2025-08-20~)
                 purpose: simpleOrder
                 // instrument廃止(2024-03-13~)
             };
-            const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', order.project.id, factory.taskName.ConfirmReserveTransaction, data.purpose.typeOf, data.purpose.orderNumber, data.object.typeOf, data.object.transactionNumber);
+            const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s:%s:%s', order.project.id, factory_1.factory.taskName.ConfirmReserveTransaction, data.purpose.typeOf, data.purpose.orderNumber, data.object.typeOf, data.object.transactionNumber);
             const confirmReserveTransactionTask = {
                 alternateName: taskIdentifier,
                 identifier: taskIdentifier,
                 project: order.project,
-                name: factory.taskName.ConfirmReserveTransaction,
-                status: factory.taskStatus.Ready,
-                runsAt: (confirmObject.typeOf === factory.assetTransactionType.COAReserveTransaction) ? taskRunsAt4coa : taskRunsAt,
+                name: factory_1.factory.taskName.ConfirmReserveTransaction,
+                status: factory_1.factory.taskStatus.Ready,
+                runsAt: (confirmObject.typeOf === factory_1.factory.assetTransactionType.COAReserveTransaction) ? taskRunsAt4coa : taskRunsAt,
                 remainingNumberOfTries: numTryConfirmReserveTransaction, // COA性能を考慮して多めに
                 numberOfTried: 0,
                 executionResults: [],
@@ -115,60 +91,78 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder, opti
         }));
     };
 }
-function createConfirmMoneyTransferTasksIfNotExist(order, simpleOrder) {
-    return async (repos) => {
-        const taskRunsAt = new Date();
-        await Promise.all(order.serialNumbers.map(async (moneyTransferTransactionNumber) => {
-            const data = {
-                project: order.project,
-                typeOf: factory.actionType.ConfirmAction,
-                object: {
-                    // pendingTransaction: { id: '' }, // 空文字であれば、transactionNumberで処理される
-                    transactionNumber: moneyTransferTransactionNumber,
-                    typeOf: factory.assetTransactionType.MoneyTransfer
-                },
-                agent: order.project,
-                purpose: simpleOrder
-            };
-            const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', data.project.id, factory.taskName.ConfirmMoneyTransfer, data.purpose.typeOf, simpleOrder.orderNumber, data.object.typeOf, data.object.transactionNumber);
-            const confirmMoneyTransferTransactionTask = {
-                alternateName: taskIdentifier,
-                identifier: taskIdentifier,
-                project: order.project,
-                name: factory.taskName.ConfirmMoneyTransfer,
-                status: factory.taskStatus.Ready,
-                runsAt: taskRunsAt,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data
-            };
-            await repos.task.createIfNotExistByAlternateName(confirmMoneyTransferTransactionTask, { emitImmediately: true });
-        }));
-    };
-}
+// function createConfirmMoneyTransferTasksIfNotExist(
+//     order: Pick<IProcessingOrder, 'orderNumber' | 'project'> & {
+//         serialNumbers: string[];
+//     },
+//     simpleOrder: factory.order.ISimpleOrder
+// ) {
+//     return async (repos: {
+//         task: TaskRepo;
+//     }): Promise<void> => {
+//         const taskRunsAt = new Date();
+//         await Promise.all(order.serialNumbers.map(async (moneyTransferTransactionNumber) => {
+//             const data: factory.task.IData<factory.taskName.ConfirmMoneyTransfer> = {
+//                 project: order.project,
+//                 typeOf: factory.actionType.ConfirmAction,
+//                 object: {
+//                     // pendingTransaction: { id: '' }, // 空文字であれば、transactionNumberで処理される
+//                     transactionNumber: moneyTransferTransactionNumber,
+//                     typeOf: factory.assetTransactionType.MoneyTransfer
+//                 },
+//                 agent: order.project,
+//                 purpose: simpleOrder
+//             };
+//             const taskIdentifier: string = util.format(
+//                 '%s:%s:%s:%s:%s:%s',
+//                 data.project.id,
+//                 factory.taskName.ConfirmMoneyTransfer,
+//                 data.purpose.typeOf,
+//                 simpleOrder.orderNumber,
+//                 data.object.typeOf,
+//                 data.object.transactionNumber
+//             );
+//             const confirmMoneyTransferTransactionTask: factory.task.IAttributes<factory.taskName.ConfirmMoneyTransfer> & {
+//                 alternateName: string;
+//                 identifier: string;
+//             } = {
+//                 alternateName: taskIdentifier,
+//                 identifier: taskIdentifier,
+//                 project: order.project,
+//                 name: factory.taskName.ConfirmMoneyTransfer,
+//                 status: factory.taskStatus.Ready,
+//                 runsAt: taskRunsAt,
+//                 remainingNumberOfTries: 10,
+//                 numberOfTried: 0,
+//                 executionResults: [],
+//                 data
+//             };
+//             await repos.task.createIfNotExistByAlternateName(confirmMoneyTransferTransactionTask, { emitImmediately: true });
+//         }));
+//     };
+// }
 function createConfirmRegisterServiceTasksIfNotExist(order, simpleOrder) {
     return async (repos) => {
         const taskRunsAt = new Date();
         await Promise.all(order.serialNumbers.map(async (registerServiceTransactionNumber) => {
             const data = {
                 project: order.project,
-                typeOf: factory.actionType.ConfirmAction,
+                typeOf: factory_1.factory.actionType.ConfirmAction,
                 object: {
                     endDate: order.orderDate,
                     transactionNumber: registerServiceTransactionNumber,
-                    typeOf: factory.assetTransactionType.RegisterService
+                    typeOf: factory_1.factory.assetTransactionType.RegisterService
                 },
                 agent: order.project,
                 purpose: simpleOrder
             };
-            const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', data.project.id, factory.taskName.ConfirmRegisterService, data.purpose.typeOf, simpleOrder.orderNumber, data.object.typeOf, data.object.transactionNumber);
+            const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s:%s:%s', data.project.id, factory_1.factory.taskName.ConfirmRegisterService, data.purpose.typeOf, simpleOrder.orderNumber, data.object.typeOf, data.object.transactionNumber);
             const confirmRegisterServiceTask = {
                 alternateName: taskIdentifier,
                 identifier: taskIdentifier,
                 project: order.project,
-                name: factory.taskName.ConfirmRegisterService,
-                status: factory.taskStatus.Ready,
+                name: factory_1.factory.taskName.ConfirmRegisterService,
+                status: factory_1.factory.taskStatus.Ready,
                 runsAt: taskRunsAt,
                 remainingNumberOfTries: 10,
                 numberOfTried: 0,

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

@@ -1,6 +1,6 @@
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
-import * as factory from '../../../factory';
+import { factory } from '../../../factory';
 import { Settings } from '../../../settings';
 import { IExternalOrder, IProcessingOrder } from './onOrderProcessing/factory';
 import { processOrder } from './onOrderProcessing/processOrder';

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

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -32,9 +9,9 @@ exports.onOrderProcessing = onOrderProcessing;
  * 注文処理時処理
  */
 const debug_1 = __importDefault(require("debug"));
-const factory = __importStar(require("../../../factory"));
+const factory_1 = require("../../../factory");
 const createSendEmailMessageTaskIfNotExist_1 = require("./onOrderProcessing/createSendEmailMessageTaskIfNotExist");
-const factory_1 = require("./onOrderProcessing/factory");
+const factory_2 = require("./onOrderProcessing/factory");
 const processOrder_1 = require("./onOrderProcessing/processOrder");
 Object.defineProperty(exports, "processOrder", { enumerable: true, get: function () { return processOrder_1.processOrder; } });
 const debug = (0, debug_1.default)('chevre-domain:service:order');
@@ -47,12 +24,12 @@ function onOrderProcessing(params) {
         let creatingCheckResourceTask;
         const sendEmailMessageByOnOrderProcessing = params.placeOrderTransaction?.potentialActions?.order?.onOrderProcessing?.sendEmailMessage;
         switch (params.order.orderStatus) {
-            case factory.orderStatus.OrderProcessing:
-                tasks = (0, factory_1.createInformProcessingOrderTasks)(params.order, setting);
-                creatingCheckResourceTask = (0, factory_1.createCheckResourceTask)(params.order); // リソース検証タスクを追加(2024-03-13~)
+            case factory_1.factory.orderStatus.OrderProcessing:
+                tasks = (0, factory_2.createInformProcessingOrderTasks)(params.order, setting);
+                creatingCheckResourceTask = (0, factory_2.createCheckResourceTask)(params.order); // リソース検証タスクを追加(2024-03-13~)
                 break;
             default:
-                throw new factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
+                throw new factory_1.factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
         }
         await repos.task.saveMany(tasks, { emitImmediately: true });
         // uniqueness of CheckResource task(2025-03-29~)
@@ -60,7 +37,7 @@ function onOrderProcessing(params) {
             await repos.task.createIfNotExistByAlternateName(creatingCheckResourceTask, { emitImmediately: true });
         }
         switch (params.order.orderStatus) {
-            case factory.orderStatus.OrderProcessing:
+            case factory_1.factory.orderStatus.OrderProcessing:
                 await (0, processOrder_1.processOrder)({
                     order: params.order,
                     options: {

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

@@ -1,4 +1,4 @@
-import * as factory from '../../../../factory';
+import { factory } from '../../../../factory';
 import type { ISetting } from '../../../../repo/setting';
 type IReturnedOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'orderNumber' | 'dateReturned' | 'id' | 'customer' | 'returner'>;
 type IReturnAction = factory.action.transfer.returnAction.order.IAttributes & {
@@ -11,5 +11,5 @@ declare function createInformTasks(order: IReturnedOrder, returnOrderAction: IRe
 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").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/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/task/deletePerson").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/onResourceDeleted").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)[];
+}): (import("@chevre/factory/lib/task").ITaskAttributes | 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/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/task/deletePerson").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/onResourceDeleted").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/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/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
 export { createInformTasks, createOnOrderReturnedTasksByTransaction, IReturnAction };

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

@@ -1,37 +1,14 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createInformTasks = createInformTasks;
 exports.createOnOrderReturnedTasksByTransaction = createOnOrderReturnedTasksByTransaction;
-const factory = __importStar(require("../../../../factory"));
+const factory_1 = require("../../../../factory");
 function createInformTasks(order, returnOrderAction, setting) {
     const taskRunsAt = new Date();
     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}`;
+    const informIdentifier = `${factory_1.factory.order.OrderType.Order}:${order.orderNumber}:${factory_1.factory.orderStatus.OrderReturned}`;
     const informObject = createReturnAction4inform(returnOrderAction);
     // if (useInformReturnAction) { // discontinue(2025-07-01~)
     //     informObject = createReturnAction4inform(returnOrderAction);
@@ -47,17 +24,17 @@ function createInformTasks(order, returnOrderAction, setting) {
         informOrder.forEach((informOrderParams) => {
             if (typeof informOrderParams.recipient?.url === 'string') {
                 const informActionAttributes = {
-                    about: { orderNumber: order.orderNumber, typeOf: factory.order.OrderType.Order },
+                    about: { orderNumber: order.orderNumber, typeOf: factory_1.factory.order.OrderType.Order },
                     object: informObject,
                     recipient: {
                         // url: informOrderParams.recipient.url, // discontinue(2025-02-13~)
                         id: recipientId,
                         name: informOrderParams.recipient?.name,
-                        typeOf: factory.creativeWorkType.WebApplication
+                        typeOf: factory_1.factory.creativeWorkType.WebApplication
                     },
                     target: {
                         httpMethod: 'POST',
-                        encodingType: factory.encodingFormat.Application.json,
+                        encodingType: factory_1.factory.encodingFormat.Application.json,
                         typeOf: 'EntryPoint',
                         urlTemplate: informOrderParams.recipient.url
                     },
@@ -65,8 +42,8 @@ function createInformTasks(order, returnOrderAction, setting) {
                 };
                 informTasks.push({
                     project: order.project,
-                    name: factory.taskName.TriggerWebhook,
-                    status: factory.taskStatus.Ready,
+                    name: factory_1.factory.taskName.TriggerWebhook,
+                    status: factory_1.factory.taskStatus.Ready,
                     runsAt: taskRunsAt,
                     remainingNumberOfTries: 10,
                     numberOfTried: 0,
@@ -130,8 +107,8 @@ function createOnOrderReturnedTasksByTransaction(params) {
         taskAttributes.push(...returnPointAwardAttributes.map((a) => {
             return {
                 project: a.project,
-                name: factory.taskName.ReturnPointAward,
-                status: factory.taskStatus.Ready,
+                name: factory_1.factory.taskName.ReturnPointAward,
+                status: factory_1.factory.taskStatus.Ready,
                 runsAt: now, // なるはやで実行
                 remainingNumberOfTries: 10,
                 numberOfTried: 0,
@@ -152,7 +129,7 @@ function createOnOrderReturnedTasksByTransaction(params) {
         sendEmailMessageAttributes.forEach((s) => {
             const actionAttributes = {
                 project: params.order.project,
-                typeOf: factory.actionType.SendAction,
+                typeOf: factory_1.factory.actionType.SendAction,
                 object: s.object,
                 agent: params.order.project,
                 recipient: { typeOf: params.order.customer.typeOf, id: params.order.customer.id },
@@ -161,8 +138,8 @@ function createOnOrderReturnedTasksByTransaction(params) {
             };
             const sendEmailMessageTask = {
                 project: params.order.project,
-                name: factory.taskName.SendEmailMessage,
-                status: factory.taskStatus.Ready,
+                name: factory_1.factory.taskName.SendEmailMessage,
+                status: factory_1.factory.taskStatus.Ready,
                 runsAt: now, // なるはやで実行
                 remainingNumberOfTries: 3,
                 numberOfTried: 0,

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

@@ -1,7 +1,7 @@
 import type { AcceptedOfferRepo } from '../../../repo/acceptedOffer';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
-import * as factory from '../../../factory';
+import { factory } from '../../../factory';
 import { IReturnAction } from './onOrderReturned/factory';
 type IReturnOrderTransaction = Pick<factory.transaction.returnOrder.ITransaction, 'id' | 'typeOf' | 'potentialActions'>;
 declare function onOrderReturned(params: {