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

package/lib/chevre/repo/reservation.js

@@ -22,18 +22,18 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        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;
+        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;
         // MongoDB検索条件
         const andConditions = [
             { typeOf: params.typeOf }
         ];
         const projectIdEq = (_b = (_a = params.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 providerIdEq = (_d = (_c = params.provider) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
+        if (typeof providerIdEq === 'string') {
+            andConditions.push({ 'provider.id': { $eq: providerIdEq } });
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
@@ -172,24 +172,24 @@ class MongoRepository {
                         }
                     });
                 }
-                const additionalTicketTextRegex = (_c = params.additionalTicketText) === null || _c === void 0 ? void 0 : _c.$regex;
+                const additionalTicketTextRegex = (_e = params.additionalTicketText) === null || _e === void 0 ? void 0 : _e.$regex;
                 if (typeof additionalTicketTextRegex === 'string' && additionalTicketTextRegex.length > 0) {
-                    const additionalTicketTextOptions = (_d = params.additionalTicketText) === null || _d === void 0 ? void 0 : _d.$options;
+                    const additionalTicketTextOptions = (_f = params.additionalTicketText) === null || _f === void 0 ? void 0 : _f.$options;
                     andConditions.push({
                         additionalTicketText: Object.assign({ $exists: true, $regex: new RegExp(additionalTicketTextRegex) }, (typeof additionalTicketTextOptions === 'string') ? { $options: additionalTicketTextOptions } : undefined)
                     });
                 }
             }
         }
-        const reservationStatusEq = (_e = params.reservationStatus) === null || _e === void 0 ? void 0 : _e.$eq;
+        const reservationStatusEq = (_g = params.reservationStatus) === null || _g === void 0 ? void 0 : _g.$eq;
         if (typeof reservationStatusEq === 'string') {
             andConditions.push({ reservationStatus: { $eq: reservationStatusEq } });
         }
-        const reservationStatusNe = (_f = params.reservationStatus) === null || _f === void 0 ? void 0 : _f.$ne;
+        const reservationStatusNe = (_h = params.reservationStatus) === null || _h === void 0 ? void 0 : _h.$ne;
         if (typeof reservationStatusNe === 'string') {
             andConditions.push({ reservationStatus: { $ne: reservationStatusNe } });
         }
-        const reservationStatusIn = (_g = params.reservationStatus) === null || _g === void 0 ? void 0 : _g.$in;
+        const reservationStatusIn = (_j = params.reservationStatus) === null || _j === void 0 ? void 0 : _j.$in;
         if (Array.isArray(reservationStatusIn)) {
             andConditions.push({ reservationStatus: { $in: reservationStatusIn } });
         }
@@ -234,7 +234,7 @@ class MongoRepository {
         }
         switch (params.typeOf) {
             case factory.reservationType.BusReservation:
-                const reservationForTypeOfEq = (_h = params.reservationFor) === null || _h === void 0 ? void 0 : _h.typeOf;
+                const reservationForTypeOfEq = (_k = params.reservationFor) === null || _k === void 0 ? void 0 : _k.typeOf;
                 if (typeof reservationForTypeOfEq === 'string') {
                     andConditions.push({
                         'reservationFor.typeOf': {
@@ -243,7 +243,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const reservationForIdEq = (_k = (_j = params.reservationFor) === null || _j === void 0 ? void 0 : _j.id) === null || _k === void 0 ? void 0 : _k.$eq;
+                const reservationForIdEq = (_m = (_l = params.reservationFor) === null || _l === void 0 ? void 0 : _l.id) === null || _m === void 0 ? void 0 : _m.$eq;
                 if (typeof reservationForIdEq === 'string') {
                     andConditions.push({
                         'reservationFor.id': {
@@ -252,7 +252,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const reservationForIdIn = (_m = (_l = params.reservationFor) === null || _l === void 0 ? void 0 : _l.id) === null || _m === void 0 ? void 0 : _m.$in;
+                const reservationForIdIn = (_p = (_o = params.reservationFor) === null || _o === void 0 ? void 0 : _o.id) === null || _p === void 0 ? void 0 : _p.$in;
                 if (Array.isArray(reservationForIdIn)) {
                     andConditions.push({
                         'reservationFor.id': {
@@ -263,7 +263,7 @@ class MongoRepository {
                 }
                 break;
             case factory.reservationType.EventReservation:
-                if (typeof ((_o = params.reservationFor) === null || _o === void 0 ? void 0 : _o.id) === 'string') {
+                if (typeof ((_q = params.reservationFor) === null || _q === void 0 ? void 0 : _q.id) === 'string') {
                     andConditions.push({
                         'reservationFor.id': {
                             $exists: true,
@@ -272,7 +272,7 @@ class MongoRepository {
                     });
                 }
                 else {
-                    const reservationForIdEq4eventReservation = (_q = (_p = params.reservationFor) === null || _p === void 0 ? void 0 : _p.id) === null || _q === void 0 ? void 0 : _q.$eq;
+                    const reservationForIdEq4eventReservation = (_s = (_r = params.reservationFor) === null || _r === void 0 ? void 0 : _r.id) === null || _s === void 0 ? void 0 : _s.$eq;
                     if (typeof reservationForIdEq4eventReservation === 'string') {
                         andConditions.push({
                             'reservationFor.id': {
@@ -526,7 +526,7 @@ class MongoRepository {
                 }
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
-                const ticketedSeatSeatingTypeIn = (_s = (_r = params.reservedTicket.ticketedSeat) === null || _r === void 0 ? void 0 : _r.seatingType) === null || _s === void 0 ? void 0 : _s.$in;
+                const ticketedSeatSeatingTypeIn = (_u = (_t = params.reservedTicket.ticketedSeat) === null || _t === void 0 ? void 0 : _t.seatingType) === null || _u === void 0 ? void 0 : _u.$in;
                 if (Array.isArray(ticketedSeatSeatingTypeIn)) {
                     andConditions.push({
                         'reservedTicket.ticketedSeat.seatingType': {
@@ -537,7 +537,7 @@ class MongoRepository {
                 }
             }
         }
-        const brokerIdRegex = (_t = params.broker) === null || _t === void 0 ? void 0 : _t.id;
+        const brokerIdRegex = (_v = params.broker) === null || _v === void 0 ? void 0 : _v.id;
         if (typeof brokerIdRegex === 'string' && brokerIdRegex.length > 0) {
             andConditions.push({
                 'broker.id': {
@@ -546,7 +546,7 @@ class MongoRepository {
                 }
             });
         }
-        const brokerIdentifierAll = (_v = (_u = params.broker) === null || _u === void 0 ? void 0 : _u.identifier) === null || _v === void 0 ? void 0 : _v.$all;
+        const brokerIdentifierAll = (_x = (_w = params.broker) === null || _w === void 0 ? void 0 : _w.identifier) === null || _x === void 0 ? void 0 : _x.$all;
         if (Array.isArray(brokerIdentifierAll)) {
             andConditions.push({
                 'broker.identifier': {
@@ -555,7 +555,7 @@ class MongoRepository {
                 }
             });
         }
-        const brokerIdentifierIn = (_x = (_w = params.broker) === null || _w === void 0 ? void 0 : _w.identifier) === null || _x === void 0 ? void 0 : _x.$in;
+        const brokerIdentifierIn = (_z = (_y = params.broker) === null || _y === void 0 ? void 0 : _y.identifier) === null || _z === void 0 ? void 0 : _z.$in;
         if (Array.isArray(brokerIdentifierIn)) {
             andConditions.push({
                 'broker.identifier': {
@@ -564,7 +564,7 @@ class MongoRepository {
                 }
             });
         }
-        const brokerIdentifierNin = (_z = (_y = params.broker) === null || _y === void 0 ? void 0 : _y.identifier) === null || _z === void 0 ? void 0 : _z.$nin;
+        const brokerIdentifierNin = (_1 = (_0 = params.broker) === null || _0 === void 0 ? void 0 : _0.identifier) === null || _1 === void 0 ? void 0 : _1.$nin;
         if (Array.isArray(brokerIdentifierNin)) {
             andConditions.push({
                 'broker.identifier': {
@@ -572,7 +572,7 @@ class MongoRepository {
                 }
             });
         }
-        const brokerIdentifierElemMatch = (_1 = (_0 = params.broker) === null || _0 === void 0 ? void 0 : _0.identifier) === null || _1 === void 0 ? void 0 : _1.$elemMatch;
+        const brokerIdentifierElemMatch = (_3 = (_2 = params.broker) === null || _2 === void 0 ? void 0 : _2.identifier) === null || _3 === void 0 ? void 0 : _3.$elemMatch;
         if (brokerIdentifierElemMatch !== undefined && brokerIdentifierElemMatch !== null) {
             andConditions.push({
                 'broker.identifier': {
@@ -607,9 +607,9 @@ class MongoRepository {
                 }
             }
             else {
-                const emailRegex = (_2 = params.underName.email) === null || _2 === void 0 ? void 0 : _2.$regex;
+                const emailRegex = (_4 = params.underName.email) === null || _4 === void 0 ? void 0 : _4.$regex;
                 if (typeof emailRegex === 'string' && emailRegex.length > 0) {
-                    const emailOptions = (_3 = params.underName.email) === null || _3 === void 0 ? void 0 : _3.$options;
+                    const emailOptions = (_5 = params.underName.email) === null || _5 === void 0 ? void 0 : _5.$options;
                     andConditions.push({
                         'underName.email': Object.assign({ $exists: true, $regex: new RegExp(emailRegex) }, (typeof emailOptions === 'string') ? { $options: emailOptions } : undefined)
                     });
@@ -628,9 +628,9 @@ class MongoRepository {
                 }
             }
             else {
-                const underNameNameRegex = (_4 = params.underName.name) === null || _4 === void 0 ? void 0 : _4.$regex;
+                const underNameNameRegex = (_6 = params.underName.name) === null || _6 === void 0 ? void 0 : _6.$regex;
                 if (typeof underNameNameRegex === 'string' && underNameNameRegex.length > 0) {
-                    const underNameNameOptions = (_5 = params.underName.name) === null || _5 === void 0 ? void 0 : _5.$options;
+                    const underNameNameOptions = (_7 = params.underName.name) === null || _7 === void 0 ? void 0 : _7.$options;
                     andConditions.push({
                         'underName.name': Object.assign({ $exists: true, $regex: new RegExp(underNameNameRegex) }, (typeof underNameNameOptions === 'string') ? { $options: underNameNameOptions } : undefined)
                     });
@@ -659,9 +659,9 @@ class MongoRepository {
                 }
             }
             else {
-                const givenNameRegex = (_6 = params.underName.givenName) === null || _6 === void 0 ? void 0 : _6.$regex;
+                const givenNameRegex = (_8 = params.underName.givenName) === null || _8 === void 0 ? void 0 : _8.$regex;
                 if (typeof givenNameRegex === 'string' && givenNameRegex.length > 0) {
-                    const givenNameOptions = (_7 = params.underName.givenName) === null || _7 === void 0 ? void 0 : _7.$options;
+                    const givenNameOptions = (_9 = params.underName.givenName) === null || _9 === void 0 ? void 0 : _9.$options;
                     andConditions.push({
                         'underName.givenName': Object.assign({ $exists: true, $regex: new RegExp(givenNameRegex) }, (typeof givenNameOptions === 'string') ? { $options: givenNameOptions } : undefined)
                     });
@@ -680,9 +680,9 @@ class MongoRepository {
                 }
             }
             else {
-                const familyNameRegex = (_8 = params.underName.familyName) === null || _8 === void 0 ? void 0 : _8.$regex;
+                const familyNameRegex = (_10 = params.underName.familyName) === null || _10 === void 0 ? void 0 : _10.$regex;
                 if (typeof familyNameRegex === 'string' && familyNameRegex.length > 0) {
-                    const familyNameOptions = (_9 = params.underName.familyName) === null || _9 === void 0 ? void 0 : _9.$options;
+                    const familyNameOptions = (_11 = params.underName.familyName) === null || _11 === void 0 ? void 0 : _11.$options;
                     andConditions.push({
                         'underName.familyName': Object.assign({ $exists: true, $regex: new RegExp(familyNameRegex) }, (typeof familyNameOptions === 'string') ? { $options: familyNameOptions } : undefined)
                     });
@@ -783,7 +783,7 @@ class MongoRepository {
                 });
             }
         }
-        const programMembershipUsedIdentifierEq = (_11 = (_10 = params.programMembershipUsed) === null || _10 === void 0 ? void 0 : _10.identifier) === null || _11 === void 0 ? void 0 : _11.$eq;
+        const programMembershipUsedIdentifierEq = (_13 = (_12 = params.programMembershipUsed) === null || _12 === void 0 ? void 0 : _12.identifier) === null || _13 === void 0 ? void 0 : _13.$eq;
         if (typeof programMembershipUsedIdentifierEq === 'string') {
             andConditions.push({
                 'programMembershipUsed.identifier': {
@@ -792,7 +792,7 @@ class MongoRepository {
                 }
             });
         }
-        const programMembershipUsedIssuedThroughServiceTypeCodeValueEq = (_15 = (_14 = (_13 = (_12 = params.programMembershipUsed) === null || _12 === void 0 ? void 0 : _12.issuedThrough) === null || _13 === void 0 ? void 0 : _13.serviceType) === null || _14 === void 0 ? void 0 : _14.codeValue) === null || _15 === void 0 ? void 0 : _15.$eq;
+        const programMembershipUsedIssuedThroughServiceTypeCodeValueEq = (_17 = (_16 = (_15 = (_14 = params.programMembershipUsed) === null || _14 === void 0 ? void 0 : _14.issuedThrough) === null || _15 === void 0 ? void 0 : _15.serviceType) === null || _16 === void 0 ? void 0 : _16.codeValue) === null || _17 === void 0 ? void 0 : _17.$eq;
         if (typeof programMembershipUsedIssuedThroughServiceTypeCodeValueEq === 'string') {
             andConditions.push({
                 'programMembershipUsed.issuedThrough.serviceType.codeValue': {
@@ -801,7 +801,7 @@ class MongoRepository {
                 }
             });
         }
-        const appliesToMovieTicketIdentifierEq = (_19 = (_18 = (_17 = (_16 = params.price) === null || _16 === void 0 ? void 0 : _16.priceComponent) === null || _17 === void 0 ? void 0 : _17.appliesToMovieTicket) === null || _18 === void 0 ? void 0 : _18.identifier) === null || _19 === void 0 ? void 0 : _19.$eq;
+        const appliesToMovieTicketIdentifierEq = (_21 = (_20 = (_19 = (_18 = params.price) === null || _18 === void 0 ? void 0 : _18.priceComponent) === null || _19 === void 0 ? void 0 : _19.appliesToMovieTicket) === null || _20 === void 0 ? void 0 : _20.identifier) === null || _21 === void 0 ? void 0 : _21.$eq;
         if (typeof appliesToMovieTicketIdentifierEq === 'string') {
             andConditions.push({
                 'price.priceComponent.appliesToMovieTicket.identifier': {
@@ -812,25 +812,24 @@ class MongoRepository {
         }
         return andConditions;
     }
-    createMany(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (params.reservations.length > 0) {
-                const result = yield this.reservationModel.insertMany(params.reservations.map((r) => {
-                    return Object.assign(Object.assign({}, r), { _id: r.id, reservationFor: params.reservationFor });
-                }), { ordered: false, rawResult: true });
-                // console.log('repos.reservation.reservationModel.insertMany result:', result);
-                // if (result.result?.ok !== 1) {
-                //     throw new factory.errors.ServiceUnavailable('creating reservations not executed correctly');
-                // }
-                if (result.insertedCount !== params.reservations.length) {
-                    throw new factory.errors.ServiceUnavailable('all reservations not saved');
-                }
-            }
-            else {
-                // no op
-            }
-        });
-    }
+    // public async createMany(params: {
+    //     reservations: factory.assetTransaction.reserve.IObjectSubReservation[];
+    //     reservationFor: factory.assetTransaction.reserve.IReservationFor;
+    // }): Promise<void> {
+    //     if (params.reservations.length > 0) {
+    //         const result = await this.reservationModel.insertMany(
+    //             params.reservations.map((r) => {
+    //                 return { ...r, _id: r.id, reservationFor: params.reservationFor };
+    //             }),
+    //             { ordered: false, rawResult: true }
+    //         );
+    //         if (result.insertedCount !== params.reservations.length) {
+    //             throw new factory.errors.ServiceUnavailable('all reservations not saved');
+    //         }
+    //     } else {
+    //         // no op
+    //     }
+    // }
     /**
      * 汎用予約カウント
      */
@@ -899,30 +898,29 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    confirmByReservationNumber(params) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = {
-                reservationNumber: { $eq: String(params.reservationNumber) },
-                reservationStatus: { $eq: params.previousReservationStatus }
-            };
-            const update = Object.assign(Object.assign(Object.assign({ 
-                // previousReservationStatusを保管(2023-01-19~)
-                previousReservationStatus: params.previousReservationStatus, reservationStatus: factory.reservationStatusType.ReservationConfirmed, modifiedTime: new Date() }, (params.underName !== undefined) ? { underName: params.underName } : undefined), (typeof ((_a = params.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.broker } : undefined), (typeof ((_b = params.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { issuedThrough: params.issuedThrough } : undefined);
-            yield this.reservationModel.updateMany(conditions, update)
-                .exec();
-        });
-    }
-    confirmByIdIfNotExist__(params) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.reservationModel.findOneAndUpdate({ _id: { $eq: params.reservation.id } }, {
-                $setOnInsert: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, params.reservation), { _id: params.reservation.id, reservationFor: params.reservationFor, reservationStatus: factory.reservationStatusType.ReservationConfirmed, modifiedTime: new Date() }), (params.underName !== undefined) ? { underName: params.underName } : undefined), (typeof ((_a = params.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.broker } : undefined), (typeof ((_b = params.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { issuedThrough: params.issuedThrough } : undefined)
-            }, { upsert: true, new: true })
-                .select({ _id: 1 })
-                .exec();
-        });
-    }
+    // public async confirmByReservationNumber(params: {
+    //     reservationNumber: string;
+    //     previousReservationStatus: factory.reservationStatusType;
+    //     underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+    //     broker?: factory.reservation.IBroker<factory.reservationType>;
+    //     issuedThrough?: factory.assetTransaction.reserve.IIssuedThrough;
+    // }): Promise<void> {
+    //     const conditions = {
+    //         reservationNumber: { $eq: String(params.reservationNumber) },
+    //         reservationStatus: { $eq: params.previousReservationStatus }
+    //     };
+    //     const update = {
+    //         // previousReservationStatusを保管(2023-01-19~)
+    //         previousReservationStatus: params.previousReservationStatus,
+    //         reservationStatus: factory.reservationStatusType.ReservationConfirmed,
+    //         modifiedTime: new Date(),
+    //         ...(params.underName !== undefined) ? { underName: params.underName } : undefined,
+    //         ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined,
+    //         ...(typeof params.issuedThrough?.typeOf === 'string') ? { issuedThrough: params.issuedThrough } : undefined
+    //     };
+    //     await this.reservationModel.updateMany(conditions, update)
+    //         .exec();
+    // }
     confirmManyIfNotExist(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const modifiedTime = new Date();
@@ -930,11 +928,26 @@ class MongoRepository {
             if (Array.isArray(params.subReservation)) {
                 params.subReservation.forEach((subReservation) => {
                     var _a, _b;
+                    let setOnInsert;
+                    switch (subReservation.typeOf) {
+                        case factory.reservationType.BusReservation:
+                            setOnInsert = Object.assign(Object.assign(Object.assign(Object.assign({}, subReservation), { _id: subReservation.id, issuedThrough: params.issuedThrough, reservationFor: params.reservationFor, reservationStatus: factory.reservationStatusType.ReservationConfirmed, modifiedTime, 
+                                // providerを追加(2023-07-19~)
+                                provider: params.provider }), (params.underName !== undefined) ? { underName: params.underName } : undefined), (typeof ((_a = params.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.broker } : undefined);
+                            break;
+                        case factory.reservationType.EventReservation:
+                            setOnInsert = Object.assign(Object.assign(Object.assign(Object.assign({}, subReservation), { _id: subReservation.id, issuedThrough: params.issuedThrough, reservationFor: params.reservationFor, reservationStatus: factory.reservationStatusType.ReservationConfirmed, modifiedTime, 
+                                // providerを追加(2023-07-19~)
+                                provider: params.provider }), (params.underName !== undefined) ? { underName: params.underName } : undefined), (typeof ((_b = params.broker) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { broker: params.broker } : undefined);
+                            break;
+                        default:
+                            throw new factory.errors.NotImplemented(`${subReservation.typeOf} not implemented`);
+                    }
                     bulkWriteOps.push({
                         updateOne: {
-                            filter: { _id: { $eq: subReservation.id } },
+                            filter: { _id: { $eq: setOnInsert.id } },
                             update: {
-                                $setOnInsert: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, subReservation), { _id: subReservation.id, reservationFor: params.reservationFor, reservationStatus: factory.reservationStatusType.ReservationConfirmed, modifiedTime }), (params.underName !== undefined) ? { underName: params.underName } : undefined), (typeof ((_a = params.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.broker } : undefined), (typeof ((_b = params.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { issuedThrough: params.issuedThrough } : undefined)
+                                $setOnInsert: setOnInsert
                             },
                             upsert: true
                         }
@@ -1099,10 +1112,10 @@ class MongoRepository {
     /**
      * 予約部分更新
      */
-    // public async findByIdAndUpdate(params: {
     updatePartiallyById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.reservationModel.findOneAndUpdate({ _id: { $eq: params.id } }, params.update, { new: true })
+                .select({ _id: 1 })
                 .exec()
                 .then((doc) => {
                 if (doc === null) {
@@ -1172,5 +1185,10 @@ class MongoRepository {
                 .exec();
         });
     }
+    getCursor(conditions, projection) {
+        return this.reservationModel.find(conditions, projection)
+            .sort({ bookingTime: factory.sortType.Descending })
+            .cursor();
+    }
 }
 exports.MongoRepository = MongoRepository;

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

@@ -34,10 +34,8 @@ export declare class MongoRepository {
     static CREATE_MONGO_CONDITIONS(params: factory.seller.ISearchConditions): any[];
     /**
      * 特定販売者検索
+     * searchに置き換え(2023-07-13~)
      */
-    findById(conditions: {
-        id: string;
-    }, inclusion: string[], exclusion: string[]): Promise<ISeller>;
     /**
      * 販売者を保管する
      */
@@ -73,6 +71,9 @@ export declare class MongoRepository {
      * 販売者を削除する
      */
     deleteById(params: {
+        project: {
+            id: string;
+        };
         id: string;
     }): Promise<void>;
     /**

package/lib/chevre/repo/seller.js

@@ -128,37 +128,39 @@ class MongoRepository {
     }
     /**
      * 特定販売者検索
+     * searchに置き換え(2023-07-13~)
      */
-    findById(conditions, 
-    // projection?: any
-    inclusion, exclusion) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let projection = {};
-            if (Array.isArray(inclusion) && inclusion.length > 0) {
-                inclusion.forEach((field) => {
-                    projection[field] = 1;
-                });
-            }
-            else {
-                projection = {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
-                };
-                if (Array.isArray(exclusion) && exclusion.length > 0) {
-                    exclusion.forEach((field) => {
-                        projection[field] = 0;
-                    });
-                }
-            }
-            const doc = yield this.organizationModel.findOne({ _id: conditions.id }, projection)
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.organizationModel.modelName);
-            }
-            return doc.toObject();
-        });
-    }
+    // public async findById(
+    //     conditions: {
+    //         id: string;
+    //     },
+    //     inclusion: string[],
+    //     exclusion: string[]
+    // ): Promise<ISeller> {
+    //     let projection: { [key: string]: number } = {};
+    //     if (Array.isArray(inclusion) && inclusion.length > 0) {
+    //         inclusion.forEach((field) => {
+    //             projection[field] = 1;
+    //         });
+    //     } else {
+    //         projection = {
+    //             __v: 0,
+    //             createdAt: 0,
+    //             updatedAt: 0
+    //         };
+    //         if (Array.isArray(exclusion) && exclusion.length > 0) {
+    //             exclusion.forEach((field) => {
+    //                 projection[field] = 0;
+    //             });
+    //         }
+    //     }
+    //     const doc = await this.organizationModel.findOne({ _id: conditions.id }, projection)
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(this.organizationModel.modelName);
+    //     }
+    //     return doc.toObject();
+    // }
     /**
      * 販売者を保管する
      */
@@ -172,7 +174,10 @@ class MongoRepository {
             else {
                 // 上書き禁止属性を除外(2022-08-24~)
                 const _a = params.attributes, { id, branchCode, project, typeOf } = _a, updateFields = __rest(_a, ["id", "branchCode", "project", "typeOf"]);
-                const doc = yield this.organizationModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
+                const doc = yield this.organizationModel.findOneAndUpdate({
+                    _id: params.id,
+                    'project.id': { $eq: project.id }
+                }, updateFields, { upsert: false, new: true })
                     .exec();
                 if (doc === null) {
                     throw new factory.errors.NotFound(this.organizationModel.modelName);
@@ -182,12 +187,6 @@ class MongoRepository {
             return organization;
         });
     }
-    // public async count(params: factory.seller.ISearchConditions): Promise<number> {
-    //     const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-    //     return this.organizationModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-    //         .setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
-    //         .exec();
-    // }
     /**
      * 販売者検索
      */
@@ -270,7 +269,10 @@ class MongoRepository {
      */
     deleteById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.organizationModel.findOneAndRemove({ _id: params.id })
+            yield this.organizationModel.findOneAndRemove({
+                _id: params.id,
+                'project.id': { $eq: params.project.id }
+            })
                 .exec();
         });
     }

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

@@ -63,7 +63,7 @@ export declare class MongoRepository {
              */
             $nin?: factory.taskName[];
         };
-    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/orderProgramMembership").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/syncScreeningRooms").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
+    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/createEvent").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/orderProgramMembership").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/syncScreeningRooms").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
     retry(params: {
         intervalInMinutes: number;
     }): Promise<void>;

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.d.ts

@@ -1,4 +1,4 @@
-import { MongoRepository as EventRepo } from '../../../repo/event';
+import { IMinimizedIndividualEvent, MongoRepository as EventRepo } from '../../../repo/event';
 import { MongoRepository as OfferRepo } from '../../../repo/offer';
 import { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
 import { MongoRepository as PlaceRepo } from '../../../repo/place';
@@ -28,5 +28,5 @@ export declare function aggregateScreeningEvent(params: {
     id: string;
 }): IAggregateScreeningEventOperation<void>;
 export declare function aggregateByEvent(params: {
-    event: factory.event.screeningEvent.IEvent | factory.event.event.IEvent;
+    event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>;
 }): IAggregateScreeningEventOperation<void>;

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -80,6 +80,7 @@ function aggregateByEvent(params) {
             movieTheaterId = String((_a = params.event.offers) === null || _a === void 0 ? void 0 : _a.itemOffered.availableChannel.serviceLocation.containedInPlace.id);
         }
         const screeningRoom = yield repos.place.findScreeningRoomsByBranchCode({
+            project: { id: event.project.id },
             branchCode: { $eq: event.location.branchCode },
             containedInPlace: { id: { $eq: movieTheaterId } }
         });
@@ -174,7 +175,7 @@ function findOffers(params) {
             // 興行設定があれば興行のカタログを参照する(2022-08-31~)
             const eventOffers = params.event.offers;
             if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-                const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id });
+                const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
                 if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                     const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
                         offerCatalog: { id: eventService.hasOfferCatalog.id },
@@ -208,7 +209,7 @@ function calculateOfferCount(params) {
         try {
             const eventOffers = params.event.offers;
             if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-                const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id });
+                const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
                 if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                     const catalogs = yield repos.offerCatalog.search({
                         limit: 1,

package/lib/chevre/service/aggregation/event/aggregateUseActionsOnEvent.js

@@ -100,7 +100,7 @@ function findOffers(params) {
             // 興行設定があれば興行のカタログを参照する(2022-08-31~)
             const eventOffers = params.event.offers;
             if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-                const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id });
+                const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
                 if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                     const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
                         offerCatalog: { id: eventService.hasOfferCatalog.id },

package/lib/chevre/service/assetTransaction/pay/account/validation.js

@@ -28,7 +28,15 @@ function validateAccount(params) {
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        const seller = yield repos.seller.findById({ id: sellerId }, ['paymentAccepted'], []);
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: sellerId }
+        }, ['paymentAccepted'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         const paymentAccepted = (_d = seller.paymentAccepted) === null || _d === void 0 ? void 0 : _d.some((a) => a.paymentMethodType === paymentMethodType);
         if (paymentAccepted !== true) {
             throw new factory.errors.Argument('recipient', `payment not accepted`);

package/lib/chevre/service/assetTransaction/pay.js

@@ -210,7 +210,15 @@ function validateSeller(params) {
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        const seller = yield repos.seller.findById({ id: sellerId }, ['paymentAccepted'], []);
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: sellerId }
+        }, ['paymentAccepted'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         const paymentMethodType = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.typeOf;
         if (typeof paymentMethodType !== 'string') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');