@chevre/domain 23.2.0-alpha.4 → 23.2.0-alpha.40

package/lib/chevre/repo/creativeWork.js

@@ -50,7 +50,7 @@ class CreativeWorkRepo {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         const andConditions = [
             { typeOf: { $eq: factory.creativeWorkType.Movie } }
         ];
@@ -90,12 +90,16 @@ class CreativeWorkRepo {
             if (Array.isArray(identifierIn)) {
                 andConditions.push({ identifier: { $in: identifierIn } });
             }
+            const identifierRegex = (_k = params.identifier) === null || _k === void 0 ? void 0 : _k.$regex;
+            if (typeof identifierRegex === 'string' && identifierRegex !== '') {
+                andConditions.push({ identifier: { $regex: new RegExp(identifierRegex) } });
+            }
         }
         if (typeof params.name === 'string' && params.name.length > 0) {
             // 多言語名称対応(2022-07-11~)
             andConditions.push({
                 $or: [
-                    { name: { $exists: true, $regex: new RegExp(params.name) } },
+                    // { name: { $exists: true, $regex: new RegExp(params.name) } }, // string型への互換性維持を廃止(2025-12-20~)
                     { 'name.ja': { $exists: true, $regex: new RegExp(params.name) } },
                     { 'name.en': { $exists: true, $regex: new RegExp(params.name) } }
                 ]
@@ -111,15 +115,15 @@ class CreativeWorkRepo {
         if (params.datePublishedThrough !== undefined) {
             andConditions.push({ datePublished: { $exists: true, $lte: params.datePublishedThrough } });
         }
-        const offersAvailableFrom = (_k = params.offers) === null || _k === void 0 ? void 0 : _k.availableFrom;
+        const offersAvailableFrom = (_l = params.offers) === null || _l === void 0 ? void 0 : _l.availableFrom;
         if (offersAvailableFrom instanceof Date) {
             andConditions.push({ 'offers.availabilityEnds': { $exists: true, $gte: offersAvailableFrom } });
         }
-        const offersAvailableThrough = (_l = params.offers) === null || _l === void 0 ? void 0 : _l.availableThrough;
+        const offersAvailableThrough = (_m = params.offers) === null || _m === void 0 ? void 0 : _m.availableThrough;
         if (offersAvailableThrough instanceof Date) {
             andConditions.push({ 'offers.availabilityStarts': { $exists: true, $lte: offersAvailableThrough } });
         }
-        const additionalPropertyElemMatch = (_m = params.additionalProperty) === null || _m === void 0 ? void 0 : _m.$elemMatch;
+        const additionalPropertyElemMatch = (_o = params.additionalProperty) === null || _o === void 0 ? void 0 : _o.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
                 additionalProperty: {

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

@@ -90,11 +90,11 @@ export declare class EventRepo {
          */
         update: boolean;
     }): Promise<{
-        bulkWriteResult: BulkWriteResult;
+        bulkWriteResult?: BulkWriteResult;
         modifiedEvents: {
             id: string;
         }[];
-    } | void>;
+    }>;
     /**
      * イベント部分更新
      */

package/lib/chevre/repo/event.js

@@ -344,15 +344,27 @@ class EventRepo {
             }
             if (bulkWriteOps.length > 0) {
                 const bulkWriteResult = yield this.eventModel.bulkWrite(bulkWriteOps, { ordered: false });
-                // modifiedの場合upsertedIdsに含まれないので、idを検索する
-                const modifiedEvents = yield this.eventModel.find({ $or: queryFilters }, {
-                    _id: 0,
-                    id: { $toString: '$_id' }
-                })
-                    .lean()
-                    .exec();
-                return { bulkWriteResult, modifiedEvents };
+                // update:falseの場合、upsertedIdsのみmodifiedEventsとして返せばよい(2026-01-16~)
+                if (!update) {
+                    // BulkWriteResult -> upsertedIds: { '0': '7iri6p4m54k0r3g' }
+                    return {
+                        bulkWriteResult,
+                        modifiedEvents: Object.values(bulkWriteResult.upsertedIds)
+                            .map((id) => ({ id: String(id) }))
+                    };
+                }
+                else {
+                    // modifiedの場合upsertedIdsに含まれないので、idを検索する
+                    const modifiedEvents = yield this.eventModel.find({ $or: queryFilters }, {
+                        _id: 0,
+                        id: { $toString: '$_id' }
+                    })
+                        .lean()
+                        .exec();
+                    return { bulkWriteResult, modifiedEvents };
+                }
             }
+            return { modifiedEvents: [] };
         });
     }
     /**

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

@@ -48,5 +48,13 @@ export declare class EventOfferRepo {
             id: string;
         };
     }): Promise<DeleteResult>;
+    /**
+     * 有効期間を過ぎたイベントオファーを削除する
+     */
+    deleteEventOffersExpired(params: {
+        validThrough: {
+            $lte: Date;
+        };
+    }): Promise<DeleteResult>;
 }
 export {};

package/lib/chevre/repo/eventOffer.js

@@ -187,5 +187,16 @@ class EventOfferRepo {
                 .exec();
         });
     }
+    /**
+     * 有効期間を過ぎたイベントオファーを削除する
+     */
+    deleteEventOffersExpired(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.eventOfferModel.deleteMany({
+                validThrough: { $lte: params.validThrough.$lte }
+            })
+                .exec();
+        });
+    }
 }
 exports.EventOfferRepo = EventOfferRepo;

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

@@ -27,17 +27,23 @@ export declare class EventSeriesRepo {
         attributes: factory.eventSeries.IAttributes;
     }[]): Promise<BulkWriteResult | void>;
     /**
-     * コンテンツ+バージョンをキーにして冪等置換
+     * 施設+コンテンツ+バージョンをキーにして冪等置換
      */
     upsertByVersion(params: {
         $set: factory.eventSeries.IAttributes;
         $unset?: IUnset;
-    }[]): Promise<{
-        bulkWriteResult4insert: BulkWriteResult;
+    }[], options: {
+        /**
+         * falseの場合setOnInsertのみ
+         * trueの場合setOnInsert+setのみ
+         */
+        upsert: boolean;
+    }): Promise<{
+        bulkWriteResult?: BulkWriteResult;
         modifiedEvents: {
             id: string;
         }[];
-    } | void>;
+    }>;
     saveEventSeries(params: {
         id?: string;
         attributes: factory.eventSeries.IAttributes;

package/lib/chevre/repo/eventSeries.js

@@ -184,21 +184,25 @@ class EventSeriesRepo {
         }
         const videoFormatTypeOfEq = (_t = (_s = conditions.videoFormat) === null || _s === void 0 ? void 0 : _s.typeOf) === null || _t === void 0 ? void 0 : _t.$eq;
         if (typeof videoFormatTypeOfEq === 'string') {
-            andConditions.push({
-                'videoFormat.typeOf': {
-                    $exists: true,
-                    $eq: videoFormatTypeOfEq
-                }
-            });
+            // 新しい参照先へ変更(2025-12-31~)
+            // andConditions.push({
+            //     'videoFormat.typeOf': {
+            //         $exists: true,
+            //         $eq: videoFormatTypeOfEq
+            //     }
+            // });
+            andConditions.push({ 'subEvent.videoFormat': { $exists: true, $eq: videoFormatTypeOfEq } });
         }
         const videoFormatTypeOfIn = (_v = (_u = conditions.videoFormat) === null || _u === void 0 ? void 0 : _u.typeOf) === null || _v === void 0 ? void 0 : _v.$in;
         if (Array.isArray(videoFormatTypeOfIn)) {
-            andConditions.push({
-                'videoFormat.typeOf': {
-                    $exists: true,
-                    $in: videoFormatTypeOfIn
-                }
-            });
+            // 新しい参照先へ変更(2025-12-31~)
+            // andConditions.push({
+            //     'videoFormat.typeOf': {
+            //         $exists: true,
+            //         $in: videoFormatTypeOfIn
+            //     }
+            // });
+            andConditions.push({ 'subEvent.videoFormat': { $exists: true, $in: videoFormatTypeOfIn } });
         }
         const soundFormatTypeOfEq = (_x = (_w = conditions.soundFormat) === null || _w === void 0 ? void 0 : _w.typeOf) === null || _x === void 0 ? void 0 : _x.$eq;
         if (typeof soundFormatTypeOfEq === 'string') {
@@ -294,13 +298,13 @@ class EventSeriesRepo {
         });
     }
     /**
-     * コンテンツ+バージョンをキーにして冪等置換
+     * 施設+コンテンツ+バージョンをキーにして冪等置換
      */
-    // tslint:disable-next-line:max-func-body-length
-    upsertByVersion(params) {
+    upsertByVersion(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { upsert } = options;
             const uniqid = yield Promise.resolve().then(() => require('uniqid'));
-            const bulkWriteOps4insert = [];
+            const bulkWriteOps = [];
             const queryFilters = [];
             if (Array.isArray(params)) {
                 params.forEach(({ $set, $unset }) => {
@@ -329,21 +333,45 @@ class EventSeriesRepo {
                         typeOf,
                         _id: uniqid()
                     };
-                    const updateOne = {
-                        filter,
-                        update: Object.assign({ $setOnInsert: setOnInsert, $set: setFields }, ($unset !== undefined) ? { $unset } : undefined),
-                        upsert: true
-                    };
-                    bulkWriteOps4insert.push({ updateOne });
+                    let updateOne;
+                    if (upsert === true) {
+                        updateOne = {
+                            filter,
+                            update: Object.assign({ $setOnInsert: setOnInsert, $set: setFields }, ($unset !== undefined) ? { $unset } : undefined),
+                            upsert: true
+                        };
+                    }
+                    else {
+                        updateOne = {
+                            filter,
+                            update: {
+                                $setOnInsert: Object.assign(Object.assign({}, setOnInsert), setFields)
+                            },
+                            upsert: true
+                        };
+                    }
+                    bulkWriteOps.push({ updateOne });
                 });
             }
-            if (bulkWriteOps4insert.length > 0) {
-                const bulkWriteResult4insert = yield this.eventSeriesModel.bulkWrite(bulkWriteOps4insert, { ordered: false });
-                // modifiedの場合upsertedIdsに含まれないので、idを検索する
-                const modifiedEvents = yield this.eventSeriesModel.find({ $or: queryFilters }, { _id: 1 })
-                    .exec();
-                return { bulkWriteResult4insert, modifiedEvents };
+            if (bulkWriteOps.length > 0) {
+                const bulkWriteResult = yield 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 = yield this.eventSeriesModel.find({ $or: queryFilters }, { _id: 1 })
+                        .exec();
+                    return { bulkWriteResult, modifiedEvents };
+                }
             }
+            return { modifiedEvents: [] };
         });
     }
     saveEventSeries(params) {

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

@@ -11,7 +11,6 @@ const schemaDefinition = {
     project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     typeOf: { type: String, required: true },
     reservationFor: { type: mongoose_1.SchemaTypes.Mixed, required: true },
-    // aggregateEntranceGate: SchemaTypes.Mixed, // discontinue(2024-12-23~)
     aggregateOffer: mongoose_1.SchemaTypes.Mixed
 };
 const schemaOptions = {

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

@@ -67,15 +67,16 @@ const indexes = [
             name: 'searchByProjectId-v20220721'
         }
     ],
-    [
-        { name: 1, identifier: 1 },
-        {
-            name: 'searchByName2',
-            partialFilterExpression: {
-                name: { $exists: true }
-            }
-        }
-    ],
+    // string型への互換性維持を廃止(2025-12-20~
+    // [
+    //     { name: 1, identifier: 1 },
+    //     {
+    //         name: 'searchByName2',
+    //         partialFilterExpression: {
+    //             name: { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { 'name.ja': 1, identifier: 1 },
         {

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

@@ -24,6 +24,7 @@ const schemaDefinition = {
     headline: mongoose_1.SchemaTypes.Mixed,
     location: mongoose_1.SchemaTypes.Mixed,
     startDate: { type: Date, required: true }, // required(2025-10-08~)
+    subEvent: mongoose_1.SchemaTypes.Mixed, // support(2025-12-31~)
     workPerformed: mongoose_1.SchemaTypes.Mixed,
     videoFormat: mongoose_1.SchemaTypes.Mixed,
     soundFormat: mongoose_1.SchemaTypes.Mixed,
@@ -146,6 +147,15 @@ const indexes = [
             }
         }
     ],
+    [
+        { 'subEvent.videoFormat': 1, startDate: 1 },
+        {
+            name: 'subEventVideoFormat',
+            partialFilterExpression: {
+                'subEvent.videoFormat': { $exists: true }
+            }
+        }
+    ],
     [
         { 'soundFormat.typeOf': 1, startDate: 1 },
         {

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

@@ -1,9 +1,13 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import * as factory from '../../../factory';
-type IDocType = factory.place.screeningRoom.IPlace & {
+type ISeatSection = Pick<factory.place.screeningRoomSection.IPlace, 'additionalProperty' | 'branchCode' | 'name' | 'typeOf'> & {
+    containsPlace?: factory.place.seat.IPlace[];
+};
+type IDocType = Omit<factory.place.screeningRoom.IPlace, 'containsPlace'> & {
     description?: any;
     openingHoursSpecification?: any;
     smokingAllowed?: boolean;
+    containsPlace: ISeatSection[];
 };
 type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
@@ -11,4 +15,4 @@ type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocT
 declare const modelName = "Place";
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
 declare function createSchema(): ISchema;
-export { createSchema, IModel, indexes, modelName };
+export { createSchema, IDocType, IModel, indexes, modelName };

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

@@ -35,7 +35,12 @@ export declare class OfferCatalogRepo {
         $unset?: {
             [key in keyof factory.offerCatalog.IOfferCatalog]?: 1;
         };
-    }[]): Promise<{
+    }[], options: {
+        /**
+         * support only update(2026-01-30~)
+         */
+        update: boolean;
+    }): Promise<{
         bulkWriteResult: BulkWriteResult;
         modifiedCatalogs: {
             id: string;

package/lib/chevre/repo/offerCatalog.js

@@ -195,11 +195,9 @@ class OfferCatalogRepo {
     /**
      * コードをキーにして冪等置換(2023-12-14~)
      */
-    upsertManyByIdentifier(params
-    // options?: {
-    // }
-    ) {
+    upsertManyByIdentifier(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { update } = options;
             const uniqid = yield Promise.resolve().then(() => require('uniqid'));
             const bulkWriteOps = [];
             const queryFilters = [];
@@ -218,19 +216,30 @@ class OfferCatalogRepo {
                         'project.id': { $eq: project.id },
                         identifier: { $eq: identifier }
                     });
-                    const newId = uniqid();
-                    const setOnInsert = {
-                        identifier,
-                        project,
-                        typeOf,
-                        _id: newId
-                    };
-                    const updateOne = {
-                        filter,
-                        update: Object.assign({ $setOnInsert: setOnInsert, $set: setFields }, ($unset !== undefined) ? { $unset } : undefined),
-                        upsert: true
-                    };
-                    bulkWriteOps.push({ updateOne });
+                    if (update === true) {
+                        const updateOne = {
+                            filter,
+                            update: Object.assign({ $set: setFields }, ($unset !== undefined) ? { $unset } : undefined),
+                            upsert: false
+                        };
+                        bulkWriteOps.push({ updateOne });
+                    }
+                    else {
+                        // デフォルトはupsert操作
+                        const newId = uniqid();
+                        const setOnInsert = {
+                            identifier,
+                            project,
+                            typeOf,
+                            _id: newId
+                        };
+                        const updateOne = {
+                            filter,
+                            update: Object.assign({ $setOnInsert: setOnInsert, $set: setFields }, ($unset !== undefined) ? { $unset } : undefined),
+                            upsert: true
+                        };
+                        bulkWriteOps.push({ updateOne });
+                    }
                 });
             }
             if (bulkWriteOps.length > 0) {

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

@@ -32,7 +32,12 @@ export declare class OfferCatalogItemRepo {
         $unset?: {
             [key in keyof factory.offerCatalog.IOfferCatalog]?: 1;
         };
-    }[]): Promise<{
+    }[], options: {
+        /**
+         * support only update(2026-01-30~)
+         */
+        update: boolean;
+    }): Promise<{
         bulkWriteResult: BulkWriteResult;
         modifiedCatalogs: {
             id: string;

package/lib/chevre/repo/offerCatalogItem.js

@@ -159,11 +159,9 @@ class OfferCatalogItemRepo {
     /**
      * コードをキーにして冪等置換(2023-12-14~)
      */
-    upsertManyByIdentifier(params
-    // options?: {
-    // }
-    ) {
+    upsertManyByIdentifier(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { update } = options;
             const bulkWriteOps = [];
             const queryFilters = [];
             if (Array.isArray(params)) {
@@ -181,17 +179,28 @@ class OfferCatalogItemRepo {
                         'project.id': { $eq: project.id },
                         identifier: { $eq: identifier }
                     });
-                    const setOnInsert = {
-                        identifier,
-                        project,
-                        typeOf
-                    };
-                    const updateOne = {
-                        filter,
-                        update: Object.assign({ $setOnInsert: setOnInsert, $set: setFields }, ($unset !== undefined) ? { $unset } : undefined),
-                        upsert: true
-                    };
-                    bulkWriteOps.push({ updateOne });
+                    if (update === true) {
+                        const updateOne = {
+                            filter,
+                            update: Object.assign({ $set: setFields }, ($unset !== undefined) ? { $unset } : undefined),
+                            upsert: false
+                        };
+                        bulkWriteOps.push({ updateOne });
+                    }
+                    else {
+                        // デフォルトはupsert操作
+                        const setOnInsert = {
+                            identifier,
+                            project,
+                            typeOf
+                        };
+                        const updateOne = {
+                            filter,
+                            update: Object.assign({ $setOnInsert: setOnInsert, $set: setFields }, ($unset !== undefined) ? { $unset } : undefined),
+                            upsert: true
+                        };
+                        bulkWriteOps.push({ updateOne });
+                    }
                 });
             }
             if (bulkWriteOps.length > 0) {

package/lib/chevre/repo/place/entranceGate.d.ts

@@ -0,0 +1,57 @@
+import type { BulkWriteResult } from 'mongodb';
+import { Connection } from 'mongoose';
+import * as factory from '../../factory';
+/**
+ * ゲートを操作する組織
+ */
+interface IOperator {
+    /**
+     * 施設ID
+     */
+    id: string;
+}
+type IEntranceGate = Pick<factory.place.entranceGate.IEntranceGate, 'identifier' | 'name'>;
+type ICreatingEntranceGate = Pick<factory.place.entranceGate.IEntranceGate, 'identifier' | 'name'>;
+interface IUpdateOptions {
+    project: {
+        id: string;
+    };
+}
+/**
+ * 施設の入場ゲートリポジトリ
+ */
+export declare class EntranceGateRepo {
+    /**
+     * 施設
+     */
+    private readonly operator;
+    private readonly civicStructureModel;
+    constructor(connection: Connection, operater: IOperator);
+    /**
+     * リポジトリの施設をセットする
+     */
+    setOperatorId(params: {
+        id: string;
+    }): void;
+    findEntranceGates(params: factory.place.entranceGate.ISearchConditions): Promise<IEntranceGate[]>;
+    addEntranceGatesByIdentifierIfNotExist(params: {
+        $set: ICreatingEntranceGate;
+    }[], options: IUpdateOptions): Promise<{
+        bulkWriteResult?: BulkWriteResult;
+    }>;
+    updateEntranceGatesByIdentifier(params: {
+        $set: ICreatingEntranceGate;
+    }[], options: IUpdateOptions): Promise<{
+        bulkWriteResult?: BulkWriteResult;
+    }>;
+    deleteEntranceGatesByIdentifier(params: {
+        /**
+         * ゲートコード
+         */
+        identifier: string;
+    }[], options: IUpdateOptions): Promise<{
+        bulkWriteResult?: BulkWriteResult;
+    }>;
+    private createMatchStages;
+}
+export {};