@chevre/domain 28.0.0-alpha.2 → 28.0.0-alpha.4

package/lib/chevre/eventEmitter/transaction.d.ts

@@ -5,12 +5,12 @@ interface IListenArgsOnTransactionStatusChanged {
      * 取引ID
      */
     id: string;
-    typeOf: factory.transactionType;
+    typeOf: factory.transactionType.PlaceOrder;
     status: factory.transactionStatusType;
 }
 type IOnTransactionStatusChangedListener = (listenArgs: IListenArgsOnTransactionStatusChanged) => void;
 /**
- * 取引イベントエミッター
+ * 注文取引イベントエミッター
  */
 declare class TransactionEventEmitter extends EventEmitter {
     onTransactionStatusChanged(listner: IOnTransactionStatusChangedListener): void;

package/lib/chevre/eventEmitter/transaction.js

@@ -7,7 +7,7 @@ var EventName;
     EventName["OnTransactionStatusChanged"] = "OnTransactionStatusChanged";
 })(EventName || (EventName = {}));
 /**
- * 取引イベントエミッター
+ * 注文取引イベントエミッター
  */
 class TransactionEventEmitter extends events_1.EventEmitter {
     onTransactionStatusChanged(listner) {

package/lib/chevre/repo/adminTransaction.d.ts

@@ -1,6 +1,5 @@
 import type { Connection } from 'mongoose';
 import { factory } from '../factory';
-import { IDocType } from './mongoose/schemas/transaction';
 /**
  * 取引管理リポジトリ
  */
@@ -43,7 +42,7 @@ export declare class AdminTransactionRepo {
         expires: {
             $lt: Date;
         };
-    }): Promise<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'typeOf'> | undefined>;
+    }): Promise<Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'typeOf'> | undefined>;
     findByIdAndDelete(params: {
         id: string;
     }): Promise<void>;
@@ -51,7 +50,7 @@ export declare class AdminTransactionRepo {
         filter: any;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
-    getCursor(conditions: any, projection: any, sort?: factory.sortType): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & (({
+    getCursor(conditions: any, projection: any, sort?: factory.sortType): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, {
         object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
         error?: any;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
@@ -66,30 +65,26 @@ export declare class AdminTransactionRepo {
         status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
         potentialActions?: undefined;
-    } & {
-        _id: import("mongoose").Types.ObjectId;
-    } & {
-        __v: number;
-    }) | ({
-        object: import("@chevre/factory/lib/chevre/transaction/returnOrder").IObject;
+    }, import("./mongoose/virtuals").IVirtuals, {}> & {
+        object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
         error?: any;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
-        seller: import("@chevre/factory/lib/chevre/transaction").ISeller;
-        typeOf: factory.transactionType.ReturnOrder;
+        seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
+        typeOf: factory.transactionType.PlaceOrder;
         expires: Date;
-        result?: undefined;
+        result?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IResult | undefined;
         startDate: Date;
         endDate?: Date | undefined;
-        agent: import("@chevre/factory/lib/chevre/transaction").IAgent;
-        recipient?: undefined;
+        instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
+        agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
-        potentialActions?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IPotentialActions | undefined;
+        potentialActions?: undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
         __v: number;
-    })), import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & (({
+    }, import("mongoose").QueryOptions<{
         object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
         error?: any;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
@@ -104,28 +99,39 @@ export declare class AdminTransactionRepo {
         status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
         potentialActions?: undefined;
-    } & {
-        _id: import("mongoose").Types.ObjectId;
-    } & {
-        __v: number;
-    }) | ({
-        object: import("@chevre/factory/lib/chevre/transaction/returnOrder").IObject;
+    }>, (import("mongoose").Document<unknown, Record<string, never>, {
+        object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
+        error?: any;
+        project: import("@chevre/factory/lib/chevre/transaction").IProject;
+        seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
+        typeOf: factory.transactionType.PlaceOrder;
+        expires: Date;
+        result?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IResult | undefined;
+        startDate: Date;
+        endDate?: Date | undefined;
+        instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
+        agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
+        status: factory.transactionStatusType;
+        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
+        potentialActions?: undefined;
+    }, import("./mongoose/virtuals").IVirtuals, {}> & {
+        object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
         error?: any;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
-        seller: import("@chevre/factory/lib/chevre/transaction").ISeller;
-        typeOf: factory.transactionType.ReturnOrder;
+        seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
+        typeOf: factory.transactionType.PlaceOrder;
         expires: Date;
-        result?: undefined;
+        result?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IResult | undefined;
         startDate: Date;
         endDate?: Date | undefined;
-        agent: import("@chevre/factory/lib/chevre/transaction").IAgent;
-        recipient?: undefined;
+        instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
+        agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
-        potentialActions?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IPotentialActions | undefined;
+        potentialActions?: undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
         __v: number;
-    }))) | null>;
+    }) | null>;
 }

package/lib/chevre/repo/adminTransaction.js

@@ -68,51 +68,6 @@ class AdminTransactionRepo {
         })
             .exec();
     }
-    // /**
-    //  * タスクエクスポートの遅延している取引について明示的にemitTransactionStatusChangedを実行する
-    //  */
-    // public async exportTasksMany(params: {
-    //     now: Date;
-    //     delayInSeconds: number;
-    //     status: {
-    //         $in: factory.transactionStatusType[];
-    //     };
-    //     limit: number;
-    // }) {
-    //     const delayedTransactions = await this.transactionModel.find({
-    //         status: { $in: params.status.$in },
-    //         'tasksExportAction.actionStatus': {
-    //             $exists: true,
-    //             $eq: factory.actionStatusType.PotentialActionStatus
-    //         },
-    //         endDate: {
-    //             $exists: true,
-    //             $lt: moment(params.now)
-    //                 .add(-params.delayInSeconds, 'seconds')
-    //                 .toDate()
-    //         }
-    //     })
-    //         .select({
-    //             _id: 0,
-    //             id: { $toString: '$_id' },
-    //             typeOf: 1,
-    //             status: 1
-    //         })
-    //         .limit(params.limit)
-    //         .setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
-    //         .lean<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'status' | 'typeOf'>[]>()
-    //         .exec();
-    //     if (delayedTransactions.length > 0) {
-    //         delayedTransactions.forEach((delayedTransaction) => {
-    //             transactionEventEmitter.emitTransactionStatusChanged({
-    //                 id: delayedTransaction.id,
-    //                 typeOf: delayedTransaction.typeOf,
-    //                 status: delayedTransaction.status
-    //             });
-    //         });
-    //     }
-    //     return delayedTransactions;
-    // }
     /**
      * add(2025-03-13~)
      */
@@ -167,59 +122,6 @@ class AdminTransactionRepo {
             return doc;
         }
     }
-    // /**
-    //  * 取引を期限切れにする
-    //  */
-    // public async makeExpired(params: {
-    //     expires: { $lt: Date };
-    //     limit: number; // add limit(2025-02-27~)
-    // }): Promise<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'typeOf'>[]> {
-    //     if (typeof params.limit !== 'number' || params.limit === 0) {
-    //         throw new factory.errors.ArgumentNull('limit');
-    //     }
-    //     const sort: { [key in keyof factory.transaction.ITransaction<factory.transactionType>]?: factory.sortType } = {
-    //         expires: factory.sortType.Ascending
-    //     };
-    //     // IDをemitしたいのでまずリスト検索(2023-04-27~)
-    //     const expiringTransactions =
-    //         await this.transactionModel.find({
-    //             status: { $eq: factory.transactionStatusType.InProgress },
-    //             expires: { $lt: params.expires.$lt }
-    //         })
-    //             .select({
-    //                 _id: 0,
-    //                 id: { $toString: '$_id' },
-    //                 typeOf: 1
-    //             })
-    //             .limit(params.limit)
-    //             .sort(sort) // sort(2025-03-03~)
-    //             .setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
-    //             .lean<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'typeOf'>[]>()
-    //             .exec();
-    //     if (expiringTransactions.length > 0) {
-    //         // ステータスと期限を見て更新
-    //         await this.transactionModel.updateMany(
-    //             {
-    //                 _id: { $in: expiringTransactions.map((t) => t.id) },
-    //                 status: { $eq: factory.transactionStatusType.InProgress },
-    //                 expires: { $lt: params.expires.$lt }
-    //             },
-    //             {
-    //                 status: factory.transactionStatusType.Expired,
-    //                 endDate: new Date()
-    //             }
-    //         )
-    //             .exec();
-    //         expiringTransactions.forEach((expiringTransaction) => {
-    //             transactionEventEmitter.emitTransactionStatusChanged({
-    //                 id: expiringTransaction.id,
-    //                 typeOf: expiringTransaction.typeOf,
-    //                 status: factory.transactionStatusType.Expired
-    //             });
-    //         });
-    //     }
-    //     return expiringTransactions;
-    // }
     async findByIdAndDelete(params) {
         await this.transactionModel.findByIdAndDelete(params.id)
             .exec();

package/lib/chevre/repo/aggregateTransaction.d.ts

@@ -31,7 +31,6 @@ export declare class AggregateTransactionRepo {
         };
         startFrom: Date;
         startThrough: Date;
-        typeOf: factory.transactionType;
         clientId?: string;
     }): Promise<IAggregatePlaceOrder>;
     private agggregateByStatus;

package/lib/chevre/repo/aggregateTransaction.js

@@ -22,7 +22,6 @@ class AggregateTransactionRepo {
                     $gte: params.startFrom,
                     $lte: params.startThrough
                 },
-                typeOf: { $eq: params.typeOf },
                 status: { $eq: transactionStatus },
                 ...(typeof params.project?.id?.$ne === 'string')
                     ? { 'project.id': { $ne: params.project.id.$ne } }

package/lib/chevre/repo/mongoose/schemas/transaction.d.ts

@@ -1,9 +1,8 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import { IVirtuals } from '../virtuals';
 import { factory } from '../../../factory';
-type IPlaceOrder = Omit<factory.transaction.placeOrder.ITransaction, 'id'>;
-type IReturnOrder = Omit<factory.transaction.returnOrder.ITransaction, 'id'>;
-type IDocType = IPlaceOrder | IReturnOrder;
+type IPlaceOrder = Pick<factory.transaction.placeOrder.ITransaction, 'agent' | 'endDate' | 'error' | 'expires' | 'instrument' | 'object' | 'potentialActions' | 'project' | 'result' | 'seller' | 'startDate' | 'status' | 'tasksExportAction' | 'typeOf'>;
+type IDocType = IPlaceOrder;
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, Record<string, never>, Record<string, never>, IVirtuals, Record<string, never>, ISchemaDefinition, IDocType>;

package/lib/chevre/repo/mongoose/schemas/transaction.js

@@ -9,17 +9,17 @@ const settings_1 = require("../../../settings");
 const modelName = 'Transaction';
 exports.modelName = modelName;
 const schemaDefinition = {
-    project: mongoose_1.SchemaTypes.Mixed,
-    status: String,
-    typeOf: String,
+    project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    status: { type: String, required: true },
+    typeOf: { type: String, required: true },
     agent: mongoose_1.SchemaTypes.Mixed,
-    recipient: mongoose_1.SchemaTypes.Mixed,
+    expires: { type: Date, required: true },
+    startDate: { type: Date, required: true },
+    // recipient: SchemaTypes.Mixed, // discontinue(2026-09-09~)
     seller: mongoose_1.SchemaTypes.Mixed,
     error: mongoose_1.SchemaTypes.Mixed,
     result: mongoose_1.SchemaTypes.Mixed,
     object: mongoose_1.SchemaTypes.Mixed,
-    expires: Date,
-    startDate: Date,
     endDate: Date,
     tasksExportAction: mongoose_1.SchemaTypes.Mixed,
     potentialActions: mongoose_1.SchemaTypes.Mixed,
@@ -67,31 +67,30 @@ const indexes = [
         { name: 'searchByStartDateDescending' }
     ],
     [
-        { endDate: 1, startDate: -1 },
+        { 'object.confirmationNumber': 1, startDate: -1 },
         {
-            name: 'searchByEndDateAndStartDate',
+            name: 'searchByObjectConfirmationNumber',
             partialFilterExpression: {
-                endDate: { $exists: true }
+                'object.confirmationNumber': { $exists: true }
             }
         }
     ],
     [
-        { expires: 1, startDate: -1 },
-        { name: 'searchByExpiresAndStartDate' }
-    ],
-    [
-        { 'object.confirmationNumber': 1, startDate: -1 },
+        { 'object.orderNumber': 1, startDate: -1 },
         {
-            name: 'searchByObjectConfirmationNumber',
+            name: 'searchByObjectOrderNumber',
             partialFilterExpression: {
-                'object.confirmationNumber': { $exists: true }
+                'object.orderNumber': { $exists: true }
             }
         }
     ],
     [
-        { 'object.orderNumber': 1, startDate: -1 },
+        // 注文取引のobject.orderNumberも発行されている場合ユニークなはず(2026-02-21~)
+        // 返品取引廃止につきuniquePlacingOrderNumberをreIndex
+        { 'object.orderNumber': 1 },
         {
-            name: 'searchByObjectOrderNumber',
+            name: 'uniqueOrderNumber',
+            unique: true,
             partialFilterExpression: {
                 'object.orderNumber': { $exists: true }
             }
@@ -180,15 +179,6 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'tasksExportAction.startDate': 1, startDate: -1 },
-        {
-            name: 'searchByTasksExportActionActionStartDate',
-            partialFilterExpression: {
-                'tasksExportAction.startDate': { $exists: true }
-            }
-        }
-    ],
     // typeOf: ReturnOrder廃止につき以下廃止(2026-09-08~)
     // [
     //     { 'object.order.orderNumber': 1, startDate: -1 },
@@ -212,6 +202,28 @@ const indexes = [
     //         }
     //     }
     // ],
+    // [
+    //     { endDate: 1, startDate: -1 },
+    //     {
+    //         name: 'searchByEndDateAndStartDate',
+    //         partialFilterExpression: {
+    //             endDate: { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { expires: 1, startDate: -1 },
+    //     { name: 'searchByExpiresAndStartDate' }
+    // ],
+    // [
+    //     { 'tasksExportAction.startDate': 1, startDate: -1 },
+    //     {
+    //         name: 'searchByTasksExportActionActionStartDate',
+    //         partialFilterExpression: {
+    //             'tasksExportAction.startDate': { $exists: true }
+    //         }
+    //     }
+    // ],
 ];
 exports.indexes = indexes;
 /**

package/lib/chevre/repo/orderInTransaction.js

@@ -5,11 +5,6 @@ exports.OrderInTransactionRepo = void 0;
 const errorHandler_1 = require("../errorHandler");
 const factory_1 = require("../factory");
 const order_1 = require("./mongoose/schemas/order");
-// import {
-//     createSchema as createTransactionSchema,
-//     IModel as ITransactionModel, modelName as transactionModelName,
-//     IDocType as ITransactionDocType
-// } from './mongoose/schemas/transaction';
 const acceptedOfferInReserve_1 = require("./acceptedOfferInReserve");
 // const debug = createDebug('chevre-domain:repo:orderInTransaction');
 /**
@@ -17,7 +12,6 @@ const acceptedOfferInReserve_1 = require("./acceptedOfferInReserve");
  */
 class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveRepo {
     orderModel;
-    // private readonly transactionModel: ITransactionModel;
     constructor(connection) {
         super(connection);
         this.orderModel = connection.model(order_1.modelName, (0, order_1.createSchema)());

package/lib/chevre/repo/transaction/placeOrder.d.ts

@@ -16,8 +16,8 @@ export type IPlaceOrder = Pick<factory.transaction.placeOrder.ITransaction, IKey
     id: string;
 };
 type IStartedPlaceOrderFields = 'expires' | 'id' | 'startDate' | 'status';
-export type IStartedPlaceOrder = Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, IStartedPlaceOrderFields>;
-type IFindParams = factory.transaction.ISearchConditions<factory.transactionType.PlaceOrder>;
+export type IStartedPlaceOrder = Pick<factory.transaction.placeOrder.ITransaction, IStartedPlaceOrderFields>;
+type IFindParams = Pick<factory.transaction.placeOrder.ISearchConditions, 'agent' | 'ids' | 'limit' | 'object' | 'page' | 'project' | 'seller' | 'sort' | 'startFrom' | 'startThrough' | 'status' | 'statuses' | 'tasksExportAction'> & {};
 /**
  * 注文取引リポジトリ
  */
@@ -34,14 +34,13 @@ export declare class PlaceOrderRepo {
     findPlaceOrderTransactions(params: Omit<IFindParams, 'result'> & {
         result?: never;
         inclusion: IKeyOfProjection[];
-    }): Promise<(Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, IKeyOfProjection> & {
+    }): Promise<(Pick<factory.transaction.placeOrder.ITransaction, IKeyOfProjection> & {
         id: string;
     })[]>;
     /**
      * 取引期限変更
      */
     updateExpires(params: {
-        typeOf: factory.transactionType.PlaceOrder;
         id: string;
         expires: Date;
     }): Promise<void>;
@@ -58,39 +57,35 @@ export declare class PlaceOrderRepo {
      * 進行中の注文取引を取得する
      */
     findPlaceOrderInProgressById(params: {
-        typeOf: factory.transactionType.PlaceOrder;
         id: string;
     }, inclusion: IKeyOfProjection[]): Promise<ITransactionInProgress>;
     /**
      * 特定注文取引参照
      */
     findPlaceOrderById(params: {
-        typeOf: factory.transactionType.PlaceOrder;
         id: string;
     }, inclusion: IKeyOfProjection[]): Promise<IPlaceOrder>;
     /**
      * 取引を開始する
      */
-    startPlaceOrder(params: factory.transaction.IStartParams<factory.transactionType.PlaceOrder>): Promise<IStartedPlaceOrder>;
+    startPlaceOrder(params: factory.transaction.placeOrder.IStartParams): Promise<IStartedPlaceOrder>;
     /**
      * 取引を確定する
      */
     confirmPlaceOrder(params: {
-        typeOf: factory.transactionType.PlaceOrder;
         id: string;
         object: {
             orderDate: Date;
             orderNumber: string;
             confirmationNumber: string;
         };
-        result: factory.transaction.IResult<factory.transactionType.PlaceOrder>;
-        potentialActions?: factory.transaction.IPotentialActions<factory.transactionType.PlaceOrder>;
+        result: factory.transaction.placeOrder.IResult;
+        potentialActions?: factory.transaction.placeOrder.IPotentialActions;
     }): Promise<void>;
     /**
      * 取引を中止する
      */
     cancelPlaceOrder(params: {
-        typeOf: factory.transactionType.PlaceOrder;
         id: string;
     }): Promise<void>;
 }