@chevre/domain 23.2.0-alpha.6 → 23.2.0-alpha.61

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

@@ -1,3 +1,4 @@
+import type { BulkWriteResult } from 'mongodb';
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../../factory';
 import { IDocType } from '../mongoose/schemas/civicStructure';
@@ -5,7 +6,23 @@ export type IScreeningRoomFoundByBranchCode = Pick<factory.place.screeningRoom.I
 export type IMovieTheaterIncludingScreeningRooms = Pick<factory.place.movieTheater.IPlace, 'additionalProperty' | 'branchCode' | 'kanaName' | 'name' | 'offers' | 'parentOrganization' | 'project' | 'telephone' | 'typeOf'> & {
     containsPlace: factory.place.screeningRoom.IPlace[];
 };
-type IKeyOfProjection = keyof factory.place.movieTheater.IPlace;
+type IKeyOfProjection = keyof factory.place.movieTheater.IPlace | 'offers.typeOf' | 'offers.eligibleQuantity' | 'offers.availabilityStartsGraceTime' | 'offers.availabilityEndsGraceTime';
+type IMovieTheaterPublicAttributes = Pick<factory.place.movieTheater.IPlace, 'additionalProperty' | 'branchCode' | 'id' | 'kanaName' | 'name' | 'parentOrganization' | 'project' | 'telephone' | 'typeOf' | 'url'> & {
+    offers?: Pick<factory.place.movieTheater.IOffer, 'availabilityEndsGraceTime' | 'availabilityStartsGraceTime'>;
+};
+type IUpsertingMovieTheater = Pick<factory.place.movieTheater.IPlace, 'additionalProperty' | 'branchCode' | 'kanaName' | 'name' | 'offers' | 'telephone' | 'url'> & {
+    hasEntranceGate?: never;
+    hasPOS?: never;
+};
+interface IUpsertOptions {
+    project: {
+        id: string;
+    };
+    /**
+     * 施設の所属販売者ID
+     */
+    sellerId: string;
+}
 /**
  * 施設リポジトリ
  */
@@ -16,15 +33,35 @@ export declare class MovieTheaterRepo {
     /**
      * 施設を保管する
      */
-    saveMovieTheater(params: factory.place.movieTheater.IPlace): Promise<{
+    saveMovieTheater(params: Pick<factory.place.movieTheater.IPlace, 'additionalProperty' | 'branchCode' | 'hasEntranceGate' | 'id' | 'kanaName' | 'name' | 'offers' | 'parentOrganization' | 'project' | 'typeOf' | 'url'> & {
+        hasEntranceGate?: never;
+    }): Promise<{
         id: string;
     }>;
     saveMovieTheaterByBranchCode4coa(params: IMovieTheaterIncludingScreeningRooms): Promise<void>;
+    /**
+     * コードをキーにして冪等作成
+     * 2026-01-13~
+     */
+    upsertMovieTheatersByBranchCode(params: {
+        $set: IUpsertingMovieTheater;
+        $unset?: {
+            [key in keyof IUpsertingMovieTheater]?: 1;
+        };
+    }[], options: IUpsertOptions): Promise<{
+        bulkWriteResult?: BulkWriteResult;
+        /**
+         * 追加あるいは編集された施設
+         */
+        modifiedMovieTheaters: {
+            id: string;
+        }[];
+    }>;
     /**
      * 施設のpublic属性検索
      * 2024-09-18~
      */
-    projectPublicFields(params: factory.place.movieTheater.ISearchConditions): Promise<Omit<factory.place.movieTheater.IPlace, 'screenCount'>[]>;
+    projectPublicFields(params: factory.place.movieTheater.ISearchConditions): Promise<IMovieTheaterPublicAttributes[]>;
     /**
      * 施設検索
      * redefine(2024-09-18~)

package/lib/chevre/repo/place/movieTheater.js

@@ -26,7 +26,11 @@ const settings_1 = require("../../settings");
 const civicStructure_1 = require("../mongoose/schemas/civicStructure");
 const AVAILABLE_PROJECT_FIELDS = [
     'additionalProperty', 'branchCode', 'hasEntranceGate', 'kanaName', 'name',
-    'offers', 'parentOrganization', 'project', 'telephone', 'typeOf', 'url'
+    'offers', 'parentOrganization', 'project', 'telephone', 'typeOf', 'url',
+    'offers.typeOf',
+    'offers.eligibleQuantity',
+    'offers.availabilityStartsGraceTime',
+    'offers.availabilityEndsGraceTime'
 ];
 /**
  * 施設リポジトリ
@@ -37,7 +41,7 @@ class MovieTheaterRepo {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         const andConditions = [{ typeOf: { $eq: factory.placeType.MovieTheater } }];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
         if (typeof projectIdEq === 'string') {
@@ -71,11 +75,15 @@ class MovieTheaterRepo {
                 ]
             });
         }
-        const parentOrganizationIdEq = (_h = (_g = params.parentOrganization) === null || _g === void 0 ? void 0 : _g.id) === null || _h === void 0 ? void 0 : _h.$eq;
+        const sellerIdEq = (_h = (_g = params.seller) === null || _g === void 0 ? void 0 : _g.id) === null || _h === void 0 ? void 0 : _h.$eq;
+        if (typeof sellerIdEq === 'string') {
+            andConditions.push({ 'parentOrganization.id': { $exists: true, $eq: sellerIdEq } });
+        }
+        const parentOrganizationIdEq = (_k = (_j = params.parentOrganization) === null || _j === void 0 ? void 0 : _j.id) === null || _k === void 0 ? void 0 : _k.$eq;
         if (typeof parentOrganizationIdEq === 'string') {
             andConditions.push({ 'parentOrganization.id': { $exists: true, $eq: parentOrganizationIdEq } });
         }
-        const additionalPropertyElemMatch = (_j = params.additionalProperty) === null || _j === void 0 ? void 0 : _j.$elemMatch;
+        const additionalPropertyElemMatch = (_l = params.additionalProperty) === null || _l === void 0 ? void 0 : _l.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
                 additionalProperty: {
@@ -94,13 +102,15 @@ class MovieTheaterRepo {
             let savedId;
             let doc;
             if (params.id === '') {
-                const { id } = params, creatingParams = __rest(params, ["id"]); // omit id(2024-09-12~)
+                const { id, hasEntranceGate } = params, // 入場ゲートを保管しない(2026-01-11~)
+                creatingParams = __rest(params, ["id", "hasEntranceGate"]); // omit id(2024-09-12~)
                 doc = yield this.civicStructureModel.create(creatingParams);
                 savedId = doc.id;
             }
             else {
                 // 上書き禁止属性を除外(2022-08-24~)
-                const { id, branchCode, project, typeOf } = params, updateFields = __rest(params, ["id", "branchCode", "project", "typeOf"]);
+                const { id, branchCode, project, typeOf, hasEntranceGate } = params, // 入場ゲートを保管しない(2026-01-11~)
+                updateFields = __rest(params, ["id", "branchCode", "project", "typeOf", "hasEntranceGate"]);
                 doc = yield this.civicStructureModel.findOneAndUpdate({ _id: { $eq: params.id } }, updateFields, { upsert: false, new: true, projection: { _id: 1 } })
                     .exec();
                 savedId = params.id;
@@ -128,6 +138,67 @@ class MovieTheaterRepo {
             }
         });
     }
+    /**
+     * コードをキーにして冪等作成
+     * 2026-01-13~
+     */
+    upsertMovieTheatersByBranchCode(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { project, sellerId } = options;
+            const bulkWriteOps = [];
+            const queryFilters = [];
+            if (Array.isArray(params)) {
+                params.forEach(({ $set, $unset }) => {
+                    const { branchCode, hasEntranceGate, hasPOS } = $set, // 入場ゲート,POSを決して編集しないように
+                    setFields = __rest($set, ["branchCode", "hasEntranceGate", "hasPOS"]);
+                    if (typeof branchCode !== 'string' || branchCode === '') {
+                        throw new factory.errors.ArgumentNull('branchCode');
+                    }
+                    // リソースのユニークネスを保証するfilter
+                    const filter = {
+                        typeOf: { $eq: factory.placeType.MovieTheater },
+                        'project.id': { $eq: project.id },
+                        branchCode: { $eq: branchCode },
+                        // プロジェクトとコードでユニークな仕様だが、販売者も指定する -> 異なる販売者でコードが重複すればDuplicateErrorとなる
+                        'parentOrganization.id': { $exists: true, $eq: sellerId }
+                    };
+                    const initialMovieTheater = {
+                        typeOf: factory.placeType.MovieTheater,
+                        project: { id: project.id, typeOf: factory.organizationType.Project },
+                        branchCode,
+                        parentOrganization: { id: sellerId, typeOf: factory.organizationType.Corporation }
+                    };
+                    const setOnInsert = initialMovieTheater;
+                    const update = Object.assign({ $setOnInsert: setOnInsert, $set: setFields }, ($unset !== undefined) ? { $unset } : undefined);
+                    const updateOne = {
+                        filter,
+                        update,
+                        upsert: true
+                    };
+                    bulkWriteOps.push({ updateOne });
+                    queryFilters.push({
+                        typeOf: { $eq: factory.placeType.MovieTheater },
+                        'project.id': { $eq: project.id },
+                        branchCode: { $eq: branchCode },
+                        // プロジェクトとコードでユニークな仕様だが、販売者も指定する -> 異なる販売者でコードが重複すればDuplicateErrorとなる
+                        'parentOrganization.id': { $exists: true, $eq: sellerId }
+                    });
+                });
+            }
+            if (bulkWriteOps.length > 0) {
+                const bulkWriteResult = yield this.civicStructureModel.bulkWrite(bulkWriteOps, { ordered: false });
+                // modifiedの場合upsertedIdsに含まれないので、idを検索する
+                const modifiedMovieTheaters = yield this.civicStructureModel.find({ $or: queryFilters }, {
+                    _id: 0,
+                    id: { $toString: '$_id' }
+                })
+                    .lean()
+                    .exec();
+                return { bulkWriteResult, modifiedMovieTheaters };
+            }
+            return { modifiedMovieTheaters: [] };
+        });
+    }
     /**
      * 施設のpublic属性検索
      * 2024-09-18~

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

@@ -1,6 +1,28 @@
-import type { Connection } from 'mongoose';
+import type { BulkWriteResult } from 'mongodb';
+import { Connection, FilterQuery, PipelineStage } from 'mongoose';
 import * as factory from '../../factory';
+import { IDocType } from '../mongoose/schemas/place';
 export type IScreeningRoomFoundByBranchCode = Pick<factory.place.screeningRoom.IPlace, 'typeOf' | 'branchCode' | 'name' | 'containsPlace' | 'seatCount' | 'parentOrganization'>;
+type IMatchStage = PipelineStage.Match;
+type IUpsertingRoom = Pick<factory.place.screeningRoom.IPlace, 'additionalProperty' | 'address' | 'branchCode' | 'name' | 'openSeatingAllowed'>;
+interface IUpdateOptions {
+    project: {
+        id: string;
+    };
+    parentOrganization?: {
+        id?: string;
+    };
+    movieTheaterCode: string;
+}
+interface IUpsertOptions {
+    project: {
+        id: string;
+    };
+    parentOrganization?: {
+        id?: string;
+    };
+    movieTheaterId: string;
+}
 /**
  * ルーム編集時レスポンス
  */
@@ -23,47 +45,34 @@ export declare class ScreeningRoomRepo {
     private readonly civicStructureModel;
     private readonly placeModel;
     constructor(connection: Connection);
+    static CREATE_ROOM_MONGO_CONDITIONS(searchConditions: Omit<factory.place.screeningRoom.ISearchConditions, '$projection' | 'limit' | 'page'>): IMatchStage[];
     saveScreeningRooms4coa(params: IMovieTheaterIncludingScreeningRooms): Promise<void>;
-    createScreeningRoom(screeningRoom: Omit<factory.place.screeningRoom.IPlace, 'containedInPlace' | 'containsPlace' | 'parentOrganization'> & {
-        containedInPlace: {
-            branchCode: string;
-        };
-        parentOrganization?: {
-            id?: string;
-        };
-    }): Promise<IUpdateScreeningRoomResult>;
-    updateScreeningRoom(screeningRoom: Omit<factory.place.screeningRoom.IPlace, 'containedInPlace' | 'containsPlace' | 'parentOrganization'> & {
-        containedInPlace: {
-            branchCode: string;
-        };
-        parentOrganization?: {
-            id?: string;
-        };
-    }, $unset: any): Promise<IUpdateScreeningRoomResult>;
+    createRoom(screeningRoom: Pick<factory.place.screeningRoom.IPlace, 'additionalProperty' | 'address' | 'branchCode' | 'name' | 'openSeatingAllowed'>, options: IUpdateOptions): Promise<IUpdateScreeningRoomResult>;
+    updateRoomByBranchCode(screeningRoom: Pick<factory.place.screeningRoom.IPlace, 'additionalProperty' | 'address' | 'branchCode' | 'name' | 'openSeatingAllowed'>, $unset: any, options: IUpdateOptions): Promise<IUpdateScreeningRoomResult>;
     updateScreeningRoomsByContainedInPlaceId(screeningRoom: {
         project: {
             id: string;
         };
         containedInPlace: Pick<factory.place.screeningRoom.IContainedInPlace, 'id' | 'name'>;
     }): Promise<void>;
-    deleteScreeningRoom(screeningRoom: {
-        project: {
-            id: string;
-        };
-        parentOrganization?: {
-            id?: string;
-        };
+    /**
+     * コードをキーにして冪等作成
+     * 2026-01-12~
+     */
+    upsertRoomsByBranchCode(params: {
+        $set: IUpsertingRoom;
+        $unset?: {
+            [key in keyof IUpsertingRoom]?: 1;
+        };
+    }[], options: IUpsertOptions): Promise<{
+        bulkWriteResult?: BulkWriteResult;
+    }>;
+    deleteRoomByBranchCode(screeningRoom: {
         /**
          * ルームコード
          */
         branchCode: string;
-        containedInPlace: {
-            /**
-             * 施設コード
-             */
-            branchCode: string;
-        };
-    }): Promise<IUpdateScreeningRoomResult>;
+    }, options: IUpdateOptions): Promise<IUpdateScreeningRoomResult>;
     deleteScreeningRoomsByMovieTheaterId(params: {
         project: {
             id: string;
@@ -76,6 +85,7 @@ export declare class ScreeningRoomRepo {
         };
     }): Promise<import("mongodb").DeleteResult>;
     searchScreeningRooms(searchConditions: factory.place.screeningRoom.ISearchConditions): Promise<Omit<factory.place.screeningRoom.IPlace, 'containsPlace' | 'parentOrganization'>[]>;
+    findRooms(params: Omit<factory.place.screeningRoom.ISearchConditions, '$projection'>): Promise<Pick<factory.place.screeningRoom.IPlace, 'additionalProperty' | 'address' | 'branchCode' | 'name' | 'openSeatingAllowed' | 'maximumAttendeeCapacity'>[]>;
     /**
      * セクションと座席も含めたひとつのルームを取得する
      */
@@ -114,5 +124,24 @@ export declare class ScreeningRoomRepo {
             id: string;
         };
     }): Promise<void>;
+    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, IDocType> & Omit<import("@chevre/factory/lib/place/screeningRoom").IPlace, "containsPlace"> & {
+        description?: any;
+        openingHoursSpecification?: any;
+        smokingAllowed?: boolean;
+        containsPlace: (Pick<import("@chevre/factory/lib/place/screeningRoomSection").IPlace, "name" | "typeOf" | "additionalProperty" | "branchCode"> & {
+            containsPlace?: factory.place.seat.IPlace[];
+        })[];
+    } & {
+        _id: import("mongoose").Types.ObjectId;
+    }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, IDocType> & Omit<import("@chevre/factory/lib/place/screeningRoom").IPlace, "containsPlace"> & {
+        description?: any;
+        openingHoursSpecification?: any;
+        smokingAllowed?: boolean;
+        containsPlace: (Pick<import("@chevre/factory/lib/place/screeningRoomSection").IPlace, "name" | "typeOf" | "additionalProperty" | "branchCode"> & {
+            containsPlace?: factory.place.seat.IPlace[];
+        })[];
+    } & {
+        _id: import("mongoose").Types.ObjectId;
+    }>>;
 }
 export {};