@chevre/domain 22.3.0-alpha.21 → 22.3.0-alpha.23

package/example/src/chevre/migrateMovieTheaters2secondary.ts

@@ -0,0 +1,70 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const movieTheaterRepo = await chevre.repository.place.MovieTheater.createInstance(mongoose.connection);
+
+    const cursor = movieTheaterRepo.getCursor(
+        {
+            typeOf: { $eq: chevre.factory.placeType.MovieTheater }
+        },
+        {
+            _id: 1,
+            branchCode: 1,
+            project: 1,
+            typeOf: 1
+        }
+    );
+    console.log('docs found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const movieTheater: Pick<chevre.factory.place.movieTheater.IPlace, 'id' | 'branchCode' | 'project' | 'typeOf'> =
+            doc.toObject();
+        const alreadyMigrated = false;
+        if (alreadyMigrated) {
+            console.log(
+                'already exist.',
+                movieTheater.project.id,
+                movieTheater.typeOf,
+                movieTheater.id,
+                movieTheater.branchCode, i, updateCount
+            );
+        } else {
+            updateCount += 1;
+            console.log(
+                'updating...',
+                movieTheater.project.id,
+                movieTheater.typeOf,
+                movieTheater.id,
+                movieTheater.branchCode, i, updateCount
+            );
+            await movieTheaterRepo.sync2secondary({
+                id: movieTheater.id
+            });
+            console.log(
+                'updated.',
+                movieTheater.project.id,
+                movieTheater.typeOf,
+                movieTheater.id,
+                movieTheater.branchCode, i, updateCount
+            );
+        }
+    });
+
+    console.log(i, 'docs checked');
+    console.log(updateCount, 'docs updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -319,28 +319,18 @@ export declare class EventRepo {
         _id: string;
     }>) | (import("@chevre/factory/lib/event/screeningEvent").IAttributes & {
         _id: string;
-        alternateName?: any;
         aggregateOffer?: import("@chevre/factory/lib/event/anyEvent").IAggregateOffer | undefined;
     } & Required<{
         _id: string;
-    }>) | (import("@chevre/factory/lib/event/screeningEventSeries").IAttributes & {
-        _id: string;
-    } & Required<{
-        _id: string;
     }>)), import("mongoose").QueryOptions<Document<unknown, {}, IDocType> & ((import("@chevre/factory/lib/event/anyEvent").IAttributes & {
         _id: string;
     } & Required<{
         _id: string;
     }>) | (import("@chevre/factory/lib/event/screeningEvent").IAttributes & {
         _id: string;
-        alternateName?: any;
         aggregateOffer?: import("@chevre/factory/lib/event/anyEvent").IAggregateOffer | undefined;
     } & Required<{
         _id: string;
-    }>) | (import("@chevre/factory/lib/event/screeningEventSeries").IAttributes & {
-        _id: string;
-    } & Required<{
-        _id: string;
     }>))>>;
     addAvailableAtOrFrom(params: {
         id: string;

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

@@ -0,0 +1,18 @@
+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;
+    description?: any;
+    openingHoursSpecification?: any;
+    smokingAllowed?: boolean;
+    sameAs?: any;
+};
+type IModel = Model<IDocType>;
+type ISchemaDefinition = SchemaDefinition<IDocType>;
+type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
+declare const modelName = "CivicStructure";
+declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): ISchema;
+export { createSchema, IModel, indexes, modelName };

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

@@ -0,0 +1,131 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.modelName = exports.indexes = exports.createSchema = void 0;
+const mongoose_1 = require("mongoose");
+const writeConcern_1 = require("../writeConcern");
+const settings_1 = require("../../../settings");
+const modelName = 'CivicStructure';
+exports.modelName = modelName;
+const schemaDefinition = {
+    project: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
+    parentOrganization: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
+    typeOf: {
+        type: String,
+        required: true
+    },
+    name: mongoose_1.SchemaTypes.Mixed,
+    branchCode: String,
+    hasEntranceGate: [mongoose_1.SchemaTypes.Mixed],
+    hasPOS: [mongoose_1.SchemaTypes.Mixed],
+    telephone: String,
+    url: String,
+    kanaName: String,
+    offers: mongoose_1.SchemaTypes.Mixed,
+    additionalProperty: [mongoose_1.SchemaTypes.Mixed]
+};
+const schemaOptions = {
+    autoIndex: settings_1.MONGO_AUTO_INDEX,
+    autoCreate: false,
+    collection: 'civicStructures',
+    id: true,
+    read: settings_1.MONGO_READ_PREFERENCE,
+    writeConcern: writeConcern_1.writeConcern,
+    strict: true,
+    strictQuery: false,
+    timestamps: false,
+    versionKey: false,
+    toJSON: {
+        getters: false,
+        virtuals: false,
+        minimize: false,
+        versionKey: false
+    },
+    toObject: {
+        getters: false,
+        virtuals: true,
+        minimize: false,
+        versionKey: false
+    }
+};
+const indexes = [
+    [
+        { branchCode: 1 },
+        { name: 'branchCode' }
+    ],
+    [
+        { typeOf: 1, branchCode: 1 },
+        { name: 'typeOf' }
+    ],
+    [
+        { 'project.id': 1, branchCode: 1 },
+        { name: 'projectId' }
+    ],
+    [
+        { 'name.ja': 1, branchCode: 1 },
+        {
+            name: 'nameJa',
+            partialFilterExpression: {
+                'name.ja': { $exists: true }
+            }
+        }
+    ],
+    [
+        { 'name.en': 1, branchCode: 1 },
+        {
+            name: 'nameEn',
+            partialFilterExpression: {
+                'name.en': { $exists: true }
+            }
+        }
+    ],
+    [
+        { kanaName: 1, branchCode: 1 },
+        {
+            name: 'kanaName',
+            partialFilterExpression: {
+                kanaName: { $exists: true }
+            }
+        }
+    ],
+    [
+        { 'parentOrganization.id': 1, branchCode: 1 },
+        {
+            name: 'parentOrganizationId',
+            partialFilterExpression: {
+                'parentOrganization.id': { $exists: true }
+            }
+        }
+    ],
+    [
+        { additionalProperty: 1, branchCode: 1 },
+        {
+            name: 'additionalProperty',
+            partialFilterExpression: {
+                additionalProperty: { $exists: true }
+            }
+        }
+    ]
+];
+exports.indexes = indexes;
+/**
+ * 施設スキーマ
+ */
+let schema;
+function createSchema() {
+    if (schema === undefined) {
+        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
+        if (settings_1.MONGO_AUTO_INDEX) {
+            indexes.forEach((indexParams) => {
+                schema === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}
+exports.createSchema = createSchema;

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

@@ -5,13 +5,9 @@ type IDocTypeAsEvent = factory.event.IAttributes<factory.eventType.Event> & {
 };
 type IDocTypeAsScreeningEvent = factory.event.IAttributes<factory.eventType.ScreeningEvent> & {
     _id: string;
-    alternateName?: any;
     aggregateOffer?: factory.event.event.IAggregateOffer;
 };
-type IDocTypeAsEventSeries = factory.event.IAttributes<factory.eventType.ScreeningEventSeries> & {
-    _id: string;
-};
-export type IDocType = IDocTypeAsEvent | IDocTypeAsScreeningEvent | IDocTypeAsEventSeries;
+export type IDocType = IDocTypeAsEvent | IDocTypeAsScreeningEvent;
 type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;

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

@@ -24,23 +24,13 @@ const schemaDefinition = {
     identifier: String,
     name: mongoose_1.SchemaTypes.Mixed,
     additionalProperty: mongoose_1.SchemaTypes.Mixed,
-    alternateName: mongoose_1.SchemaTypes.Mixed,
-    alternativeHeadline: mongoose_1.SchemaTypes.Mixed,
     description: mongoose_1.SchemaTypes.Mixed,
     doorTime: Date,
-    duration: String,
     endDate: Date,
     eventStatus: String,
-    headline: mongoose_1.SchemaTypes.Mixed,
     location: mongoose_1.SchemaTypes.Mixed,
     startDate: Date,
-    workPerformed: mongoose_1.SchemaTypes.Mixed,
     superEvent: mongoose_1.SchemaTypes.Mixed,
-    videoFormat: mongoose_1.SchemaTypes.Mixed,
-    soundFormat: mongoose_1.SchemaTypes.Mixed,
-    subtitleLanguage: mongoose_1.SchemaTypes.Mixed,
-    dubLanguage: mongoose_1.SchemaTypes.Mixed,
-    kanaName: String,
     offers: mongoose_1.SchemaTypes.Mixed,
     maximumAttendeeCapacity: { type: Number },
     remainingAttendeeCapacity: { type: Number },
@@ -50,9 +40,17 @@ const schemaDefinition = {
     aggregateReservation: mongoose_1.SchemaTypes.Mixed,
     aggregateOffer: mongoose_1.SchemaTypes.Mixed,
     coaInfo: mongoose_1.SchemaTypes.Mixed
-    // createdAt: SchemaTypes.Mixed,
-    // updatedAt: SchemaTypes.Mixed,
-    // __v: SchemaTypes.Mixed
+    // ↓discontinue EventSeries(2024-09-17~)
+    // alternateName: SchemaTypes.Mixed,
+    // alternativeHeadline: SchemaTypes.Mixed,
+    // duration: String,
+    // headline: SchemaTypes.Mixed,
+    // workPerformed: SchemaTypes.Mixed,
+    // videoFormat: SchemaTypes.Mixed,
+    // soundFormat: SchemaTypes.Mixed,
+    // subtitleLanguage: SchemaTypes.Mixed,
+    // dubLanguage: SchemaTypes.Mixed,
+    // kanaName: String,
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

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

@@ -4,7 +4,7 @@ import * as factory from '../../factory';
  * ターミナルリポジトリ
  */
 export declare class BusStopRepo {
-    private readonly placeModel;
+    private readonly civicStructureModel;
     constructor(connection: Connection);
     static CREATE_BUS_STOP_MONGO_CONDITIONS(params: factory.place.busStop.ISearchConditions): FilterQuery<import("@chevre/factory/lib/place/busStop").IPlace>[];
     saveBusStop(params: factory.place.busStop.IPlace): Promise<factory.place.busStop.IPlace>;

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

@@ -23,13 +23,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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) {
-        this.placeModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
+        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)());
+        }
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_BUS_STOP_MONGO_CONDITIONS(params) {
@@ -111,23 +117,23 @@ class BusStopRepo {
         return __awaiter(this, void 0, void 0, function* () {
             let doc;
             if (typeof params.id !== 'string' || params.id.length === 0) {
-                doc = yield this.placeModel.create(params);
+                doc = yield this.civicStructureModel.create(params);
             }
             else {
                 // 上書き禁止属性を除外(2022-08-24~)
                 const { id, branchCode, project, typeOf } = params, updateFields = __rest(params, ["id", "branchCode", "project", "typeOf"]);
-                doc = yield this.placeModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
+                doc = yield this.civicStructureModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
                     .exec();
             }
             if (doc === null) {
-                throw new factory.errors.NotFound(this.placeModel.modelName);
+                throw new factory.errors.NotFound(this.civicStructureModel.modelName);
             }
             return doc.toObject();
         });
     }
     findBusStopByBranchCode(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.placeModel.findOne({
+            return this.civicStructureModel.findOne({
                 typeOf: { $eq: factory.placeType.BusStop },
                 'project.id': { $eq: params.project.id },
                 branchCode: { $eq: params.branchCode }
@@ -146,7 +152,7 @@ class BusStopRepo {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = BusStopRepo.CREATE_BUS_STOP_MONGO_CONDITIONS(params);
             // containsPlaceを含めるとデータサイズが大きくなるので、検索結果には含めない
-            const query = this.placeModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
+            const query = this.civicStructureModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
                 __v: 0,
                 createdAt: 0,
                 updatedAt: 0,
@@ -169,20 +175,20 @@ class BusStopRepo {
     }
     findBusStopById(params, projection) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.placeModel.findOne({
+            const doc = yield this.civicStructureModel.findOne({
                 typeOf: { $eq: factory.placeType.BusStop },
                 _id: { $eq: params.id }
             }, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.placeModel.modelName);
+                throw new factory.errors.NotFound(this.civicStructureModel.modelName);
             }
             return doc.toObject();
         });
     }
     deleteBusStopById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.placeModel.findOneAndDelete({
+            yield this.civicStructureModel.findOneAndDelete({
                 typeOf: { $eq: factory.placeType.BusStop },
                 _id: { $eq: params.id },
                 'project.id': { $eq: params.project.id }
@@ -190,7 +196,7 @@ class BusStopRepo {
                 .exec()
                 .then((doc) => {
                 if (doc === null) {
-                    throw new factory.errors.NotFound(this.placeModel.modelName);
+                    throw new factory.errors.NotFound(this.civicStructureModel.modelName);
                 }
             });
         });

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

@@ -14,7 +14,7 @@ interface IOperator {
  */
 export declare class HasPOSRepo {
     readonly operator: IOperator;
-    private readonly placeModel;
+    private readonly civicStructureModel;
     constructor(connection: Connection, operater: IOperator);
     search(params: {
         limit?: number;

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

@@ -11,6 +11,7 @@ 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");
@@ -19,7 +20,12 @@ const settings_1 = require("../../settings");
  */
 class HasPOSRepo {
     constructor(connection, operater) {
-        this.placeModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
+        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.operator = operater;
     }
     search(params) {
@@ -40,7 +46,7 @@ class HasPOSRepo {
             if (typeof branchCodeRegex === 'string' && branchCodeRegex.length > 0) {
                 matchStages.push({ $match: { 'hasPOS.branchCode': { $regex: new RegExp(branchCodeRegex) } } });
             }
-            const aggregate = this.placeModel.aggregate([
+            const aggregate = this.civicStructureModel.aggregate([
                 {
                     $unwind: {
                         path: '$hasPOS'
@@ -69,7 +75,7 @@ class HasPOSRepo {
     createByBranchCode(params) {
         return __awaiter(this, void 0, void 0, function* () {
             // 施設存在確認
-            let doc = yield this.placeModel.findOne({
+            let doc = yield this.civicStructureModel.findOne({
                 'project.id': { $eq: params.project.id },
                 _id: { $eq: this.operator.id }
             }, { _id: 1, typeOf: 1 })
@@ -82,7 +88,7 @@ class HasPOSRepo {
                 branchCode: params.branchCode,
                 name: params.name
             };
-            doc = yield this.placeModel.findOneAndUpdate({
+            doc = yield this.civicStructureModel.findOneAndUpdate({
                 'project.id': { $eq: params.project.id },
                 _id: { $eq: this.operator.id },
                 'hasPOS.branchCode': { $ne: params.branchCode }
@@ -102,7 +108,7 @@ class HasPOSRepo {
     }
     updateByBranchCode(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.placeModel.findOneAndUpdate({
+            const doc = yield this.civicStructureModel.findOneAndUpdate({
                 'project.id': { $eq: params.project.id },
                 _id: { $eq: this.operator.id },
                 'hasPOS.branchCode': { $eq: params.branchCode }
@@ -124,7 +130,7 @@ class HasPOSRepo {
     }
     deleteByBranchCode(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.placeModel.findOneAndUpdate({
+            const doc = yield this.civicStructureModel.findOneAndUpdate({
                 'project.id': { $eq: params.project.id },
                 _id: { $eq: this.operator.id },
                 'hasPOS.branchCode': { $eq: params.branchCode }

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

@@ -25,7 +25,7 @@
 import type { Connection, Document, FilterQuery } from 'mongoose';
 import * as factory from '../../factory';
 export type IScreeningRoomFoundByBranchCode = Pick<factory.place.screeningRoom.IPlace, 'typeOf' | 'branchCode' | 'name' | 'containsPlace' | 'seatCount' | 'parentOrganization'>;
-export type IMovieTheaterIncludingScreeningRooms = factory.place.movieTheater.IPlace & {
+export type IMovieTheaterIncludingScreeningRooms = Pick<factory.place.movieTheater.IPlace, 'additionalProperty' | 'branchCode' | 'kanaName' | 'name' | 'offers' | 'parentOrganization' | 'project' | 'telephone' | 'typeOf'> & {
     containsPlace: factory.place.screeningRoom.IPlace[];
 };
 type IKeyOfProjectionMovieTheater = keyof factory.place.movieTheater.IPlace | '_id';
@@ -33,6 +33,8 @@ type IKeyOfProjectionMovieTheater = 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>[];
@@ -130,5 +132,13 @@ export declare class MovieTheaterRepo {
         filter: any;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
+    /**
+     * 旧施設廃止専用メソッド
+     * 2024-09-17~
+     */
+    deleteOldMovieTheaters(): Promise<import("mongodb").DeleteResult>;
+    sync2secondary(params: {
+        id: string;
+    }): Promise<void>;
 }
 export {};

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

@@ -23,12 +23,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MovieTheaterRepo = 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 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.placeModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
     }
     // tslint:disable-next-line:max-func-body-length
@@ -140,12 +148,12 @@ class MovieTheaterRepo {
             let doc;
             if (params.id === '') {
                 const { id } = params, creatingParams = __rest(params, ["id"]); // omit id(2024-09-12~)
-                doc = yield this.placeModel.create(creatingParams);
+                doc = yield this.civicStructureModel.create(creatingParams);
             }
             else {
                 // 上書き禁止属性を除外(2022-08-24~)
                 const { id, branchCode, project, typeOf } = params, updateFields = __rest(params, ["id", "branchCode", "project", "typeOf"]);
-                doc = yield this.placeModel.findOneAndUpdate({ _id: params.id }, updateFields, {
+                doc = yield this.civicStructureModel.findOneAndUpdate({ _id: params.id }, updateFields, {
                     upsert: false,
                     new: true,
                     projection: {
@@ -158,23 +166,19 @@ class MovieTheaterRepo {
                     .exec();
             }
             if (doc === null) {
-                throw new factory.errors.NotFound(this.placeModel.modelName);
+                throw new factory.errors.NotFound(this.civicStructureModel.modelName);
             }
             return doc.toObject();
         });
     }
-    // void化(2023-06-23~)
     saveMovieTheaterByBranchCode4coa(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const { containsPlace } = params, movieTheater4update = __rest(params, ["containsPlace"]);
-            const movieTheaterDoc = yield this.placeModel.findOneAndUpdate({
+            const movieTheaterDoc = yield this.civicStructureModel.findOneAndUpdate({
                 typeOf: { $eq: factory.placeType.MovieTheater },
                 'project.id': { $eq: params.project.id },
                 branchCode: { $eq: params.branchCode }
-            }, 
-            // containsPlaceの保管を廃止(2023-07-04~)
-            // params,
-            movieTheater4update, {
+            }, movieTheater4update, {
                 new: true,
                 projection: { _id: 1 }
             })
@@ -182,39 +186,6 @@ class MovieTheaterRepo {
             if (movieTheaterDoc === null) {
                 throw new factory.errors.NotFound(factory.placeType.MovieTheater);
             }
-            const movieTheater = movieTheaterDoc.toObject();
-            // ScreeningRoomも保管する(2023-06-24~)
-            const creatingScreeningRooms = params.containsPlace.map((place) => {
-                return Object.assign(Object.assign({}, place), { containedInPlace: {
-                        id: movieTheater.id,
-                        typeOf: params.typeOf,
-                        branchCode: params.branchCode,
-                        name: params.name
-                    }, containsPlace: (Array.isArray(place.containsPlace)) ? place.containsPlace : [], project: params.project });
-            });
-            yield Promise.all(creatingScreeningRooms.map((createScreeningRoom) => __awaiter(this, void 0, void 0, function* () {
-                const { typeOf, project, branchCode } = createScreeningRoom, setFields = __rest(createScreeningRoom, ["typeOf", "project", "branchCode"]);
-                if (typeof branchCode === 'string' && branchCode.length > 0) {
-                    yield this.placeModel.findOneAndUpdate({
-                        typeOf: { $eq: factory.placeType.ScreeningRoom },
-                        'project.id': { $eq: createScreeningRoom.project.id },
-                        'containedInPlace.id': { $exists: true, $eq: createScreeningRoom.containedInPlace.id },
-                        branchCode: { $eq: createScreeningRoom.branchCode }
-                    }, {
-                        $setOnInsert: {
-                            typeOf: createScreeningRoom.typeOf,
-                            project: createScreeningRoom.project,
-                            branchCode: createScreeningRoom.branchCode
-                        },
-                        $set: setFields
-                    }, {
-                        upsert: true,
-                        new: true,
-                        projection: { _id: 1 }
-                    })
-                        .exec();
-                }
-            })));
         });
     }
     /**
@@ -247,7 +218,7 @@ class MovieTheaterRepo {
                     });
                 }
             }
-            const query = this.placeModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
+            const query = this.civicStructureModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
                 query.limit(params.limit)
@@ -265,7 +236,7 @@ class MovieTheaterRepo {
     }
     deleteMovieTheaterById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.placeModel.findOneAndDelete({
+            yield this.civicStructureModel.findOneAndDelete({
                 typeOf: { $eq: factory.placeType.MovieTheater },
                 _id: { $eq: params.id },
                 'project.id': { $eq: params.project.id }
@@ -273,7 +244,7 @@ class MovieTheaterRepo {
                 .exec()
                 .then((doc) => {
                 if (doc === null) {
-                    throw new factory.errors.NotFound(this.placeModel.modelName);
+                    throw new factory.errors.NotFound(this.civicStructureModel.modelName);
                 }
             });
         });
@@ -283,7 +254,7 @@ class MovieTheaterRepo {
      */
     deleteMovieTheatersByParentOrganizationId(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.placeModel.deleteMany({
+            return this.civicStructureModel.deleteMany({
                 typeOf: { $eq: factory.placeType.MovieTheater },
                 'project.id': { $eq: params.project.id },
                 'parentOrganization.id': { $exists: true, $eq: params.parentOrganization.id }
@@ -296,7 +267,7 @@ class MovieTheaterRepo {
      */
     deleteMovieTheatersByProject(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.placeModel.deleteMany({
+            yield this.civicStructureModel.deleteMany({
                 typeOf: { $eq: factory.placeType.MovieTheater },
                 'project.id': { $eq: params.project.id }
             })
@@ -304,15 +275,55 @@ class MovieTheaterRepo {
         });
     }
     getCursor(conditions, projection) {
-        return this.placeModel.find(conditions, projection)
+        return this.civicStructureModel.find(conditions, projection)
             .sort({ branchCode: factory.sortType.Ascending })
             .cursor();
     }
     unsetUnnecessaryFields(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.placeModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+            return this.civicStructureModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
                 .exec();
         });
     }
+    /**
+     * 旧施設廃止専用メソッド
+     * 2024-09-17~
+     */
+    deleteOldMovieTheaters() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.placeModel.deleteMany({
+                typeOf: { $eq: factory.placeType.MovieTheater }
+            })
+                .exec();
+        });
+    }
+    // tslint:disable-next-line:prefer-function-over-method
+    sync2secondary(params) {
+        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);
+            }
+        });
+    }
 }
 exports.MovieTheaterRepo = MovieTheaterRepo;

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

@@ -13,12 +13,17 @@ interface IUpdateScreeningRoomResult {
     };
     typeOf: factory.placeType.ScreeningRoom;
 }
+type IMovieTheaterIncludingScreeningRooms = Pick<factory.place.movieTheater.IPlace, 'name' | 'branchCode' | 'typeOf' | 'project'> & {
+    containsPlace: factory.place.screeningRoom.IPlace[];
+};
 /**
  * ルームリポジトリ
  */
 export declare class ScreeningRoomRepo {
+    private readonly civicStructureModel;
     private readonly placeModel;
     constructor(connection: Connection);
+    saveScreeningRooms4coa(params: IMovieTheaterIncludingScreeningRooms): Promise<void>;
     createScreeningRoom(screeningRoom: Omit<factory.place.screeningRoom.IPlace, 'containedInPlace' | 'containsPlace' | 'parentOrganization'> & {
         containedInPlace: {
             branchCode: string;

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

@@ -8,30 +8,99 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScreeningRoomRepo = 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 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.placeModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
     }
+    saveScreeningRooms4coa(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { containsPlace } = params, movieTheater4update = __rest(params, ["containsPlace"]);
+            const movieTheater = yield this.civicStructureModel.findOne({
+                typeOf: { $eq: factory.placeType.MovieTheater },
+                'project.id': { $eq: params.project.id },
+                branchCode: { $eq: movieTheater4update.branchCode }
+            }, { _id: 0, id: { $toString: '$_id' } })
+                .lean()
+                .exec();
+            if (movieTheater === null) {
+                throw new factory.errors.NotFound(factory.placeType.MovieTheater);
+            }
+            const creatingScreeningRooms = params.containsPlace.map((place) => {
+                return Object.assign(Object.assign({}, place), { containedInPlace: {
+                        id: movieTheater.id,
+                        typeOf: movieTheater4update.typeOf,
+                        branchCode: movieTheater4update.branchCode,
+                        name: movieTheater4update.name
+                    }, containsPlace: (Array.isArray(place.containsPlace)) ? place.containsPlace : [], project: params.project });
+            });
+            yield Promise.all(creatingScreeningRooms.map((createScreeningRoom) => __awaiter(this, void 0, void 0, function* () {
+                const { typeOf, project, branchCode } = createScreeningRoom, setFields = __rest(createScreeningRoom, ["typeOf", "project", "branchCode"]);
+                if (typeof branchCode === 'string' && branchCode.length > 0) {
+                    yield this.placeModel.findOneAndUpdate({
+                        typeOf: { $eq: factory.placeType.ScreeningRoom },
+                        'project.id': { $eq: createScreeningRoom.project.id },
+                        'containedInPlace.id': { $exists: true, $eq: createScreeningRoom.containedInPlace.id },
+                        branchCode: { $eq: createScreeningRoom.branchCode }
+                    }, {
+                        $setOnInsert: {
+                            typeOf: createScreeningRoom.typeOf,
+                            project: createScreeningRoom.project,
+                            branchCode: createScreeningRoom.branchCode
+                        },
+                        $set: setFields
+                    }, {
+                        upsert: true,
+                        new: true,
+                        projection: { _id: 1 }
+                    })
+                        .exec();
+                }
+            })));
+        });
+    }
     createScreeningRoom(screeningRoom) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             // 施設存在確認
-            const movieTheaterDoc = yield this.placeModel.findOne(Object.assign({ typeOf: { $eq: factory.placeType.MovieTheater }, 'project.id': { $eq: screeningRoom.project.id }, branchCode: { $eq: screeningRoom.containedInPlace.branchCode } }, (typeof ((_a = screeningRoom.parentOrganization) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+            const movieTheaterDoc = yield this.civicStructureModel.findOne(Object.assign({ typeOf: { $eq: factory.placeType.MovieTheater }, 'project.id': { $eq: screeningRoom.project.id }, branchCode: { $eq: screeningRoom.containedInPlace.branchCode } }, (typeof ((_a = screeningRoom.parentOrganization) === null || _a === void 0 ? void 0 : _a.id) === 'string')
                 ? { 'parentOrganization.id': { $exists: true, $eq: screeningRoom.parentOrganization.id } }
-                : undefined), { _id: 1, typeOf: 1, branchCode: 1, name: 1, parentOrganization: 1 })
+                : undefined), { _id: 0, id: { $toString: '$_id' }, typeOf: 1, branchCode: 1, name: 1, parentOrganization: 1 })
+                .lean()
                 .exec();
             if (movieTheaterDoc === null) {
                 throw new factory.errors.NotFound(factory.placeType.MovieTheater);
             }
-            const movieTheater = movieTheaterDoc.toObject();
+            // const movieTheater = <Pick<
+            //     factory.place.movieTheater.IPlace,
+            //     'id' | 'typeOf' | 'branchCode' | 'name' | 'parentOrganization'
+            // >>movieTheaterDoc.toObject();
+            const movieTheater = movieTheaterDoc;
             const creatingScreeningRoom = Object.assign({ typeOf: screeningRoom.typeOf, branchCode: screeningRoom.branchCode, name: screeningRoom.name, address: screeningRoom.address, additionalProperty: (Array.isArray(screeningRoom.additionalProperty)) ? screeningRoom.additionalProperty : [], containedInPlace: {
                     id: movieTheater.id,
                     typeOf: movieTheater.typeOf,

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

@@ -16,6 +16,7 @@ interface IUpdateSeatResult {
  * 座席リポジトリ
  */
 export declare class SeatRepo {
+    private readonly civicStructureModel;
     private readonly placeModel;
     constructor(connection: Connection);
     static CREATE_SEARCH_SEATS_PROJECTION(params: factory.place.seat.IProjection): {

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

@@ -12,12 +12,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SeatRepo = 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 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.placeModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
     }
     static CREATE_SEARCH_SEATS_PROJECTION(params) {
@@ -75,9 +82,10 @@ class SeatRepo {
                 throw new factory.errors.ArgumentNull('containedInPlace.containedInPlace.containedInPlace.branchCode');
             }
             // 施設存在確認
-            const movieTheaterDoc = yield this.placeModel.findOne(Object.assign({ typeOf: { $eq: factory.placeType.MovieTheater }, 'project.id': { $eq: seat.project.id }, branchCode: { $eq: movieTheater.branchCode } }, (typeof ((_a = seat.parentOrganization) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+            const movieTheaterDoc = yield this.civicStructureModel.findOne(Object.assign({ typeOf: { $eq: factory.placeType.MovieTheater }, 'project.id': { $eq: seat.project.id }, branchCode: { $eq: movieTheater.branchCode } }, (typeof ((_a = seat.parentOrganization) === null || _a === void 0 ? void 0 : _a.id) === 'string')
                 ? { 'parentOrganization.id': { $exists: true, $eq: seat.parentOrganization.id } }
                 : undefined), { _id: 1 })
+                .lean()
                 .exec();
             if (movieTheaterDoc === null) {
                 throw new factory.errors.NotFound(factory.placeType.MovieTheater);

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

@@ -17,6 +17,7 @@ interface IUpdateSectionResult {
  * セクションリポジトリ
  */
 export declare class SectionRepo {
+    private readonly civicStructureModel;
     private readonly placeModel;
     constructor(connection: Connection);
     createScreeningRoomSection(screeningRoomSection: IScreeningRoomSectionWithoutContainsPlace & {

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

@@ -12,12 +12,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SectionRepo = 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 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.placeModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
     }
     // tslint:disable-next-line:max-func-body-length
@@ -33,9 +40,10 @@ class SectionRepo {
                 throw new factory.errors.ArgumentNull('containedInPlace.containedInPlace.branchCode');
             }
             // 施設存在確認
-            const movieTheaterDoc = yield this.placeModel.findOne(Object.assign({ typeOf: { $eq: factory.placeType.MovieTheater }, 'project.id': { $eq: screeningRoomSection.project.id }, branchCode: { $eq: movieTheater.branchCode } }, (typeof ((_a = screeningRoomSection.parentOrganization) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+            const movieTheaterDoc = yield this.civicStructureModel.findOne(Object.assign({ typeOf: { $eq: factory.placeType.MovieTheater }, 'project.id': { $eq: screeningRoomSection.project.id }, branchCode: { $eq: movieTheater.branchCode } }, (typeof ((_a = screeningRoomSection.parentOrganization) === null || _a === void 0 ? void 0 : _a.id) === 'string')
                 ? { 'parentOrganization.id': { $exists: true, $eq: screeningRoomSection.parentOrganization.id } }
                 : undefined), { _id: 1 })
+                .lean()
                 .exec();
             if (movieTheaterDoc === null) {
                 throw new factory.errors.NotFound(factory.placeType.MovieTheater);

package/lib/chevre/service/event.js

@@ -178,6 +178,7 @@ function processUpdateMovieTheater(params) {
                 const processStart = process.hrtime.bigint();
                 const savingMovieTheater = createMovieTheaterFromCOA(params.project, { id: seller.id }, yield repos.masterService.theater({ theaterCode: params.locationBranchCode }), yield repos.masterService.screen({ theaterCode: params.locationBranchCode }));
                 yield repos.movieTheater.saveMovieTheaterByBranchCode4coa(savingMovieTheater);
+                yield repos.screeningRoom.saveScreeningRooms4coa(savingMovieTheater);
                 const processEnd = process.hrtime.bigint();
                 processTime = processEnd - processStart;
             }
@@ -751,11 +752,11 @@ function createScreeningEventSeriesId(params) {
 // tslint:disable-next-line:no-single-line-block-comment
 /* istanbul ignore next */
 function createMovieTheaterFromCOA(project, seller, theaterFromCOA, screensFromCOA) {
-    const id = `MovieTheater-${theaterFromCOA.theaterCode}`;
+    // const id = `MovieTheater-${theaterFromCOA.theaterCode}`;
     return {
         project: { typeOf: project.typeOf, id: project.id },
-        id: id,
-        screenCount: screensFromCOA.length,
+        // id: id,
+        // screenCount: screensFromCOA.length,
         branchCode: theaterFromCOA.theaterCode,
         name: {
             ja: theaterFromCOA.theaterName,

package/lib/chevre/settings.d.ts

@@ -8,6 +8,10 @@ export declare const MONGO_AUTO_INDEX: boolean;
 /**
  * 施設コンテンツのsecondaryコレクションへ同期するかどうか
  */
+/**
+ * 施設の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.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = void 0;
+exports.Settings = exports.USE_CIVIC_STRUCTURE_SCHEMA = 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,6 +9,18 @@ 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コレクションとして新スキーマを使用するかどうか
+ */
+// export const USE_EVENT_SERIES_NEW_SCHEMA = process.env.USE_EVENT_SERIES_NEW_SCHEMA === '1';
+/**
+ * 施設コンテンツのsecondaryコレクションへ同期するかどうか
+ */
+// export const USE_EVENT_SERIES_SYNC2SECONDARY = process.env.USE_EVENT_SERIES_SYNC2SECONDARY === '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.21"
+  "version": "22.3.0-alpha.23"
 }