@chevre/domain 20.2.0-alpha.8 → 20.2.0

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': {
@@ -865,11 +900,25 @@ class MongoRepository {
     // }
     findById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.reservationModel.findById(params.id, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0
-            })
+            let projection = {};
+            if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
+                params.inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(params.exclusion) && params.exclusion.length > 0) {
+                    params.exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
+            const doc = yield this.reservationModel.findById(params.id, projection)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.reservationModel.modelName);
@@ -880,49 +929,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();
         });
@@ -973,7 +1027,7 @@ class MongoRepository {
     /**
      * 発券する
      */
-    checkIn(params) {
+    checkInIfNot(params) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = [];
@@ -1001,6 +1055,8 @@ class MongoRepository {
             }
             // 無条件で実行されないように
             if (conditions.length > 0) {
+                // false->trueのみ(2023-01-31~)
+                conditions.push({ checkedIn: { $eq: false } });
                 yield this.reservationModel.updateMany({ $and: conditions }, {
                     checkedIn: true,
                     modifiedTime: params.now
@@ -1009,19 +1065,68 @@ class MongoRepository {
             }
         });
     }
+    /**
+     * 発券する
+     */
+    // public async checkIn(params: {
+    //     id?: string | { $in?: string[] };
+    //     reservationNumber?: string | { $in?: string[] };
+    //     /**
+    //      * modifiedTime
+    //      */
+    //     now: Date;
+    // }): Promise<void> {
+    //     const conditions: any[] = [];
+    //     if (typeof params.id === 'string') {
+    //         if (params.id.length > 0) {
+    //             conditions.push({ _id: { $eq: params.id } });
+    //         }
+    //     } else {
+    //         const idIn = params.id?.$in;
+    //         if (Array.isArray(idIn)) {
+    //             conditions.push({ _id: { $in: idIn } });
+    //         }
+    //     }
+    //     if (typeof params.reservationNumber === 'string') {
+    //         if (params.reservationNumber.length > 0) {
+    //             conditions.push({ reservationNumber: { $eq: params.reservationNumber } });
+    //         }
+    //     } else {
+    //         const reservationNumberIn = params.reservationNumber?.$in;
+    //         if (Array.isArray(reservationNumberIn)) {
+    //             conditions.push({ reservationNumber: { $in: reservationNumberIn } });
+    //         }
+    //     }
+    //     // 無条件で実行されないように
+    //     if (conditions.length > 0) {
+    //         await this.reservationModel.updateMany(
+    //             { $and: conditions },
+    //             {
+    //                 checkedIn: true,
+    //                 modifiedTime: params.now
+    //             }
+    //         )
+    //             .exec();
+    //     }
+    // }
     /**
      * 入場する
      */
-    attend(params) {
+    attendIfNotAttended(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.reservationModel.findByIdAndUpdate(String(params.id), {
+            const doc = yield this.reservationModel.findOneAndUpdate({
+                _id: { $eq: params.id },
+                attended: { $eq: false }
+            }, {
                 attended: true,
-                modifiedTime: params.now
+                modifiedTime: params.now,
+                'reservedTicket.dateUsed': params.now
             }, { new: true })
                 .select({ __v: 0, createdAt: 0, updatedAt: 0 })
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.reservationModel.modelName);
+                return this.findById({ id: params.id });
+                // throw new factory.errors.NotFound(this.reservationModel.modelName);
             }
             return doc.toObject();
         });

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

@@ -1,13 +1,29 @@
 import { Connection, Model } from 'mongoose';
 import * as factory from '../factory';
+interface IAggregationByStatus {
+    taskCount: number;
+    avgLatency: number;
+    maxLatency: number;
+    minLatency: number;
+    percentilesLatency: {
+        name: string;
+        value: number;
+    }[];
+}
+interface IStatus {
+    status: factory.taskStatus;
+    aggregation: IAggregationByStatus;
+}
+export interface IAggregateTask {
+    statuses: IStatus[];
+}
 /**
  * タスクリポジトリ
  */
 export declare class MongoRepository {
     readonly taskModel: typeof Model;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS<T extends factory.taskName>(params: factory.task.ISearchConditions<T>): any[];
-    save(taskAttributes: factory.task.IAttributes<factory.taskName>): Promise<factory.task.ITask<factory.taskName>>;
+    static CREATE_MONGO_CONDITIONS(params: factory.task.ISearchConditions): any[];
     saveMany(taskAttributes: factory.task.IAttributes<factory.taskName>[]): Promise<any[]>;
     executeOneByName<T extends factory.taskName>(params: {
         name: T;
@@ -29,14 +45,25 @@ export declare class MongoRepository {
         name: T;
         id: string;
     }): Promise<factory.task.ITask<T>>;
-    count<T extends factory.taskName>(params: factory.task.ISearchConditions<T>): Promise<number>;
+    count(params: factory.task.ISearchConditions): Promise<number>;
     /**
      * 検索する
      */
-    search<T extends factory.taskName>(params: factory.task.ISearchConditions<T>, projection?: any): Promise<factory.task.ITask<T>[]>;
+    search(params: factory.task.ISearchConditions, projection?: any): Promise<factory.task.ITask<factory.taskName>[]>;
     deleteByProject(params: {
         project: {
             id: string;
         };
     }): Promise<void>;
+    aggregateTask(params: {
+        project?: {
+            id?: {
+                $ne?: string;
+            };
+        };
+        runsFrom: Date;
+        runsThrough: Date;
+    }): Promise<IAggregateTask>;
+    private agggregateByStatus;
 }
+export {};