@chevre/domain 20.2.0-alpha.23 → 20.2.0-alpha.25

package/example/src/chevre/aggregation/aggregateSystem.ts

@@ -21,24 +21,22 @@ async function main() {
         typeOf: { $in: ['AggregateOrder', 'AggregateReservation'] }
     })
         .exec();
-    await chevre.service.aggregation.system.aggregateTask({
+    await chevre.service.aggregation.system.aggregateReserveTransaction({
         aggregationDays: AGGREGATE_DAYS,
         excludedProjectId: EXCLUDED_PROJECT_ID
     })({
         agregation: aggregationRepo,
-        task: taskRepo
+        assetTransaction: assetTransactionRepo
     });
 
-    await aggregationRepo.aggregationModel.deleteMany({
-        typeOf: { $in: ['AggregateOrder', 'AggregateReservation'] }
-    })
-        .exec();
-    await chevre.service.aggregation.system.aggregateReserveTransaction({
+    return;
+
+    await chevre.service.aggregation.system.aggregateTask({
         aggregationDays: AGGREGATE_DAYS,
         excludedProjectId: EXCLUDED_PROJECT_ID
     })({
         agregation: aggregationRepo,
-        assetTransaction: assetTransactionRepo
+        task: taskRepo
     });
 
     await chevre.service.aggregation.system.aggregatePlaceOrder({

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

@@ -11,6 +11,10 @@ interface IAggregationByStatus {
         name: string;
         value: number;
     }[];
+    reservationCount: number;
+    avgGraceTime: number;
+    maxGraceTime: number;
+    minGraceTime: number;
 }
 interface IStatus {
     status: factory.transactionStatusType;

package/lib/chevre/repo/assetTransaction.js

@@ -567,10 +567,18 @@ class MongoRepository {
                 {
                     $project: {
                         duration: { $subtract: ['$endDate', '$startDate'] },
+                        graceTime: { $subtract: ['$object.reservationFor.startDate', '$startDate'] },
                         status: '$status',
                         startDate: '$startDate',
                         endDate: '$endDate',
-                        typeOf: '$typeOf'
+                        typeOf: '$typeOf',
+                        reservationCount: {
+                            $cond: {
+                                if: { $isArray: '$object.subReservation' },
+                                then: { $size: '$object.subReservation' },
+                                else: 0
+                            }
+                        }
                     }
                 },
                 {
@@ -579,7 +587,11 @@ class MongoRepository {
                         transactionCount: { $sum: 1 },
                         maxDuration: { $max: '$duration' },
                         minDuration: { $min: '$duration' },
-                        avgDuration: { $avg: '$duration' }
+                        avgDuration: { $avg: '$duration' },
+                        reservationCount: { $sum: '$reservationCount' },
+                        maxGraceTime: { $max: '$graceTime' },
+                        minGraceTime: { $min: '$graceTime' },
+                        avgGraceTime: { $avg: '$graceTime' }
                     }
                 },
                 {
@@ -588,7 +600,11 @@ class MongoRepository {
                         transactionCount: '$transactionCount',
                         avgDuration: '$avgDuration',
                         maxDuration: '$maxDuration',
-                        minDuration: '$minDuration'
+                        minDuration: '$minDuration',
+                        reservationCount: '$reservationCount',
+                        avgGraceTime: '$avgGraceTime',
+                        maxGraceTime: '$maxGraceTime',
+                        minGraceTime: '$minGraceTime'
                     }
                 }
             ])
@@ -608,7 +624,11 @@ class MongoRepository {
                                 name: String(percent),
                                 value: 0
                             };
-                        })
+                        }),
+                        reservationCount: 0,
+                        avgGraceTime: 0,
+                        maxGraceTime: 0,
+                        minGraceTime: 0
                     }
                 };
             }

package/package.json

@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.2.0-alpha.23"
+  "version": "20.2.0-alpha.25"
 }