@chevre/domain 22.3.0-alpha.7 → 22.3.0-alpha.8

package/example/src/chevre/aggregateScreeningEventMaxVersion.ts

@@ -8,8 +8,8 @@ const project = { id: String(process.env.PROJECT_ID) };
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
-    const result = await eventRepo.aggregateScreeningEventMaxVersion(
+    const eventSeriesRepo = await chevre.repository.EventSeries.createInstance(mongoose.connection);
+    const result = await eventSeriesRepo.aggregateMaxVersion(
         {
             project: {
                 id: { $eq: project.id }

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -6,79 +6,14 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const accountTitleRepo = await chevre.repository.AccountTitle.createInstance(mongoose.connection);
-    const customerRepo = await chevre.repository.Customer.createInstance(mongoose.connection);
-    const additionalPropertyRepo = await chevre.repository.AdditionalProperty.createInstance(mongoose.connection);
-    const movieTheaterRepo = await chevre.repository.place.MovieTheater.createInstance(mongoose.connection);
-    const productModelRepo = await chevre.repository.ProductModel.createInstance(mongoose.connection);
-    const tripRepo = await chevre.repository.Trip.createInstance(mongoose.connection);
+    const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
 
     let updateResult: any;
-    updateResult = await customerRepo.unsetUnnecessaryFields({
+    updateResult = await eventRepo.unsetUnnecessaryFields({
         filter: {
             _id: { $exists: true }
         },
-        $unset: {
-            createdAt: 1,
-            updatedAt: 1,
-            __v: 1
-        }
-    });
-    console.log(updateResult);
-
-    updateResult = await accountTitleRepo.unsetUnnecessaryFields({
-        filter: {
-            _id: { $exists: true }
-        },
-        $unset: {
-            createdAt: 1,
-            updatedAt: 1,
-            __v: 1
-        }
-    });
-    console.log(updateResult);
-
-    updateResult = await additionalPropertyRepo.unsetUnnecessaryFields({
-        filter: {
-            _id: { $exists: true }
-        },
-        $unset: {
-            createdAt: 1,
-            updatedAt: 1,
-            __v: 1
-        }
-    });
-    console.log(updateResult);
-
-    updateResult = await movieTheaterRepo.unsetUnnecessaryFields({
-        filter: {
-            _id: { $exists: true }
-        },
-        $unset: {
-            createdAt: 1,
-            updatedAt: 1,
-            __v: 1
-        }
-    });
-    console.log(updateResult);
-
-    updateResult = await productModelRepo.unsetUnnecessaryFields({
-        filter: {
-            _id: { $exists: true }
-        },
-        $unset: {
-            createdAt: 1,
-            updatedAt: 1,
-            __v: 1
-        }
-    });
-    console.log(updateResult);
-
-    updateResult = await tripRepo.unsetUnnecessaryFields({
-        filter: {
-            _id: { $exists: true }
-        },
-        $unset: {
+        $unset: <any>{
             createdAt: 1,
             updatedAt: 1,
             __v: 1

package/example/src/chevre/upsertScreeningEventSeriesByVersion.ts

@@ -10,9 +10,9 @@ const PROJECT_ID = String(process.env.PROJECT_ID);
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
+    const eventSeriesRepo = await chevre.repository.EventSeries.createInstance(mongoose.connection);
 
-    const result = await eventRepo.upsertScreeningEventSeriesByVersion(
+    const result = await eventSeriesRepo.upsertByVersion(
         [
             {
                 $set: {

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

@@ -26,7 +26,6 @@ import type { BulkWriteResult } from 'mongodb';
 import type { Connection, Document, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 import * as EventFactory from '../factory/event';
-import { IDocType } from './mongoose/schemas/event';
 export interface IAttributes4patchUpdate<T extends factory.eventType> {
     typeOf: T;
     eventStatus?: factory.eventStatusType;
@@ -107,24 +106,6 @@ export declare class EventRepo {
             id: string;
         }[];
     } | void>;
-    /**
-     * コンテンツ+バージョンをキーにして、なければ作成する(複数対応)
-     */
-    createScreeningEventSeriesIfNotExistByWorkPerformed(params: {
-        attributes: factory.event.IAttributes<factory.eventType.ScreeningEventSeries>;
-    }[]): Promise<BulkWriteResult | void>;
-    /**
-     * コンテンツ+バージョンをキーにして冪等置換
-     */
-    upsertScreeningEventSeriesByVersion(params: {
-        $set: factory.event.IAttributes<factory.eventType.ScreeningEventSeries>;
-        $unset?: IUnset<factory.eventType.ScreeningEventSeries>;
-    }[]): Promise<{
-        bulkWriteResult4insert: BulkWriteResult;
-        modifiedEvents: {
-            id: string;
-        }[];
-    } | void>;
     /**
      * イベント部分更新
      */
@@ -337,51 +318,33 @@ export declare class EventRepo {
             validationErrors: import("mongoose").Error[];
         } | undefined;
     }>;
-    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<Document<unknown, {}, IDocType> & Omit<(import("@chevre/factory/lib/event/anyEvent").IAttributes & {
+    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<Document<unknown, {}, import("./mongoose/schemas/event").IDocType> & Omit<(import("@chevre/factory/lib/event/anyEvent").IAttributes & {
         _id: string;
     } & Required<{
-        /**
-         * イベントリポジトリ
-         */
         _id: string;
     }>) | (import("@chevre/factory/lib/event/screeningEvent").IAttributes & {
         _id: string;
         alternateName?: any;
         aggregateOffer?: import("@chevre/factory/lib/event/anyEvent").IAggregateOffer | undefined;
     } & Required<{
-        /**
-         * イベントリポジトリ
-         */
         _id: string;
     }>) | (import("@chevre/factory/lib/event/screeningEventSeries").IAttributes & {
         _id: string;
     } & Required<{
-        /**
-         * イベントリポジトリ
-         */
         _id: string;
-    }>), never>, import("mongoose").QueryOptions<Document<unknown, {}, IDocType> & Omit<(import("@chevre/factory/lib/event/anyEvent").IAttributes & {
+    }>), never>, import("mongoose").QueryOptions<Document<unknown, {}, import("./mongoose/schemas/event").IDocType> & Omit<(import("@chevre/factory/lib/event/anyEvent").IAttributes & {
         _id: string;
     } & Required<{
-        /**
-         * イベントリポジトリ
-         */
         _id: string;
     }>) | (import("@chevre/factory/lib/event/screeningEvent").IAttributes & {
         _id: string;
         alternateName?: any;
         aggregateOffer?: import("@chevre/factory/lib/event/anyEvent").IAggregateOffer | undefined;
     } & Required<{
-        /**
-         * イベントリポジトリ
-         */
         _id: string;
     }>) | (import("@chevre/factory/lib/event/screeningEventSeries").IAttributes & {
         _id: string;
     } & Required<{
-        /**
-         * イベントリポジトリ
-         */
         _id: string;
     }>), never>>>;
     addAvailableAtOrFrom(params: {
@@ -408,28 +371,6 @@ export declare class EventRepo {
         filter: FilterQuery<factory.event.IEvent<T>>;
         $unset: IUnset<T>;
     }): Promise<import("mongodb").UpdateResult>;
-    /**
-     * 既存施設コンテンツの最大バージョンを集計する
-     */
-    aggregateScreeningEventMaxVersion(params: {
-        project: {
-            id: {
-                $eq: string;
-            };
-        };
-        workPerformed: {
-            identifier: {
-                $eq: string;
-            };
-        };
-        location: {
-            branchCode: {
-                $in: string[];
-            };
-        };
-    }): Promise<{
-        maxVersion: string;
-    }>;
     aggregateEvent(params: {
         project?: {
             id?: {

package/lib/chevre/repo/event.js

@@ -568,119 +568,6 @@ class EventRepo {
             }
         });
     }
-    /**
-     * コンテンツ+バージョンをキーにして、なければ作成する(複数対応)
-     */
-    createScreeningEventSeriesIfNotExistByWorkPerformed(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const uniqid = yield Promise.resolve().then(() => require('uniqid'));
-            const bulkWriteOps = [];
-            if (Array.isArray(params)) {
-                params.forEach((creatingEventParams) => {
-                    const version = creatingEventParams.attributes.workPerformed.version;
-                    if (typeof version !== 'string') {
-                        throw new factory.errors.ArgumentNull('workPerformed.version');
-                    }
-                    const setOnInsertFields = creatingEventParams.attributes;
-                    bulkWriteOps.push({
-                        updateOne: {
-                            filter: {
-                                typeOf: creatingEventParams.attributes.typeOf,
-                                'project.id': { $eq: creatingEventParams.attributes.project.id },
-                                'location.branchCode': {
-                                    $exists: true,
-                                    $eq: creatingEventParams.attributes.location.branchCode
-                                },
-                                'workPerformed.identifier': {
-                                    $exists: true,
-                                    $eq: creatingEventParams.attributes.workPerformed.identifier
-                                },
-                                'workPerformed.version': {
-                                    $exists: true,
-                                    $eq: version
-                                }
-                            },
-                            update: {
-                                $setOnInsert: Object.assign(Object.assign({}, setOnInsertFields), { _id: uniqid() })
-                                // 変更可能な属性のみ上書き
-                                // $set: {}
-                            },
-                            upsert: true
-                        }
-                    });
-                });
-            }
-            if (bulkWriteOps.length > 0) {
-                return this.eventModel.bulkWrite(bulkWriteOps, { ordered: false });
-            }
-        });
-    }
-    /**
-     * コンテンツ+バージョンをキーにして冪等置換
-     */
-    // tslint:disable-next-line:max-func-body-length
-    upsertScreeningEventSeriesByVersion(params
-    // options?: {
-    // }
-    ) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const uniqid = yield Promise.resolve().then(() => require('uniqid'));
-            const bulkWriteOps4insert = [];
-            // const bulkWriteOps: AnyBulkWriteOperation<factory.event.IAttributes<factory.eventType.ScreeningEventSeries>>[] = [];
-            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.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 } = $set, setFields = __rest($set, ["identifier", "project", "typeOf"]);
-                    const setOnInsert = {
-                        project,
-                        typeOf,
-                        _id: uniqid()
-                    };
-                    const updateOne = {
-                        filter,
-                        update: Object.assign({ $setOnInsert: setOnInsert, $set: setFields }, ($unset !== undefined) ? { $unset } : undefined),
-                        upsert: true
-                    };
-                    bulkWriteOps4insert.push({ updateOne });
-                    // updateOneで再実装
-                    // const replacement: WithoutId<factory.event.IAttributes<factory.eventType.ScreeningEventSeries>> = attributes;
-                    // const replaceOne: ReplaceOneModel<factory.event.IAttributes<factory.eventType.ScreeningEventSeries>> = {
-                    //     filter,
-                    //     replacement,
-                    //     upsert: true
-                    // };
-                    // bulkWriteOps.push({ replaceOne });
-                });
-            }
-            if (bulkWriteOps4insert.length > 0) {
-                const bulkWriteResult4insert = yield this.eventModel.bulkWrite(bulkWriteOps4insert, { ordered: false });
-                // const bulkWriteResult = await this.eventModel.bulkWrite(bulkWriteOps, { ordered: false });
-                // modifiedの場合upsertedIdsに含まれないので、idを検索する
-                const modifiedEvents = yield this.eventModel.find({ $or: queryFilters }, { _id: 1 })
-                    .exec();
-                return { bulkWriteResult4insert, modifiedEvents };
-            }
-        });
-    }
     /**
      * イベント部分更新
      */
@@ -1210,43 +1097,6 @@ class EventRepo {
                 .exec();
         });
     }
-    /**
-     * 既存施設コンテンツの最大バージョンを集計する
-     */
-    aggregateScreeningEventMaxVersion(params) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const aggregations = yield this.eventModel.aggregate([
-                {
-                    $match: {
-                        typeOf: { $eq: 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((_a = aggregations.shift()) === null || _a === void 0 ? void 0 : _a.maxVersion)
-                : '0';
-            return { maxVersion };
-        });
-    }
     aggregateEvent(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const statuses = yield Promise.all([

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

@@ -0,0 +1,81 @@
+import type { BulkWriteResult } from 'mongodb';
+import type { Connection } from 'mongoose';
+import * as factory from '../factory';
+type IUnset = {
+    [key in keyof factory.event.IEvent<factory.eventType.ScreeningEventSeries>]?: 1;
+};
+/**
+ * 施設コンテンツリポジトリ
+ */
+export declare class EventSeriesRepo {
+    private readonly eventModel;
+    constructor(connection: Connection);
+    /**
+     * 複数イベントを作成する
+     */
+    createMany(params: {
+        attributes: factory.event.IAttributes<factory.eventType.ScreeningEventSeries>[];
+        expectsNoContent: boolean;
+    }): Promise<string[] | void>;
+    /**
+     * コンテンツ+バージョンをキーにして、なければ作成する(複数対応)
+     */
+    createIfNotExistByWorkPerformed(params: {
+        attributes: factory.event.IAttributes<factory.eventType.ScreeningEventSeries>;
+    }[]): Promise<BulkWriteResult | void>;
+    /**
+     * コンテンツ+バージョンをキーにして冪等置換
+     */
+    upsertByVersion(params: {
+        $set: factory.event.IAttributes<factory.eventType.ScreeningEventSeries>;
+        $unset?: IUnset;
+    }[]): Promise<{
+        bulkWriteResult4insert: BulkWriteResult;
+        modifiedEvents: {
+            id: string;
+        }[];
+    } | void>;
+    /**
+     * イベントを保管する
+     */
+    save(params: {
+        id?: string;
+        attributes: factory.event.IAttributes<factory.eventType.ScreeningEventSeries>;
+        /**
+         * ドキュメント作成時には無視される
+         */
+        $unset?: IUnset;
+        upsert?: boolean;
+    }): Promise<{
+        id: string;
+    }>;
+    saveMany(params: {
+        id: string;
+        attributes: factory.event.IAttributes<factory.eventType.ScreeningEventSeries>;
+        $unset?: IUnset;
+        upsert: boolean;
+    }[]): Promise<void>;
+    /**
+     * 既存施設コンテンツの最大バージョンを集計する
+     */
+    aggregateMaxVersion(params: {
+        project: {
+            id: {
+                $eq: string;
+            };
+        };
+        workPerformed: {
+            identifier: {
+                $eq: string;
+            };
+        };
+        location: {
+            branchCode: {
+                $in: string[];
+            };
+        };
+    }): Promise<{
+        maxVersion: string;
+    }>;
+}
+export {};

package/lib/chevre/repo/eventSeries.js

@@ -0,0 +1,289 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EventSeriesRepo = void 0;
+const factory = require("../factory");
+const event_1 = require("./mongoose/schemas/event");
+const errorHandler_1 = require("../errorHandler");
+/**
+ * 施設コンテンツリポジトリ
+ */
+class EventSeriesRepo {
+    constructor(connection) {
+        this.eventModel = connection.model(event_1.modelName, (0, event_1.createSchema)());
+    }
+    /**
+     * 複数イベントを作成する
+     */
+    createMany(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const uniqid = yield Promise.resolve().then(() => require('uniqid'));
+            // let docs: HydratedDocument<factory.event.IEvent<T>>[];
+            const insertingDocs = params.attributes.map((p) => {
+                return Object.assign({ _id: uniqid() }, p);
+            });
+            try {
+                yield this.eventModel.insertMany(insertingDocs, { rawResult: true } // rawResult(2024-08-02~)
+                );
+                // console.dir(insertResult, { depth: null });
+            }
+            catch (error) {
+                if (yield (0, errorHandler_1.isMongoError)(error)) {
+                    if (error.code === errorHandler_1.MongoErrorCode.DuplicateKey) {
+                        throw new factory.errors.AlreadyInUse(factory.eventType.ScreeningEventSeries, ['workPerformed.version']);
+                    }
+                }
+                throw error;
+            }
+            if (params.expectsNoContent) {
+                return;
+            }
+            // return docs.map((doc) => doc.toObject<factory.event.IEvent<T>>());
+            return insertingDocs.map(({ _id }) => _id);
+        });
+    }
+    /**
+     * コンテンツ+バージョンをキーにして、なければ作成する(複数対応)
+     */
+    createIfNotExistByWorkPerformed(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const uniqid = yield Promise.resolve().then(() => require('uniqid'));
+            const bulkWriteOps = [];
+            if (Array.isArray(params)) {
+                params.forEach((creatingEventParams) => {
+                    const version = creatingEventParams.attributes.workPerformed.version;
+                    if (typeof version !== 'string') {
+                        throw new factory.errors.ArgumentNull('workPerformed.version');
+                    }
+                    const setOnInsertFields = creatingEventParams.attributes;
+                    bulkWriteOps.push({
+                        updateOne: {
+                            filter: {
+                                typeOf: creatingEventParams.attributes.typeOf,
+                                'project.id': { $eq: creatingEventParams.attributes.project.id },
+                                'location.branchCode': {
+                                    $exists: true,
+                                    $eq: creatingEventParams.attributes.location.branchCode
+                                },
+                                'workPerformed.identifier': {
+                                    $exists: true,
+                                    $eq: creatingEventParams.attributes.workPerformed.identifier
+                                },
+                                'workPerformed.version': {
+                                    $exists: true,
+                                    $eq: version
+                                }
+                            },
+                            update: {
+                                $setOnInsert: Object.assign(Object.assign({}, setOnInsertFields), { _id: uniqid() })
+                                // 変更可能な属性のみ上書き
+                                // $set: {}
+                            },
+                            upsert: true
+                        }
+                    });
+                });
+            }
+            if (bulkWriteOps.length > 0) {
+                return this.eventModel.bulkWrite(bulkWriteOps, { ordered: false });
+            }
+        });
+    }
+    /**
+     * コンテンツ+バージョンをキーにして冪等置換
+     */
+    // tslint:disable-next-line:max-func-body-length
+    upsertByVersion(params
+    // options?: {
+    // }
+    ) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const uniqid = yield Promise.resolve().then(() => require('uniqid'));
+            const bulkWriteOps4insert = [];
+            // const bulkWriteOps: AnyBulkWriteOperation<factory.event.IAttributes<factory.eventType.ScreeningEventSeries>>[] = [];
+            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.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 } = $set, setFields = __rest($set, ["identifier", "project", "typeOf"]);
+                    const setOnInsert = {
+                        project,
+                        typeOf,
+                        _id: uniqid()
+                    };
+                    const updateOne = {
+                        filter,
+                        update: Object.assign({ $setOnInsert: setOnInsert, $set: setFields }, ($unset !== undefined) ? { $unset } : undefined),
+                        upsert: true
+                    };
+                    bulkWriteOps4insert.push({ updateOne });
+                    // updateOneで再実装
+                    // const replacement: WithoutId<factory.event.IAttributes<factory.eventType.ScreeningEventSeries>> = attributes;
+                    // const replaceOne: ReplaceOneModel<factory.event.IAttributes<factory.eventType.ScreeningEventSeries>> = {
+                    //     filter,
+                    //     replacement,
+                    //     upsert: true
+                    // };
+                    // bulkWriteOps.push({ replaceOne });
+                });
+            }
+            if (bulkWriteOps4insert.length > 0) {
+                const bulkWriteResult4insert = yield this.eventModel.bulkWrite(bulkWriteOps4insert, { ordered: false });
+                // const bulkWriteResult = await this.eventModel.bulkWrite(bulkWriteOps, { ordered: false });
+                // modifiedの場合upsertedIdsに含まれないので、idを検索する
+                const modifiedEvents = yield this.eventModel.find({ $or: queryFilters }, { _id: 1 })
+                    .exec();
+                return { bulkWriteResult4insert, modifiedEvents };
+            }
+        });
+    }
+    /**
+     * イベントを保管する
+     */
+    save(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let savedEventId;
+            let doc;
+            const _a = params.attributes, { identifier, project, typeOf } = _a, updateFields = __rest(_a, ["identifier", "project", "typeOf"]);
+            if (typeof typeOf !== 'string' || typeOf.length === 0) {
+                throw new factory.errors.ArgumentNull('attributes.typeOf');
+            }
+            try {
+                if (params.id === undefined) {
+                    const uniqid = yield Promise.resolve().then(() => require('uniqid'));
+                    const id = uniqid();
+                    doc = yield this.eventModel.create(Object.assign(Object.assign({}, params.attributes), { _id: id }));
+                    savedEventId = id;
+                }
+                else {
+                    const upsert = params.upsert === true;
+                    doc = yield this.eventModel.findOneAndUpdate({
+                        _id: { $eq: params.id },
+                        typeOf: { $eq: typeOf }
+                    }, Object.assign({ 
+                        // 上書き禁止属性を除外(2022-08-24~)
+                        $setOnInsert: Object.assign({ typeOf,
+                            project }, (identifier !== undefined) ? { identifier } : undefined), $set: updateFields }, (params.$unset !== undefined) ? { $unset: params.$unset } : undefined), { upsert, new: true, projection: { _id: 1 } })
+                        .lean()
+                        .exec();
+                    savedEventId = params.id;
+                }
+            }
+            catch (error) {
+                if (yield (0, errorHandler_1.isMongoError)(error)) {
+                    if (error.code === errorHandler_1.MongoErrorCode.DuplicateKey) {
+                        throw new factory.errors.AlreadyInUse(factory.eventType.ScreeningEventSeries, ['workPerformed.version']);
+                    }
+                }
+                throw error;
+            }
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.eventModel.modelName);
+            }
+            return { id: savedEventId }; // optimize(2024-07-31~)
+            // return doc.toObject();
+        });
+    }
+    saveMany(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const bulkWriteOps = [];
+            if (Array.isArray(params)) {
+                params.forEach((p) => {
+                    const upsert = p.upsert === true;
+                    // 上書き禁止属性を除外(2022-08-24~)
+                    const _a = p.attributes, { identifier, project, typeOf } = _a, updateFields = __rest(_a, ["identifier", "project", "typeOf"]);
+                    bulkWriteOps.push({
+                        updateOne: {
+                            filter: {
+                                _id: p.id,
+                                typeOf: p.attributes.typeOf
+                            },
+                            // upsertの場合、createがありうるので属性を除外しない
+                            update: Object.assign({ $setOnInsert: Object.assign({ typeOf: p.attributes.typeOf, project: p.attributes.project }, (typeof p.attributes.identifier === 'string')
+                                    ? { identifier: p.attributes.identifier } : undefined), $set: updateFields }, (p.$unset !== undefined) ? { $unset: p.$unset } : undefined),
+                            upsert
+                        }
+                    });
+                });
+            }
+            if (bulkWriteOps.length > 0) {
+                yield this.eventModel.bulkWrite(bulkWriteOps, { ordered: false });
+            }
+        });
+    }
+    /**
+     * 既存施設コンテンツの最大バージョンを集計する
+     */
+    aggregateMaxVersion(params) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const aggregations = yield this.eventModel.aggregate([
+                {
+                    $match: {
+                        typeOf: { $eq: 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((_a = aggregations.shift()) === null || _a === void 0 ? void 0 : _a.maxVersion)
+                : '0';
+            return { maxVersion };
+        });
+    }
+}
+exports.EventSeriesRepo = EventSeriesRepo;

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

@@ -50,6 +50,9 @@ const schemaDefinition = {
     aggregateReservation: mongoose_1.SchemaTypes.Mixed,
     aggregateOffer: mongoose_1.SchemaTypes.Mixed,
     coaInfo: mongoose_1.SchemaTypes.Mixed
+    // createdAt: SchemaTypes.Mixed,
+    // updatedAt: SchemaTypes.Mixed,
+    // __v: SchemaTypes.Mixed
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
@@ -60,10 +63,8 @@ const schemaOptions = {
     writeConcern: writeConcern_1.writeConcern,
     strict: true,
     strictQuery: false,
-    timestamps: {
-        createdAt: 'createdAt',
-        updatedAt: 'updatedAt'
-    },
+    timestamps: false,
+    versionKey: false,
     toJSON: {
         getters: false,
         virtuals: false,
@@ -78,14 +79,6 @@ const schemaOptions = {
     }
 };
 const indexes = [
-    [
-        { createdAt: 1 },
-        { name: 'searchByCreatedAt' }
-    ],
-    [
-        { updatedAt: 1 },
-        { name: 'searchByUpdatedAt' }
-    ],
     [
         { 'project.id': 1, startDate: 1 },
         {

package/lib/chevre/repository.d.ts

@@ -20,6 +20,7 @@ import type { CustomerRepo } from './repo/customer';
 import type { CustomerTypeRepo } from './repo/customerType';
 import type { EmailMessageRepo } from './repo/emailMessage';
 import type { EventRepo } from './repo/event';
+import type { EventSeriesRepo } from './repo/eventSeries';
 import type { MemberRepo } from './repo/member';
 import type { MerchantReturnPolicyRepo } from './repo/merchantReturnPolicy';
 import type { MessageRepo } from './repo/message';
@@ -146,6 +147,10 @@ export type Event = EventRepo;
 export declare namespace Event {
     function createInstance(...params: ConstructorParameters<typeof EventRepo>): Promise<EventRepo>;
 }
+export type EventSeries = EventSeriesRepo;
+export declare namespace EventSeries {
+    function createInstance(...params: ConstructorParameters<typeof EventSeriesRepo>): Promise<EventSeriesRepo>;
+}
 export type Member = MemberRepo;
 export declare namespace Member {
     function createInstance(...params: ConstructorParameters<typeof MemberRepo>): Promise<MemberRepo>;

package/lib/chevre/repository.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServiceOutput = exports.SellerPaymentAccepted = exports.Seller = exports.Role = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.Product = exports.PriceSpecification = exports.place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.Note = exports.Message = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
-exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = void 0;
+exports.SellerPaymentAccepted = exports.Seller = exports.Role = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.Product = exports.PriceSpecification = exports.place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.Note = exports.Message = exports.MerchantReturnPolicy = exports.Member = exports.EventSeries = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
+exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -271,6 +271,19 @@ var Event;
     }
     Event.createInstance = createInstance;
 })(Event = exports.Event || (exports.Event = {}));
+var EventSeries;
+(function (EventSeries) {
+    let repo;
+    function createInstance(...params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (repo === undefined) {
+                repo = (yield Promise.resolve().then(() => require('./repo/eventSeries'))).EventSeriesRepo;
+            }
+            return new repo(...params);
+        });
+    }
+    EventSeries.createInstance = createInstance;
+})(EventSeries = exports.EventSeries || (exports.EventSeries = {}));
 var Member;
 (function (Member) {
     let repo;

package/lib/chevre/service/event/createEvent.d.ts

@@ -1,11 +1,13 @@
 import * as factory from '../../factory';
 import type { ActionRepo } from '../../repo/action';
 import type { EventRepo } from '../../repo/event';
+import type { EventSeriesRepo } from '../../repo/eventSeries';
 import type { MovieTheaterRepo } from '../../repo/place/movieTheater';
 import type { TaskRepo } from '../../repo/task';
 export declare function createEvent(params: factory.task.createEvent.IData): (repos: {
     action: ActionRepo;
     event: EventRepo;
+    eventSeries: EventSeriesRepo;
     movieTheater: MovieTheaterRepo;
     task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/event/createEvent.js

@@ -57,7 +57,7 @@ function createEvent(params) {
                             };
                         });
                     }
-                    const bulkWriteResult = yield repos.event.createScreeningEventSeriesIfNotExistByWorkPerformed(creatingEventParams);
+                    const bulkWriteResult = yield repos.eventSeries.createIfNotExistByWorkPerformed(creatingEventParams);
                     let upsertedIds;
                     if (bulkWriteResult !== undefined) {
                         upsertedIds = bulkWriteResult.getUpsertedIds()

package/lib/chevre/service/task/createEvent.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const action_1 = require("../../repo/action");
 const event_1 = require("../../repo/event");
+const eventSeries_1 = require("../../repo/eventSeries");
 const movieTheater_1 = require("../../repo/place/movieTheater");
 const task_1 = require("../../repo/task");
 const EventService = require("../event");
@@ -23,6 +24,7 @@ function call(data) {
         yield EventService.createEvent(data)({
             action: new action_1.ActionRepo(connection),
             event: new event_1.EventRepo(connection),
+            eventSeries: new eventSeries_1.EventSeriesRepo(connection),
             movieTheater: new movieTheater_1.MovieTheaterRepo(connection),
             task: new task_1.TaskRepo(connection)
         });

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.3.0-alpha.7"
+  "version": "22.3.0-alpha.8"
 }