@chevre/domain 22.3.0-alpha.27 → 22.3.0-alpha.29

package/example/src/chevre/projectFields.ts

@@ -12,26 +12,15 @@ mongoose.Model.on('index', (...args) => {
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const movieTheaterRepo = await chevre.repository.place.MovieTheater.createInstance(mongoose.connection);
+    const creativeWorkRepo = await chevre.repository.CreativeWork.createInstance(mongoose.connection);
 
-    let docs = await movieTheaterRepo.projectPublicFields(
-        {
-            limit: 1,
-            page: 1,
-            project: { id: { $eq: project.id } }
-        }
-    );
-    // tslint:disable-next-line:no-null-keyword
-    console.dir(docs, { depth: null });
-    console.log(docs.length, 'docs found');
-
-    docs = await movieTheaterRepo.projectFields(
+    const docs = await creativeWorkRepo.projectFields(
         {
             limit: 1,
             page: 1,
             project: { id: { $eq: project.id } }
         },
-        ['branchCode', 'id']
+        ['additionalProperty', 'alternativeHeadline', 'contentRating', 'datePublished']
     );
     // tslint:disable-next-line:no-null-keyword
     console.dir(docs, { depth: null });

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

@@ -23,9 +23,9 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import type { BulkWriteResult } from 'mongodb';
-import { Connection, Document, FilterQuery, Types } from 'mongoose';
+import { Connection, FilterQuery, Types } from 'mongoose';
 import * as factory from '../factory';
-type IKeyOfProjection = keyof factory.creativeWork.movie.ICreativeWork | '_id';
+type IKeyOfProjection = keyof factory.creativeWork.movie.ICreativeWork;
 /**
  * コンテンツリポジトリ
  */
@@ -43,7 +43,9 @@ export declare class CreativeWorkRepo {
         $unset?: {
             [key in keyof factory.creativeWork.movie.ICreativeWork]?: 1;
         };
-    }): Promise<any>;
+    }): Promise<{
+        id: string;
+    }>;
     /**
      * コードをキーにして冪等作成
      */
@@ -60,7 +62,7 @@ export declare class CreativeWorkRepo {
     /**
      * コンテンツを検索する
      */
-    searchMovies(params: factory.creativeWork.movie.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<factory.creativeWork.movie.ICreativeWork[]>;
+    projectFields(params: factory.creativeWork.movie.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.creativeWork.movie.ICreativeWork[]>;
     /**
      * コンテンツを削除する
      */
@@ -72,13 +74,13 @@ export declare class CreativeWorkRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: FilterQuery<factory.creativeWork.movie.ICreativeWork>, projection: any): import("mongoose").Cursor<Document<unknown, {}, import("@chevre/factory/lib/creativeWork/movie").ICreativeWork & {
+    getCursor(conditions: FilterQuery<factory.creativeWork.movie.ICreativeWork>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, import("@chevre/factory/lib/creativeWork/movie").ICreativeWork & {
         description?: string | undefined;
     }> & import("@chevre/factory/lib/creativeWork/movie").ICreativeWork & {
         description?: string | undefined;
     } & {
         _id: Types.ObjectId;
-    }, import("mongoose").QueryOptions<Document<unknown, {}, import("@chevre/factory/lib/creativeWork/movie").ICreativeWork & {
+    }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, import("@chevre/factory/lib/creativeWork/movie").ICreativeWork & {
         description?: string | undefined;
     }> & import("@chevre/factory/lib/creativeWork/movie").ICreativeWork & {
         description?: string | undefined;

package/lib/chevre/repo/creativeWork.js

@@ -22,9 +22,25 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreativeWorkRepo = void 0;
 const mongoose_1 = require("mongoose");
-const creativeWork_1 = require("./mongoose/schemas/creativeWork");
 const factory = require("../factory");
 const settings_1 = require("../settings");
+const creativeWork_1 = require("./mongoose/schemas/creativeWork");
+const AVAILABLE_PROJECT_FIELDS = [
+    'project',
+    'typeOf',
+    'identifier',
+    'name',
+    'alternativeHeadline',
+    // 'description',
+    'datePublished',
+    'distributor',
+    'headline',
+    'thumbnailUrl',
+    'duration',
+    'contentRating',
+    'offers',
+    'additionalProperty'
+];
 /**
  * コンテンツリポジトリ
  */
@@ -119,21 +135,24 @@ class CreativeWorkRepo {
      */
     saveMovie(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            let savedId;
             let doc;
-            if (params.id === '') {
+            if (typeof params.id !== 'string' || params.id === '') {
                 const { $unset, id } = params, createParams = __rest(params, ["$unset", "id"]); // omit id(2024-09-12~)
                 doc = yield this.creativeWorkModel.create(createParams);
+                savedId = doc.id;
             }
             else {
                 // 上書き禁止属性を除外
                 const { id, identifier, project, typeOf, $unset } = params, setFields = __rest(params, ["id", "identifier", "project", "typeOf", "$unset"]);
-                doc = yield this.creativeWorkModel.findOneAndUpdate({ _id: { $eq: params.id } }, Object.assign({ $set: setFields }, ($unset !== undefined) ? { $unset } : undefined), { upsert: false, new: true })
+                doc = yield this.creativeWorkModel.findOneAndUpdate({ _id: { $eq: params.id } }, Object.assign({ $set: setFields }, ($unset !== undefined) ? { $unset } : undefined), { upsert: false, new: true, projection: { _id: 1 } })
                     .exec();
+                savedId = params.id;
             }
             if (doc === null) {
                 throw new factory.errors.NotFound(this.creativeWorkModel.modelName);
             }
-            return doc.toObject();
+            return { id: savedId };
         });
     }
     /**
@@ -209,28 +228,37 @@ class CreativeWorkRepo {
     /**
      * コンテンツを検索する
      */
-    searchMovies(params, inclusion, exclusion) {
+    projectFields(params, inclusion
+    // exclusion: IKeyOfProjection[]
+    ) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = CreativeWorkRepo.CREATE_MONGO_CONDITIONS(params);
-            let projection = {};
+            // let projection: { [key: string]: number } = {};
+            // if (Array.isArray(inclusion) && inclusion.length > 0) {
+            //     inclusion.forEach((field) => {
+            //         projection[field] = 1;
+            //     });
+            // } else {
+            //     projection = {
+            //         __v: 0,
+            //         createdAt: 0,
+            //         updatedAt: 0
+            //     };
+            //     if (Array.isArray(exclusion) && exclusion.length > 0) {
+            //         exclusion.forEach((field) => {
+            //             projection[field] = 0;
+            //         });
+            //     }
+            // }
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
             if (Array.isArray(inclusion) && inclusion.length > 0) {
-                inclusion.forEach((field) => {
-                    projection[field] = 1;
-                });
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
             else {
-                projection = {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
-                };
-                if (Array.isArray(exclusion) && exclusion.length > 0) {
-                    exclusion.forEach((field) => {
-                        projection[field] = 0;
-                    });
-                }
+                throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
             }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
             const query = this.creativeWorkModel.find({ $and: conditions }, projection);
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
@@ -243,8 +271,8 @@ class CreativeWorkRepo {
                 query.sort({ identifier: params.sort.identifier });
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean() // 2024-09-19~
+                .exec();
         });
     }
     /**
@@ -252,7 +280,7 @@ class CreativeWorkRepo {
      */
     deleteMovie(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.creativeWorkModel.findOneAndRemove({ _id: { $eq: params.id } })
+            yield this.creativeWorkModel.findOneAndRemove({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
                 .exec();
         });
     }

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

@@ -1,13 +1,7 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import * as factory from '../../../factory';
-type IDocType = ((factory.place.movieTheater.IPlace & {
+export type IDocType = Omit<factory.place.movieTheater.IPlace, 'id'> & {
     hasPOS?: factory.place.movieTheater.IPOS[];
-}) | factory.place.screeningRoom.IPlace) & {
-    alternateName?: any;
-    description?: any;
-    openingHoursSpecification?: any;
-    smokingAllowed?: boolean;
-    sameAs?: any;
 };
 type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;

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

@@ -1,13 +1,9 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import * as factory from '../../../factory';
-type IDocType = ((factory.place.movieTheater.IPlace & {
-    hasPOS?: factory.place.movieTheater.IPOS[];
-}) | factory.place.screeningRoom.IPlace) & {
-    alternateName?: any;
+type IDocType = factory.place.screeningRoom.IPlace & {
     description?: any;
     openingHoursSpecification?: any;
     smokingAllowed?: boolean;
-    sameAs?: any;
 };
 type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;

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

@@ -21,29 +21,27 @@ const schemaDefinition = {
         required: true
     },
     name: mongoose_1.SchemaTypes.Mixed,
-    alternateName: mongoose_1.SchemaTypes.Mixed,
     description: mongoose_1.SchemaTypes.Mixed,
     address: mongoose_1.SchemaTypes.Mixed,
     branchCode: String,
     containedInPlace: mongoose_1.SchemaTypes.Mixed,
     containsPlace: [mongoose_1.SchemaTypes.Mixed],
-    hasEntranceGate: [mongoose_1.SchemaTypes.Mixed],
-    hasPOS: [mongoose_1.SchemaTypes.Mixed],
     maximumAttendeeCapacity: Number,
     openingHoursSpecification: mongoose_1.SchemaTypes.Mixed,
     smokingAllowed: Boolean,
-    telephone: String,
-    sameAs: String,
-    url: String,
-    kanaName: String,
-    offers: mongoose_1.SchemaTypes.Mixed,
     additionalProperty: [mongoose_1.SchemaTypes.Mixed],
     // ↓ルームの施設からの分離に伴い属性追加(2023-06-22~)
     openSeatingAllowed: mongoose_1.SchemaTypes.Mixed,
     amenityFeature: mongoose_1.SchemaTypes.Mixed
-    // createdAt: SchemaTypes.Mixed,
-    // updatedAt: SchemaTypes.Mixed,
-    // __v: 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,
@@ -80,9 +78,7 @@ const indexes = [
     ],
     [
         { 'project.id': 1, branchCode: 1 },
-        {
-            name: 'searchByProjectId-v20220721'
-        }
+        { name: 'searchByProjectId-v20220721' }
     ],
     [
         { 'name.ja': 1, branchCode: 1 },
@@ -102,15 +98,15 @@ const indexes = [
             }
         }
     ],
-    [
-        { kanaName: 1, branchCode: 1 },
-        {
-            name: 'searchByKanaName-v2',
-            partialFilterExpression: {
-                kanaName: { $exists: true }
-            }
-        }
-    ],
+    // [
+    //     { kanaName: 1, branchCode: 1 },
+    //     {
+    //         name: 'searchByKanaName-v2',
+    //         partialFilterExpression: {
+    //             kanaName: { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { 'parentOrganization.id': 1, branchCode: 1 },
         {
@@ -138,15 +134,15 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'containsPlace.containsPlace.containsPlace.branchCode': 1, branchCode: 1 },
-        {
-            name: 'searchByContainsPlaceContainsPlaceContainsPlaceBranchCode',
-            partialFilterExpression: {
-                'containsPlace.containsPlace.containsPlace.branchCode': { $exists: true }
-            }
-        }
-    ],
+    // [
+    //     { 'containsPlace.containsPlace.containsPlace.branchCode': 1, branchCode: 1 },
+    //     {
+    //         name: 'searchByContainsPlaceContainsPlaceContainsPlaceBranchCode',
+    //         partialFilterExpression: {
+    //             'containsPlace.containsPlace.containsPlace.branchCode': { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { additionalProperty: 1, branchCode: 1 },
         {
@@ -174,15 +170,15 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'containsPlace.containsPlace.containsPlace.additionalProperty': 1, branchCode: 1 },
-        {
-            name: 'searchByContainsPlaceContainsPlaceContainsPlaceAdditionalProperty',
-            partialFilterExpression: {
-                'containsPlace.containsPlace.containsPlace.additionalProperty': { $exists: true }
-            }
-        }
-    ],
+    // [
+    //     { 'containsPlace.containsPlace.containsPlace.additionalProperty': 1, branchCode: 1 },
+    //     {
+    //         name: 'searchByContainsPlaceContainsPlaceContainsPlaceAdditionalProperty',
+    //         partialFilterExpression: {
+    //             'containsPlace.containsPlace.containsPlace.additionalProperty': { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { 'containedInPlace.id': 1, branchCode: 1 },
         {
@@ -204,7 +200,7 @@ const indexes = [
 ];
 exports.indexes = indexes;
 /**
- * 施設スキーマ
+ * ルームスキーマ
  */
 let schema;
 function createSchema() {

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

@@ -24,18 +24,12 @@ exports.BusStopRepo = void 0;
 const factory = require("../../factory");
 const settings_1 = require("../../settings");
 const civicStructure_1 = require("../mongoose/schemas/civicStructure");
-const place_1 = require("../mongoose/schemas/place");
 /**
  * ターミナルリポジトリ
  */
 class BusStopRepo {
     constructor(connection) {
-        if (settings_1.USE_CIVIC_STRUCTURE_SCHEMA) {
-            this.civicStructureModel = connection.model(civicStructure_1.modelName, (0, civicStructure_1.createSchema)());
-        }
-        else {
-            this.civicStructureModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
-        }
+        this.civicStructureModel = connection.model(civicStructure_1.modelName, (0, civicStructure_1.createSchema)());
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_BUS_STOP_MONGO_CONDITIONS(params) {

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

@@ -11,21 +11,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HasPOSRepo = void 0;
 const mongoose_1 = require("mongoose");
-const civicStructure_1 = require("../mongoose/schemas/civicStructure");
-const place_1 = require("../mongoose/schemas/place");
 const factory = require("../../factory");
 const settings_1 = require("../../settings");
+const civicStructure_1 = require("../mongoose/schemas/civicStructure");
 /**
  * 施設のPOSリポジトリ
  */
 class HasPOSRepo {
     constructor(connection, operater) {
-        if (settings_1.USE_CIVIC_STRUCTURE_SCHEMA) {
-            this.civicStructureModel = connection.model(civicStructure_1.modelName, (0, civicStructure_1.createSchema)());
-        }
-        else {
-            this.civicStructureModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
-        }
+        this.civicStructureModel = connection.model(civicStructure_1.modelName, (0, civicStructure_1.createSchema)());
         this.operator = operater;
     }
     search(params) {

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

@@ -22,8 +22,9 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import type { Connection, Document, FilterQuery } from 'mongoose';
+import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../../factory';
+import { IDocType } from '../mongoose/schemas/civicStructure';
 export type IScreeningRoomFoundByBranchCode = Pick<factory.place.screeningRoom.IPlace, 'typeOf' | 'branchCode' | 'name' | 'containsPlace' | 'seatCount' | 'parentOrganization'>;
 export type IMovieTheaterIncludingScreeningRooms = Pick<factory.place.movieTheater.IPlace, 'additionalProperty' | 'branchCode' | 'kanaName' | 'name' | 'offers' | 'parentOrganization' | 'project' | 'telephone' | 'typeOf'> & {
     containsPlace: factory.place.screeningRoom.IPlace[];
@@ -34,14 +35,15 @@ type IKeyOfProjection = keyof factory.place.movieTheater.IPlace;
  */
 export declare class MovieTheaterRepo {
     private readonly civicStructureModel;
-    private readonly civicStructureModelAsSecondary;
     private readonly placeModel;
     constructor(connection: Connection);
     static CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params: factory.place.movieTheater.ISearchConditions): FilterQuery<import("@chevre/factory/lib/place/movieTheater").IPlace>[];
     /**
      * 施設を保管する
      */
-    saveMovieTheater(params: factory.place.movieTheater.IPlace): Promise<factory.place.movieTheater.IPlace>;
+    saveMovieTheater(params: factory.place.movieTheater.IPlace): Promise<{
+        id: string;
+    }>;
     saveMovieTheaterByBranchCode4coa(params: IMovieTheaterIncludingScreeningRooms): Promise<void>;
     /**
      * 施設のpublic属性検索
@@ -81,59 +83,15 @@ export declare class MovieTheaterRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<Document<unknown, {}, ((import("@chevre/factory/lib/place/movieTheater").IPlace & {
-        hasPOS?: import("@chevre/factory/lib/place/movieTheater").IPOS[] | undefined;
-    }) | import("@chevre/factory/lib/place/screeningRoom").IPlace) & {
-        alternateName?: any;
-        description?: any;
-        openingHoursSpecification?: any;
-        smokingAllowed?: boolean | undefined;
-        sameAs?: any;
-    }> & ((import("@chevre/factory/lib/place/movieTheater").IPlace & {
+    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, IDocType> & Omit<import("@chevre/factory/lib/place/movieTheater").IPlace, "id"> & {
         hasPOS?: import("@chevre/factory/lib/place/movieTheater").IPOS[] | undefined;
-    } & {
-        alternateName?: any;
-        description?: any;
-        openingHoursSpecification?: any;
-        smokingAllowed?: boolean | undefined;
-        sameAs?: any;
-    } & {
-        _id: import("mongoose").Types.ObjectId;
-    }) | (import("@chevre/factory/lib/place/screeningRoom").IPlace & {
-        alternateName?: any;
-        description?: any;
-        openingHoursSpecification?: any;
-        smokingAllowed?: boolean | undefined;
-        sameAs?: any;
     } & {
         _id: import("mongoose").Types.ObjectId;
-    })), import("mongoose").QueryOptions<Document<unknown, {}, ((import("@chevre/factory/lib/place/movieTheater").IPlace & {
+    }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, IDocType> & Omit<import("@chevre/factory/lib/place/movieTheater").IPlace, "id"> & {
         hasPOS?: import("@chevre/factory/lib/place/movieTheater").IPOS[] | undefined;
-    }) | import("@chevre/factory/lib/place/screeningRoom").IPlace) & {
-        alternateName?: any;
-        description?: any;
-        openingHoursSpecification?: any;
-        smokingAllowed?: boolean | undefined;
-        sameAs?: any;
-    }> & ((import("@chevre/factory/lib/place/movieTheater").IPlace & {
-        hasPOS?: import("@chevre/factory/lib/place/movieTheater").IPOS[] | undefined;
-    } & {
-        alternateName?: any;
-        description?: any;
-        openingHoursSpecification?: any;
-        smokingAllowed?: boolean | undefined;
-        sameAs?: any;
-    } & {
-        _id: import("mongoose").Types.ObjectId;
-    }) | (import("@chevre/factory/lib/place/screeningRoom").IPlace & {
-        alternateName?: any;
-        description?: any;
-        openingHoursSpecification?: any;
-        smokingAllowed?: boolean | undefined;
-        sameAs?: any;
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }))>>;
+    }>>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;
@@ -143,7 +101,7 @@ export declare class MovieTheaterRepo {
      * 2024-09-17~
      */
     deleteOldMovieTheaters(): Promise<import("mongodb").DeleteResult>;
-    sync2secondary(params: {
+    sync2secondary(__: {
         id: string;
     }): Promise<void>;
 }

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

@@ -34,13 +34,8 @@ const AVAILABLE_PROJECT_FIELDS = [
  */
 class MovieTheaterRepo {
     constructor(connection) {
-        if (settings_1.USE_CIVIC_STRUCTURE_SCHEMA) {
-            this.civicStructureModel = connection.model(civicStructure_1.modelName, (0, civicStructure_1.createSchema)());
-        }
-        else {
-            this.civicStructureModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
-        }
-        this.civicStructureModelAsSecondary = connection.model(civicStructure_1.modelName, (0, civicStructure_1.createSchema)());
+        this.civicStructureModel = connection.model(civicStructure_1.modelName, (0, civicStructure_1.createSchema)());
+        // this.civicStructureModelAsSecondary = connection.model(civicStructureModelName, createCivicStructureSchema());
         this.placeModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
     }
     // tslint:disable-next-line:max-func-body-length
@@ -54,84 +49,35 @@ class MovieTheaterRepo {
         }
         const branchCodeEq = (_c = params.branchCode) === null || _c === void 0 ? void 0 : _c.$eq;
         if (typeof branchCodeEq === 'string') {
-            andConditions.push({
-                branchCode: {
-                    $exists: true,
-                    $eq: branchCodeEq
-                }
-            });
+            andConditions.push({ branchCode: { $eq: branchCodeEq } });
         }
         const branchCodeRegex = (_d = params.branchCode) === null || _d === void 0 ? void 0 : _d.$regex;
         if (typeof branchCodeRegex === 'string' && branchCodeRegex.length > 0) {
-            andConditions.push({
-                branchCode: {
-                    $exists: true,
-                    $regex: new RegExp(branchCodeRegex)
-                }
-            });
+            andConditions.push({ branchCode: { $regex: new RegExp(branchCodeRegex) } });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (Array.isArray(params.branchCodes)) {
-            andConditions.push({
-                branchCode: {
-                    $exists: true,
-                    $in: params.branchCodes
-                }
-            });
+            andConditions.push({ branchCode: { $in: params.branchCodes } });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         const idEq = (_e = params.id) === null || _e === void 0 ? void 0 : _e.$eq;
         if (typeof idEq === 'string') {
-            andConditions.push({
-                _id: {
-                    $eq: idEq
-                }
-            });
+            andConditions.push({ _id: { $eq: idEq } });
         }
         const idIn = (_f = params.id) === null || _f === void 0 ? void 0 : _f.$in;
         if (Array.isArray(idIn)) {
-            andConditions.push({
-                _id: {
-                    $in: idIn
-                }
-            });
+            andConditions.push({ _id: { $in: idIn } });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (typeof params.name === 'string' && params.name.length > 0) {
             andConditions.push({
                 $or: [
-                    {
-                        'name.ja': {
-                            $exists: true,
-                            $regex: new RegExp(params.name)
-                        }
-                    },
-                    {
-                        'name.en': {
-                            $exists: true,
-                            $regex: new RegExp(params.name)
-                        }
-                    },
-                    {
-                        kanaName: {
-                            $exists: true,
-                            $regex: new RegExp(params.name)
-                        }
-                    }
+                    { 'name.ja': { $exists: true, $regex: new RegExp(params.name) } },
+                    { 'name.en': { $exists: true, $regex: new RegExp(params.name) } },
+                    { kanaName: { $exists: true, $regex: new RegExp(params.name) } }
                 ]
             });
         }
         const parentOrganizationIdEq = (_h = (_g = params.parentOrganization) === null || _g === void 0 ? void 0 : _g.id) === null || _h === void 0 ? void 0 : _h.$eq;
         if (typeof parentOrganizationIdEq === 'string') {
-            andConditions.push({
-                'parentOrganization.id': {
-                    $exists: true,
-                    $eq: parentOrganizationIdEq
-                }
-            });
+            andConditions.push({ 'parentOrganization.id': { $exists: true, $eq: parentOrganizationIdEq } });
         }
         const additionalPropertyElemMatch = (_j = params.additionalProperty) === null || _j === void 0 ? void 0 : _j.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
@@ -149,30 +95,24 @@ class MovieTheaterRepo {
      */
     saveMovieTheater(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            let savedId;
             let doc;
             if (params.id === '') {
                 const { id } = params, creatingParams = __rest(params, ["id"]); // 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"]);
-                doc = yield this.civicStructureModel.findOneAndUpdate({ _id: params.id }, updateFields, {
-                    upsert: false,
-                    new: true,
-                    projection: {
-                        __v: 0,
-                        createdAt: 0,
-                        updatedAt: 0,
-                        containsPlace: 0
-                    }
-                })
+                doc = yield this.civicStructureModel.findOneAndUpdate({ _id: { $eq: params.id } }, updateFields, { upsert: false, new: true, projection: { _id: 1 } })
                     .exec();
+                savedId = params.id;
             }
             if (doc === null) {
                 throw new factory.errors.NotFound(this.civicStructureModel.modelName);
             }
-            return doc.toObject();
+            return { id: savedId };
         });
     }
     saveMovieTheaterByBranchCode4coa(params) {
@@ -351,31 +291,35 @@ class MovieTheaterRepo {
         });
     }
     // tslint:disable-next-line:prefer-function-over-method
-    sync2secondary(params) {
+    sync2secondary(__) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (settings_1.USE_CIVIC_STRUCTURE_SCHEMA) {
-                return;
-            }
-            const doc = yield this.placeModel.findOne({
-                _id: { $eq: params.id },
-                typeOf: { $eq: factory.placeType.MovieTheater }
-            })
-                .lean()
-                .exec();
-            if (doc !== null) {
-                const { _id } = doc, replacement = __rest(doc, ["_id"]);
-                // console.log('replacing eventSeries', params.id, 'replacement:', replacement);
-                const replaceResult = yield this.civicStructureModelAsSecondary.findOneAndReplace({
-                    _id: { $eq: params.id },
-                    typeOf: { $eq: factory.placeType.MovieTheater }
-                }, replacement, {
-                    upsert: true,
-                    rawResult: true
-                })
-                    .exec();
-                // tslint:disable-next-line:no-console
-                console.log('factory.placeType.MovieTheater', params.id, 'replaced. result:', replaceResult);
-            }
+            // if (USE_CIVIC_STRUCTURE_SCHEMA) {
+            //     return;
+            // }
+            // const doc = await this.placeModel.findOne({
+            //     _id: { $eq: params.id },
+            //     typeOf: { $eq: factory.placeType.MovieTheater }
+            // })
+            //     .lean()
+            //     .exec();
+            // if (doc !== null) {
+            //     const { _id, ...replacement } = doc;
+            //     // console.log('replacing eventSeries', params.id, 'replacement:', replacement);
+            //     const replaceResult = await this.civicStructureModelAsSecondary.findOneAndReplace(
+            //         {
+            //             _id: { $eq: params.id },
+            //             typeOf: { $eq: factory.placeType.MovieTheater }
+            //         },
+            //         replacement,
+            //         {
+            //             upsert: true,
+            //             rawResult: true
+            //         }
+            //     )
+            //         .exec();
+            //     // tslint:disable-next-line:no-console
+            //     console.log('factory.placeType.MovieTheater', params.id, 'replaced. result:', replaceResult);
+            // }
         });
     }
 }

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

@@ -30,12 +30,7 @@ const place_1 = require("../mongoose/schemas/place");
  */
 class ScreeningRoomRepo {
     constructor(connection) {
-        if (settings_1.USE_CIVIC_STRUCTURE_SCHEMA) {
-            this.civicStructureModel = connection.model(civicStructure_1.modelName, (0, civicStructure_1.createSchema)());
-        }
-        else {
-            this.civicStructureModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
-        }
+        this.civicStructureModel = connection.model(civicStructure_1.modelName, (0, civicStructure_1.createSchema)());
         this.placeModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
     }
     saveScreeningRooms4coa(params) {

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

@@ -19,12 +19,7 @@ const place_1 = require("../mongoose/schemas/place");
  */
 class SeatRepo {
     constructor(connection) {
-        if (settings_1.USE_CIVIC_STRUCTURE_SCHEMA) {
-            this.civicStructureModel = connection.model(civicStructure_1.modelName, (0, civicStructure_1.createSchema)());
-        }
-        else {
-            this.civicStructureModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
-        }
+        this.civicStructureModel = connection.model(civicStructure_1.modelName, (0, civicStructure_1.createSchema)());
         this.placeModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
     }
     static CREATE_SEARCH_SEATS_PROJECTION(params) {

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

@@ -19,12 +19,7 @@ const place_1 = require("../mongoose/schemas/place");
  */
 class SectionRepo {
     constructor(connection) {
-        if (settings_1.USE_CIVIC_STRUCTURE_SCHEMA) {
-            this.civicStructureModel = connection.model(civicStructure_1.modelName, (0, civicStructure_1.createSchema)());
-        }
-        else {
-            this.civicStructureModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
-        }
+        this.civicStructureModel = connection.model(civicStructure_1.modelName, (0, civicStructure_1.createSchema)());
         this.placeModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
     }
     // tslint:disable-next-line:max-func-body-length

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

@@ -241,10 +241,10 @@ function createInformNoteTasks(params) {
 }
 function createInformMovieTasks(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        const movies4inform = yield repos.creativeWork.searchMovies({ id: { $in: params.ids } }, [
+        const movies4inform = yield repos.creativeWork.projectFields({ id: { $in: params.ids } }, [
             'additionalProperty', 'datePublished', 'duration', 'identifier', 'name', 'project',
             'typeOf', 'distributor', 'contentRating', 'headline', 'thumbnailUrl'
-        ], []);
+        ]);
         const informResources = settings.onResourceUpdated.informResource;
         if (movies4inform.length > 0) {
             const taskRunsAt = new Date();

package/lib/chevre/settings.d.ts

@@ -2,10 +2,6 @@ import * as factory from './factory';
 export declare const MONGO_MAX_TIME_MS: number;
 export declare const MONGO_READ_PREFERENCE: string;
 export declare const MONGO_AUTO_INDEX: boolean;
-/**
- * 施設のprimaryコレクションとして新スキーマを使用するかどうか
- */
-export declare const USE_CIVIC_STRUCTURE_SCHEMA: boolean;
 interface IOptions {
     onOrderStatusChanged: factory.project.IOnOrderStatusChanged;
     onEventChanged: {

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Settings = exports.USE_CIVIC_STRUCTURE_SCHEMA = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = void 0;
+exports.Settings = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = void 0;
 exports.MONGO_MAX_TIME_MS = (typeof process.env.MONGO_MAX_TIME_MS === 'string')
     ? Number(process.env.MONGO_MAX_TIME_MS)
     // tslint:disable-next-line:no-magic-numbers
@@ -9,10 +9,6 @@ exports.MONGO_READ_PREFERENCE = (typeof process.env.MONGO_READ_PREFERENCE === 's
     ? process.env.MONGO_READ_PREFERENCE
     : 'primaryPreferred';
 exports.MONGO_AUTO_INDEX = process.env.MONGO_AUTO_INDEX === '1';
-/**
- * 施設のprimaryコレクションとして新スキーマを使用するかどうか
- */
-exports.USE_CIVIC_STRUCTURE_SCHEMA = process.env.USE_CIVIC_STRUCTURE_SCHEMA === '1';
 /**
  * domain settings
  */

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.27"
+  "version": "22.3.0-alpha.29"
 }