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

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は必ず返ります

package/lib/chevre/repo/event.js

@@ -22,18 +22,18 @@ class EventRepo {
     }
     static CREATE_MONGO_CONDITIONS(conditions) {
         const andConditions = [];
-        const typeOfEq = conditions.typeOf;
-        if (typeof typeOfEq === 'string') {
-            andConditions.push({ typeOf: { $eq: typeOfEq } });
-        }
-        const typeOfIn = conditions.typeOfIn;
-        if (Array.isArray(typeOfIn)) {
-            andConditions.push({ typeOf: { $in: typeOfIn } });
-        }
-        // typeOf条件必須検証(2023-07-13~)
-        if (typeof typeOfEq !== 'string' && !Array.isArray(typeOfIn)) {
-            throw new factory_1.factory.errors.ArgumentNull('typeOf');
-        }
+        // const typeOfEq = conditions.typeOf;
+        // if (typeof typeOfEq === 'string') {
+        //     andConditions.push({ typeOf: { $eq: typeOfEq } });
+        // }
+        // const typeOfIn = conditions.typeOfIn;
+        // if (Array.isArray(typeOfIn)) {
+        //     andConditions.push({ typeOf: { $in: typeOfIn } });
+        // }
+        // // typeOf条件必須検証(2023-07-13~)
+        // if (typeof typeOfEq !== 'string' && !Array.isArray(typeOfIn)) {
+        //     throw new factory.errors.ArgumentNull('typeOf');
+        // }
         const projectIdEq = conditions.project?.id?.$eq;
         if (typeof projectIdEq === 'string') {
             andConditions.push({ 'project.id': { $eq: projectIdEq } });
@@ -113,110 +113,72 @@ class EventRepo {
                 }
             });
         }
-        let params;
-        switch (conditions.typeOf) {
-            case factory_1.factory.eventType.ScreeningEvent: {
-                params = conditions;
-                // /* istanbul ignore else */
-                // if (typeof params.name === 'string' && params.name.length > 0) {
-                //     andConditions.push({
-                //         $or: [
-                //             {
-                //                 'name.ja': {
-                //                     $exists: true,
-                //                     $regex: new RegExp(params.name)
-                //                 }
-                //             },
-                //             {
-                //                 'name.en': {
-                //                     $exists: true,
-                //                     $regex: new RegExp(params.name)
-                //                 }
-                //             }
-                //         ]
-                //     });
-                // }
-                /* istanbul ignore else */
-                const superEventLocationIdEq = params.superEvent?.location?.id?.$eq;
-                if (typeof superEventLocationIdEq === 'string') {
-                    andConditions.push({
-                        'superEvent.location.id': {
-                            $exists: true,
-                            $eq: superEventLocationIdEq
-                        }
-                    });
+        /* istanbul ignore else */
+        const superEventLocationIdEq = conditions.superEvent?.location?.id?.$eq;
+        if (typeof superEventLocationIdEq === 'string') {
+            andConditions.push({
+                'superEvent.location.id': {
+                    $exists: true,
+                    $eq: superEventLocationIdEq
                 }
-                /* istanbul ignore else */
-                if (params.superEvent !== undefined) {
-                    /* istanbul ignore else */
-                    if (Array.isArray(params.superEvent.ids)) {
-                        andConditions.push({
-                            'superEvent.id': {
-                                $exists: true,
-                                $in: params.superEvent.ids
-                            }
-                        });
+            });
+        }
+        /* istanbul ignore else */
+        if (conditions.superEvent !== undefined) {
+            /* istanbul ignore else */
+            if (Array.isArray(conditions.superEvent.ids)) {
+                andConditions.push({
+                    'superEvent.id': {
+                        $exists: true,
+                        $in: conditions.superEvent.ids
                     }
-                    /* istanbul ignore else */
-                    if (Array.isArray(params.superEvent.locationBranchCodes)) {
-                        andConditions.push({
-                            'superEvent.location.branchCode': {
-                                $exists: true,
-                                $in: params.superEvent.locationBranchCodes
-                            }
-                        });
+                });
+            }
+            /* istanbul ignore else */
+            if (Array.isArray(conditions.superEvent.locationBranchCodes)) {
+                andConditions.push({
+                    'superEvent.location.branchCode': {
+                        $exists: true,
+                        $in: conditions.superEvent.locationBranchCodes
                     }
-                    /* istanbul ignore else */
-                    if (Array.isArray(params.superEvent.workPerformedIdentifiers)) {
-                        andConditions.push({
-                            'superEvent.workPerformed.identifier': {
-                                $exists: true,
-                                $in: params.superEvent.workPerformedIdentifiers
-                            }
-                        });
+                });
+            }
+            /* istanbul ignore else */
+            if (Array.isArray(conditions.superEvent.workPerformedIdentifiers)) {
+                andConditions.push({
+                    'superEvent.workPerformed.identifier': {
+                        $exists: true,
+                        $in: conditions.superEvent.workPerformedIdentifiers
                     }
+                });
+            }
+        }
+        const itemOfferedIdIn = conditions.offers?.itemOffered?.id?.$in;
+        if (Array.isArray(itemOfferedIdIn)) {
+            andConditions.push({
+                'offers.itemOffered.id': {
+                    $exists: true,
+                    $in: itemOfferedIdIn
                 }
-                const itemOfferedIdIn = params.offers?.itemOffered?.id?.$in;
-                if (Array.isArray(itemOfferedIdIn)) {
-                    andConditions.push({
-                        'offers.itemOffered.id': {
-                            $exists: true,
-                            $in: itemOfferedIdIn
-                        }
-                    });
-                }
-                const itemOfferedTicketedSeatTypeOfIn = params.offers?.itemOffered?.serviceOutput?.reservedTicket?.ticketedSeat?.typeOfs;
-                if (Array.isArray(itemOfferedTicketedSeatTypeOfIn)) {
-                    andConditions.push({
-                        'offers.itemOffered.serviceOutput.reservedTicket.ticketedSeat.typeOf': {
-                            $exists: true,
-                            $in: itemOfferedTicketedSeatTypeOfIn
-                        }
-                    });
+            });
+        }
+        const itemOfferedTicketedSeatTypeOfIn = conditions.offers?.itemOffered?.serviceOutput?.reservedTicket?.ticketedSeat?.typeOfs;
+        if (Array.isArray(itemOfferedTicketedSeatTypeOfIn)) {
+            andConditions.push({
+                'offers.itemOffered.serviceOutput.reservedTicket.ticketedSeat.typeOf': {
+                    $exists: true,
+                    $in: itemOfferedTicketedSeatTypeOfIn
                 }
-                // const itemOfferedServiceTypeIdIn = params.offers?.itemOffered?.serviceType?.ids;
-                // if (Array.isArray(itemOfferedServiceTypeIdIn)) {
-                //     andConditions.push({
-                //         'offers.itemOffered.serviceType.id': {
-                //             $exists: true,
-                //             $in: itemOfferedServiceTypeIdIn
-                //         }
-                //     });
-                // }
-                const sellerMakesOfferElemMatch = params.offers?.seller?.makesOffer?.$elemMatch;
-                if (typeof sellerMakesOfferElemMatch?.['availableAtOrFrom.id']?.$eq === 'string') {
-                    andConditions.push({
-                        'offers.seller.makesOffer': {
-                            $exists: true,
-                            $elemMatch: sellerMakesOfferElemMatch
-                        }
-                    });
+            });
+        }
+        const sellerMakesOfferElemMatch = conditions.offers?.seller?.makesOffer?.$elemMatch;
+        if (typeof sellerMakesOfferElemMatch?.['availableAtOrFrom.id']?.$eq === 'string') {
+            andConditions.push({
+                'offers.seller.makesOffer': {
+                    $exists: true,
+                    $elemMatch: sellerMakesOfferElemMatch
                 }
-                break;
-            }
-            case factory_1.factory.eventType.ScreeningEventSeries: // eslint-disable-line @typescript-eslint/no-explicit-any
-                throw new factory_1.factory.errors.Internal('typeOf: ScreeningEventSeries discontinued');
-            default:
+            });
         }
         return andConditions;
     }
@@ -339,7 +301,6 @@ class EventRepo {
         const doc = await this.eventModel.findOne({
             _id: { $eq: params.id.$eq },
             'project.id': { $eq: params.project.id.$eq },
-            typeOf: { $in: [factory_1.factory.eventType.ScreeningEvent] },
             ...(typeof params.organizer?.id.$eq === 'string')
                 ? { 'organizer.id': { $exists: true, $eq: params.organizer.id.$eq } }
                 : undefined

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

@@ -1,10 +1,7 @@
-import type { Connection, FilterQuery, mongo } from 'mongoose';
+import type { Connection, FilterQuery } from 'mongoose';
 import { factory } from '../factory';
 type ISearchConditions = factory.eventSeries.ISearchConditions;
 type IKeyOfProjection = Exclude<keyof factory.eventSeries.IEvent, 'id' | 'videoFormat'>;
-type IUnset = {
-    [key in keyof factory.eventSeries.IEvent]?: 1;
-};
 /**
  * 施設コンテンツリポジトリ
  */
@@ -12,41 +9,10 @@ export declare class EventSeriesRepo {
     private readonly eventSeriesModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(conditions: ISearchConditions): FilterQuery<factory.eventSeries.IEvent>[];
-    /**
-     * 施設+コンテンツ+バージョンをキーにして冪等置換
-     */
-    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>;
     /**
      * イベントを検索する(inclusion projection)
      */
     projectEventSeriesFields(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.eventSeries.IEvent[]>;
-    deleteEventSeriesById(params: {
-        project: {
-            id: string;
-        };
-        id: string;
-    }): Promise<void>;
     deleteManyByOrganizerId(params: {
         project: {
             id: string;
@@ -54,7 +20,7 @@ export declare class EventSeriesRepo {
         organizer: {
             id: string;
         };
-    }): Promise<mongo.DeleteResult>;
+    }): Promise<import("mongodb").DeleteResult>;
     deleteManyByLocationId(params: {
         project: {
             id: string;
@@ -62,51 +28,6 @@ export declare class EventSeriesRepo {
         location: {
             id: string;
         };
-    }): Promise<mongo.DeleteResult>;
-    /**
-     * 既存施設コンテンツの最大バージョンを集計する
-     */
-    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>;
+    }): Promise<import("mongodb").DeleteResult>;
 }
 export {};