@chevre/domain 24.0.0-alpha.9 → 24.0.0

package/lib/chevre/service/transaction/placeOrder/exportTasksById.d.ts

@@ -1,15 +1,16 @@
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
-type ITaskAndTransactionOperation<T> = (repos: {
+interface IExportTasksByIdRepos {
     setting: SettingRepo;
     task: TaskRepo;
     placeOrder: PlaceOrderRepo;
-}) => Promise<T>;
+}
+type ITaskAndTransactionOperation<T> = (repos: IExportTasksByIdRepos) => Promise<T>;
 /**
  * 取引のタスクを出力します
  */
-export declare function exportTasksById(params: {
+declare function exportTasksById(params: {
     id: string;
     /**
      * タスク実行日時バッファ
@@ -20,4 +21,4 @@ export declare function exportTasksById(params: {
      */
     optimizeRedundantTasks: boolean;
 }): ITaskAndTransactionOperation<void>;
-export {};
+export { IExportTasksByIdRepos, exportTasksById };

package/lib/chevre/service/transaction/placeOrder/exportTasksById.js

@@ -1,36 +1,13 @@
 "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 };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.exportTasksById = exportTasksById;
 const moment_1 = __importDefault(require("moment"));
-const factory = __importStar(require("../../../factory"));
+const factory_1 = require("../../../factory");
 // import { Settings } from '../../../settings';
-const factory_1 = require("./exportTasks/factory");
+const factory_2 = require("./exportTasks/factory");
 /**
  * 取引のタスクを出力します
  */
@@ -39,7 +16,7 @@ function exportTasksById(params) {
     // settings: Settings
     ) => {
         const transaction = await repos.placeOrder.findPlaceOrderById({
-            typeOf: factory.transactionType.PlaceOrder,
+            typeOf: factory_1.factory.transactionType.PlaceOrder,
             id: params.id
         }, ['endDate', 'object', 'project', 'seller', 'startDate', 'status', 'typeOf']);
         // タスク実行日時バッファの指定があれば調整
@@ -51,7 +28,7 @@ function exportTasksById(params) {
         }
         // search settings
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onTransactionStatusChanged', 'storage']);
-        const taskAttributes = (0, factory_1.createTasks)({
+        const taskAttributes = (0, factory_2.createTasks)({
             transaction,
             runsAt: taskRunsAt,
             optimizeRedundantTasks: params.optimizeRedundantTasks === true

package/lib/chevre/service/transaction/placeOrder/issueOrderNumberIfNotExist.js

@@ -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.issueOrderNumberIfNotExist = issueOrderNumberIfNotExist;
-const factory = __importStar(require("../../../factory"));
+const factory_1 = require("../../../factory");
 /**
  * 未発行であれば、注文番号を発行して取引に保管する
  */
@@ -39,7 +16,7 @@ function issueOrderNumberIfNotExist(params) {
         // 2. 発行準備
         const { alternateName } = await repos.project.findAlternateNameById({ id: params.project.id });
         if (typeof alternateName !== 'string') {
-            throw new factory.errors.NotFound('project.alternateName');
+            throw new factory_1.factory.errors.NotFound('project.alternateName');
         }
         // 3. 番号発行
         const issuedOrderNumber = await repos.orderNumber.issueOrderNumber({
@@ -60,7 +37,7 @@ function issueOrderNumberIfNotExist(params) {
         orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.id });
         if (typeof orderNumber !== 'string') {
             // ここを通るのは、他者が保存した直後に取引がキャンセル/削除された等の極めて稀なケース
-            throw new factory.errors.Internal('OrderNumber conflict: failed to retrieve existing number');
+            throw new factory_1.factory.errors.Internal('OrderNumber conflict: failed to retrieve existing number');
         }
         return orderNumber;
     };

package/lib/chevre/service/transaction/placeOrder/publishConfirmationNumberIfNotExist.d.ts

@@ -1,6 +1,6 @@
 import type { ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
-import * as factory from '../../../factory';
+import { factory } from '../../../factory';
 /**
  * 未発行であれば、注文の確認番号を発行して取引に保管する
  */

package/lib/chevre/service/transaction/placeOrder/publishConfirmationNumberIfNotExist.js

@@ -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.publishConfirmationNumberIfNotExist = publishConfirmationNumberIfNotExist;
-const factory = __importStar(require("../../../factory"));
+const factory_1 = require("../../../factory");
 /**
  * 未発行であれば、注文の確認番号を発行して取引に保管する
  */
@@ -53,7 +30,7 @@ function publishConfirmationNumberIfNotExist(params) {
         });
         // 万が一処理が想定通りでない場合confirmationNumberが存在しない
         if (typeof confirmationNumber !== 'string') {
-            throw new factory.errors.Internal('transaction.object.confirmationNumber not found');
+            throw new factory_1.factory.errors.Internal('transaction.object.confirmationNumber not found');
         }
         return confirmationNumber;
     };

package/lib/chevre/service/transaction/placeOrder/start/factory.d.ts

@@ -1,4 +1,4 @@
-import * as factory from '../../../../factory';
+import { factory } from '../../../../factory';
 declare const AGENT_IDENTIFIER_NAME_PASSPORT = "passport";
 type IVerifiedPassport = factory.waiter.passport.IPassport & {
     /**

package/lib/chevre/service/transaction/placeOrder/start/factory.js

@@ -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.AGENT_IDENTIFIER_NAME_PASSPORT = void 0;
 exports.createStartParams = createStartParams;
-const factory = __importStar(require("../../../../factory"));
+const factory_1 = require("../../../../factory");
 const AGENT_IDENTIFIER_NAME_PASSPORT = 'passport';
 exports.AGENT_IDENTIFIER_NAME_PASSPORT = AGENT_IDENTIFIER_NAME_PASSPORT;
 function createStartParams(params, expiresInSeconds, passport, seller, broker, customerType, memeberOfPayload) {
@@ -34,7 +11,7 @@ function createStartParams(params, expiresInSeconds, passport, seller, broker, c
     if (typeof params.object.clientUser?.client_id === 'string') {
         const { sub, token_use, iss, exp, iat, version, jti, client_id, username, aud, typ } = params.object.clientUser;
         clientUser = { sub, token_use, iss, exp, iat, version, jti, client_id, username, aud, typ };
-        instrument = { id: client_id, typeOf: factory.creativeWorkType.WebApplication };
+        instrument = { id: client_id, typeOf: factory_1.factory.creativeWorkType.WebApplication };
     }
     const transactionObject = {
         // discontinue passportToken(2024-07-05~)
@@ -47,10 +24,10 @@ function createStartParams(params, expiresInSeconds, passport, seller, broker, c
         ...(typeof customerType === 'string') ? { customerType } : undefined
     };
     if (typeof seller.id !== 'string') {
-        throw new factory.errors.NotFound('seller.id');
+        throw new factory_1.factory.errors.NotFound('seller.id');
     }
     if (typeof expiresInSeconds !== 'number') {
-        throw new factory.errors.ArgumentNull('expiresInSeconds');
+        throw new factory_1.factory.errors.ArgumentNull('expiresInSeconds');
     }
     const agentIdentifier = [
         ...(Array.isArray(params.agent.identifier)) ? params.agent.identifier : [],
@@ -64,7 +41,7 @@ function createStartParams(params, expiresInSeconds, passport, seller, broker, c
     };
     return {
         project: { typeOf: seller.project.typeOf, id: seller.project.id },
-        typeOf: factory.transactionType.PlaceOrder,
+        typeOf: factory_1.factory.transactionType.PlaceOrder,
         agent,
         seller: {
             id: seller.id,

package/lib/chevre/service/transaction/placeOrder/start/validateStartRequest.d.ts

@@ -3,7 +3,7 @@ import type { MemberRepo } from '../../../../repo/member';
 import type { MemberProgramRepo } from '../../../../repo/memberProgram';
 import type { ProjectMakesOfferRepo } from '../../../../repo/projectMakesOffer';
 import type { ISellerWithId, SellerRepo } from '../../../../repo/seller';
-import * as factory from '../../../../factory';
+import { factory } from '../../../../factory';
 type ISeller = Pick<ISellerWithId, 'id' | 'name' | 'project' | 'typeOf' | 'makesOffer' | 'additionalProperty'>;
 declare function validateStartRequest(params: {
     project: {

package/lib/chevre/service/transaction/placeOrder/start/validateStartRequest.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.validateStartRequest = validateStartRequest;
-const jwt = __importStar(require("jsonwebtoken"));
-const factory = __importStar(require("../../../../factory"));
+const jsonwebtoken_1 = require("jsonwebtoken");
+const factory_1 = require("../../../../factory");
 async function verifyMembershipToken(params) {
     let result;
     const { issuer, secret, token } = params;
     if (typeof token === 'string' && token.length > 0) {
         try {
             result = await new Promise((resolve, reject) => {
-                jwt.verify(token, secret, {
+                (0, jsonwebtoken_1.verify)(token, secret, {
                     issuer
                     // ...(Array.isArray(params.audience)) ? { audience: params.audience } : undefined
                 }, (err, decoded) => {
@@ -47,17 +24,17 @@ async function verifyMembershipToken(params) {
         }
         catch (error) {
             // JWTエラーをハンドリング
-            if (error instanceof jwt.TokenExpiredError) {
-                throw new factory.errors.Argument('memberOfToken', `invalid token. [${error.message} expiredAt:${error.expiredAt}]`);
+            if (error instanceof jsonwebtoken_1.TokenExpiredError) {
+                throw new factory_1.factory.errors.Argument('memberOfToken', `invalid token. [${error.message} expiredAt:${error.expiredAt}]`);
             }
-            else if (error instanceof jwt.JsonWebTokenError) {
-                throw new factory.errors.Argument('memberOfToken', `invalid token. [${error.message}]`);
+            else if (error instanceof jsonwebtoken_1.JsonWebTokenError) {
+                throw new factory_1.factory.errors.Argument('memberOfToken', `invalid token. [${error.message}]`);
             }
             throw error;
         }
     }
     else {
-        throw new factory.errors.ArgumentNull('memberOfToken');
+        throw new factory_1.factory.errors.ArgumentNull('memberOfToken');
     }
     return result;
 }
@@ -65,7 +42,7 @@ function validateStartRequest(params) {
     return async (repos) => {
         const clientId = params.clientUser?.client_id;
         if (typeof clientId !== 'string' || clientId.length === 0) {
-            throw new factory.errors.ArgumentNull('client_id');
+            throw new factory_1.factory.errors.ArgumentNull('client_id');
         }
         const projectMakesOffer = (await repos.projectMakesOffer.search({
             limit: 1,
@@ -74,7 +51,7 @@ function validateStartRequest(params) {
             availableAtOrFrom: { id: { $eq: clientId } }
         })).shift();
         if (projectMakesOffer === undefined) {
-            throw new factory.errors.Argument('project', 'project makes no offers');
+            throw new factory_1.factory.errors.Argument('project', 'project makes no offers');
         }
         const seller = (await repos.seller.projectFields({
             limit: 1,
@@ -83,7 +60,7 @@ function validateStartRequest(params) {
             id: { $eq: params.seller.id }
         }, ['name', 'project', 'typeOf', 'makesOffer', 'additionalProperty'])).shift();
         if (seller === undefined) {
-            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.organizationType.Corporation);
         }
         // support non-array(2024-10-19~)
         const sellerMakesOffer = seller.makesOffer?.find(({ availableAtOrFrom }) => {
@@ -91,7 +68,7 @@ function validateStartRequest(params) {
                 || (!Array.isArray(availableAtOrFrom) && availableAtOrFrom?.id === clientId);
         });
         if (sellerMakesOffer === undefined) {
-            throw new factory.errors.Argument('seller', 'seller makes no offers');
+            throw new factory_1.factory.errors.Argument('seller', 'seller makes no offers');
         }
         // eligibleCustomerType検証(2023-11-20~)
         const { customerType } = params;
@@ -101,7 +78,7 @@ function validateStartRequest(params) {
             if (Array.isArray(eligibleCustomerTypeByProject)) {
                 const isCustomerTypeEligible = eligibleCustomerTypeByProject.some(({ codeValue }) => codeValue === customerType);
                 if (!isCustomerTypeEligible) {
-                    throw new factory.errors.Argument('customerType', `cutomer type ineligible according to the project settings. [${customerType}]`);
+                    throw new factory_1.factory.errors.Argument('customerType', `cutomer type ineligible according to the project settings. [${customerType}]`);
                 }
             }
             const { eligibleCustomerType } = sellerMakesOffer;
@@ -109,7 +86,7 @@ function validateStartRequest(params) {
             if (Array.isArray(eligibleCustomerType)) {
                 const isCustomerTypeEligible = eligibleCustomerType.some(({ codeValue }) => codeValue === customerType);
                 if (!isCustomerTypeEligible) {
-                    throw new factory.errors.Argument('customerType', `cutomer type ineligible according to the seller settings. [${customerType}]`);
+                    throw new factory_1.factory.errors.Argument('customerType', `cutomer type ineligible according to the seller settings. [${customerType}]`);
                 }
             }
         }
@@ -125,7 +102,7 @@ function validateStartRequest(params) {
             }
         })).shift();
         if (iamMember === undefined) {
-            throw new factory.errors.NotFound(factory.role.RoleType.OrganizationRole);
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.role.RoleType.OrganizationRole);
         }
         // メンバーシップトークン検証(2024-01-31~)
         let memeberOfPayload;
@@ -140,14 +117,14 @@ function validateStartRequest(params) {
                 identifier: { $eq: validMemberProgramIdentifier }
             })).shift();
             if (memberProgram === undefined) {
-                throw new factory.errors.NotFound('MemberProgram');
+                throw new factory_1.factory.errors.NotFound('MemberProgram');
             }
             const issuer = await repos.issuer.findByIdentifier({
                 project: { id: params.project.id },
                 identifier: memberProgram.hostingOrganization.identifier
             });
             if (typeof issuer.tokenSecret !== 'string' || issuer.tokenSecret === '') {
-                throw new factory.errors.NotFound('issuer.tokenSecret');
+                throw new factory_1.factory.errors.NotFound('issuer.tokenSecret');
             }
             memeberOfPayload = await verifyMembershipToken({
                 secret: issuer.tokenSecret,

package/lib/chevre/service/transaction/placeOrder/start.d.ts

@@ -5,7 +5,7 @@ import type { PassportRepo } from '../../../repo/passport';
 import type { ProjectMakesOfferRepo } from '../../../repo/projectMakesOffer';
 import type { SellerRepo } from '../../../repo/seller';
 import type { IStartedPlaceOrder, PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
-import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
+import { PlaceOrderFactory } from '../../../factory/transaction';
 interface IStartOperationRepos {
     issuer: IssuerRepo;
     member: MemberRepo;

package/lib/chevre/service/transaction/placeOrder/start.js

@@ -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.start = start;
-const factory = __importStar(require("../../../factory"));
-const factory_1 = require("./start/factory");
+const factory_1 = require("../../../factory");
+const factory_2 = require("./start/factory");
 const validateStartRequest_1 = require("./start/validateStartRequest");
 /**
  * 取引開始
@@ -42,10 +19,10 @@ function start(params, options) {
         })(repos);
         const expiresInSeconds = sellerMakesOffer.eligibleTransactionDuration?.maxValue;
         if (typeof expiresInSeconds !== 'number') {
-            throw new factory.errors.NotFound('eligibleTransactionDuration.maxValue');
+            throw new factory_1.factory.errors.NotFound('eligibleTransactionDuration.maxValue');
         }
         // 取引ファクトリーで新しい進行中取引オブジェクトを作成
-        const startParams = (0, factory_1.createStartParams)(params, expiresInSeconds, passport, seller, params.broker, customerType, memeberOfPayload);
+        const startParams = (0, factory_2.createStartParams)(params, expiresInSeconds, passport, seller, params.broker, customerType, memeberOfPayload);
         let transaction;
         // lock passport(2024-07-05~)
         if (options.lockPassport && passport !== undefined) {
@@ -56,10 +33,10 @@ function start(params, options) {
                 // in case already locked
                 const alreadyStartedTransaction = (await repos.placeOrder.findPlaceOrderTransactions({
                     limit: 1, page: 1,
-                    typeOf: factory.transactionType.PlaceOrder,
+                    typeOf: factory_1.factory.transactionType.PlaceOrder,
                     project: { id: { $eq: startParams.project.id } },
-                    status: { $in: [factory.transactionStatusType.InProgress] },
-                    agent: { identifiers: [{ name: factory_1.AGENT_IDENTIFIER_NAME_PASSPORT, value: passport.identifier }] },
+                    status: { $in: [factory_1.factory.transactionStatusType.InProgress] },
+                    agent: { identifiers: [{ name: factory_2.AGENT_IDENTIFIER_NAME_PASSPORT, value: passport.identifier }] },
                     inclusion: ['expires', 'startDate', 'status']
                 })).shift();
                 if (alreadyStartedTransaction !== undefined) {

package/lib/chevre/service/transaction/placeOrder/updateAgent.d.ts

@@ -1,4 +1,4 @@
-import * as factory from '../../../factory';
+import { factory } from '../../../factory';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { ProjectRepo } from '../../../repo/project';

package/lib/chevre/service/transaction/placeOrder/updateAgent.js

@@ -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.updateAgent = updateAgent;
 const google_libphonenumber_1 = require("google-libphonenumber");
-const factory = __importStar(require("../../../factory"));
+const factory_1 = require("../../../factory");
 const issueOrderNumberIfNotExist_1 = require("./issueOrderNumberIfNotExist");
 // import { Settings } from '../settings';
 // export type ITransactionOperation<T> = (repos: { transaction: TransactionRepo }) => Promise<T>;
@@ -36,23 +13,23 @@ function fixCustomer(params) {
             const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
             const phoneNumber = phoneUtil.parse(params.agent.telephone, params.agent.telephoneRegion);
             if (!phoneUtil.isValidNumber(phoneNumber)) {
-                throw new factory.errors.Argument('telephone', 'Invalid phone number');
+                throw new factory_1.factory.errors.Argument('telephone', 'Invalid phone number');
             }
             formattedTelephone = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.E164);
         }
         catch (error) {
-            throw new factory.errors.Argument('telephone', error.message);
+            throw new factory_1.factory.errors.Argument('telephone', (error instanceof Error) ? error.message : String(error));
         }
         const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: params.typeOf,
             id: params.id
         }, ['agent', 'object', 'typeOf', 'project']);
         if (transaction.agent.id !== params.agent.id) {
-            throw new factory.errors.Forbidden('Transaction not yours');
+            throw new factory_1.factory.errors.Forbidden('Transaction not yours');
         }
         // 注文取引の場合、object.customerにも適用
         let customer;
-        if (transaction.typeOf === factory.transactionType.PlaceOrder) {
+        if (transaction.typeOf === factory_1.factory.transactionType.PlaceOrder) {
             // いったんtransaction.object.customer?.typeOfは取引開始時にセットされている前提
             const trasactionObject = transaction.object;
             if (typeof trasactionObject.customer?.typeOf === 'string') {

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

@@ -1,5 +1,5 @@
 import type { ISetting } from '../../../../repo/setting';
-import * as factory from '../../../../factory';
+import { factory } from '../../../../factory';
 /**
  * 取引のタスクを作成する
  */