@chevre/domain 28.0.0-alpha.0 → 28.0.0-alpha.10

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 {};

package/lib/chevre/repo/eventSeries.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventSeriesRepo = void 0;
 const factory_1 = require("../factory");
 const eventSeries_1 = require("./mongoose/schemas/eventSeries");
-// import { isMongoError, MongoErrorCode } from '../errorHandler';
 const settings_1 = require("../settings");
 /**
  * 施設コンテンツリポジトリ
@@ -14,10 +13,7 @@ class EventSeriesRepo {
         this.eventSeriesModel = connection.model(eventSeries_1.modelName, (0, eventSeries_1.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(conditions) {
-        const andConditions = [
-        // typeOfは必ずScreeningEventSeriesなので不要(2026-02-14~)
-        // { typeOf: { $eq: factory.eventType.ScreeningEventSeries } } // fix(2024-09-08~)
-        ];
+        const andConditions = [];
         const projectIdEq = conditions.project?.id?.$eq;
         if (typeof projectIdEq === 'string') {
             andConditions.push({ 'project.id': { $eq: projectIdEq } });
@@ -34,12 +30,6 @@ class EventSeriesRepo {
         if (Array.isArray(idIn)) {
             andConditions.push({ _id: { $in: idIn } });
         }
-        // /* istanbul ignore else */
-        // if (Array.isArray(conditions.eventStatuses)) {
-        //     andConditions.push({
-        //         eventStatus: { $in: conditions.eventStatuses }
-        //     });
-        // }
         /* istanbul ignore else */
         if (conditions.inSessionFrom !== undefined) {
             andConditions.push({
@@ -158,143 +148,8 @@ class EventSeriesRepo {
         if (Array.isArray(videoFormatTypeOfIn)) {
             andConditions.push({ 'subEvent.videoFormat': { $exists: true, $in: videoFormatTypeOfIn } });
         }
-        // const soundFormatTypeOfEq = conditions.soundFormat?.typeOf?.$eq;
-        // if (typeof soundFormatTypeOfEq === 'string') {
-        //     andConditions.push({
-        //         'soundFormat.typeOf': {
-        //             $exists: true,
-        //             $eq: soundFormatTypeOfEq
-        //         }
-        //     });
-        // }
-        // const soundFormatTypeOfIn = conditions.soundFormat?.typeOf?.$in;
-        // if (Array.isArray(soundFormatTypeOfIn)) {
-        //     andConditions.push({
-        //         'soundFormat.typeOf': {
-        //             $exists: true,
-        //             $in: soundFormatTypeOfIn
-        //         }
-        //     });
-        // }
         return andConditions;
     }
-    /**
-     * 施設+コンテンツ+バージョンをキーにして冪等置換
-     */
-    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 = {
-                    typeOf: $set.typeOf,
-                    '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({
-                    typeOf: $set.typeOf,
-                    '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 },
-                            typeOf: { $eq: factory_1.factory.eventType.ScreeningEventSeries }
-                        },
-                        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 });
-        }
-    }
     /**
      * イベントを検索する(inclusion projection)
      */
@@ -337,72 +192,19 @@ class EventSeriesRepo {
             .lean() // lean(2024-08-01~)
             .exec();
     }
-    async deleteEventSeriesById(params) {
-        await this.eventSeriesModel.findOneAndDelete({
-            _id: { $eq: params.id },
-            'project.id': { $eq: params.project.id },
-            typeOf: { $eq: factory_1.factory.eventType.ScreeningEventSeries }
-        }, { projection: { _id: 1 } })
-            .exec();
-    }
     async deleteManyByOrganizerId(params) {
         return this.eventSeriesModel.deleteMany({
             'project.id': { $eq: params.project.id },
-            'organizer.id': { $exists: true, $eq: params.organizer.id },
-            typeOf: { $eq: factory_1.factory.eventType.ScreeningEventSeries }
+            'organizer.id': { $exists: true, $eq: params.organizer.id }
         })
             .exec();
     }
     async deleteManyByLocationId(params) {
         return this.eventSeriesModel.deleteMany({
             'project.id': { $eq: params.project.id },
-            'location.id': { $exists: true, $eq: params.location.id },
-            typeOf: { $eq: factory_1.factory.eventType.ScreeningEventSeries }
+            'location.id': { $exists: true, $eq: params.location.id }
         })
             .exec();
     }
-    /**
-     * 既存施設コンテンツの最大バージョンを集計する
-     */
-    async aggregateMaxVersion(params) {
-        const aggregations = await this.eventSeriesModel.aggregate([
-            {
-                $match: {
-                    typeOf: { $eq: factory_1.factory.eventType.ScreeningEventSeries },
-                    '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: { $toInt: '$workPerformed.version' }
-                    version: { $toLong: '$workPerformed.version' } // support YYYYMMDDHHmmss
-                }
-            },
-            {
-                $group: {
-                    _id: '$typeOf',
-                    maxVersion: { $max: '$version' }
-                }
-            }
-        ])
-            .exec();
-        const maxVersion = (aggregations.length > 0)
-            ? String(aggregations.shift()?.maxVersion)
-            : '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.EventSeriesRepo = EventSeriesRepo;

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' | 'expires' | 'instrument' | 'object' | '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>;