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

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

@@ -3,6 +3,7 @@ import { IVirtuals } from '../virtuals';
 import { factory } from '../../../factory';
 export type IDocType = Omit<factory.place.movieTheater.IPlace, 'id'> & {
     hasPOS?: factory.place.movieTheater.IPOS[];
+    hasEntranceGate?: factory.place.movieTheater.IEntranceGate[];
 };
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;

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

@@ -34,15 +34,6 @@ const schemaDefinition = {
     // ↓ルームの施設からの分離に伴い属性追加(2023-06-22~)
     openSeatingAllowed: mongoose_1.SchemaTypes.Mixed,
     amenityFeature: mongoose_1.SchemaTypes.Mixed
-    // ↓migrated to civicStructures(2024-09-19~)
-    // alternateName: SchemaTypes.Mixed,
-    // hasEntranceGate: [SchemaTypes.Mixed],
-    // hasPOS: [SchemaTypes.Mixed],
-    // sameAs: String,
-    // telephone: String,
-    // url: String,
-    // kanaName: String,
-    // offers: SchemaTypes.Mixed,
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

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

@@ -32,7 +32,7 @@ export declare class MovieTheaterRepo {
     /**
      * 施設を保管する
      */
-    saveMovieTheater(params: Pick<factory.place.movieTheater.IPlace, 'additionalProperty' | 'branchCode' | 'hasEntranceGate' | 'id' | 'kanaName' | 'name' | 'offers' | 'parentOrganization' | 'project' | 'typeOf' | 'url'> & {
+    saveMovieTheater(params: Pick<factory.place.movieTheater.IPlace, 'additionalProperty' | 'branchCode' | 'id' | 'kanaName' | 'name' | 'offers' | 'parentOrganization' | 'project' | 'typeOf' | 'url'> & {
         hasEntranceGate?: never;
     }): Promise<{
         id: string;
@@ -96,12 +96,14 @@ export declare class MovieTheaterRepo {
     }): Promise<void>;
     getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("../mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/chevre/place/movieTheater").IPlace, "id"> & {
         hasPOS?: factory.place.movieTheater.IPOS[];
+        hasEntranceGate?: factory.place.movieTheater.IEntranceGate[];
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
         __v: number;
     }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("../mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/chevre/place/movieTheater").IPlace, "id"> & {
         hasPOS?: factory.place.movieTheater.IPOS[];
+        hasEntranceGate?: factory.place.movieTheater.IEntranceGate[];
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {

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

@@ -5,7 +5,9 @@ const factory_1 = require("../../factory");
 const settings_1 = require("../../settings");
 const civicStructure_1 = require("../mongoose/schemas/civicStructure");
 const AVAILABLE_PROJECT_FIELDS = [
-    'additionalProperty', 'branchCode', 'hasEntranceGate', 'kanaName', 'name',
+    'additionalProperty', 'branchCode',
+    // 'hasEntranceGate',
+    'kanaName', 'name',
     'offers', 'parentOrganization', 'project', 'telephone', 'typeOf', 'url',
     'offers.typeOf',
     'offers.eligibleQuantity',

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

@@ -24,7 +24,12 @@ export declare class POSRepo {
             $eq?: string;
             $regex?: string;
         };
-    }): Promise<Pick<factory.place.movieTheater.IPOS, 'branchCode' | 'name' | 'id'>[]>;
+    }, options: {
+        /**
+         * 2026-09-18~
+         */
+        excludePOSId: boolean;
+    }): Promise<Pick<factory.place.movieTheater.IPOS, 'branchCode' | 'name'>[]>;
     createByBranchCode(params: Pick<factory.place.movieTheater.IPOS, 'branchCode' | 'name'> & {
         project: {
             id: string;

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

@@ -15,7 +15,7 @@ class POSRepo {
         this.civicStructureModel = connection.model(civicStructure_1.modelName, (0, civicStructure_1.createSchema)());
         this.operator = operater;
     }
-    async findPOS(params) {
+    async findPOS(params, options) {
         const matchStages = [];
         const branchCodeEq = params.branchCode?.$eq;
         if (typeof branchCodeEq === 'string') {
@@ -25,6 +25,7 @@ class POSRepo {
         if (typeof branchCodeRegex === 'string' && branchCodeRegex.length > 0) {
             matchStages.push({ $match: { 'hasPOS.branchCode': { $regex: new RegExp(branchCodeRegex) } } });
         }
+        const { excludePOSId } = options;
         const aggregate = this.civicStructureModel.aggregate([
             // まず施設ドキュメントで絞る
             {
@@ -43,9 +44,9 @@ class POSRepo {
             {
                 $project: {
                     _id: 0,
-                    id: '$hasPOS.branchCode',
                     branchCode: '$hasPOS.branchCode',
-                    name: '$hasPOS.name'
+                    name: '$hasPOS.name',
+                    ...((!excludePOSId) && { id: '$hasPOS.branchCode' })
                 }
             }
         ]);

package/lib/chevre/service/task/onResourceUpdated/onHasPOSUpdated.js

@@ -28,7 +28,7 @@ function createInformHasPOSTasks(params) {
         repos.pos.operator.id = movieTheater.id;
         const hasPOS = await repos.pos.findPOS({
             projectId: params.project.id
-        });
+        }, { excludePOSId: true }); // pos.idを除外(2026-09-18~)
         const movieTheaters4inform = [{
                 hasPOS: (Array.isArray(hasPOS)) ? hasPOS : [],
                 id: movieTheater.id,

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

@@ -401,32 +401,11 @@ function createInformMovieTheaterTasks(params, setting) {
         ]
         // []
         );
-        // const movieTheater = movieTheaters.shift();
-        // if (movieTheater === undefined) {
-        //     throw new factory.errors.NotFound(factory.placeType.MovieTheater);
-        // }
-        // // ルームを検索
-        // const screeningRooms = await repos.screeningRoom.findRooms(
-        //     {
-        //         containedInPlace: { id: { $eq: movieTheater.id } }
-        //     }
-        // );
         // 入場ゲートを廃止(2026-01-17~)
         const movieTheaters4inform = movieTheaters.map((movieTheater) => {
             const { hasEntranceGate, ...movieTheaterWithoutEntranceGates } = movieTheater; // eslint-disable-line @typescript-eslint/no-unused-vars
             return {
                 ...movieTheaterWithoutEntranceGates
-                // ...movieTheater
-                // migrate to IRoomAsNotification(2026-01-16~)
-                // containsPlace: screeningRooms.map((room) => {
-                //     return {
-                //         branchCode: room.branchCode,
-                //         name: room.name,
-                //         typeOf: factory.placeType.ScreeningRoom,
-                //         additionalProperty: room.additionalProperty,
-                //         address: room.address
-                //     };
-                // })
             };
         });
         if (movieTheaters4inform.length > 0) {

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "11.0.0-alpha.3",
+    "@chevre/factory": "11.0.0-alpha.4",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "28.0.0-alpha.10"
+  "version": "28.0.0-alpha.12"
 }