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

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

@@ -18,7 +18,7 @@ async function main() {
     const taskRepo = new chevre.repository.Task(mongoose.connection);
 
     await aggregationRepo.aggregationModel.deleteMany({
-        typeOf: { $in: ['AggregateOrder', 'AggregateReservation'] }
+        typeOf: { $in: ['AggregateOrder', 'AggregateReservation', 'AggregatePay', 'AggregateReserve'] }
     })
         .exec();
     await chevre.service.aggregation.system.aggregateReserveTransaction({
@@ -29,8 +29,14 @@ async function main() {
         assetTransaction: assetTransactionRepo
     });
 
-    return;
-
+    await chevre.service.aggregation.system.aggregatePayTransaction({
+        aggregationDays: AGGREGATE_DAYS,
+        excludedProjectId: EXCLUDED_PROJECT_ID
+    })({
+        agregation: aggregationRepo,
+        assetTransaction: assetTransactionRepo
+    });
+    // return;
     await chevre.service.aggregation.system.aggregateTask({
         aggregationDays: AGGREGATE_DAYS,
         excludedProjectId: EXCLUDED_PROJECT_ID

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

@@ -5,6 +5,7 @@ export declare enum AggregationType {
     AggregateAuthorizeEventServiceOfferAction = "AggregateAuthorizeEventServiceOfferAction",
     AggregateAuthorizeOrderAction = "AggregateAuthorizeOrderAction",
     AggregateAuthorizePaymentAction = "AggregateAuthorizePaymentAction",
+    AggregatePay = "AggregatePay",
     AggregateReserve = "AggregateReserve",
     AggregateTask = "AggregateTask",
     AggregateUseAction = "AggregateUseAction"

package/lib/chevre/repo/aggregation.js

@@ -28,6 +28,7 @@ var AggregationType;
     AggregationType["AggregateAuthorizeEventServiceOfferAction"] = "AggregateAuthorizeEventServiceOfferAction";
     AggregationType["AggregateAuthorizeOrderAction"] = "AggregateAuthorizeOrderAction";
     AggregationType["AggregateAuthorizePaymentAction"] = "AggregateAuthorizePaymentAction";
+    AggregationType["AggregatePay"] = "AggregatePay";
     AggregationType["AggregateReserve"] = "AggregateReserve";
     AggregationType["AggregateTask"] = "AggregateTask";
     AggregationType["AggregateUseAction"] = "AggregateUseAction";

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

@@ -144,7 +144,7 @@ export declare class MongoRepository {
     findByIdAndDelete(params: {
         id: string;
     }): Promise<void>;
-    aggregateReserve(params: {
+    aggregateAssetTransaction(params: {
         project?: {
             id?: {
                 $ne?: string;

package/lib/chevre/repo/assetTransaction.js

@@ -536,7 +536,7 @@ class MongoRepository {
                 .exec();
         });
     }
-    aggregateReserve(params) {
+    aggregateAssetTransaction(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const statuses = yield Promise.all([
                 factory.transactionStatusType.Confirmed,
@@ -567,7 +567,13 @@ class MongoRepository {
                 {
                     $project: {
                         duration: { $subtract: ['$endDate', '$startDate'] },
-                        graceTime: { $subtract: ['$object.reservationFor.startDate', '$startDate'] },
+                        graceTime: {
+                            $cond: {
+                                if: { $eq: ['$typeOf', factory.assetTransactionType.Reserve] },
+                                then: { $subtract: ['$object.reservationFor.startDate', '$startDate'] },
+                                else: 0
+                            }
+                        },
                         status: '$status',
                         startDate: '$startDate',
                         endDate: '$endDate',

package/lib/chevre/service/aggregation/system.d.ts

@@ -51,6 +51,13 @@ declare function aggregateUseAction(params: {
     agregation: AggregationRepo;
     action: ActionRepo;
 }) => Promise<void>;
+declare function aggregatePayTransaction(params: {
+    aggregationDays: number;
+    excludedProjectId?: string;
+}): (repos: {
+    agregation: AggregationRepo;
+    assetTransaction: AssetTransactionRepo;
+}) => Promise<void>;
 /**
  * 予約集計
  */
@@ -68,4 +75,4 @@ declare function aggregateTask(params: {
     agregation: AggregationRepo;
     task: TasKRepo;
 }) => Promise<void>;
-export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregatePlaceOrder, aggregateReserveTransaction, aggregateTask, aggregateUseAction };
+export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregatePayTransaction, aggregatePlaceOrder, aggregateReserveTransaction, aggregateTask, aggregateUseAction };

package/lib/chevre/service/aggregation/system.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aggregateUseAction = exports.aggregateTask = exports.aggregateReserveTransaction = exports.aggregatePlaceOrder = exports.aggregateAuthorizePaymentAction = exports.aggregateAuthorizeOrderAction = exports.aggregateAuthorizeEventServiceOfferAction = void 0;
+exports.aggregateUseAction = exports.aggregateTask = exports.aggregateReserveTransaction = exports.aggregatePlaceOrder = exports.aggregatePayTransaction = exports.aggregateAuthorizePaymentAction = exports.aggregateAuthorizeOrderAction = exports.aggregateAuthorizeEventServiceOfferAction = void 0;
 const createDebug = require("debug");
 const moment = require("moment-timezone");
 const factory = require("../../factory");
@@ -28,11 +28,13 @@ function aggregatePlaceOrder(params) {
         while (i < params.aggregationDays) {
             i += 1;
             const startFrom = moment()
+                .utc()
                 // .tz('Asia/Tokyo')
                 .add(-i, 'days')
                 .startOf('day')
                 .toDate();
             const startThrough = moment()
+                .utc()
                 // .tz('Asia/Tokyo')
                 .add(-i, 'days')
                 .endOf('day')
@@ -79,11 +81,13 @@ function aggregateAuthorizeEventServiceOfferAction(params) {
         while (i < params.aggregationDays) {
             i += 1;
             const startFrom = moment()
+                .utc()
                 // .tz('Asia/Tokyo')
                 .add(-i, 'days')
                 .startOf('day')
                 .toDate();
             const startThrough = moment()
+                .utc()
                 // .tz('Asia/Tokyo')
                 .add(-i, 'days')
                 .endOf('day')
@@ -113,11 +117,13 @@ function aggregateAuthorizePaymentAction(params) {
         while (i < params.aggregationDays) {
             i += 1;
             const startFrom = moment()
+                .utc()
                 // .tz('Asia/Tokyo')
                 .add(-i, 'days')
                 .startOf('day')
                 .toDate();
             const startThrough = moment()
+                .utc()
                 // .tz('Asia/Tokyo')
                 .add(-i, 'days')
                 .endOf('day')
@@ -144,11 +150,13 @@ function aggregateAuthorizeOrderAction(params) {
         while (i < params.aggregationDays) {
             i += 1;
             const startFrom = moment()
+                .utc()
                 // .tz('Asia/Tokyo')
                 .add(-i, 'days')
                 .startOf('day')
                 .toDate();
             const startThrough = moment()
+                .utc()
                 // .tz('Asia/Tokyo')
                 .add(-i, 'days')
                 .endOf('day')
@@ -178,11 +186,13 @@ function aggregateUseAction(params) {
         while (i < params.aggregationDays) {
             i += 1;
             const startFrom = moment()
+                .utc()
                 // .tz('Asia/Tokyo')
                 .add(-i, 'days')
                 .startOf('day')
                 .toDate();
             const startThrough = moment()
+                .utc()
                 // .tz('Asia/Tokyo')
                 .add(-i, 'days')
                 .endOf('day')
@@ -199,6 +209,39 @@ function aggregateUseAction(params) {
     });
 }
 exports.aggregateUseAction = aggregateUseAction;
+function aggregatePayTransaction(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const aggregateDate = new Date();
+        const aggregateDuration = moment.duration(1, 'days')
+            .toISOString();
+        let i = -1;
+        while (i < params.aggregationDays) {
+            i += 1;
+            const startFrom = moment()
+                .utc()
+                // .tz('Asia/Tokyo')
+                .add(-i, 'days')
+                .startOf('day')
+                .toDate();
+            const startThrough = moment()
+                .utc()
+                // .tz('Asia/Tokyo')
+                .add(-i, 'days')
+                .endOf('day')
+                .toDate();
+            const aggregateResult = yield repos.assetTransaction.aggregateAssetTransaction({
+                project: { id: { $ne: params.excludedProjectId } },
+                startFrom,
+                startThrough,
+                typeOf: factory.assetTransactionType.Pay
+            });
+            debug('aggregatePayTransaction:result', aggregateResult, (_a = aggregateResult.statuses[0]) === null || _a === void 0 ? void 0 : _a.aggregation, startFrom);
+            yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregatePay, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: startFrom, aggregateDate }, aggregateResult));
+        }
+    });
+}
+exports.aggregatePayTransaction = aggregatePayTransaction;
 /**
  * 予約集計
  */
@@ -212,16 +255,18 @@ function aggregateReserveTransaction(params) {
         while (i < params.aggregationDays) {
             i += 1;
             const startFrom = moment()
+                .utc()
                 // .tz('Asia/Tokyo')
                 .add(-i, 'days')
                 .startOf('day')
                 .toDate();
             const startThrough = moment()
+                .utc()
                 // .tz('Asia/Tokyo')
                 .add(-i, 'days')
                 .endOf('day')
                 .toDate();
-            const aggregateResult = yield repos.assetTransaction.aggregateReserve({
+            const aggregateResult = yield repos.assetTransaction.aggregateAssetTransaction({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough,
@@ -243,11 +288,13 @@ function aggregateTask(params) {
         while (i < params.aggregationDays) {
             i += 1;
             const runsFrom = moment()
+                .utc()
                 // .tz('Asia/Tokyo')
                 .add(-i, 'days')
                 .startOf('day')
                 .toDate();
             const runsThrough = moment()
+                .utc()
                 // .tz('Asia/Tokyo')
                 .add(-i, 'days')
                 .endOf('day')

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.25"
+  "version": "20.2.0-alpha.26"
 }