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

package/lib/chevre/repo/reservation.js

@@ -21,7 +21,7 @@ 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;
+        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;
         // MongoDB検索条件
         const andConditions = [
             { typeOf: params.typeOf }
@@ -233,9 +233,54 @@ class MongoRepository {
         }
         switch (params.typeOf) {
             case factory.reservationType.BusReservation:
-                // no op
+                const reservationForTypeOfEq = (_h = params.reservationFor) === null || _h === void 0 ? void 0 : _h.typeOf;
+                if (typeof reservationForTypeOfEq === 'string') {
+                    andConditions.push({
+                        'reservationFor.typeOf': {
+                            $exists: true,
+                            $eq: reservationForTypeOfEq
+                        }
+                    });
+                }
+                const reservationForIdEq = (_k = (_j = params.reservationFor) === null || _j === void 0 ? void 0 : _j.id) === null || _k === void 0 ? void 0 : _k.$eq;
+                if (typeof reservationForIdEq === 'string') {
+                    andConditions.push({
+                        'reservationFor.id': {
+                            $exists: true,
+                            $eq: reservationForIdEq
+                        }
+                    });
+                }
+                const reservationForIdIn = (_m = (_l = params.reservationFor) === null || _l === void 0 ? void 0 : _l.id) === null || _m === void 0 ? void 0 : _m.$in;
+                if (Array.isArray(reservationForIdIn)) {
+                    andConditions.push({
+                        'reservationFor.id': {
+                            $exists: true,
+                            $in: reservationForIdIn
+                        }
+                    });
+                }
                 break;
             case factory.reservationType.EventReservation:
+                if (typeof ((_o = params.reservationFor) === null || _o === void 0 ? void 0 : _o.id) === 'string') {
+                    andConditions.push({
+                        'reservationFor.id': {
+                            $exists: true,
+                            $eq: params.reservationFor.id
+                        }
+                    });
+                }
+                else {
+                    const reservationForIdEq4eventReservation = (_q = (_p = params.reservationFor) === null || _p === void 0 ? void 0 : _p.id) === null || _q === void 0 ? void 0 : _q.$eq;
+                    if (typeof reservationForIdEq4eventReservation === 'string') {
+                        andConditions.push({
+                            'reservationFor.id': {
+                                $exists: true,
+                                $eq: reservationForIdEq4eventReservation
+                            }
+                        });
+                    }
+                }
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
                 if (params.reservationFor !== undefined) {
@@ -251,16 +296,6 @@ class MongoRepository {
                     }
                     // tslint:disable-next-line:no-single-line-block-comment
                     /* istanbul ignore else */
-                    if (params.reservationFor.id !== undefined) {
-                        andConditions.push({
-                            'reservationFor.id': {
-                                $exists: true,
-                                $eq: params.reservationFor.id
-                            }
-                        });
-                    }
-                    // tslint:disable-next-line:no-single-line-block-comment
-                    /* istanbul ignore else */
                     if (Array.isArray(params.reservationFor.ids)) {
                         andConditions.push({
                             'reservationFor.id': {
@@ -490,7 +525,7 @@ class MongoRepository {
                 }
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
-                const ticketedSeatSeatingTypeIn = (_j = (_h = params.reservedTicket.ticketedSeat) === null || _h === void 0 ? void 0 : _h.seatingType) === null || _j === void 0 ? void 0 : _j.$in;
+                const ticketedSeatSeatingTypeIn = (_s = (_r = params.reservedTicket.ticketedSeat) === null || _r === void 0 ? void 0 : _r.seatingType) === null || _s === void 0 ? void 0 : _s.$in;
                 if (Array.isArray(ticketedSeatSeatingTypeIn)) {
                     andConditions.push({
                         'reservedTicket.ticketedSeat.seatingType': {
@@ -501,7 +536,7 @@ class MongoRepository {
                 }
             }
         }
-        const brokerIdRegex = (_k = params.broker) === null || _k === void 0 ? void 0 : _k.id;
+        const brokerIdRegex = (_t = params.broker) === null || _t === void 0 ? void 0 : _t.id;
         if (typeof brokerIdRegex === 'string' && brokerIdRegex.length > 0) {
             andConditions.push({
                 'broker.id': {
@@ -510,7 +545,7 @@ class MongoRepository {
                 }
             });
         }
-        const brokerIdentifierAll = (_m = (_l = params.broker) === null || _l === void 0 ? void 0 : _l.identifier) === null || _m === void 0 ? void 0 : _m.$all;
+        const brokerIdentifierAll = (_v = (_u = params.broker) === null || _u === void 0 ? void 0 : _u.identifier) === null || _v === void 0 ? void 0 : _v.$all;
         if (Array.isArray(brokerIdentifierAll)) {
             andConditions.push({
                 'broker.identifier': {
@@ -519,7 +554,7 @@ class MongoRepository {
                 }
             });
         }
-        const brokerIdentifierIn = (_p = (_o = params.broker) === null || _o === void 0 ? void 0 : _o.identifier) === null || _p === void 0 ? void 0 : _p.$in;
+        const brokerIdentifierIn = (_x = (_w = params.broker) === null || _w === void 0 ? void 0 : _w.identifier) === null || _x === void 0 ? void 0 : _x.$in;
         if (Array.isArray(brokerIdentifierIn)) {
             andConditions.push({
                 'broker.identifier': {
@@ -528,7 +563,7 @@ class MongoRepository {
                 }
             });
         }
-        const brokerIdentifierNin = (_r = (_q = params.broker) === null || _q === void 0 ? void 0 : _q.identifier) === null || _r === void 0 ? void 0 : _r.$nin;
+        const brokerIdentifierNin = (_z = (_y = params.broker) === null || _y === void 0 ? void 0 : _y.identifier) === null || _z === void 0 ? void 0 : _z.$nin;
         if (Array.isArray(brokerIdentifierNin)) {
             andConditions.push({
                 'broker.identifier': {
@@ -536,7 +571,7 @@ class MongoRepository {
                 }
             });
         }
-        const brokerIdentifierElemMatch = (_t = (_s = params.broker) === null || _s === void 0 ? void 0 : _s.identifier) === null || _t === void 0 ? void 0 : _t.$elemMatch;
+        const brokerIdentifierElemMatch = (_1 = (_0 = params.broker) === null || _0 === void 0 ? void 0 : _0.identifier) === null || _1 === void 0 ? void 0 : _1.$elemMatch;
         if (brokerIdentifierElemMatch !== undefined && brokerIdentifierElemMatch !== null) {
             andConditions.push({
                 'broker.identifier': {
@@ -571,9 +606,9 @@ class MongoRepository {
                 }
             }
             else {
-                const emailRegex = (_u = params.underName.email) === null || _u === void 0 ? void 0 : _u.$regex;
+                const emailRegex = (_2 = params.underName.email) === null || _2 === void 0 ? void 0 : _2.$regex;
                 if (typeof emailRegex === 'string' && emailRegex.length > 0) {
-                    const emailOptions = (_v = params.underName.email) === null || _v === void 0 ? void 0 : _v.$options;
+                    const emailOptions = (_3 = params.underName.email) === null || _3 === void 0 ? void 0 : _3.$options;
                     andConditions.push({
                         'underName.email': Object.assign({ $exists: true, $regex: new RegExp(emailRegex) }, (typeof emailOptions === 'string') ? { $options: emailOptions } : undefined)
                     });
@@ -592,9 +627,9 @@ class MongoRepository {
                 }
             }
             else {
-                const underNameNameRegex = (_w = params.underName.name) === null || _w === void 0 ? void 0 : _w.$regex;
+                const underNameNameRegex = (_4 = params.underName.name) === null || _4 === void 0 ? void 0 : _4.$regex;
                 if (typeof underNameNameRegex === 'string' && underNameNameRegex.length > 0) {
-                    const underNameNameOptions = (_x = params.underName.name) === null || _x === void 0 ? void 0 : _x.$options;
+                    const underNameNameOptions = (_5 = params.underName.name) === null || _5 === void 0 ? void 0 : _5.$options;
                     andConditions.push({
                         'underName.name': Object.assign({ $exists: true, $regex: new RegExp(underNameNameRegex) }, (typeof underNameNameOptions === 'string') ? { $options: underNameNameOptions } : undefined)
                     });
@@ -623,9 +658,9 @@ class MongoRepository {
                 }
             }
             else {
-                const givenNameRegex = (_y = params.underName.givenName) === null || _y === void 0 ? void 0 : _y.$regex;
+                const givenNameRegex = (_6 = params.underName.givenName) === null || _6 === void 0 ? void 0 : _6.$regex;
                 if (typeof givenNameRegex === 'string' && givenNameRegex.length > 0) {
-                    const givenNameOptions = (_z = params.underName.givenName) === null || _z === void 0 ? void 0 : _z.$options;
+                    const givenNameOptions = (_7 = params.underName.givenName) === null || _7 === void 0 ? void 0 : _7.$options;
                     andConditions.push({
                         'underName.givenName': Object.assign({ $exists: true, $regex: new RegExp(givenNameRegex) }, (typeof givenNameOptions === 'string') ? { $options: givenNameOptions } : undefined)
                     });
@@ -644,9 +679,9 @@ class MongoRepository {
                 }
             }
             else {
-                const familyNameRegex = (_0 = params.underName.familyName) === null || _0 === void 0 ? void 0 : _0.$regex;
+                const familyNameRegex = (_8 = params.underName.familyName) === null || _8 === void 0 ? void 0 : _8.$regex;
                 if (typeof familyNameRegex === 'string' && familyNameRegex.length > 0) {
-                    const familyNameOptions = (_1 = params.underName.familyName) === null || _1 === void 0 ? void 0 : _1.$options;
+                    const familyNameOptions = (_9 = params.underName.familyName) === null || _9 === void 0 ? void 0 : _9.$options;
                     andConditions.push({
                         'underName.familyName': Object.assign({ $exists: true, $regex: new RegExp(familyNameRegex) }, (typeof familyNameOptions === 'string') ? { $options: familyNameOptions } : undefined)
                     });
@@ -747,7 +782,7 @@ class MongoRepository {
                 });
             }
         }
-        const programMembershipUsedIdentifierEq = (_3 = (_2 = params.programMembershipUsed) === null || _2 === void 0 ? void 0 : _2.identifier) === null || _3 === void 0 ? void 0 : _3.$eq;
+        const programMembershipUsedIdentifierEq = (_11 = (_10 = params.programMembershipUsed) === null || _10 === void 0 ? void 0 : _10.identifier) === null || _11 === void 0 ? void 0 : _11.$eq;
         if (typeof programMembershipUsedIdentifierEq === 'string') {
             andConditions.push({
                 'programMembershipUsed.identifier': {
@@ -756,7 +791,7 @@ class MongoRepository {
                 }
             });
         }
-        const programMembershipUsedIssuedThroughServiceTypeCodeValueEq = (_7 = (_6 = (_5 = (_4 = params.programMembershipUsed) === null || _4 === void 0 ? void 0 : _4.issuedThrough) === null || _5 === void 0 ? void 0 : _5.serviceType) === null || _6 === void 0 ? void 0 : _6.codeValue) === null || _7 === void 0 ? void 0 : _7.$eq;
+        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;
         if (typeof programMembershipUsedIssuedThroughServiceTypeCodeValueEq === 'string') {
             andConditions.push({
                 'programMembershipUsed.issuedThrough.serviceType.codeValue': {
@@ -765,7 +800,7 @@ class MongoRepository {
                 }
             });
         }
-        const appliesToMovieTicketIdentifierEq = (_11 = (_10 = (_9 = (_8 = params.price) === null || _8 === void 0 ? void 0 : _8.priceComponent) === null || _9 === void 0 ? void 0 : _9.appliesToMovieTicket) === null || _10 === void 0 ? void 0 : _10.identifier) === null || _11 === void 0 ? void 0 : _11.$eq;
+        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;
         if (typeof appliesToMovieTicketIdentifierEq === 'string') {
             andConditions.push({
                 'price.priceComponent.appliesToMovieTicket.identifier': {
@@ -880,49 +915,54 @@ class MongoRepository {
     /**
      * 予約確定
      */
-    confirm(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = {
-                _id: { $eq: String(params.id) },
-                reservationStatus: { $eq: params.previousReservationStatus }
-            };
-            // 更新属性をwhitelist化(2022-06-13~)
-            const update = Object.assign(Object.assign({ 
-                // ...params,
-                reservationStatus: factory.reservationStatusType.ReservationConfirmed, modifiedTime: new Date() }, (params.underName !== undefined) ? { underName: params.underName } : undefined), (params.reservedTicket !== undefined) ? { reservedTicket: params.reservedTicket } : undefined);
-            // 以下値は更新しない(他処理で更新される可能性あり)
-            // if (typeof update.checkedIn === 'boolean') {
-            //     delete update.checkedIn;
-            // }
-            // if (typeof update.attended === 'boolean') {
-            //     delete update.attended;
-            // }
-            const doc = yield this.reservationModel.findOneAndUpdate(conditions, update, { new: true })
-                .select({ __v: 0, createdAt: 0, updatedAt: 0 })
-                .exec();
-            // NotFoundであれば状態確認
-            if (doc === null) {
-                const reservation = yield this.findById({ id: String(params.id) });
-                if (reservation.reservationStatus === factory.reservationStatusType.ReservationConfirmed) {
-                    // すでに確定済の場合
-                    return reservation;
-                }
-                else {
-                    throw new factory.errors.Argument('id', `Reservation ${reservation.id} already changed -> ${reservation.reservationStatus}`);
-                }
-            }
-            return doc.toObject();
-        });
-    }
+    // public async confirm<T extends factory.reservationType>(params: {
+    //     id: string;
+    //     previousReservationStatus: factory.reservationStatusType;
+    //     underName?: factory.reservation.IUnderName<T>;
+    // }): Promise<factory.reservation.IReservation<T>> {
+    //     const conditions = {
+    //         _id: { $eq: String(params.id) },
+    //         reservationStatus: { $eq: params.previousReservationStatus }
+    //     };
+    //     // 更新属性をwhitelist化(2022-06-13~)
+    //     const update = {
+    //         // previousReservationStatusを保管(2023-01-19~)
+    //         previousReservationStatus: params.previousReservationStatus,
+    //         reservationStatus: factory.reservationStatusType.ReservationConfirmed,
+    //         modifiedTime: new Date(),
+    //         ...(params.underName !== undefined) ? { underName: params.underName } : undefined
+    //     };
+    //     const doc = await this.reservationModel.findOneAndUpdate(
+    //         conditions,
+    //         update,
+    //         { new: true }
+    //     )
+    //         .select({ __v: 0, createdAt: 0, updatedAt: 0 })
+    //         .exec();
+    //     // NotFoundであれば状態確認
+    //     if (doc === null) {
+    //         const reservation = await this.findById<T>({ id: String(params.id) });
+    //         if (reservation.reservationStatus === factory.reservationStatusType.ReservationConfirmed) {
+    //             // すでに確定済の場合
+    //             return reservation;
+    //         } else {
+    //             throw new factory.errors.Argument(
+    //                 'id',
+    //                 `Reservation ${reservation.id} already changed -> ${reservation.reservationStatus}`
+    //             );
+    //         }
+    //     }
+    //     return doc.toObject();
+    // }
     confirmByReservationNumber(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = {
                 reservationNumber: { $eq: String(params.reservationNumber) },
                 reservationStatus: { $eq: params.previousReservationStatus }
             };
-            const update = Object.assign({ reservationStatus: factory.reservationStatusType.ReservationConfirmed, modifiedTime: new Date() }, (params.underName !== undefined) ? { underName: params.underName } : undefined
-            // ...(params.reservedTicket !== undefined) ? { reservedTicket: params.reservedTicket } : undefined
-            );
+            const update = Object.assign({ 
+                // previousReservationStatusを保管(2023-01-19~)
+                previousReservationStatus: params.previousReservationStatus, reservationStatus: factory.reservationStatusType.ReservationConfirmed, modifiedTime: new Date() }, (params.underName !== undefined) ? { underName: params.underName } : undefined);
             yield this.reservationModel.updateMany(conditions, update)
                 .exec();
         });

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

@@ -2,6 +2,23 @@ import { Connection } from 'mongoose';
 import * as factory from '../factory';
 import { modelName } from './mongoose/model/transaction';
 export { modelName };
+interface IAggregationByStatus {
+    transactionCount: number;
+    avgDuration: number;
+    maxDuration: number;
+    minDuration: number;
+    percentilesDuration: {
+        name: string;
+        value: number;
+    }[];
+}
+interface IStatus {
+    status: factory.transactionStatusType;
+    aggregation: IAggregationByStatus;
+}
+export interface IAggregatePlaceOrder {
+    statuses: IStatus[];
+}
 /**
  * 取引リポジトリ
  */
@@ -129,4 +146,16 @@ export declare class MongoRepository {
     findByIdAndDelete(params: {
         id: string;
     }): Promise<void>;
+    aggregatePlaceOrder(params: {
+        project?: {
+            id?: {
+                $ne?: string;
+            };
+        };
+        startFrom: Date;
+        startThrough: Date;
+        typeOf: factory.transactionType;
+        clientId?: string;
+    }): Promise<IAggregatePlaceOrder>;
+    private agggregateByStatus;
 }

package/lib/chevre/repo/transaction.js

@@ -600,5 +600,138 @@ class MongoRepository {
                 .exec();
         });
     }
+    aggregatePlaceOrder(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const statuses = yield Promise.all([
+                factory.transactionStatusType.Canceled,
+                factory.transactionStatusType.Expired,
+                factory.transactionStatusType.Confirmed
+            ].map((transactionStatus) => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
+                const matchConditions = Object.assign(Object.assign({ startDate: {
+                        $gte: params.startFrom,
+                        $lte: params.startThrough
+                    }, typeOf: { $eq: params.typeOf }, status: { $eq: transactionStatus } }, (typeof ((_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$ne) === 'string')
+                    ? { 'project.id': { $ne: params.project.id.$ne } }
+                    : undefined), (typeof params.clientId === 'string')
+                    // customerIdentifierAll.push();
+                    ? {
+                        'agent.identifier': {
+                            $exists: true,
+                            $all: [{ name: 'clientId', value: params.clientId }]
+                        }
+                    }
+                    : undefined);
+                return this.agggregateByStatus({ matchConditions, status: transactionStatus });
+            })));
+            return { statuses };
+        });
+    }
+    // tslint:disable-next-line:max-func-body-length
+    agggregateByStatus(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const matchConditions = params.matchConditions;
+            const transactionStatus = params.status;
+            const aggregations = yield this.transactionModel.aggregate([
+                {
+                    $match: matchConditions
+                },
+                {
+                    $project: {
+                        duration: { $subtract: ['$endDate', '$startDate'] },
+                        status: '$status',
+                        startDate: '$startDate',
+                        endDate: '$endDate',
+                        typeOf: '$typeOf'
+                    }
+                },
+                {
+                    $group: {
+                        _id: '$typeOf',
+                        transactionCount: { $sum: 1 },
+                        maxDuration: { $max: '$duration' },
+                        minDuration: { $min: '$duration' },
+                        avgDuration: { $avg: '$duration' }
+                    }
+                },
+                {
+                    $project: {
+                        _id: 0,
+                        transactionCount: '$transactionCount',
+                        avgDuration: '$avgDuration',
+                        maxDuration: '$maxDuration',
+                        minDuration: '$minDuration'
+                    }
+                }
+            ])
+                .exec();
+            // tslint:disable-next-line:no-magic-numbers
+            const percents = [50, 95, 99];
+            if (aggregations.length === 0) {
+                return {
+                    status: transactionStatus,
+                    aggregation: {
+                        transactionCount: 0,
+                        avgDuration: 0,
+                        maxDuration: 0,
+                        minDuration: 0,
+                        percentilesDuration: percents.map((percent) => {
+                            return {
+                                name: String(percent),
+                                value: 0
+                            };
+                        })
+                    }
+                };
+            }
+            const ranks4percentile = percents.map((percentile) => {
+                return {
+                    percentile,
+                    // tslint:disable-next-line:no-magic-numbers
+                    rank: Math.floor(aggregations[0].transactionCount * percentile / 100)
+                };
+            });
+            const aggregations2 = yield this.transactionModel.aggregate([
+                {
+                    $match: matchConditions
+                },
+                {
+                    $project: {
+                        duration: { $subtract: ['$endDate', '$startDate'] },
+                        status: '$status',
+                        startDate: '$startDate',
+                        endDate: '$endDate',
+                        typeOf: '$typeOf'
+                    }
+                },
+                { $sort: { duration: 1 } },
+                {
+                    $group: {
+                        _id: '$typeOf',
+                        durations: { $push: '$duration' }
+                    }
+                },
+                {
+                    $project: {
+                        _id: 0,
+                        avgSmallDuration: '$avgSmallDuration',
+                        avgMediumDuration: '$avgMediumDuration',
+                        avgLargeDuration: '$avgLargeDuration',
+                        percentilesDuration: ranks4percentile.map((rank) => {
+                            return {
+                                name: String(rank.percentile),
+                                value: { $arrayElemAt: ['$durations', rank.rank] }
+                            };
+                        })
+                    }
+                }
+            ])
+                .exec();
+            return {
+                status: transactionStatus,
+                aggregation: Object.assign(Object.assign({}, aggregations[0]), aggregations2[0])
+            };
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

package/lib/chevre/repo/trip.js

@@ -32,18 +32,46 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(conditions) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f;
         const andConditions = [{ typeOf: { $eq: conditions.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 idIn = (_c = conditions.id) === null || _c === void 0 ? void 0 : _c.$in;
         if (Array.isArray(idIn)) {
+            andConditions.push({ _id: { $in: idIn } });
+        }
+        const identifierEq = (_d = conditions.identifier) === null || _d === void 0 ? void 0 : _d.$eq;
+        if (typeof identifierEq === 'string') {
+            andConditions.push({ identifier: { $eq: identifierEq } });
+        }
+        const nameRegex = (_e = conditions.name) === null || _e === void 0 ? void 0 : _e.$regex;
+        if (typeof nameRegex === 'string' && nameRegex.length > 0) {
+            andConditions.push({
+                $or: [
+                    {
+                        'name.ja': {
+                            $exists: true,
+                            $regex: new RegExp(nameRegex)
+                        }
+                    },
+                    {
+                        'name.en': {
+                            $exists: true,
+                            $regex: new RegExp(nameRegex)
+                        }
+                    }
+                ]
+            });
+        }
+        const additionalPropertyElemMatch = (_f = conditions.additionalProperty) === null || _f === void 0 ? void 0 : _f.$elemMatch;
+        if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
-                _id: { $in: idIn }
+                additionalProperty: {
+                    $exists: true,
+                    $elemMatch: additionalPropertyElemMatch
+                }
             });
         }
         return andConditions;
@@ -119,28 +147,6 @@ class MongoRepository {
                         if (p.attributes.typeOf === factory.tripType.BusTrip) {
                             // 上書き禁止属性を除外
                             const _a = p.attributes, { identifier, project, typeOf } = _a, updateFields = __rest(_a, ["identifier", "project", "typeOf"]);
-                            bulkWriteOps.push({
-                                updateOne: {
-                                    filter: {
-                                        _id: p.id,
-                                        typeOf: p.attributes.typeOf
-                                    },
-                                    // upsertの場合、createがありうるので属性を除外しない
-                                    update: Object.assign({ $setOnInsert: {
-                                            typeOf: p.attributes.typeOf,
-                                            project: p.attributes.project,
-                                            identifier: p.attributes.identifier
-                                            // ...(typeof p.attributes.remainingAttendeeCapacity === 'number')
-                                            //     ? { remainingAttendeeCapacity: p.attributes.remainingAttendeeCapacity }
-                                            //     : undefined
-                                        }, $set: updateFields }, (p.$unset !== undefined) ? { $unset: p.$unset } : undefined),
-                                    upsert
-                                }
-                            });
-                        }
-                        else if (p.attributes.typeOf === factory.tripType.BusTripSeries) {
-                            // 上書き禁止属性を除外
-                            const _b = p.attributes, { identifier, project, typeOf } = _b, updateFields = __rest(_b, ["identifier", "project", "typeOf"]);
                             bulkWriteOps.push({
                                 updateOne: {
                                     filter: {

package/lib/chevre/repository.d.ts

@@ -7,6 +7,7 @@ import { MongoRepository as AccountTitleRepo } from './repo/accountTitle';
 import { MongoRepository as AccountTransactionRepo } from './repo/accountTransaction';
 import { MongoRepository as ActionRepo } from './repo/action';
 import { MongoRepository as AdditionalPropertyRepo } from './repo/additionalProperty';
+import { MongoRepository as AggregationRepo } from './repo/aggregation';
 import { MongoRepository as AssetTransactionRepo } from './repo/assetTransaction';
 import { MongoRepository as CategoryCodeRepo } from './repo/categoryCode';
 import { MongoRepository as CodeRepo } from './repo/code';
@@ -69,6 +70,8 @@ export declare class Action extends ActionRepo {
  */
 export declare class AdditionalProperty extends AdditionalPropertyRepo {
 }
+export declare class Aggregation extends AggregationRepo {
+}
 export declare namespace action {
     class RegisterServiceInProgress extends RegisterServiceActionInProgress {
     }

package/lib/chevre/repository.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rateLimit = exports.itemAvailability = exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.Product = exports.PriceSpecification = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.OfferCatalog = exports.Offer = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = void 0;
+exports.rateLimit = exports.itemAvailability = exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.Product = exports.PriceSpecification = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.OfferCatalog = exports.Offer = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.Aggregation = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = void 0;
 // tslint:disable:max-classes-per-file completed-docs
 /**
  * リポジトリ
@@ -11,6 +11,7 @@ const accountTitle_1 = require("./repo/accountTitle");
 const accountTransaction_1 = require("./repo/accountTransaction");
 const action_1 = require("./repo/action");
 const additionalProperty_1 = require("./repo/additionalProperty");
+const aggregation_1 = require("./repo/aggregation");
 const assetTransaction_1 = require("./repo/assetTransaction");
 const categoryCode_1 = require("./repo/categoryCode");
 const code_1 = require("./repo/code");
@@ -80,6 +81,9 @@ exports.Action = Action;
 class AdditionalProperty extends additionalProperty_1.MongoRepository {
 }
 exports.AdditionalProperty = AdditionalProperty;
+class Aggregation extends aggregation_1.MongoRepository {
+}
+exports.Aggregation = Aggregation;
 var action;
 (function (action) {
     class RegisterServiceInProgress extends registerServiceInProgress_1.RedisRepository {

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

@@ -26,5 +26,5 @@ export declare function aggregateScreeningEvent(params: {
     id: string;
 }): IAggregateScreeningEventOperation<void>;
 export declare function aggregateByEvent(params: {
-    event: factory.event.screeningEvent.IEvent;
+    event: factory.event.screeningEvent.IEvent | factory.event.event.IEvent;
 }): IAggregateScreeningEventOperation<void>;