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

package/lib/chevre/repo/assetTransaction.js

@@ -319,23 +319,17 @@ class MongoRepository {
         });
     }
     addReservations(params) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.transactionModel.findOneAndUpdate({
                 _id: { $eq: params.id },
                 typeOf: { $eq: params.typeOf },
                 status: { $eq: factory.transactionStatusType.InProgress }
-            }, Object.assign({ 'object.acceptedOffer': params.object.acceptedOffer, 
-                // 念のため残す(2021/10/14)が、そのうち削除
-                // 冗長なので削除(2021/10/19～)
-                // 'object.event': params.object.reservationFor,
-                'object.reservationFor': params.object.reservationFor, 
-                // 念のため残す(2021/10/14)が、そのうち削除
-                // 冗長なので削除(2021/10/19～)
-                // 'object.reservations': params.object.subReservation,
-                'object.subReservation': params.object.subReservation }, (typeof ((_a = params.object.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-                ? { 'object.issuedThrough': params.object.issuedThrough }
-                : undefined), { new: true })
+            }, {
+                'object.acceptedOffer': params.object.acceptedOffer,
+                'object.issuedThrough': params.object.issuedThrough,
+                'object.reservationFor': params.object.reservationFor,
+                'object.subReservation': params.object.subReservation
+            }, { new: true })
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.transactionModel.modelName);

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

@@ -121,6 +121,9 @@ export declare class MongoRepository {
      * イベント部分更新
      */
     updatePartiallyById<T extends factory.eventType>(params: {
+        project: {
+            id: string;
+        };
         id: string;
         attributes: IAttributes4patchUpdate<T>;
     }): Promise<factory.event.IEvent<T>>;
@@ -143,15 +146,11 @@ export declare class MongoRepository {
         oldEventId: string;
         attributes: factory.event.IAttributes<factory.eventType.ScreeningEvent>;
     }): Promise<factory.event.IEvent<factory.eventType.ScreeningEvent>>;
-    count<T extends factory.eventType>(params: ISearchConditions<T>): Promise<number>;
     /**
      * イベントを検索する
      */
     search<T extends factory.eventType>(params: ISearchConditions<T>, projection?: IProjection): Promise<factory.event.IEvent<T>[]>;
     searchIds<T extends factory.eventType>(params: ISearchConditions<T>): Promise<string[]>;
-    findById<T extends factory.eventType>(params: {
-        id: string;
-    }, projection?: IProjection): Promise<factory.event.IEvent<T>>;
     findMinimizedIndividualEventById<T extends factory.eventType.ScreeningEvent | factory.eventType.Event>(params: {
         id: string;
     }): Promise<IMinimizedIndividualEvent<T>>;
@@ -159,11 +158,33 @@ export declare class MongoRepository {
      * イベントをキャンセルする
      */
     cancel(params: {
+        project: {
+            id: string;
+        };
         id: string;
     }): Promise<void>;
     deleteById(params: {
+        project: {
+            id: string;
+        };
         id: string;
     }): Promise<void>;
+    deleteScreeningEventsByMovieTheaterBranchCode(params: {
+        project: {
+            id: string;
+        };
+        location: {
+            branchCode: string;
+        };
+    }): Promise<import("mongodb").DeleteResult>;
+    deleteScreeningEventSeriesByMovieTheaterBranchCode(params: {
+        project: {
+            id: string;
+        };
+        location: {
+            branchCode: string;
+        };
+    }): Promise<import("mongodb").DeleteResult>;
     deleteByProject(params: {
         project: {
             id: string;

package/lib/chevre/repo/event.js

@@ -28,6 +28,7 @@ const errorHandler_1 = require("../errorHandler");
 const settings_1 = require("../settings");
 exports.PROJECTION_MINIMIZED_EVENT = {
     project: 1,
+    organizer: 1,
     _id: 1,
     typeOf: 1,
     additionalProperty: 1,
@@ -51,19 +52,35 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(conditions) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39;
-        const andConditions = [{ typeOf: { $eq: conditions.typeOf } }];
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42;
+        const andConditions = [];
+        const typeOfEq = conditions.typeOf;
+        if (typeof typeOfEq === 'string') {
+            andConditions.push({ typeOf: { $eq: typeOfEq } });
+        }
+        const typeOfIn = conditions.typeOfIn;
+        if (Array.isArray(typeOfIn)) {
+            andConditions.push({ typeOf: { $in: typeOfIn } });
+        }
+        // typeOf条件必須検証(2023-07-13~)
+        if (typeof typeOfEq !== 'string' && !Array.isArray(typeOfIn)) {
+            throw new factory.errors.ArgumentNull('typeOf');
+        }
         const projectIdEq = (_b = (_a = conditions.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
         if (typeof projectIdEq === 'string') {
-            andConditions.push({
-                'project.id': { $eq: projectIdEq }
-            });
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
+        }
+        const organizerIdEq = (_d = (_c = conditions.organizer) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
+        if (typeof organizerIdEq === 'string') {
+            andConditions.push({ 'organizer.id': { $exists: true, $eq: organizerIdEq } });
         }
-        const idIn = (_c = conditions.id) === null || _c === void 0 ? void 0 : _c.$in;
+        const idEq = (_e = conditions.id) === null || _e === void 0 ? void 0 : _e.$eq;
+        if (typeof idEq === 'string') {
+            andConditions.push({ _id: { $eq: idEq } });
+        }
+        const idIn = (_f = conditions.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 */
@@ -114,17 +131,17 @@ class MongoRepository {
                 endDate: { $lte: conditions.endThrough }
             });
         }
-        const locationBranchCodeEq = (_e = (_d = conditions.location) === null || _d === void 0 ? void 0 : _d.branchCode) === null || _e === void 0 ? void 0 : _e.$eq;
+        const locationBranchCodeEq = (_h = (_g = conditions.location) === null || _g === void 0 ? void 0 : _g.branchCode) === null || _h === void 0 ? void 0 : _h.$eq;
         if (typeof locationBranchCodeEq === 'string') {
             andConditions.push({ 'location.branchCode': { $exists: true, $eq: locationBranchCodeEq } });
         }
-        const locationBranchCodeIn = (_g = (_f = conditions.location) === null || _f === void 0 ? void 0 : _f.branchCode) === null || _g === void 0 ? void 0 : _g.$in;
+        const locationBranchCodeIn = (_k = (_j = conditions.location) === null || _j === void 0 ? void 0 : _j.branchCode) === null || _k === void 0 ? void 0 : _k.$in;
         if (Array.isArray(locationBranchCodeIn)) {
             andConditions.push({ 'location.branchCode': { $exists: true, $in: locationBranchCodeIn } });
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
-        const hasOfferCatalogIdEq = (_j = (_h = conditions.hasOfferCatalog) === null || _h === void 0 ? void 0 : _h.id) === null || _j === void 0 ? void 0 : _j.$eq;
+        const hasOfferCatalogIdEq = (_m = (_l = conditions.hasOfferCatalog) === null || _l === void 0 ? void 0 : _l.id) === null || _m === void 0 ? void 0 : _m.$eq;
         if (typeof hasOfferCatalogIdEq === 'string') {
             andConditions.push({
                 'hasOfferCatalog.id': {
@@ -133,7 +150,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyElemMatch = (_k = conditions.additionalProperty) === null || _k === void 0 ? void 0 : _k.$elemMatch;
+        const additionalPropertyElemMatch = (_o = conditions.additionalProperty) === null || _o === void 0 ? void 0 : _o.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
                 additionalProperty: {
@@ -149,7 +166,7 @@ class MongoRepository {
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
                 if (params.offers !== undefined) {
-                    const itemOfferedIdIn4event = (_m = (_l = params.offers.itemOffered) === null || _l === void 0 ? void 0 : _l.id) === null || _m === void 0 ? void 0 : _m.$in;
+                    const itemOfferedIdIn4event = (_q = (_p = params.offers.itemOffered) === null || _p === void 0 ? void 0 : _p.id) === null || _q === void 0 ? void 0 : _q.$in;
                     if (Array.isArray(itemOfferedIdIn4event)) {
                         andConditions.push({
                             'offers.itemOffered.id': {
@@ -199,8 +216,8 @@ class MongoRepository {
                         }
                     }
                 }
-                const sellerMakesOfferElemMatch4event = (_q = (_p = (_o = params.offers) === null || _o === void 0 ? void 0 : _o.seller) === null || _p === void 0 ? void 0 : _p.makesOffer) === null || _q === void 0 ? void 0 : _q.$elemMatch;
-                if (typeof ((_r = sellerMakesOfferElemMatch4event === null || sellerMakesOfferElemMatch4event === void 0 ? void 0 : sellerMakesOfferElemMatch4event['availableAtOrFrom.id']) === null || _r === void 0 ? void 0 : _r.$eq) === 'string') {
+                const sellerMakesOfferElemMatch4event = (_t = (_s = (_r = params.offers) === null || _r === void 0 ? void 0 : _r.seller) === null || _s === void 0 ? void 0 : _s.makesOffer) === null || _t === void 0 ? void 0 : _t.$elemMatch;
+                if (typeof ((_u = sellerMakesOfferElemMatch4event === null || sellerMakesOfferElemMatch4event === void 0 ? void 0 : sellerMakesOfferElemMatch4event['availableAtOrFrom.id']) === null || _u === void 0 ? void 0 : _u.$eq) === 'string') {
                     andConditions.push({
                         'offers.seller.makesOffer': {
                             $exists: true,
@@ -208,7 +225,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const reservationForIdentifierEq = (_w = (_v = (_u = (_t = (_s = params.offers) === null || _s === void 0 ? void 0 : _s.itemOffered) === null || _t === void 0 ? void 0 : _t.serviceOutput) === null || _u === void 0 ? void 0 : _u.reservationFor) === null || _v === void 0 ? void 0 : _v.identifier) === null || _w === void 0 ? void 0 : _w.$eq;
+                const reservationForIdentifierEq = (_z = (_y = (_x = (_w = (_v = params.offers) === null || _v === void 0 ? void 0 : _v.itemOffered) === null || _w === void 0 ? void 0 : _w.serviceOutput) === null || _x === void 0 ? void 0 : _x.reservationFor) === null || _y === void 0 ? void 0 : _y.identifier) === null || _z === void 0 ? void 0 : _z.$eq;
                 if (typeof reservationForIdentifierEq === 'string') {
                     andConditions.push({
                         'offers.itemOffered.serviceOutput.reservationFor.identifier': {
@@ -217,7 +234,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const reservationForArrivalBusStopBranchCodeEq = (_2 = (_1 = (_0 = (_z = (_y = (_x = params.offers) === null || _x === void 0 ? void 0 : _x.itemOffered) === null || _y === void 0 ? void 0 : _y.serviceOutput) === null || _z === void 0 ? void 0 : _z.reservationFor) === null || _0 === void 0 ? void 0 : _0.arrivalBusStop) === null || _1 === void 0 ? void 0 : _1.branchCode) === null || _2 === void 0 ? void 0 : _2.$eq;
+                const reservationForArrivalBusStopBranchCodeEq = (_5 = (_4 = (_3 = (_2 = (_1 = (_0 = params.offers) === null || _0 === void 0 ? void 0 : _0.itemOffered) === null || _1 === void 0 ? void 0 : _1.serviceOutput) === null || _2 === void 0 ? void 0 : _2.reservationFor) === null || _3 === void 0 ? void 0 : _3.arrivalBusStop) === null || _4 === void 0 ? void 0 : _4.branchCode) === null || _5 === void 0 ? void 0 : _5.$eq;
                 if (typeof reservationForArrivalBusStopBranchCodeEq === 'string') {
                     andConditions.push({
                         'offers.itemOffered.serviceOutput.reservationFor.arrivalBusStop.branchCode': {
@@ -226,7 +243,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const reservationForDepartureBusStopBranchCodeEq = (_8 = (_7 = (_6 = (_5 = (_4 = (_3 = params.offers) === null || _3 === void 0 ? void 0 : _3.itemOffered) === null || _4 === void 0 ? void 0 : _4.serviceOutput) === null || _5 === void 0 ? void 0 : _5.reservationFor) === null || _6 === void 0 ? void 0 : _6.departureBusStop) === null || _7 === void 0 ? void 0 : _7.branchCode) === null || _8 === void 0 ? void 0 : _8.$eq;
+                const reservationForDepartureBusStopBranchCodeEq = (_11 = (_10 = (_9 = (_8 = (_7 = (_6 = params.offers) === null || _6 === void 0 ? void 0 : _6.itemOffered) === null || _7 === void 0 ? void 0 : _7.serviceOutput) === null || _8 === void 0 ? void 0 : _8.reservationFor) === null || _9 === void 0 ? void 0 : _9.departureBusStop) === null || _10 === void 0 ? void 0 : _10.branchCode) === null || _11 === void 0 ? void 0 : _11.$eq;
                 if (typeof reservationForDepartureBusStopBranchCodeEq === 'string') {
                     andConditions.push({
                         'offers.itemOffered.serviceOutput.reservationFor.departureBusStop.branchCode': {
@@ -260,7 +277,7 @@ class MongoRepository {
                 }
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
-                const superEventLocationIdEq = (_11 = (_10 = (_9 = params.superEvent) === null || _9 === void 0 ? void 0 : _9.location) === null || _10 === void 0 ? void 0 : _10.id) === null || _11 === void 0 ? void 0 : _11.$eq;
+                const superEventLocationIdEq = (_14 = (_13 = (_12 = params.superEvent) === null || _12 === void 0 ? void 0 : _12.location) === null || _13 === void 0 ? void 0 : _13.id) === null || _14 === void 0 ? void 0 : _14.$eq;
                 if (typeof superEventLocationIdEq === 'string') {
                     andConditions.push({
                         'superEvent.location.id': {
@@ -303,7 +320,7 @@ class MongoRepository {
                         });
                     }
                 }
-                const itemOfferedIdIn = (_14 = (_13 = (_12 = params.offers) === null || _12 === void 0 ? void 0 : _12.itemOffered) === null || _13 === void 0 ? void 0 : _13.id) === null || _14 === void 0 ? void 0 : _14.$in;
+                const itemOfferedIdIn = (_17 = (_16 = (_15 = params.offers) === null || _15 === void 0 ? void 0 : _15.itemOffered) === null || _16 === void 0 ? void 0 : _16.id) === null || _17 === void 0 ? void 0 : _17.$in;
                 if (Array.isArray(itemOfferedIdIn)) {
                     andConditions.push({
                         'offers.itemOffered.id': {
@@ -312,7 +329,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const itemOfferedTicketedSeatTypeOfIn = (_19 = (_18 = (_17 = (_16 = (_15 = params.offers) === null || _15 === void 0 ? void 0 : _15.itemOffered) === null || _16 === void 0 ? void 0 : _16.serviceOutput) === null || _17 === void 0 ? void 0 : _17.reservedTicket) === null || _18 === void 0 ? void 0 : _18.ticketedSeat) === null || _19 === void 0 ? void 0 : _19.typeOfs;
+                const itemOfferedTicketedSeatTypeOfIn = (_22 = (_21 = (_20 = (_19 = (_18 = params.offers) === null || _18 === void 0 ? void 0 : _18.itemOffered) === null || _19 === void 0 ? void 0 : _19.serviceOutput) === null || _20 === void 0 ? void 0 : _20.reservedTicket) === null || _21 === void 0 ? void 0 : _21.ticketedSeat) === null || _22 === void 0 ? void 0 : _22.typeOfs;
                 if (Array.isArray(itemOfferedTicketedSeatTypeOfIn)) {
                     andConditions.push({
                         'offers.itemOffered.serviceOutput.reservedTicket.ticketedSeat.typeOf': {
@@ -321,7 +338,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const itemOfferedServiceTypeIdIn = (_22 = (_21 = (_20 = params.offers) === null || _20 === void 0 ? void 0 : _20.itemOffered) === null || _21 === void 0 ? void 0 : _21.serviceType) === null || _22 === void 0 ? void 0 : _22.ids;
+                const itemOfferedServiceTypeIdIn = (_25 = (_24 = (_23 = params.offers) === null || _23 === void 0 ? void 0 : _23.itemOffered) === null || _24 === void 0 ? void 0 : _24.serviceType) === null || _25 === void 0 ? void 0 : _25.ids;
                 if (Array.isArray(itemOfferedServiceTypeIdIn)) {
                     andConditions.push({
                         'offers.itemOffered.serviceType.id': {
@@ -330,8 +347,8 @@ class MongoRepository {
                         }
                     });
                 }
-                const sellerMakesOfferElemMatch = (_25 = (_24 = (_23 = params.offers) === null || _23 === void 0 ? void 0 : _23.seller) === null || _24 === void 0 ? void 0 : _24.makesOffer) === null || _25 === void 0 ? void 0 : _25.$elemMatch;
-                if (typeof ((_26 = sellerMakesOfferElemMatch === null || sellerMakesOfferElemMatch === void 0 ? void 0 : sellerMakesOfferElemMatch['availableAtOrFrom.id']) === null || _26 === void 0 ? void 0 : _26.$eq) === 'string') {
+                const sellerMakesOfferElemMatch = (_28 = (_27 = (_26 = params.offers) === null || _26 === void 0 ? void 0 : _26.seller) === null || _27 === void 0 ? void 0 : _27.makesOffer) === null || _28 === void 0 ? void 0 : _28.$elemMatch;
+                if (typeof ((_29 = sellerMakesOfferElemMatch === null || sellerMakesOfferElemMatch === void 0 ? void 0 : sellerMakesOfferElemMatch['availableAtOrFrom.id']) === null || _29 === void 0 ? void 0 : _29.$eq) === 'string') {
                     andConditions.push({
                         'offers.seller.makesOffer': {
                             $exists: true,
@@ -368,7 +385,7 @@ class MongoRepository {
                         ]
                     });
                 }
-                const locationIdEq = (_28 = (_27 = params.location) === null || _27 === void 0 ? void 0 : _27.id) === null || _28 === void 0 ? void 0 : _28.$eq;
+                const locationIdEq = (_31 = (_30 = params.location) === null || _30 === void 0 ? void 0 : _30.id) === null || _31 === void 0 ? void 0 : _31.$eq;
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
                 if (typeof locationIdEq === 'string') {
@@ -390,7 +407,7 @@ class MongoRepository {
                         });
                     }
                 }
-                const workPerformedIdentifierIn = (_29 = params.workPerformed) === null || _29 === void 0 ? void 0 : _29.identifiers;
+                const workPerformedIdentifierIn = (_32 = params.workPerformed) === null || _32 === void 0 ? void 0 : _32.identifiers;
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
                 if (Array.isArray(workPerformedIdentifierIn)) {
@@ -398,13 +415,13 @@ class MongoRepository {
                         'workPerformed.identifier': { $exists: true, $in: workPerformedIdentifierIn }
                     });
                 }
-                const workPerformedVersionEq = (_31 = (_30 = params.workPerformed) === null || _30 === void 0 ? void 0 : _30.version) === null || _31 === void 0 ? void 0 : _31.$eq;
+                const workPerformedVersionEq = (_34 = (_33 = params.workPerformed) === null || _33 === void 0 ? void 0 : _33.version) === null || _34 === void 0 ? void 0 : _34.$eq;
                 if (typeof workPerformedVersionEq === 'string') {
                     andConditions.push({
                         'workPerformed.version': { $exists: true, $eq: workPerformedVersionEq }
                     });
                 }
-                const videoFormatTypeOfEq = (_33 = (_32 = params.videoFormat) === null || _32 === void 0 ? void 0 : _32.typeOf) === null || _33 === void 0 ? void 0 : _33.$eq;
+                const videoFormatTypeOfEq = (_36 = (_35 = params.videoFormat) === null || _35 === void 0 ? void 0 : _35.typeOf) === null || _36 === void 0 ? void 0 : _36.$eq;
                 if (typeof videoFormatTypeOfEq === 'string') {
                     andConditions.push({
                         'videoFormat.typeOf': {
@@ -413,7 +430,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const videoFormatTypeOfIn = (_35 = (_34 = params.videoFormat) === null || _34 === void 0 ? void 0 : _34.typeOf) === null || _35 === void 0 ? void 0 : _35.$in;
+                const videoFormatTypeOfIn = (_38 = (_37 = params.videoFormat) === null || _37 === void 0 ? void 0 : _37.typeOf) === null || _38 === void 0 ? void 0 : _38.$in;
                 if (Array.isArray(videoFormatTypeOfIn)) {
                     andConditions.push({
                         'videoFormat.typeOf': {
@@ -422,7 +439,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const soundFormatTypeOfEq = (_37 = (_36 = params.soundFormat) === null || _36 === void 0 ? void 0 : _36.typeOf) === null || _37 === void 0 ? void 0 : _37.$eq;
+                const soundFormatTypeOfEq = (_40 = (_39 = params.soundFormat) === null || _39 === void 0 ? void 0 : _39.typeOf) === null || _40 === void 0 ? void 0 : _40.$eq;
                 if (typeof soundFormatTypeOfEq === 'string') {
                     andConditions.push({
                         'soundFormat.typeOf': {
@@ -431,7 +448,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const soundFormatTypeOfIn = (_39 = (_38 = params.soundFormat) === null || _38 === void 0 ? void 0 : _38.typeOf) === null || _39 === void 0 ? void 0 : _39.$in;
+                const soundFormatTypeOfIn = (_42 = (_41 = params.soundFormat) === null || _41 === void 0 ? void 0 : _41.typeOf) === null || _42 === void 0 ? void 0 : _42.$in;
                 if (Array.isArray(soundFormatTypeOfIn)) {
                     andConditions.push({
                         'soundFormat.typeOf': {
@@ -586,6 +603,7 @@ class MongoRepository {
             const _a = params.attributes, { typeOf } = _a, updateFields = __rest(_a, ["typeOf"]);
             doc = yield this.eventModel.findOneAndUpdate({
                 _id: params.id,
+                'project.id': { $eq: params.project.id },
                 typeOf: params.attributes.typeOf
             }, {
                 $set: updateFields
@@ -688,6 +706,7 @@ class MongoRepository {
             const _a = params.attributes, { identifier, project, typeOf } = _a, updateFields = __rest(_a, ["identifier", "project", "typeOf"]);
             const id = uniqid();
             doc = yield this.eventModel.findOneAndUpdate({
+                'project.id': { $eq: params.attributes.project.id },
                 typeOf: params.attributes.typeOf,
                 // 追加特性をキーに更新
                 additionalProperty: {
@@ -711,14 +730,16 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    count(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            return this.eventModel.countDocuments({ $and: conditions })
-                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-        });
-    }
+    // public async count<T extends factory.eventType>(
+    //     params: ISearchConditions<T>
+    // ): Promise<number> {
+    //     const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
+    //     return this.eventModel.countDocuments(
+    //         { $and: conditions }
+    //     )
+    //         .setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
+    //         .exec();
+    // }
     /**
      * イベントを検索する
      */
@@ -766,24 +787,39 @@ class MongoRepository {
                 .exec();
         });
     }
-    findById(params, projection) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const positiveProjectionExists = (projection !== undefined && projection !== null)
-                ? Object.values(projection)
-                    .some((value) => value !== 0)
-                : false;
-            const doc = yield this.eventModel.findOne({ _id: params.id }, 
-            // :1対応(2023-01-25~)
-            (positiveProjectionExists)
-                ? projection
-                : Object.assign(Object.assign({}, projection), { __v: 0, createdAt: 0, updatedAt: 0 }))
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.eventModel.modelName);
-            }
-            return doc.toObject();
-        });
-    }
+    // searchに置き換え(2023-07-13~)
+    // public async findById<T extends factory.eventType>(
+    //     params: {
+    //         project: { id: string };
+    //         id: string;
+    //     },
+    //     projection?: IProjection
+    // ): Promise<factory.event.IEvent<T>> {
+    //     const positiveProjectionExists: boolean = (projection !== undefined && projection !== null)
+    //         ? Object.values(projection)
+    //             .some((value) => value !== 0)
+    //         : false;
+    //     const doc = await this.eventModel.findOne(
+    //         {
+    //             _id: params.id,
+    //             'project.id': { $eq: params.project.id }
+    //         },
+    //         // :1対応(2023-01-25~)
+    //         (positiveProjectionExists)
+    //             ? projection
+    //             : {
+    //                 ...projection,
+    //                 __v: 0,
+    //                 createdAt: 0,
+    //                 updatedAt: 0
+    //             }
+    //     )
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(this.eventModel.modelName);
+    //     }
+    //     return doc.toObject();
+    // }
     findMinimizedIndividualEventById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.eventModel.findOne({ _id: params.id }, exports.PROJECTION_MINIMIZED_EVENT)
@@ -799,13 +835,39 @@ class MongoRepository {
      */
     cancel(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.eventModel.findOneAndUpdate({ _id: params.id }, { eventStatus: factory.eventStatusType.EventCancelled })
+            yield this.eventModel.findOneAndUpdate({
+                _id: params.id,
+                'project.id': { $eq: params.project.id }
+            }, { eventStatus: factory.eventStatusType.EventCancelled })
                 .exec();
         });
     }
     deleteById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.eventModel.findOneAndDelete({ _id: params.id })
+            yield this.eventModel.findOneAndDelete({
+                _id: params.id,
+                'project.id': { $eq: params.project.id }
+            })
+                .exec();
+        });
+    }
+    deleteScreeningEventsByMovieTheaterBranchCode(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.eventModel.deleteMany({
+                typeOf: { $eq: factory.eventType.ScreeningEvent },
+                'project.id': { $eq: params.project.id },
+                'superEvent.location.branchCode': { $exists: true, $eq: params.location.branchCode }
+            })
+                .exec();
+        });
+    }
+    deleteScreeningEventSeriesByMovieTheaterBranchCode(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.eventModel.deleteMany({
+                typeOf: { $eq: factory.eventType.ScreeningEventSeries },
+                'project.id': { $eq: params.project.id },
+                'location.branchCode': { $exists: true, $eq: params.location.branchCode }
+            })
                 .exec();
         });
     }

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

@@ -25,7 +25,7 @@
 import { Schema } from 'mongoose';
 declare const modelName = "Event";
 /**
- * イベント(公演など)スキーマ
+ * イベントスキーマ
  */
 declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
     collection: string;
@@ -53,11 +53,12 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     };
 }, {
     typeOf: string;
+    project: any;
+    organizer: any;
     checkInCount: number;
     attendeeCount: number;
     _id?: string | undefined;
     name?: any;
-    project?: any;
     alternateName?: any;
     description?: any;
     additionalProperty?: any;
@@ -86,11 +87,12 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     kanaName?: string | undefined;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     typeOf: string;
+    project: any;
+    organizer: any;
     checkInCount: number;
     attendeeCount: number;
     _id?: string | undefined;
     name?: any;
-    project?: any;
     alternateName?: any;
     description?: any;
     additionalProperty?: any;
@@ -119,11 +121,12 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     kanaName?: string | undefined;
 }>> & Omit<import("mongoose").FlatRecord<{
     typeOf: string;
+    project: any;
+    organizer: any;
     checkInCount: number;
     attendeeCount: number;
     _id?: string | undefined;
     name?: any;
-    project?: any;
     alternateName?: any;
     description?: any;
     additionalProperty?: any;

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

@@ -7,10 +7,17 @@ const factory = require("../../../factory");
 const modelName = 'Event';
 exports.modelName = modelName;
 /**
- * イベント(公演など)スキーマ
+ * イベントスキーマ
  */
 const schema = new mongoose_1.Schema({
-    project: mongoose_1.SchemaTypes.Mixed,
+    project: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
+    organizer: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
     _id: String,
     typeOf: {
         type: String,
@@ -78,6 +85,12 @@ schema.index({ updatedAt: 1 }, { name: 'searchByUpdatedAt' });
 schema.index({ 'project.id': 1, startDate: 1 }, {
     name: 'searchByProjectId-v20220721'
 });
+schema.index({ 'organizer.id': 1, startDate: 1 }, {
+    name: 'searchByOrganizerId',
+    partialFilterExpression: {
+        'organizer.id': { $exists: true }
+    }
+});
 schema.index({ typeOf: 1, startDate: 1 }, { name: 'searchByTypeOf' });
 schema.index({ eventStatus: 1, startDate: 1 }, { name: 'searchByEventStatus' });
 schema.index({ name: 1, startDate: 1 }, { name: 'searchByName' });

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

@@ -53,13 +53,14 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     };
 }, {
     typeOf: string;
+    project: any;
     additionalProperty: any[];
+    parentOrganization: any;
     containsPlace: any[];
     hasEntranceGate: any[];
     hasPOS: any[];
     name?: any;
     url?: string | undefined;
-    project?: any;
     alternateName?: any;
     description?: any;
     offers?: any;
@@ -72,18 +73,18 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     openingHoursSpecification?: any;
     smokingAllowed?: boolean | undefined;
     sameAs?: string | undefined;
-    parentOrganization?: any;
     openSeatingAllowed?: any;
     amenityFeature?: any;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     typeOf: string;
+    project: any;
     additionalProperty: any[];
+    parentOrganization: any;
     containsPlace: any[];
     hasEntranceGate: any[];
     hasPOS: any[];
     name?: any;
     url?: string | undefined;
-    project?: any;
     alternateName?: any;
     description?: any;
     offers?: any;
@@ -96,18 +97,18 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     openingHoursSpecification?: any;
     smokingAllowed?: boolean | undefined;
     sameAs?: string | undefined;
-    parentOrganization?: any;
     openSeatingAllowed?: any;
     amenityFeature?: any;
 }>> & Omit<import("mongoose").FlatRecord<{
     typeOf: string;
+    project: any;
     additionalProperty: any[];
+    parentOrganization: any;
     containsPlace: any[];
     hasEntranceGate: any[];
     hasPOS: any[];
     name?: any;
     url?: string | undefined;
-    project?: any;
     alternateName?: any;
     description?: any;
     offers?: any;
@@ -120,7 +121,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     openingHoursSpecification?: any;
     smokingAllowed?: boolean | undefined;
     sameAs?: string | undefined;
-    parentOrganization?: any;
     openSeatingAllowed?: any;
     amenityFeature?: any;
 }> & {

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

@@ -9,7 +9,15 @@ exports.modelName = modelName;
  * 場所スキーマ
  */
 const schema = new mongoose_1.Schema({
-    project: mongoose_1.SchemaTypes.Mixed,
+    project: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
+    // 必須化(2023-07-14~)
+    parentOrganization: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
     typeOf: {
         type: String,
         required: true
@@ -32,7 +40,6 @@ const schema = new mongoose_1.Schema({
     kanaName: String,
     offers: mongoose_1.SchemaTypes.Mixed,
     additionalProperty: [mongoose_1.SchemaTypes.Mixed],
-    parentOrganization: mongoose_1.SchemaTypes.Mixed,
     // ↓ルームの施設からの分離に伴い属性追加(2023-06-22~)
     openSeatingAllowed: mongoose_1.SchemaTypes.Mixed,
     amenityFeature: mongoose_1.SchemaTypes.Mixed