npm - @chevre/domain - Versions diffs - 24.0.0-alpha.7 → 24.0.0-alpha.71 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (947) hide show

package/lib/chevre/service/task/cancelPendingReservation.js CHANGED Viewed

@@ -1,31 +1,8 @@
 "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.call = call;
-const COA = __importStar(require("@motionpicture/coa-service"));
-const factory = __importStar(require("../../factory"));
+const coa_service_1 = require("@motionpicture/coa-service");
+const factory_1 = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const offer_1 = require("../../repo/rateLimit/offer");
@@ -37,10 +14,10 @@ const task_1 = require("../../repo/task");
 const cancelReservation_1 = require("../reserve/cancelReservation");
 const cancelReservation_2 = require("../reserveCOA/cancelReservation");
 let coaAuthClientCreated = false;
-let coaAuthClient = new COA.auth.RefreshToken({
+let coaAuthClient = new coa_service_1.COA.auth.RefreshToken({
     endpoint: '', // 使用されないので空文字でok
     refreshToken: '', // 使用されないので空文字でok
-    useFetch: true
+    // useFetch: true
 });
 /**
  * タスク実行関数
@@ -48,11 +25,11 @@ let coaAuthClient = new COA.auth.RefreshToken({
 function call(params) {
     return async ({ connection, redisClient, settings }) => {
         if (redisClient === undefined) {
-            throw new factory.errors.Argument('settings', 'redisClient required');
+            throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
         const { data } = params;
         // support COAReserve(2025-03-01~)
-        if (data.purpose?.typeOf === factory.assetTransactionType.Reserve) {
+        if (data.purpose?.typeOf === factory_1.factory.assetTransactionType.Reserve) {
             await (0, cancelReservation_1.cancelPendingReservation)({ purpose: data.purpose })({
                 action: new action_1.ActionRepo(connection),
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
@@ -63,18 +40,18 @@ function call(params) {
                 task: new task_1.TaskRepo(connection)
             });
         }
-        else if (data.object?.typeOf === factory.assetTransactionType.COAReserveTransaction) {
+        else if (data.object?.typeOf === factory_1.factory.assetTransactionType.COAReserveTransaction) {
             // throw new factory.errors.NotImplemented(`object.typeOf ${data.object?.typeOf} not implemented`);
             if (!coaAuthClientCreated) {
                 const reserveInterfaceRepo = new reserveInterface_1.ReserveInterfaceRepo(connection);
                 const coaAPI = await reserveInterfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
                 const credentials = coaAPI?.availableChannel?.credentials;
                 if (typeof credentials?.refreshToken === 'string') {
-                    coaAuthClient = new COA.auth.RefreshToken(credentials);
+                    coaAuthClient = new coa_service_1.COA.auth.RefreshToken(credentials);
                     coaAuthClientCreated = true;
                 }
             }
-            const reserveService = new COA.service.Reserve({
+            const reserveService = new coa_service_1.COA.service.Reserve({
                 endpoint: coaAuthClient.options.endpoint,
                 auth: coaAuthClient
             }, { timeout: settings.coa.timeout });
@@ -89,7 +66,7 @@ function call(params) {
             });
         }
         else {
-            throw new factory.errors.NotImplemented(`purpose.typeOf ${data.purpose?.typeOf} not implemented`);
+            throw new factory_1.factory.errors.NotImplemented(`purpose.typeOf ${data.purpose?.typeOf} not implemented`);
         }
     };
 }

package/lib/chevre/service/task/cancelReservation.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import * as factory from '../../factory';
+import { factory } from '../../factory';
 import type { IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数

package/lib/chevre/service/task/cancelReservation.js CHANGED Viewed

@@ -1,30 +1,7 @@
 "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.call = call;
-const factory = __importStar(require("../../factory"));
+const factory_1 = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const offer_1 = require("../../repo/rateLimit/offer");
@@ -39,7 +16,7 @@ const cancelReservation_1 = require("../reserve/cancelReservation");
 function call(data) {
     return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
-            throw new factory.errors.Argument('settings', 'redisClient required');
+            throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
         await (0, cancelReservation_1.cancelReservation)(data.actionAttributes)({
             action: new action_1.ActionRepo(connection),

package/lib/chevre/service/task/checkMovieTicket.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
-import * as factory from '../../factory';
+import { factory } from '../../factory';
 /**
  * タスク実行関数
  */

package/lib/chevre/service/task/checkMovieTicket.js CHANGED Viewed

@@ -1,31 +1,8 @@
 "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.call = call;
-const factory = __importStar(require("../../factory"));
-const action_1 = require("../../repo/action");
+const factory_1 = require("../../factory");
+const checkMovieTicket_1 = require("../../repo/action/checkMovieTicket");
 const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
 const paymentService_1 = require("../../repo/paymentService");
@@ -39,13 +16,13 @@ const pay_1 = require("../assetTransaction/pay");
 function call(params) {
     return async ({ connection, redisClient, settings }, options) => {
         if (redisClient === undefined) {
-            throw new factory.errors.Argument('settings', 'redisClient required');
+            throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
         // 遅延実行(executeByName)には対応しない
         if (!options.executeById) {
             return;
         }
-        const actionRepo = new action_1.ActionRepo(connection);
+        const actionRepo = new checkMovieTicket_1.CheckMovieTicketActionRepo(connection);
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         const paymentServiceId = params.data.object[0]?.id;
         const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
@@ -56,9 +33,9 @@ function call(params) {
                 ...params.data,
                 sameAs: { id: params.id, typeOf: 'Task' }
             })({
-                action: actionRepo,
+                checkMovieTicketAction: actionRepo,
                 credentials: new credentials_1.CredentialsRepo(redisClient, {
-                    scope: `${factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,
+                    scope: `${factory_1.factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,
                     expireInSeconds: (useCredentialsRepo) ? credentialsExpireInSeconds : 0
                 }),
                 event: new event_1.EventRepo(connection),
@@ -72,7 +49,7 @@ function call(params) {
             // アクションが存在すればタスクを実行済扱いにする
             const action = (await actionRepo.searchBySameAs({
                 sameAs: { id: { $eq: params.id } },
-                typeOf: { $eq: factory.actionType.CheckAction },
+                typeOf: { $eq: factory_1.factory.actionType.CheckAction },
                 ...(typeof params.data.purpose?.id === 'string')
                     ? { purpose: { id: { $eq: params.data.purpose.id } } }
                     : undefined

package/lib/chevre/service/task/checkResource.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import * as factory from '../../factory';
+import { factory } from '../../factory';
 import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数

package/lib/chevre/service/task/checkResource.js CHANGED Viewed

@@ -1,32 +1,9 @@
 "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.call = call;
-const factory = __importStar(require("../../factory"));
+const factory_1 = require("../../factory");
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
-const action_1 = require("../../repo/action");
+const checkThing_1 = require("../../repo/action/checkThing");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
@@ -41,22 +18,22 @@ const validateOrder_1 = require("../validation/validateOrder");
 function call(params) {
     return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
-            throw new factory.errors.Argument('settings', 'redisClient required');
+            throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
-        const actionRepo = new action_1.ActionRepo(connection);
+        const actionRepo = new checkThing_1.CheckThingActionRepo(connection);
         const { data } = params;
         const actionAttributes = {
-            agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+            agent: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
             object: data.object,
-            project: { id: params.project.id, typeOf: factory.organizationType.Project },
-            typeOf: factory.actionType.CheckAction,
+            project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
+            typeOf: factory_1.factory.actionType.CheckAction,
             sameAs: { id: params.id, typeOf: 'Task' } // add sameAs(2025-09-22~)
         };
         const action = await actionRepo.start(actionAttributes);
         const objectTypeOf = data.object.typeOf;
         try {
             switch (objectTypeOf) {
-                case factory.order.OrderType.Order:
+                case factory_1.factory.order.OrderType.Order:
                     await (0, validateOrder_1.validateOrder)({
                         orderNumber: data.object.orderNumber,
                         project: { id: params.project.id }
@@ -69,7 +46,7 @@ function call(params) {
                     });
                     break;
                 // support ScreeningEvent(2025-05-01~)
-                case factory.eventType.ScreeningEvent:
+                case factory_1.factory.eventType.ScreeningEvent:
                     await (0, validateEvent_1.validateEvent)({
                         id: data.object.id,
                         project: { id: params.project.id }
@@ -79,7 +56,7 @@ function call(params) {
                     });
                     break;
                 default:
-                    throw new factory.errors.NotImplemented(`${objectTypeOf} not implemented`);
+                    throw new factory_1.factory.errors.NotImplemented(`${objectTypeOf} not implemented`);
             }
         }
         catch (error) {

package/lib/chevre/service/task/confirmPayTransaction.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
-import * as factory from '../../factory';
+import { factory } from '../../factory';
 /**
  * タスク実行関数
  */

package/lib/chevre/service/task/confirmPayTransaction.js CHANGED Viewed

@@ -9,7 +9,7 @@ const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
 const project_1 = require("../../repo/project");
 const task_1 = require("../../repo/task");
-const transaction_1 = require("../../repo/transaction");
+// import { TransactionRepo } from '../../repo/transaction';
 const confirmPayTransaction_1 = require("../order/confirmPayTransaction");
 /**
  * タスク実行関数
@@ -29,7 +29,7 @@ function call(params) {
             event: new event_1.EventRepo(connection),
             project: new project_1.ProjectRepo(connection),
             task: new task_1.TaskRepo(connection),
-            transaction: new transaction_1.TransactionRepo(connection)
+            // transaction: new TransactionRepo(connection)
         });
     };
 }

package/lib/chevre/service/task/confirmRegisterService.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { IOperationExecute } from '../taskHandler';
-import * as factory from '../../factory';
+import { factory } from '../../factory';
 /**
  * タスク実行関数
  */

package/lib/chevre/service/task/confirmRegisterServiceTransaction.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { IOperationExecute } from '../taskHandler';
-import * as factory from '../../factory';
+import { factory } from '../../factory';
 import { ActionRepo } from '../../repo/action';
 import { AssetTransactionRepo } from '../../repo/assetTransaction';
 import { TaskRepo } from '../../repo/task';

package/lib/chevre/service/task/confirmRegisterServiceTransaction.js CHANGED Viewed

@@ -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 };
 };
@@ -30,7 +7,7 @@ exports.call = call;
 exports.confirmRegisterServiceTransaction = confirmRegisterServiceTransaction;
 exports.onRegistered = onRegistered;
 const moment_1 = __importDefault(require("moment"));
-const factory = __importStar(require("../../factory"));
+const factory_1 = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const task_1 = require("../../repo/task");
@@ -60,12 +37,12 @@ function confirmRegisterServiceTransaction(params) {
                 const assetTransactions = await repos.assetTransaction.search({
                     limit: 1,
                     page: 1,
-                    typeOf: factory.assetTransactionType.RegisterService,
+                    typeOf: factory_1.factory.assetTransactionType.RegisterService,
                     object: { itemOffered: { serviceOutput: { identifier: { $eq: serviceOutputIdentifier } } } }
                 });
                 const assetTransaction = assetTransactions.shift();
                 if (assetTransaction === undefined) {
-                    throw new factory.errors.NotFound('AssetTransaction', `AssetTransaction with serviceOutputIdentifier '${serviceOutputIdentifier}' not found`);
+                    throw new factory_1.factory.errors.NotFound('AssetTransaction', `AssetTransaction with serviceOutputIdentifier '${serviceOutputIdentifier}' not found`);
                 }
                 transactionNumber = assetTransaction.transactionNumber;
             }
@@ -84,7 +61,7 @@ function confirmRegisterServiceTransaction(params) {
                 })(repos);
             }
             else {
-                throw new factory.errors.Argument('transactionNumber not specified');
+                throw new factory_1.factory.errors.Argument('transactionNumber not specified');
             }
         }
         catch (error) {
@@ -107,26 +84,26 @@ function onRegistered(params) {
         const taskAttributes = [];
         // タスク保管
         await repos.task.saveMany(taskAttributes, { emitImmediately: true });
-        if (params.purpose.typeOf === factory.order.OrderType.Order) {
+        if (params.purpose.typeOf === factory_1.factory.order.OrderType.Order) {
             // タスク冪等作成
             const onAssetTransactionStatusChangedTaskData = {
-                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
                 object: {
                     typeOf: params.object.typeOf,
                     transactionNumber: params.object.transactionNumber,
-                    status: factory.transactionStatusType.Confirmed
+                    status: factory_1.factory.transactionStatusType.Confirmed
                 },
                 purpose: {
                     confirmationNumber: '', // OnAssetTransactionStatusChanged処理内で使用されないので空文字でok
                     orderNumber: params.purpose.orderNumber,
-                    typeOf: factory.order.OrderType.Order
+                    typeOf: factory_1.factory.order.OrderType.Order
                 },
                 useOnOrderStatusChanged: true
             };
             const onAssetTransactionStatusChangedTask = {
-                project: { id: params.project.id, typeOf: factory.organizationType.Project },
-                name: factory.taskName.OnAssetTransactionStatusChanged,
-                status: factory.taskStatus.Ready,
+                project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
+                name: factory_1.factory.taskName.OnAssetTransactionStatusChanged,
+                status: factory_1.factory.taskStatus.Ready,
                 runsAt: new Date(),
                 remainingNumberOfTries: 10,
                 numberOfTried: 0,

package/lib/chevre/service/task/confirmReserveTransaction.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
-import * as COA from '@motionpicture/coa-service';
-import * as factory from '../../factory';
+import { COA } from '@motionpicture/coa-service';
+import { factory } from '../../factory';
 import { Settings } from '../../settings';
 import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import { AcceptedOfferRepo } from '../../repo/acceptedOffer';

package/lib/chevre/service/task/confirmReserveTransaction.js CHANGED Viewed

@@ -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.call = call;
 exports.confirmReserveTransaction = confirmReserveTransaction;
-const COA = __importStar(require("@motionpicture/coa-service"));
+const coa_service_1 = require("@motionpicture/coa-service");
 const google_libphonenumber_1 = require("google-libphonenumber");
 const util_1 = require("util");
-const factory = __importStar(require("../../factory"));
+const factory_1 = require("../../factory");
 const confirm_1 = require("../assetTransaction/reserve/confirm");
 const reserveCOA_1 = require("../assetTransaction/reserveCOA");
-const factory_1 = require("../assetTransaction/reserveCOA/factory");
+const factory_2 = require("../assetTransaction/reserveCOA/factory");
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
@@ -42,10 +19,10 @@ const reserveInterface_1 = require("../../repo/reserveInterface");
 const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
 let coaAuthClientCreated = false;
-let coaAuthClient = new COA.auth.RefreshToken({
+let coaAuthClient = new coa_service_1.COA.auth.RefreshToken({
     endpoint: '', // 使用されないので空文字でok
     refreshToken: '', // 使用されないので空文字でok
-    useFetch: true
+    // useFetch: true
 });
 /**
  * タスク実行関数
@@ -57,11 +34,11 @@ function call(params) {
             const coaAPI = await reserveInterfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
             const credentials = coaAPI?.availableChannel?.credentials;
             if (typeof credentials?.refreshToken === 'string') {
-                coaAuthClient = new COA.auth.RefreshToken(credentials);
+                coaAuthClient = new coa_service_1.COA.auth.RefreshToken(credentials);
                 coaAuthClientCreated = true;
             }
         }
-        const reserveService = new COA.service.Reserve({
+        const reserveService = new coa_service_1.COA.service.Reserve({
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
         }, { timeout: settings.coa.timeout });
@@ -88,8 +65,8 @@ function call(params) {
 function createConfirmObject4COAByOrder(params) {
     // COA予約のみ
     const coaReservationOffers = params.order.acceptedOffers.filter((o) => {
-        return o.itemOffered.typeOf === factory.reservationType.EventReservation
-            && o.offeredThrough?.identifier === factory.service.webAPI.Identifier.COA;
+        return o.itemOffered.typeOf === factory_1.factory.reservationType.EventReservation
+            && o.offeredThrough?.identifier === factory_1.factory.service.webAPI.Identifier.COA;
     });
     const customer = params.order.customer;
     // 電話番号のフォーマットを日本人にリーダブルに調整(COAではこのフォーマットで扱うので)
@@ -100,7 +77,7 @@ function createConfirmObject4COAByOrder(params) {
     telNum = telNum.replace(/[^\d]/g, '');
     const mailAddr = customer.email;
     if (mailAddr === undefined) {
-        throw new factory.errors.Argument('order', 'order.customer.email undefined');
+        throw new factory_1.factory.errors.Argument('order', 'order.customer.email undefined');
     }
     const coaReservations = coaReservationOffers
         .filter((o) => o.itemOffered.reservationNumber === params.reservationNumber)
@@ -110,15 +87,15 @@ function createConfirmObject4COAByOrder(params) {
     const coaReservation = coaReservations[0];
     const reservationForCOAInfo = coaReservation.reservationFor.coaInfo;
     if (reservationForCOAInfo === undefined) {
-        throw new factory.errors.NotFound('reservationFor.coaInfo');
+        throw new factory_1.factory.errors.NotFound('reservationFor.coaInfo');
     }
     const totalPrice = coaReservation.reservedTicket.coaReserveAmount;
     if (totalPrice === undefined) {
-        throw new factory.errors.NotFound('reservedTicket.coaReserveAmount');
+        throw new factory_1.factory.errors.NotFound('reservedTicket.coaReserveAmount');
     }
     const listTicket = coaReservations.map((r) => {
         if (typeof r.reservedTicket.coaTicketInfo?.ticketCode !== 'string') {
-            throw new factory.errors.NotFound('reservedTicket.coaTicketInfo');
+            throw new factory_1.factory.errors.NotFound('reservedTicket.coaTicketInfo');
         }
         // 冗長な属性を排除(2023-03-20~)
         const { ticketCode, stdPrice, addPrice, spseatAdd1, spseatAdd2, disPrice, salePrice, mvtkAppPrice, ticketCount, spseatKbn, seatNum, addGlasses, kbnEisyahousiki, mvtkNum, mvtkKbnDenshiken, mvtkKbnMaeuriken, mvtkKbnKensyu, mvtkSalesPrice, kbnMgtk } = r.reservedTicket.coaTicketInfo;
@@ -155,7 +132,7 @@ function fixOrderAsPurpose(params) {
         }, { inclusion: ['customer', 'orderNumber', 'typeOf'] });
         const order = orders.shift();
         if (order === undefined) {
-            throw new factory.errors.NotFound('Order as purpose');
+            throw new factory_1.factory.errors.NotFound('Order as purpose');
         }
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: order.orderNumber },
@@ -176,7 +153,7 @@ function confirmReserveTransaction(params, options) {
         // let updReserveResult: COA.factory.reserve.IUpdReserveResult | undefined;
         let recipe;
         switch (params.object.typeOf) {
-            case factory.assetTransactionType.COAReserveTransaction:
+            case factory_1.factory.assetTransactionType.COAReserveTransaction: {
                 // 最適化されたタスクに対応するため、ここでIObject4COAを注文から生成する(2024-01-24~)
                 const order = await fixOrderAsPurpose({
                     project: { id: params.project.id },
@@ -186,14 +163,15 @@ function confirmReserveTransaction(params, options) {
                 const object4coa = {
                     ...updReserveArgs,
                     transactionNumber: params.object.transactionNumber,
-                    typeOf: factory.assetTransactionType.COAReserveTransaction
+                    typeOf: factory_1.factory.assetTransactionType.COAReserveTransaction
                 };
                 confirmActionObject = object4coa;
-                recipe = (0, factory_1.processConfirmCOAReserveResult2recipe)({
+                recipe = (0, factory_2.processConfirmCOAReserveResult2recipe)({
                     processConfirmCOAReserveResult: { updReserveArgs: object4coa },
                     project: { id: params.project.id }
                 });
                 break;
+            }
             default:
                 confirmActionObject = params.object;
         }
@@ -210,7 +188,7 @@ function confirmReserveTransaction(params, options) {
         try {
             const object = confirmActionAttributes.object;
             switch (object.typeOf) {
-                case factory.assetTransactionType.COAReserveTransaction:
+                case factory_1.factory.assetTransactionType.COAReserveTransaction: {
                     // COA本予約
                     const processConfirmCOAReserveResult = await (0, reserveCOA_1.confirm)({
                         project: { id: confirmActionAttributes.project.id },
@@ -218,11 +196,12 @@ function confirmReserveTransaction(params, options) {
                         purpose: confirmActionAttributes.purpose
                     })({ reserveService: repos.reserveService });
                     // updReserveResult = processConfirmCOAReserveResult.updReserveResult;
-                    recipe = (0, factory_1.processConfirmCOAReserveResult2recipe)({
+                    recipe = (0, factory_2.processConfirmCOAReserveResult2recipe)({
                         processConfirmCOAReserveResult,
                         project: { id: confirmActionAttributes.project.id }
                     });
                     break;
+                }
                 default:
                     // 予約取引確定
                     await (0, confirm_1.confirm)({
@@ -258,23 +237,23 @@ function onConfirmed(params, options) {
         if (options.sendOrder === true) {
             // タスク冪等作成
             const onAssetTransactionStatusChangedTaskData = {
-                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
                 object: {
                     typeOf: params.object.typeOf,
                     transactionNumber: params.object.transactionNumber,
-                    status: factory.transactionStatusType.Confirmed
+                    status: factory_1.factory.transactionStatusType.Confirmed
                 },
                 purpose: {
                     confirmationNumber: '', // OnAssetTransactionStatusChanged処理内で使用されないので空文字でok
                     orderNumber: params.purpose.orderNumber,
-                    typeOf: factory.order.OrderType.Order
+                    typeOf: factory_1.factory.order.OrderType.Order
                 },
                 useOnOrderStatusChanged: options.useOnOrderStatusChanged === true
             };
             const onAssetTransactionStatusChangedTask = {
-                project: { id: params.project.id, typeOf: factory.organizationType.Project },
-                name: factory.taskName.OnAssetTransactionStatusChanged,
-                status: factory.taskStatus.Ready,
+                project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
+                name: factory_1.factory.taskName.OnAssetTransactionStatusChanged,
+                status: factory_1.factory.taskStatus.Ready,
                 runsAt: new Date(),
                 remainingNumberOfTries: 10,
                 numberOfTried: 0,