@chevre/domain 20.2.0-alpha.8 → 20.2.0

package/lib/chevre/repo/transaction.js

@@ -274,8 +274,8 @@ class MongoRepository {
     findById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.transactionModel.findOne({
-                _id: params.id,
-                typeOf: params.typeOf
+                _id: { $eq: params.id },
+                typeOf: { $eq: params.typeOf }
             })
                 .exec();
             if (doc === null) {
@@ -290,9 +290,9 @@ class MongoRepository {
     findInProgressById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.transactionModel.findOne({
-                _id: params.id,
-                typeOf: params.typeOf,
-                status: factory.transactionStatusType.InProgress
+                _id: { $eq: params.id },
+                typeOf: { $eq: params.typeOf },
+                status: { $eq: factory.transactionStatusType.InProgress }
             })
                 .exec();
             if (doc === null) {
@@ -301,6 +301,42 @@ class MongoRepository {
             return doc.toObject();
         });
     }
+    /**
+     * 取引の注文番号を検索する
+     */
+    findInProgressOrderNumberById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.transactionModel.findOne({
+                _id: { $eq: params.id },
+                typeOf: { $eq: factory.transactionType.PlaceOrder },
+                status: { $eq: factory.transactionStatusType.InProgress }
+            }, { 'object.orderNumber': 1 })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.transactionModel.modelName);
+            }
+            const transaction = doc.toObject();
+            return transaction.object.orderNumber;
+        });
+    }
+    /**
+     * 取引の確認番号を検索する
+     */
+    findInProgressConfirmationNumberById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.transactionModel.findOne({
+                _id: { $eq: params.id },
+                typeOf: { $eq: factory.transactionType.PlaceOrder },
+                status: { $eq: factory.transactionStatusType.InProgress }
+            }, { 'object.confirmationNumber': 1 })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.transactionModel.modelName);
+            }
+            const transaction = doc.toObject();
+            return transaction.object.confirmationNumber;
+        });
+    }
     /**
      * 取引進行者プロフィールを更新
      */
@@ -313,6 +349,8 @@ class MongoRepository {
                 status: factory.transactionStatusType.InProgress
             }, {
                 $set: Object.assign(Object.assign({ 'agent.id': params.agent.id }, (typeof params.agent.name === 'string') ? { 'agent.name': params.agent.name } : undefined), (typeof ((_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.customer) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { 'object.customer': params.object.customer } : undefined)
+            }, {
+                projection: { _id: 1 }
             })
                 .exec();
             if (doc === null) {
@@ -333,6 +371,8 @@ class MongoRepository {
                 $set: {
                     expires: params.expires
                 }
+            }, {
+                projection: { _id: 1 }
             })
                 .exec();
             if (doc === null) {
@@ -353,6 +393,8 @@ class MongoRepository {
                 status: factory.transactionStatusType.InProgress
             }, {
                 $set: Object.assign({}, (typeof ((_a = params.object) === null || _a === void 0 ? void 0 : _a.name) === 'string') ? { 'object.name': params.object.name } : undefined)
+            }, {
+                projection: { _id: 1 }
             })
                 .exec();
             if (doc === null) {
@@ -375,7 +417,10 @@ class MongoRepository {
                 'object.authorizeActions': params.authorizeActions,
                 result: params.result,
                 potentialActions: params.potentialActions // resultを更新
-            }, { new: true })
+            }, {
+                new: true,
+                projection: { _id: 1 }
+            })
                 .exec();
             // NotFoundであれば取引状態確認
             if (doc === null) {
@@ -384,7 +429,7 @@ class MongoRepository {
                 /* istanbul ignore next */
                 if (transaction.status === factory.transactionStatusType.Confirmed) {
                     // すでに確定済の場合
-                    return transaction;
+                    return;
                     // tslint:disable-next-line:no-single-line-block-comment
                     /* istanbul ignore next */
                 }
@@ -402,7 +447,7 @@ class MongoRepository {
                     throw new factory.errors.NotFound(this.transactionModel.modelName);
                 }
             }
-            return doc.toObject();
+            // return doc.toObject();
         });
     }
     /**
@@ -485,7 +530,10 @@ class MongoRepository {
             }, {
                 status: factory.transactionStatusType.Canceled,
                 endDate: endDate
-            }, { new: true })
+            }, {
+                new: true,
+                projection: { _id: 1 }
+            })
                 .exec();
             // NotFoundであれば取引状態確認
             if (doc === null) {
@@ -494,7 +542,7 @@ class MongoRepository {
                 /* istanbul ignore next */
                 if (transaction.status === factory.transactionStatusType.Canceled) {
                     // すでに中止済の場合
-                    return transaction;
+                    return;
                 }
                 else if (transaction.status === factory.transactionStatusType.Expired) {
                     throw new factory.errors.Argument('Transaction id', 'Transaction already expired');
@@ -506,7 +554,7 @@ class MongoRepository {
                     throw new factory.errors.NotFound(this.transactionModel.modelName);
                 }
             }
-            return doc.toObject();
+            // return doc.toObject();
         });
     }
     count(params) {
@@ -542,43 +590,26 @@ class MongoRepository {
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
     }
-    // public stream<T extends factory.transactionType>(
-    //     params: factory.transaction.ISearchConditions<T>
-    // ): QueryCursor<Document> {
-    //     const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-    //     const query = this.transactionModel.find((conditions.length > 0) ? { $and: conditions } : {})
-    //         .select({ __v: 0, createdAt: 0, updatedAt: 0 });
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     if (params.limit !== undefined && params.page !== undefined) {
-    //         query.limit(params.limit)
-    //             .skip(params.limit * (params.page - 1));
-    //     }
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     if (params.sort !== undefined) {
-    //         query.sort(params.sort);
-    //     }
-    //     return query.cursor();
-    // }
     /**
      * 特定の取引を更新する(汎用)
      */
     findByIdAndUpdate(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.transactionModel.findOneAndUpdate({ _id: params.id }, params.update, { new: true })
+            yield this.transactionModel.findOneAndUpdate({ _id: params.id }, params.update, {
+                // new: true,
+                projection: { _id: 1 }
+            })
                 .exec()
                 .then((doc) => {
                 if (doc === null) {
                     throw new factory.errors.ArgumentNull(this.transactionModel.modelName);
                 }
-                return doc.toObject();
             });
         });
     }
     saveOrderNumberIfNotExist(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.transactionModel.findOneAndUpdate({
+            yield this.transactionModel.updateOne({
                 _id: params.id,
                 'object.orderNumber': { $exists: false }
             }, { 'object.orderNumber': params.orderNumber })
@@ -587,7 +618,7 @@ class MongoRepository {
     }
     saveConfirmationNumberIfNotExist(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.transactionModel.findOneAndUpdate({
+            yield this.transactionModel.updateOne({
                 _id: params.id,
                 'object.confirmationNumber': { $exists: false }
             }, { 'object.confirmationNumber': params.confirmationNumber })
@@ -600,5 +631,168 @@ class MongoRepository {
                 .exec();
         });
     }
+    aggregatePlaceOrder(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const statuses = yield Promise.all([
+                factory.transactionStatusType.Confirmed,
+                factory.transactionStatusType.Canceled,
+                factory.transactionStatusType.Expired
+            ].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
+                            };
+                        }),
+                        acceptedOfferCount: 0,
+                        avgAcceptedOfferCount: 0,
+                        totalPrice: 0,
+                        maxPrice: 0,
+                        minPrice: 0,
+                        avgPrice: 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',
+                        // result: '$result',
+                        acceptedOffers: {
+                            $cond: {
+                                if: { $isArray: '$result.order.acceptedOffers' },
+                                then: '$result.order.acceptedOffers',
+                                else: []
+                            }
+                        },
+                        price: {
+                            $cond: {
+                                if: { $isNumber: '$result.order.price' },
+                                then: '$result.order.price',
+                                else: 0
+                            }
+                        }
+                    }
+                },
+                { $sort: { duration: 1 } },
+                {
+                    $group: {
+                        _id: '$typeOf',
+                        durations: { $push: '$duration' },
+                        acceptedOfferCount: { $sum: { $size: '$acceptedOffers' } },
+                        avgAcceptedOfferCount: { $avg: { $size: '$acceptedOffers' } },
+                        totalPrice: { $sum: '$price' },
+                        maxPrice: { $max: '$price' },
+                        minPrice: { $min: '$price' },
+                        avgPrice: { $avg: '$price' }
+                    }
+                },
+                {
+                    $project: {
+                        _id: 0,
+                        percentilesDuration: ranks4percentile.map((rank) => {
+                            return {
+                                name: String(rank.percentile),
+                                value: { $arrayElemAt: ['$durations', rank.rank] }
+                            };
+                        }),
+                        acceptedOfferCount: '$acceptedOfferCount',
+                        avgAcceptedOfferCount: '$avgAcceptedOfferCount',
+                        totalPrice: '$totalPrice',
+                        maxPrice: '$maxPrice',
+                        minPrice: '$minPrice',
+                        avgPrice: '$avgPrice'
+                    }
+                }
+            ])
+                .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 {