@chevre/domain 21.4.0-alpha.2 → 21.4.0-alpha.21

package/lib/chevre/repo/place.js

@@ -342,7 +342,8 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.placeModel.findOneAndDelete({
                 typeOf: { $eq: factory.placeType.MovieTheater },
-                _id: { $eq: params.id }
+                _id: { $eq: params.id },
+                'project.id': { $eq: params.project.id }
             }, { projection: { _id: 1 } })
                 .exec()
                 .then((doc) => {
@@ -353,13 +354,12 @@ class MongoRepository {
         });
     }
     createScreeningRoom(screeningRoom) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             // 施設存在確認
-            const movieTheaterDoc = yield this.placeModel.findOne({
-                typeOf: { $eq: factory.placeType.MovieTheater },
-                'project.id': { $eq: screeningRoom.project.id },
-                branchCode: { $eq: screeningRoom.containedInPlace.branchCode }
-            }, { _id: 1, typeOf: 1, branchCode: 1, name: 1 })
+            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')
+                ? { 'parentOrganization.id': { $exists: true, $eq: screeningRoom.parentOrganization.id } }
+                : undefined), { _id: 1, typeOf: 1, branchCode: 1, name: 1, parentOrganization: 1 })
                 .exec();
             if (movieTheaterDoc === null) {
                 throw new factory.errors.NotFound(factory.placeType.MovieTheater);
@@ -370,7 +370,9 @@ class MongoRepository {
                     typeOf: movieTheater.typeOf,
                     branchCode: movieTheater.branchCode,
                     name: movieTheater.name
-                }, containsPlace: [], project: screeningRoom.project }, (typeof screeningRoom.openSeatingAllowed === 'boolean')
+                }, containsPlace: [], project: screeningRoom.project, 
+                // 必須化(2023-07-14~)
+                parentOrganization: movieTheater.parentOrganization }, (typeof screeningRoom.openSeatingAllowed === 'boolean')
                 ? { openSeatingAllowed: screeningRoom.openSeatingAllowed }
                 : undefined);
             const upsertScreeningRoomResult = yield this.placeModel.updateOne({
@@ -393,13 +395,11 @@ class MongoRepository {
         });
     }
     updateScreeningRoom(screeningRoom, $unset) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.placeModel.findOneAndUpdate({
-                typeOf: { $eq: factory.placeType.ScreeningRoom },
-                'project.id': { $eq: screeningRoom.project.id },
-                'containedInPlace.branchCode': { $exists: true, $eq: screeningRoom.containedInPlace.branchCode },
-                branchCode: screeningRoom.branchCode
-            }, Object.assign(Object.assign(Object.assign(Object.assign({ name: screeningRoom.name }, (screeningRoom.address !== undefined && screeningRoom.address !== null)
+            const doc = yield this.placeModel.findOneAndUpdate(Object.assign({ typeOf: { $eq: factory.placeType.ScreeningRoom }, 'project.id': { $eq: screeningRoom.project.id }, 'containedInPlace.branchCode': { $exists: true, $eq: screeningRoom.containedInPlace.branchCode }, branchCode: screeningRoom.branchCode }, (typeof ((_a = screeningRoom.parentOrganization) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                ? { 'parentOrganization.id': { $exists: true, $eq: screeningRoom.parentOrganization.id } }
+                : undefined), Object.assign(Object.assign(Object.assign(Object.assign({ name: screeningRoom.name }, (screeningRoom.address !== undefined && screeningRoom.address !== null)
                 ? { address: screeningRoom.address }
                 : undefined), (typeof screeningRoom.openSeatingAllowed === 'boolean')
                 ? { openSeatingAllowed: screeningRoom.openSeatingAllowed }
@@ -423,6 +423,26 @@ class MongoRepository {
             return doc.toObject();
         });
     }
+    addParentOrganization2ScreeningRoom(screeningRoom) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.placeModel.findOneAndUpdate({
+                typeOf: { $eq: factory.placeType.ScreeningRoom },
+                'project.id': { $eq: screeningRoom.project.id },
+                'containedInPlace.branchCode': { $exists: true, $eq: screeningRoom.containedInPlace.branchCode },
+                branchCode: screeningRoom.branchCode
+            }, {
+                parentOrganization: screeningRoom.parentOrganization
+            }, {
+                new: true,
+                projection: { 'containedInPlace.id': 1, typeOf: 1 }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(factory.placeType.ScreeningRoom);
+            }
+            return doc.toObject();
+        });
+    }
     updateScreeningRoomsByContainedInPlaceId(screeningRoom) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
@@ -439,13 +459,11 @@ class MongoRepository {
         });
     }
     deleteScreeningRoom(screeningRoom) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.placeModel.findOneAndDelete({
-                typeOf: { $eq: factory.placeType.ScreeningRoom },
-                'project.id': { $eq: screeningRoom.project.id },
-                'containedInPlace.branchCode': { $exists: true, $eq: screeningRoom.containedInPlace.branchCode },
-                branchCode: screeningRoom.branchCode
-            }, {
+            const doc = yield this.placeModel.findOneAndDelete(Object.assign({ typeOf: { $eq: factory.placeType.ScreeningRoom }, 'project.id': { $eq: screeningRoom.project.id }, 'containedInPlace.branchCode': { $exists: true, $eq: screeningRoom.containedInPlace.branchCode }, branchCode: screeningRoom.branchCode }, (typeof ((_a = screeningRoom.parentOrganization) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                ? { 'parentOrganization.id': { $exists: true, $eq: screeningRoom.parentOrganization.id } }
+                : undefined), {
                 projection: { 'containedInPlace.id': 1, typeOf: 1 }
             })
                 .exec();
@@ -467,6 +485,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     createScreeningRoomSection(screeningRoomSection) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const screeningRoom = screeningRoomSection.containedInPlace;
             if (typeof (screeningRoom === null || screeningRoom === void 0 ? void 0 : screeningRoom.branchCode) !== 'string') {
@@ -477,11 +496,9 @@ class MongoRepository {
                 throw new factory.errors.ArgumentNull('containedInPlace.containedInPlace.branchCode');
             }
             // 施設存在確認
-            let doc = yield this.placeModel.findOne({
-                typeOf: { $eq: factory.placeType.MovieTheater },
-                'project.id': { $eq: screeningRoomSection.project.id },
-                branchCode: { $eq: movieTheater.branchCode }
-            }, { _id: 1 })
+            let doc = 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')
+                ? { 'parentOrganization.id': { $exists: true, $eq: screeningRoomSection.parentOrganization.id } }
+                : undefined), { _id: 1 })
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(factory.placeType.MovieTheater);
@@ -513,6 +530,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     updateScreeningRoomSection(screeningRoomSection, $unset) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const screeningRoom = screeningRoomSection.containedInPlace;
             if (typeof (screeningRoom === null || screeningRoom === void 0 ? void 0 : screeningRoom.branchCode) !== 'string') {
@@ -522,13 +540,9 @@ class MongoRepository {
             if (typeof (movieTheater === null || movieTheater === void 0 ? void 0 : movieTheater.branchCode) !== 'string') {
                 throw new factory.errors.ArgumentNull('containedInPlace.containedInPlace.branchCode');
             }
-            const doc = yield this.placeModel.findOneAndUpdate({
-                typeOf: { $eq: factory.placeType.ScreeningRoom },
-                'project.id': { $eq: screeningRoomSection.project.id },
-                'containedInPlace.branchCode': { $exists: true, $eq: movieTheater.branchCode },
-                branchCode: { $eq: screeningRoom.branchCode },
-                'containsPlace.branchCode': { $eq: screeningRoomSection.branchCode }
-            }, Object.assign(Object.assign(Object.assign(Object.assign({ 'containsPlace.$[screeningRoomSection].branchCode': screeningRoomSection.branchCode }, (screeningRoomSection.name !== undefined && screeningRoomSection !== null)
+            const doc = yield this.placeModel.findOneAndUpdate(Object.assign({ typeOf: { $eq: factory.placeType.ScreeningRoom }, 'project.id': { $eq: screeningRoomSection.project.id }, 'containedInPlace.branchCode': { $exists: true, $eq: movieTheater.branchCode }, branchCode: { $eq: screeningRoom.branchCode }, 'containsPlace.branchCode': { $eq: screeningRoomSection.branchCode } }, (typeof ((_a = screeningRoomSection.parentOrganization) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                ? { 'parentOrganization.id': { $exists: true, $eq: screeningRoomSection.parentOrganization.id } }
+                : undefined), Object.assign(Object.assign(Object.assign(Object.assign({ 'containsPlace.$[screeningRoomSection].branchCode': screeningRoomSection.branchCode }, (screeningRoomSection.name !== undefined && screeningRoomSection !== null)
                 ? {
                     'containsPlace.$[screeningRoomSection].name': screeningRoomSection.name
                 }
@@ -558,7 +572,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     searchScreeningRoomSections(searchConditions) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = [{ $match: { typeOf: { $eq: factory.placeType.ScreeningRoom } } }];
             const projectIdEq = (_b = (_a = searchConditions.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -567,8 +581,14 @@ class MongoRepository {
                     $match: { 'project.id': { $eq: projectIdEq } }
                 });
             }
+            const parentOrganizationIdEq = (_d = (_c = searchConditions.parentOrganization) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
+            if (typeof parentOrganizationIdEq === 'string') {
+                matchStages.push({
+                    $match: { 'parentOrganization.id': { $exists: true, $eq: parentOrganizationIdEq } }
+                });
+            }
             // 施設コード
-            const movieTheaterBranchCodeEq = (_e = (_d = (_c = searchConditions.containedInPlace) === null || _c === void 0 ? void 0 : _c.containedInPlace) === null || _d === void 0 ? void 0 : _d.branchCode) === null || _e === void 0 ? void 0 : _e.$eq;
+            const movieTheaterBranchCodeEq = (_g = (_f = (_e = searchConditions.containedInPlace) === null || _e === void 0 ? void 0 : _e.containedInPlace) === null || _f === void 0 ? void 0 : _f.branchCode) === null || _g === void 0 ? void 0 : _g.$eq;
             if (typeof movieTheaterBranchCodeEq === 'string') {
                 matchStages.push({
                     $match: {
@@ -580,7 +600,7 @@ class MongoRepository {
                 });
             }
             // ルームコード
-            const containedInPlaceBranchCodeEq = (_g = (_f = searchConditions.containedInPlace) === null || _f === void 0 ? void 0 : _f.branchCode) === null || _g === void 0 ? void 0 : _g.$eq;
+            const containedInPlaceBranchCodeEq = (_j = (_h = searchConditions.containedInPlace) === null || _h === void 0 ? void 0 : _h.branchCode) === null || _j === void 0 ? void 0 : _j.$eq;
             if (typeof containedInPlaceBranchCodeEq === 'string') {
                 matchStages.push({
                     $match: {
@@ -591,7 +611,7 @@ class MongoRepository {
                 });
             }
             // セクションコード
-            const sectionBranchCodeEq = (_h = searchConditions === null || searchConditions === void 0 ? void 0 : searchConditions.branchCode) === null || _h === void 0 ? void 0 : _h.$eq;
+            const sectionBranchCodeEq = (_k = searchConditions === null || searchConditions === void 0 ? void 0 : searchConditions.branchCode) === null || _k === void 0 ? void 0 : _k.$eq;
             if (typeof sectionBranchCodeEq === 'string') {
                 matchStages.push({
                     $match: {
@@ -602,7 +622,7 @@ class MongoRepository {
                     }
                 });
             }
-            const nameCodeRegex = (_j = searchConditions.name) === null || _j === void 0 ? void 0 : _j.$regex;
+            const nameCodeRegex = (_l = searchConditions.name) === null || _l === void 0 ? void 0 : _l.$regex;
             if (typeof nameCodeRegex === 'string') {
                 matchStages.push({
                     $match: {
@@ -623,7 +643,7 @@ class MongoRepository {
                     }
                 });
             }
-            const branchCodeRegex = (_k = searchConditions.branchCode) === null || _k === void 0 ? void 0 : _k.$regex;
+            const branchCodeRegex = (_m = searchConditions.branchCode) === null || _m === void 0 ? void 0 : _m.$regex;
             if (typeof branchCodeRegex === 'string') {
                 matchStages.push({
                     $match: {
@@ -634,7 +654,7 @@ class MongoRepository {
                     }
                 });
             }
-            const additionalPropertyElemMatch = (_l = searchConditions.additionalProperty) === null || _l === void 0 ? void 0 : _l.$elemMatch;
+            const additionalPropertyElemMatch = (_o = searchConditions.additionalProperty) === null || _o === void 0 ? void 0 : _o.$elemMatch;
             if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
                 matchStages.push({
                     $match: {
@@ -659,7 +679,7 @@ class MongoRepository {
                                 branchCode: '$containedInPlace.branchCode',
                                 name: '$containedInPlace.name'
                             }
-                        }, additionalProperty: '$containsPlace.additionalProperty' }, (((_m = searchConditions.$projection) === null || _m === void 0 ? void 0 : _m.seatCount) === 1)
+                        }, additionalProperty: '$containsPlace.additionalProperty' }, (((_p = searchConditions.$projection) === null || _p === void 0 ? void 0 : _p.seatCount) === 1)
                         ? {
                             seatCount: {
                                 $cond: {
@@ -683,17 +703,14 @@ class MongoRepository {
         });
     }
     deleteScreeningRoomSection(screeningRoomSection) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.placeModel.findOneAndUpdate({
-                typeOf: { $eq: factory.placeType.ScreeningRoom },
-                'project.id': { $eq: screeningRoomSection.project.id },
-                'containedInPlace.branchCode': {
+            const doc = yield this.placeModel.findOneAndUpdate(Object.assign({ typeOf: { $eq: factory.placeType.ScreeningRoom }, 'project.id': { $eq: screeningRoomSection.project.id }, 'containedInPlace.branchCode': {
                     $exists: true,
                     $eq: screeningRoomSection.containedInPlace.containedInPlace.branchCode
-                },
-                branchCode: { $eq: screeningRoomSection.containedInPlace.branchCode },
-                'containsPlace.branchCode': { $eq: screeningRoomSection.branchCode }
-            }, {
+                }, branchCode: { $eq: screeningRoomSection.containedInPlace.branchCode }, 'containsPlace.branchCode': { $eq: screeningRoomSection.branchCode } }, (typeof ((_a = screeningRoomSection.parentOrganization) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                ? { 'parentOrganization.id': { $exists: true, $eq: screeningRoomSection.parentOrganization.id } }
+                : undefined), {
                 $pull: {
                     containsPlace: {
                         branchCode: screeningRoomSection.branchCode
@@ -712,7 +729,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     searchScreeningRooms(searchConditions) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = [{ $match: { typeOf: { $eq: factory.placeType.ScreeningRoom } } }];
             const projectIdEq = (_b = (_a = searchConditions.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -721,8 +738,14 @@ class MongoRepository {
                     $match: { 'project.id': { $eq: projectIdEq } }
                 });
             }
+            const parentOrganizationIdEq = (_d = (_c = searchConditions.parentOrganization) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
+            if (typeof parentOrganizationIdEq === 'string') {
+                matchStages.push({
+                    $match: { 'parentOrganization.id': { $exists: true, $eq: parentOrganizationIdEq } }
+                });
+            }
             // 施設ID
-            const containedInPlaceIdEq = (_d = (_c = searchConditions.containedInPlace) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
+            const containedInPlaceIdEq = (_f = (_e = searchConditions.containedInPlace) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$eq;
             if (typeof containedInPlaceIdEq === 'string') {
                 matchStages.push({
                     $match: {
@@ -748,7 +771,7 @@ class MongoRepository {
                     }
                 }
             }
-            const branchCodeEq = (_e = searchConditions.branchCode) === null || _e === void 0 ? void 0 : _e.$eq;
+            const branchCodeEq = (_g = searchConditions.branchCode) === null || _g === void 0 ? void 0 : _g.$eq;
             if (typeof branchCodeEq === 'string') {
                 matchStages.push({
                     $match: {
@@ -756,7 +779,7 @@ class MongoRepository {
                     }
                 });
             }
-            const branchCodeIn = (_f = searchConditions.branchCode) === null || _f === void 0 ? void 0 : _f.$in;
+            const branchCodeIn = (_h = searchConditions.branchCode) === null || _h === void 0 ? void 0 : _h.$in;
             if (Array.isArray(branchCodeIn)) {
                 matchStages.push({
                     $match: {
@@ -764,7 +787,7 @@ class MongoRepository {
                     }
                 });
             }
-            const branchCodeRegex = (_g = searchConditions.branchCode) === null || _g === void 0 ? void 0 : _g.$regex;
+            const branchCodeRegex = (_j = searchConditions.branchCode) === null || _j === void 0 ? void 0 : _j.$regex;
             if (typeof branchCodeRegex === 'string') {
                 matchStages.push({
                     $match: {
@@ -774,7 +797,7 @@ class MongoRepository {
                     }
                 });
             }
-            const nameCodeRegex = (_h = searchConditions.name) === null || _h === void 0 ? void 0 : _h.$regex;
+            const nameCodeRegex = (_k = searchConditions.name) === null || _k === void 0 ? void 0 : _k.$regex;
             if (typeof nameCodeRegex === 'string') {
                 matchStages.push({
                     $match: {
@@ -806,7 +829,7 @@ class MongoRepository {
                     }
                 });
             }
-            const additionalPropertyElemMatch = (_j = searchConditions.additionalProperty) === null || _j === void 0 ? void 0 : _j.$elemMatch;
+            const additionalPropertyElemMatch = (_l = searchConditions.additionalProperty) === null || _l === void 0 ? void 0 : _l.$elemMatch;
             if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
                 matchStages.push({
                     $match: {
@@ -827,7 +850,7 @@ class MongoRepository {
                             typeOf: '$containedInPlace.typeOf',
                             branchCode: '$containedInPlace.branchCode',
                             name: '$containedInPlace.name'
-                        }, openSeatingAllowed: '$openSeatingAllowed', additionalProperty: '$additionalProperty', maximumAttendeeCapacity: '$maximumAttendeeCapacity' }, (((_k = searchConditions.$projection) === null || _k === void 0 ? void 0 : _k.sectionCount) === 1)
+                        }, openSeatingAllowed: '$openSeatingAllowed', additionalProperty: '$additionalProperty', maximumAttendeeCapacity: '$maximumAttendeeCapacity' }, (((_m = searchConditions.$projection) === null || _m === void 0 ? void 0 : _m.sectionCount) === 1)
                         ? {
                             sectionCount: {
                                 $cond: {
@@ -837,7 +860,7 @@ class MongoRepository {
                                 }
                             }
                         }
-                        : undefined), (((_l = searchConditions.$projection) === null || _l === void 0 ? void 0 : _l.seatCount) === 1)
+                        : undefined), (((_o = searchConditions.$projection) === null || _o === void 0 ? void 0 : _o.seatCount) === 1)
                         ? {
                             seatCount: {
                                 $sum: {
@@ -871,12 +894,9 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = [
                 { $match: { typeOf: { $eq: factory.placeType.ScreeningRoom } } },
-                {
-                    $match: { 'containedInPlace.id': { $exists: true, $eq: params.containedInPlace.id.$eq } }
-                },
-                {
-                    $match: { branchCode: { $eq: params.branchCode.$eq } }
-                }
+                { $match: { 'project.id': { $eq: params.project.id } } },
+                { $match: { 'containedInPlace.id': { $exists: true, $eq: params.containedInPlace.id.$eq } } },
+                { $match: { branchCode: { $eq: params.branchCode.$eq } } }
             ];
             const aggregate = this.placeModel.aggregate([
                 // { $unwind: '$containsPlace' },
@@ -915,7 +935,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     createSeat(seat) {
-        var _a, _b;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const screeningRoomSection = seat.containedInPlace;
             if (typeof (screeningRoomSection === null || screeningRoomSection === void 0 ? void 0 : screeningRoomSection.branchCode) !== 'string') {
@@ -930,11 +950,9 @@ class MongoRepository {
                 throw new factory.errors.ArgumentNull('containedInPlace.containedInPlace.containedInPlace.branchCode');
             }
             // 施設存在確認
-            let doc = yield this.placeModel.findOne({
-                typeOf: { $eq: factory.placeType.MovieTheater },
-                'project.id': { $eq: seat.project.id },
-                branchCode: { $eq: movieTheater.branchCode }
-            }, { _id: 1 })
+            let doc = 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')
+                ? { 'parentOrganization.id': { $exists: true, $eq: seat.parentOrganization.id } }
+                : undefined), { _id: 1 })
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(factory.placeType.MovieTheater);
@@ -947,7 +965,7 @@ class MongoRepository {
                 'containsPlace.branchCode': { $eq: screeningRoomSection.branchCode }
             }, {
                 $push: {
-                    'containsPlace.$[screeningRoomSection].containsPlace': Object.assign(Object.assign({ typeOf: seat.typeOf, branchCode: seat.branchCode, additionalProperty: seat.additionalProperty }, (typeof ((_a = seat.name) === null || _a === void 0 ? void 0 : _a.ja) === 'string' || typeof ((_b = seat.name) === null || _b === void 0 ? void 0 : _b.en) === 'string') ? { name: seat.name } : undefined), (Array.isArray(seat.seatingType)) ? { seatingType: seat.seatingType } : undefined)
+                    'containsPlace.$[screeningRoomSection].containsPlace': Object.assign(Object.assign({ typeOf: seat.typeOf, branchCode: seat.branchCode, additionalProperty: seat.additionalProperty }, (typeof ((_b = seat.name) === null || _b === void 0 ? void 0 : _b.ja) === 'string' || typeof ((_c = seat.name) === null || _c === void 0 ? void 0 : _c.en) === 'string') ? { name: seat.name } : undefined), (Array.isArray(seat.seatingType)) ? { seatingType: seat.seatingType } : undefined)
                 }
             }, {
                 new: true,
@@ -969,7 +987,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     updateSeat(seat, $unset) {
-        var _a, _b;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const screeningRoomSection = seat.containedInPlace;
             if (typeof (screeningRoomSection === null || screeningRoomSection === void 0 ? void 0 : screeningRoomSection.branchCode) !== 'string') {
@@ -983,14 +1001,9 @@ class MongoRepository {
             if (typeof (movieTheater === null || movieTheater === void 0 ? void 0 : movieTheater.branchCode) !== 'string') {
                 throw new factory.errors.ArgumentNull('containedInPlace.containedInPlace.containedInPlace.branchCode');
             }
-            const doc = yield this.placeModel.findOneAndUpdate({
-                typeOf: { $eq: factory.placeType.ScreeningRoom },
-                'project.id': { $eq: seat.project.id },
-                'containedInPlace.branchCode': { $exists: true, $eq: movieTheater.branchCode },
-                branchCode: { $eq: screeningRoom.branchCode },
-                'containsPlace.branchCode': { $eq: screeningRoomSection.branchCode },
-                'containsPlace.containsPlace.branchCode': { $eq: seat.branchCode }
-            }, Object.assign(Object.assign(Object.assign(Object.assign({ 'containsPlace.$[screeningRoomSection].containsPlace.$[seat].branchCode': seat.branchCode }, (typeof ((_a = seat.name) === null || _a === void 0 ? void 0 : _a.ja) === 'string' || typeof ((_b = seat.name) === null || _b === void 0 ? void 0 : _b.en) === 'string')
+            const doc = yield this.placeModel.findOneAndUpdate(Object.assign({ typeOf: { $eq: factory.placeType.ScreeningRoom }, 'project.id': { $eq: seat.project.id }, 'containedInPlace.branchCode': { $exists: true, $eq: movieTheater.branchCode }, branchCode: { $eq: screeningRoom.branchCode }, 'containsPlace.branchCode': { $eq: screeningRoomSection.branchCode }, 'containsPlace.containsPlace.branchCode': { $eq: seat.branchCode } }, (typeof ((_a = seat.parentOrganization) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                ? { 'parentOrganization.id': { $exists: true, $eq: seat.parentOrganization.id } }
+                : undefined), Object.assign(Object.assign(Object.assign(Object.assign({ 'containsPlace.$[screeningRoomSection].containsPlace.$[seat].branchCode': seat.branchCode }, (typeof ((_b = seat.name) === null || _b === void 0 ? void 0 : _b.ja) === 'string' || typeof ((_c = seat.name) === null || _c === void 0 ? void 0 : _c.en) === 'string')
                 ? {
                     'containsPlace.$[screeningRoomSection].containsPlace.$[seat].name': seat.name
                 }
@@ -1031,7 +1044,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     searchSeats(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = [{ $match: { typeOf: { $eq: factory.placeType.ScreeningRoom } } }];
             const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -1040,7 +1053,13 @@ class MongoRepository {
                     $match: { 'project.id': { $eq: projectIdEq } }
                 });
             }
-            const containedInPlaceBranchCodeEq = (_d = (_c = params.containedInPlace) === null || _c === void 0 ? void 0 : _c.branchCode) === null || _d === void 0 ? void 0 : _d.$eq;
+            const parentOrganizationIdEq = (_d = (_c = params.parentOrganization) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
+            if (typeof parentOrganizationIdEq === 'string') {
+                matchStages.push({
+                    $match: { 'parentOrganization.id': { $exists: true, $eq: parentOrganizationIdEq } }
+                });
+            }
+            const containedInPlaceBranchCodeEq = (_f = (_e = params.containedInPlace) === null || _e === void 0 ? void 0 : _e.branchCode) === null || _f === void 0 ? void 0 : _f.$eq;
             if (typeof containedInPlaceBranchCodeEq === 'string') {
                 matchStages.push({
                     $match: {
@@ -1051,7 +1070,7 @@ class MongoRepository {
                     }
                 });
             }
-            const containedInPlaceBranchCodeIn = (_f = (_e = params.containedInPlace) === null || _e === void 0 ? void 0 : _e.branchCode) === null || _f === void 0 ? void 0 : _f.$in;
+            const containedInPlaceBranchCodeIn = (_h = (_g = params.containedInPlace) === null || _g === void 0 ? void 0 : _g.branchCode) === null || _h === void 0 ? void 0 : _h.$in;
             if (Array.isArray(containedInPlaceBranchCodeIn)) {
                 matchStages.push({
                     $match: {
@@ -1104,7 +1123,7 @@ class MongoRepository {
                     });
                 }
             }
-            const branchCodeIn = (_g = params.branchCode) === null || _g === void 0 ? void 0 : _g.$in;
+            const branchCodeIn = (_j = params.branchCode) === null || _j === void 0 ? void 0 : _j.$in;
             if (Array.isArray(branchCodeIn)) {
                 matchStages.push({
                     $match: {
@@ -1115,7 +1134,7 @@ class MongoRepository {
                     }
                 });
             }
-            const branchCodeRegex = (_h = params.branchCode) === null || _h === void 0 ? void 0 : _h.$regex;
+            const branchCodeRegex = (_k = params.branchCode) === null || _k === void 0 ? void 0 : _k.$regex;
             if (typeof branchCodeRegex === 'string' && branchCodeRegex.length > 0) {
                 matchStages.push({
                     $match: {
@@ -1126,7 +1145,7 @@ class MongoRepository {
                     }
                 });
             }
-            const nameRegex = (_j = params.name) === null || _j === void 0 ? void 0 : _j.$regex;
+            const nameRegex = (_l = params.name) === null || _l === void 0 ? void 0 : _l.$regex;
             if (typeof nameRegex === 'string' && nameRegex.length > 0) {
                 matchStages.push({
                     $match: {
@@ -1147,7 +1166,7 @@ class MongoRepository {
                     }
                 });
             }
-            const seatingTypeEq = (_k = params.seatingType) === null || _k === void 0 ? void 0 : _k.$eq;
+            const seatingTypeEq = (_m = params.seatingType) === null || _m === void 0 ? void 0 : _m.$eq;
             if (typeof seatingTypeEq === 'string') {
                 matchStages.push({
                     $match: {
@@ -1163,7 +1182,7 @@ class MongoRepository {
                 && params.$projection['containedInPlace.containedInPlace'] === 0) {
                 includeScreeningRooms = false;
             }
-            const additionalPropertyElemMatch = (_l = params.additionalProperty) === null || _l === void 0 ? void 0 : _l.$elemMatch;
+            const additionalPropertyElemMatch = (_o = params.additionalProperty) === null || _o === void 0 ? void 0 : _o.$elemMatch;
             if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
                 matchStages.push({
                     $match: {
@@ -1214,18 +1233,14 @@ class MongoRepository {
         });
     }
     deleteSeat(seat) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.placeModel.findOneAndUpdate({
-                typeOf: { $eq: factory.placeType.ScreeningRoom },
-                'project.id': { $eq: seat.project.id },
-                'containedInPlace.branchCode': {
+            const doc = yield this.placeModel.findOneAndUpdate(Object.assign({ typeOf: { $eq: factory.placeType.ScreeningRoom }, 'project.id': { $eq: seat.project.id }, 'containedInPlace.branchCode': {
                     $exists: true,
                     $eq: seat.containedInPlace.containedInPlace.containedInPlace.branchCode
-                },
-                branchCode: { $eq: seat.containedInPlace.containedInPlace.branchCode },
-                'containsPlace.branchCode': { $eq: seat.containedInPlace.branchCode },
-                'containsPlace.containsPlace.branchCode': { $eq: seat.branchCode }
-            }, {
+                }, branchCode: { $eq: seat.containedInPlace.containedInPlace.branchCode }, 'containsPlace.branchCode': { $eq: seat.containedInPlace.branchCode }, 'containsPlace.containsPlace.branchCode': { $eq: seat.branchCode } }, (typeof ((_a = seat.parentOrganization) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                ? { 'parentOrganization.id': { $exists: true, $eq: seat.parentOrganization.id } }
+                : undefined), {
                 $pull: {
                     'containsPlace.$[screeningRoomSection].containsPlace': {
                         branchCode: seat.branchCode
@@ -1245,77 +1260,6 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    // tslint:disable-next-line:prefer-function-over-method
-    syncScreeningRooms(__) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return;
-            // const movieTheater = <Pick<
-            //     factory.place.movieTheater.IPlace,
-            //     'id' | 'branchCode' | 'name' | 'project' | 'typeOf' | 'containsPlace'
-            // >>await this.placeModel.findOne({
-            //     _id: { $eq: params.id },
-            //     typeOf: { $eq: factory.placeType.MovieTheater }
-            // })
-            //     .select({
-            //         _id: 1, branchCode: 1, name: 1, project: 1, typeOf: 1, containsPlace: 1
-            //     })
-            //     .exec()
-            //     .then((doc) => {
-            //         if (doc === null) {
-            //             throw new factory.errors.NotFound(factory.placeType.MovieTheater);
-            //         }
-            //         return doc.toObject();
-            //     });
-            // let screeningRoomsFromMovieTheater = movieTheater.containsPlace;
-            // if (typeof params.screeningRoomBranchCode === 'string' && params.screeningRoomBranchCode.length > 0) {
-            //     screeningRoomsFromMovieTheater = screeningRoomsFromMovieTheater.filter(
-            //         (place) => place.branchCode === params.screeningRoomBranchCode
-            //     );
-            // }
-            // const creatingScreeningRooms: ICreatingScreeningRoom[] = screeningRoomsFromMovieTheater.map((place) => {
-            //     return {
-            //         ...place,
-            //         containedInPlace: {
-            //             id: movieTheater.id,
-            //             typeOf: movieTheater.typeOf,
-            //             branchCode: movieTheater.branchCode,
-            //             name: movieTheater.name
-            //         },
-            //         containsPlace: (Array.isArray(place.containsPlace)) ? place.containsPlace : [],
-            //         project: movieTheater.project
-            //     };
-            // });
-            // debug('sync processing', creatingScreeningRooms.length, 'screeningRooms...', creatingScreeningRooms);
-            // await Promise.all(creatingScreeningRooms.map(async (createScreeningRoom) => {
-            //     const { typeOf, project, branchCode, ...setFields } = createScreeningRoom;
-            //     if (typeof branchCode === 'string' && branchCode.length > 0) {
-            //         const upsertScreeningRoomResult = await 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();
-            //         debug('screeningRoom upserted. upsertScreeningRoomResult:', upsertScreeningRoomResult);
-            //     }
-            // }));
-        });
-    }
     unsetContainsPlaceFromMovieTheater(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.placeModel.findOneAndUpdate({
@@ -1420,7 +1364,8 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.placeModel.findOneAndDelete({
                 typeOf: { $eq: factory.placeType.BusStop },
-                _id: { $eq: params.id }
+                _id: { $eq: params.id },
+                'project.id': { $eq: params.project.id }
             })
                 .exec()
                 .then((doc) => {

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

@@ -37,9 +37,7 @@ export declare class MongoRepository {
     static CREATE_MONGO_CONDITIONS(params: factory.product.ISearchConditions): any[];
     findById(conditions: {
         id: string;
-    }, projection?: {
-        [key: string]: number;
-    }): Promise<IProduct>;
+    }, inclusion: string[], exclusion: string[]): Promise<IProduct>;
     search(conditions: factory.product.ISearchConditions, inclusion: string[], exclusion: string[]): Promise<IProduct[]>;
     deleteById(params: {
         id: string;
@@ -64,7 +62,7 @@ export declare class MongoRepository {
          * idを指定すれば更新
          */
         id?: string;
-        attributes: factory.product.IProduct;
+        attributes: factory.product.IProduct | factory.service.paymentService.IService;
         /**
          * 指定プロジェクトの指定プロダクトタイプが存在しなければ作成する
          */