@chevre/domain 23.2.0-alpha.21 → 23.2.0-alpha.22

package/example/src/chevre/place/upsertRoomsByBranchCode.ts

@@ -0,0 +1,40 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+import { chevre } from '../../../../lib/index';
+
+const project = { typeOf: chevre.factory.organizationType.Project, id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const roomRepo = await chevre.repository.place.ScreeningRoom.createInstance(mongoose.connection);
+
+    const result = await roomRepo.upsertRoomsByBranchCode(
+        [
+            {
+                $set: {
+                    branchCode: 'SAMPLE',
+                    name: { ja: 'sampleNameJa', en: 'from samples' },
+                    additionalProperty: []
+                }
+            },
+            {
+                $set: {
+                    branchCode: 'SAMPLE2',
+                    name: { ja: 'from samples2', en: 'from samples' },
+                    additionalProperty: []
+                }
+            }
+        ],
+        {
+            project: { id: project.id },
+            movieTheaterId: '5bfb841d5a78d7948369979a',
+            parentOrganization: { id: '59d20831e53ebc2b4e774466' }
+        }
+    );
+    console.log(result);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -11,4 +11,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/place/movieTheater.d.ts

@@ -19,7 +19,9 @@ 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>;

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

@@ -96,13 +96,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;

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

@@ -1,7 +1,10 @@
-import type { Connection, FilterQuery, PipelineStage } 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;
@@ -11,6 +14,15 @@ interface IUpdateOptions {
     };
     movieTheaterCode: string;
 }
+interface IUpsertOptions {
+    project: {
+        id: string;
+    };
+    parentOrganization?: {
+        id?: string;
+    };
+    movieTheaterId: string;
+}
 /**
  * ルーム編集時レスポンス
  */
@@ -43,6 +55,18 @@ export declare class ScreeningRoomRepo {
         };
         containedInPlace: Pick<factory.place.screeningRoom.IContainedInPlace, 'id' | 'name'>;
     }): Promise<void>;
+    /**
+     * コードをキーにして冪等作成
+     * 2026-01-12~
+     */
+    upsertRoomsByBranchCode(params: {
+        $set: IUpsertingRoom;
+        $unset?: {
+            [key in keyof IUpsertingRoom]?: 1;
+        };
+    }[], options: IUpsertOptions): Promise<{
+        bulkWriteResult?: BulkWriteResult;
+    }>;
     deleteRoomByBranchCode(screeningRoom: {
         /**
          * ルームコード
@@ -100,21 +124,13 @@ export declare class ScreeningRoomRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, import("@chevre/factory/lib/place/screeningRoom").IPlace & {
-        description?: any;
-        openingHoursSpecification?: any;
-        smokingAllowed?: boolean;
-    }> & import("@chevre/factory/lib/place/screeningRoom").IPlace & {
+    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, IDocType> & import("@chevre/factory/lib/place/screeningRoom").IPlace & {
         description?: any;
         openingHoursSpecification?: any;
         smokingAllowed?: boolean;
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, import("@chevre/factory/lib/place/screeningRoom").IPlace & {
-        description?: any;
-        openingHoursSpecification?: any;
-        smokingAllowed?: boolean;
-    }> & import("@chevre/factory/lib/place/screeningRoom").IPlace & {
+    }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, IDocType> & import("@chevre/factory/lib/place/screeningRoom").IPlace & {
         description?: any;
         openingHoursSpecification?: any;
         smokingAllowed?: boolean;

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

@@ -278,6 +278,67 @@ class ScreeningRoomRepo {
             }
         });
     }
+    /**
+     * コードをキーにして冪等作成
+     * 2026-01-12~
+     */
+    upsertRoomsByBranchCode(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { project, parentOrganization, movieTheaterId } = options;
+            // 施設存在確認
+            const movieTheater = yield this.civicStructureModel.findOne(Object.assign({ typeOf: { $eq: factory.placeType.MovieTheater }, 'project.id': { $eq: project.id }, _id: { $eq: movieTheaterId } }, (typeof (parentOrganization === null || parentOrganization === void 0 ? void 0 : parentOrganization.id) === 'string')
+                ? { 'parentOrganization.id': { $exists: true, $eq: parentOrganization.id } }
+                : undefined), { _id: 0, id: { $toString: '$_id' }, typeOf: 1, branchCode: 1, name: 1, parentOrganization: 1 })
+                .lean()
+                .exec();
+            if (movieTheater === null) {
+                throw new factory.errors.NotFound(factory.placeType.MovieTheater);
+            }
+            const containedInPlace = {
+                id: movieTheater.id,
+                typeOf: movieTheater.typeOf,
+                branchCode: movieTheater.branchCode,
+                name: movieTheater.name
+            };
+            const bulkWriteOps = [];
+            if (Array.isArray(params)) {
+                params.forEach(({ $set, $unset }) => {
+                    const { branchCode } = $set, setFields = __rest($set, ["branchCode"]);
+                    if (typeof branchCode !== 'string' || branchCode === '') {
+                        throw new factory.errors.ArgumentNull('branchCode');
+                    }
+                    // リソースのユニークネスを保証するfilter
+                    const filter = {
+                        typeOf: { $eq: factory.placeType.ScreeningRoom },
+                        'project.id': { $eq: project.id },
+                        'containedInPlace.id': { $eq: movieTheaterId },
+                        branchCode: { $eq: branchCode }
+                    };
+                    const initialRoom = {
+                        typeOf: factory.placeType.ScreeningRoom,
+                        project: { id: project.id, typeOf: factory.organizationType.Project },
+                        branchCode,
+                        containedInPlace,
+                        containsPlace: [],
+                        parentOrganization: movieTheater.parentOrganization
+                    };
+                    const setOnInsert = initialRoom;
+                    const update = Object.assign({ $setOnInsert: setOnInsert, $set: setFields }, ($unset !== undefined) ? { $unset } : undefined);
+                    const updateOne = {
+                        filter,
+                        update,
+                        upsert: true
+                    };
+                    bulkWriteOps.push({ updateOne });
+                });
+            }
+            if (bulkWriteOps.length > 0) {
+                const bulkWriteResult = yield this.placeModel.bulkWrite(bulkWriteOps, { ordered: false });
+                return { bulkWriteResult };
+            }
+            return {};
+        });
+    }
     deleteRoomByBranchCode(screeningRoom, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const { project, parentOrganization, movieTheaterCode } = options;

package/package.json

@@ -116,5 +116,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.2.0-alpha.21"
+  "version": "23.2.0-alpha.22"
 }

package/example/src/chevre/place/upsertSeatsByBranchCode.ts

@@ -1,72 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-import { chevre } from '../../../../lib/index';
-
-const project = { typeOf: chevre.factory.organizationType.Project, id: String(process.env.PROJECT_ID) };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const seatRepo = await chevre.repository.place.Seat.createInstance(mongoose.connection);
-
-    let result = await seatRepo.addSeatsByBranchCodeIfNotExist(
-        [
-            {
-                $set: {
-                    branchCode: 'SAMPLE',
-                    name: { ja: 'from samples', en: 'from samples' },
-                    additionalProperty: []
-                }
-            },
-            {
-                $set: {
-                    branchCode: 'SAMPLE2',
-                    name: { ja: 'from samples2', en: 'from samples' },
-                    additionalProperty: []
-                }
-            }
-        ],
-        {
-            project: { id: project.id },
-            movieTheaterCode: '118',
-            roomCode: '10',
-            sectionCode: 'Default02'
-        }
-    );
-    console.log(result);
-
-    result = await seatRepo.updateSeatsByBranchCode(
-        [
-            {
-                $set: {
-                    branchCode: 'SAMPLE',
-                    name: { ja: 'from samples', en: 'from samples' },
-                    additionalProperty: [],
-                    maximumAttendeeCapacity: 0
-                }
-            },
-            {
-                $set: {
-                    branchCode: 'SAMPLE2',
-                    name: { ja: 'from samples2', en: 'from samples' },
-                    additionalProperty: []
-                    // maximumAttendeeCapacity: 0
-                },
-                $unset: {
-                    maximumAttendeeCapacity: 1
-                }
-            }
-        ],
-        {
-            project: { id: project.id },
-            movieTheaterCode: '118',
-            roomCode: '10',
-            sectionCode: 'Default02'
-        }
-    );
-    console.log(result);
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);