@chevre/domain 28.0.0-alpha.1 → 28.0.0-alpha.11

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/adminEvent.d.ts

@@ -170,9 +170,6 @@ export declare class AdminEventRepo {
         };
     }): Promise<mongo.DeleteResult>;
     deleteManyEventsEndedByProject(params: {
-        typeOf: {
-            $in: factory.eventType.ScreeningEvent[];
-        };
         project: {
             id: string;
         };
@@ -181,9 +178,6 @@ export declare class AdminEventRepo {
         };
     }): Promise<mongo.DeleteResult>;
     deleteManyEventsEnded(params: {
-        typeOf: {
-            $eq: factory.eventType.ScreeningEvent;
-        };
         endDate: {
             $lte: Date;
         };

package/lib/chevre/repo/adminEvent.js

@@ -155,8 +155,7 @@ class AdminEventRepo {
         }
         const doc = await this.eventModel.findOneAndUpdate({
             _id: { $eq: params.id },
-            'project.id': { $eq: params.project.id },
-            typeOf: { $eq: typeOf }
+            'project.id': { $eq: params.project.id }
         }, {
             $set: updateFields
         }, { upsert: false, new: false, projection: { _id: 1 } })
@@ -187,8 +186,7 @@ class AdminEventRepo {
         }
         try {
             doc = await this.eventModel.findOneAndUpdate({
-                _id: { $eq: params.id },
-                typeOf: { $eq: typeOf }
+                _id: { $eq: params.id }
             }, {
                 // 編集のためのみのメソッドになったので、setOnInsertは廃止(2025-10-27~)
                 // 上書き禁止属性を除外(2022-08-24~)
@@ -231,8 +229,7 @@ class AdminEventRepo {
                     bulkWriteOps.push({
                         updateOne: {
                             filter: {
-                                _id: p.id,
-                                typeOf: p.attributes.typeOf
+                                _id: p.id
                             },
                             update: {
                                 $setOnInsert: {
@@ -279,7 +276,6 @@ class AdminEventRepo {
     async syncScreeningEventSeries2screeningEvents(params) {
         const superEvent = EventFactory.minimizeSuperEvent({ superEventFromDB: params.superEventFromDB });
         await this.eventModel.updateMany({
-            typeOf: { $eq: factory_1.factory.eventType.ScreeningEvent },
             'project.id': { $eq: params.project.id },
             'superEvent.id': { $exists: true, $eq: params.superEventFromDB.id },
             startDate: { $gte: params.startDate.$gte }
@@ -338,7 +334,6 @@ class AdminEventRepo {
     }
     async deleteManyEventsEndedByProject(params) {
         return this.eventModel.deleteMany({
-            typeOf: { $in: params.typeOf.$in },
             'project.id': { $eq: params.project.id },
             endDate: { $lte: params.endDate.$lte }
         })
@@ -346,7 +341,6 @@ class AdminEventRepo {
     }
     async deleteManyEventsEnded(params) {
         return this.eventModel.deleteMany({
-            typeOf: { $eq: params.typeOf.$eq },
             endDate: { $lte: params.endDate.$lte }
         })
             .exec();

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

@@ -0,0 +1,89 @@
+import type { Connection, FilterQuery, mongo } from 'mongoose';
+import { factory } from '../factory';
+type IUnset = {
+    [key in keyof factory.eventSeries.IEvent]?: 1;
+};
+/**
+ * 施設コンテンツ管理リポジトリ
+ */
+export declare class AdminEventSeriesRepo {
+    private readonly eventSeriesModel;
+    constructor(connection: Connection);
+    /**
+     * 施設+コンテンツ+バージョンをキーにして冪等置換
+     */
+    upsertByVersion(params: {
+        $set: factory.eventSeries.IAttributes;
+        $unset?: IUnset;
+    }[], options: {
+        /**
+         * falseの場合setOnInsertのみ
+         * trueの場合setOnInsert+setのみ
+         */
+        upsert: boolean;
+    }): Promise<{
+        bulkWriteResult?: mongo.BulkWriteResult;
+        modifiedEvents: {
+            id: string;
+        }[];
+    }>;
+    /**
+     * sskts施設コンテンツ保管
+     */
+    upsertManyEventSeriesById4sskts(params: {
+        id: string;
+        attributes: factory.eventSeries.IAttributes;
+    }[]): Promise<void>;
+    deleteEventSeriesById(params: {
+        project: {
+            id: string;
+        };
+        id: string;
+    }): Promise<void>;
+    /**
+     * 既存施設コンテンツの最大バージョンを集計する
+     */
+    aggregateMaxVersion(params: {
+        project: {
+            id: {
+                $eq: string;
+            };
+        };
+        workPerformed: {
+            identifier: {
+                $eq: string;
+            };
+        };
+        location: {
+            branchCode: {
+                $in: string[];
+            };
+        };
+    }): Promise<{
+        maxVersion: string;
+    }>;
+    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, factory.eventSeries.IAttributes & {
+        _id: string;
+    }, import("./mongoose/virtuals").IVirtuals, {}> & factory.eventSeries.IAttributes & {
+        _id: string;
+    } & Required<{
+        _id: string;
+    }> & {
+        __v: number;
+    }, import("mongoose").QueryOptions<factory.eventSeries.IAttributes & {
+        _id: string;
+    }>, (import("mongoose").Document<unknown, Record<string, never>, factory.eventSeries.IAttributes & {
+        _id: string;
+    }, import("./mongoose/virtuals").IVirtuals, {}> & factory.eventSeries.IAttributes & {
+        _id: string;
+    } & Required<{
+        _id: string;
+    }> & {
+        __v: number;
+    }) | null>;
+    unsetUnnecessaryFields(params: {
+        filter: FilterQuery<factory.eventSeries.IEvent>;
+        $unset: IUnset;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
+}
+export {};

package/lib/chevre/repo/adminEventSeries.js

@@ -0,0 +1,174 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AdminEventSeriesRepo = void 0;
+const factory_1 = require("../factory");
+const eventSeries_1 = require("./mongoose/schemas/eventSeries");
+/**
+ * 施設コンテンツ管理リポジトリ
+ */
+class AdminEventSeriesRepo {
+    eventSeriesModel;
+    constructor(connection) {
+        this.eventSeriesModel = connection.model(eventSeries_1.modelName, (0, eventSeries_1.createSchema)());
+    }
+    /**
+     * 施設+コンテンツ+バージョンをキーにして冪等置換
+     */
+    async upsertByVersion(params, options) {
+        const { upsert } = options;
+        const { default: uniqid } = await import('uniqid');
+        const bulkWriteOps = [];
+        const queryFilters = [];
+        if (Array.isArray(params)) {
+            params.forEach(({ $set, $unset }) => {
+                const version = $set.workPerformed.version;
+                if (typeof version !== 'string' || version.length === 0) {
+                    throw new factory_1.factory.errors.ArgumentNull('workPerformed.version');
+                }
+                // リソースのユニークネスを保証するfilter
+                const filter = {
+                    'project.id': { $eq: $set.project.id },
+                    'location.branchCode': { $exists: true, $eq: $set.location.branchCode },
+                    'workPerformed.identifier': { $exists: true, $eq: $set.workPerformed.identifier },
+                    'workPerformed.version': { $exists: true, $eq: version }
+                };
+                queryFilters.push({
+                    'project.id': { $eq: $set.project.id },
+                    'location.branchCode': { $exists: true, $eq: $set.location.branchCode },
+                    'workPerformed.identifier': { $exists: true, $eq: $set.workPerformed.identifier },
+                    'workPerformed.version': { $exists: true, $eq: version }
+                });
+                const { identifier, project, typeOf, ...setFields } = $set; // eslint-disable-line @typescript-eslint/no-unused-vars
+                const setOnInsert = {
+                    project,
+                    typeOf,
+                    _id: uniqid()
+                };
+                let updateOne;
+                if (upsert === true) {
+                    updateOne = {
+                        filter,
+                        update: {
+                            $setOnInsert: setOnInsert,
+                            $set: setFields,
+                            ...($unset !== undefined) ? { $unset } : undefined
+                        },
+                        upsert: true
+                    };
+                }
+                else {
+                    updateOne = {
+                        filter,
+                        update: {
+                            $setOnInsert: {
+                                ...setOnInsert,
+                                ...setFields
+                            }
+                        },
+                        upsert: true
+                    };
+                }
+                bulkWriteOps.push({ updateOne });
+            });
+        }
+        if (bulkWriteOps.length > 0) {
+            const bulkWriteResult = await this.eventSeriesModel.bulkWrite(bulkWriteOps, { ordered: false });
+            // upsert:falseの場合、upsertedIdsのみmodifiedEventsとして返せばよい(2026-01-27~)
+            if (!upsert) {
+                // BulkWriteResult -> upsertedIds: { '0': '7iri6p4m54k0r3g' }
+                return {
+                    bulkWriteResult,
+                    modifiedEvents: Object.values(bulkWriteResult.upsertedIds)
+                        .map((id) => ({ id: String(id) }))
+                };
+            }
+            else {
+                // modifiedの場合upsertedIdsに含まれないので、idを検索する
+                const modifiedEvents = await this.eventSeriesModel.find({ $or: queryFilters }, { _id: 1 })
+                    .exec();
+                return { bulkWriteResult, modifiedEvents };
+            }
+        }
+        return { modifiedEvents: [] };
+    }
+    /**
+     * sskts施設コンテンツ保管
+     */
+    async upsertManyEventSeriesById4sskts(params) {
+        const bulkWriteOps = [];
+        if (Array.isArray(params)) {
+            params.forEach((p) => {
+                // 上書き禁止属性を除外(2022-08-24~)
+                const { identifier, project, typeOf, ...updateFields } = p.attributes; // eslint-disable-line @typescript-eslint/no-unused-vars
+                bulkWriteOps.push({
+                    updateOne: {
+                        filter: { _id: { $eq: p.id } },
+                        update: {
+                            $setOnInsert: {
+                                typeOf: factory_1.factory.eventType.ScreeningEventSeries,
+                                project: p.attributes.project,
+                                ...(typeof p.attributes.identifier === 'string')
+                                    ? { identifier: p.attributes.identifier } : undefined
+                            },
+                            $set: updateFields
+                            // $unsetに対応(2022-08-31~)
+                            // ...(p.$unset !== undefined) ? { $unset: p.$unset } : undefined
+                        },
+                        upsert: true
+                    }
+                });
+            });
+        }
+        if (bulkWriteOps.length > 0) {
+            await this.eventSeriesModel.bulkWrite(bulkWriteOps, { ordered: false });
+        }
+    }
+    async deleteEventSeriesById(params) {
+        await this.eventSeriesModel.findOneAndDelete({
+            _id: { $eq: params.id },
+            'project.id': { $eq: params.project.id }
+        }, { projection: { _id: 1 } })
+            .exec();
+    }
+    /**
+     * 既存施設コンテンツの最大バージョンを集計する
+     */
+    async aggregateMaxVersion(params) {
+        const aggregations = await this.eventSeriesModel.aggregate([
+            {
+                $match: {
+                    'project.id': { $eq: params.project.id.$eq },
+                    'workPerformed.identifier': { $exists: true, $eq: params.workPerformed.identifier.$eq },
+                    'workPerformed.version': { $exists: true },
+                    'location.branchCode': { $exists: true, $in: params.location.branchCode.$in }
+                }
+            },
+            {
+                $project: {
+                    // workPerformed: '$workPerformed',
+                    version: { $toLong: '$workPerformed.version' } // support YYYYMMDDHHmmss
+                }
+            },
+            {
+                $group: {
+                    _id: null,
+                    maxVersion: { $max: '$version' }
+                }
+            }
+        ])
+            .exec();
+        const firstMaxVersion = aggregations.at(0)?.maxVersion;
+        const maxVersion = (typeof firstMaxVersion === 'number') ? String(firstMaxVersion) : '0';
+        return { maxVersion };
+    }
+    getCursor(conditions, projection) {
+        return this.eventSeriesModel.find(conditions, projection)
+            .sort({ startDate: factory_1.factory.sortType.Descending })
+            .cursor();
+    }
+    async unsetUnnecessaryFields(params) {
+        return this.eventSeriesModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+            .exec();
+    }
+}
+exports.AdminEventSeriesRepo = AdminEventSeriesRepo;

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,9 +50,8 @@ 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;
         seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
         typeOf: factory.transactionType.PlaceOrder;
@@ -64,34 +62,26 @@ export declare class AdminTransactionRepo {
         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;
-    } & {
-        _id: import("mongoose").Types.ObjectId;
-    } & {
-        __v: number;
-    }) | ({
-        object: import("@chevre/factory/lib/chevre/transaction/returnOrder").IObject;
-        error?: any;
+        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction/placeOrder").ITasksExportAction | undefined;
+    }, import("./mongoose/virtuals").IVirtuals, {}> & {
+        object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
         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;
+        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction/placeOrder").ITasksExportAction | 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;
         seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
         typeOf: factory.transactionType.PlaceOrder;
@@ -102,30 +92,36 @@ export declare class AdminTransactionRepo {
         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;
-    } & {
-        _id: import("mongoose").Types.ObjectId;
-    } & {
-        __v: number;
-    }) | ({
-        object: import("@chevre/factory/lib/chevre/transaction/returnOrder").IObject;
-        error?: any;
+        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction/placeOrder").ITasksExportAction | undefined;
+    }>, (import("mongoose").Document<unknown, Record<string, never>, {
+        object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
         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/placeOrder").ITasksExportAction | undefined;
+    }, import("./mongoose/virtuals").IVirtuals, {}> & {
+        object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
+        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?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IPotentialActions | undefined;
+        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction/placeOrder").ITasksExportAction | 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/aggregateEvent.js

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

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/event.d.ts

@@ -1,7 +1,7 @@
 import { Connection, FilterQuery } from 'mongoose';
 import { factory } from '../factory';
 import * as EventFactory from '../factory/event';
-export type ISearchConditions = factory.event.screeningEvent.ISearchConditions;
+export type ISearchConditions = Pick<factory.event.screeningEvent.ISearchConditions, 'additionalProperty' | 'endFrom' | 'endThrough' | 'eventStatuses' | 'id' | 'identifiers' | 'inSessionFrom' | 'inSessionThrough' | 'limit' | 'location' | 'offers' | 'organizer' | 'page' | 'project' | 'sort' | 'startFrom' | 'startThrough' | 'superEvent'> & {};
 export import IMinimizedIndividualEvent = EventFactory.IMinimizedIndividualEvent;
 type IKeyOfProjection = Exclude<keyof factory.event.screeningEvent.IEvent, 'id'> | 'aggregateOffer' | 'superEvent.location.id' | 'offers.itemOffered' | 'offers.itemOffered.id' | 'offers.typeOf';
 type IKeyOfProjection4publicFields = Exclude<keyof factory.event.screeningEvent.IEvent, 'id' | 'offers'>;
@@ -60,7 +60,7 @@ export declare class EventRepo {
     /**
      * COAイベントキャンセル時に使用
      */
-    searchEventIds(params: Pick<ISearchConditions, 'project' | 'typeOf' | 'superEvent' | 'startFrom' | 'startThrough'>): Promise<string[]>;
+    searchEventIds(params: Pick<ISearchConditions, 'project' | 'superEvent' | 'startFrom' | 'startThrough'>): Promise<string[]>;
     /**
      * 特定イベントから指定フィールドのみ取得する
      * イベント IDは必ず返ります