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

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/example/src/chevre/migrateProjectSubscription.ts

@@ -0,0 +1,51 @@
+// tslint:disable:no-console
+// import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const projectRepo = new chevre.repository.Project(mongoose.connection);
+
+    const cursor = projectRepo.getCursor(
+        {
+        },
+        {
+            // _id: 1,
+        }
+    );
+    console.log('projects found');
+
+    let i = 0;
+    let updateCount = 0;
+    // tslint:disable-next-line:max-func-body-length
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const project: chevre.factory.project.IProject = doc.toObject();
+
+        const useEventServiceAsProduct = project.subscription?.useEventServiceAsProduct;
+        const alreadyMigrated = useEventServiceAsProduct === true;
+
+        if (alreadyMigrated) {
+            console.log('already migrated.', project.id, i);
+        } else {
+            console.log(
+                'updating product...', project.id, i);
+            await projectRepo.findByIdAndIUpdate({
+                id: project.id,
+                subscription: { useEventServiceAsProduct: true }
+            });
+            updateCount += 1;
+            console.log('updated...', project.id, i);
+        }
+    });
+    console.log(i, 'projects checked');
+    console.log(updateCount, 'projects updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

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/repo/mongoose/model/project.js

@@ -10,6 +10,12 @@ const writeConcern = { j: true, w: 'majority', wtimeout: 10000 };
  */
 const schema = new mongoose.Schema({
     _id: String,
+    aggregateReservation: mongoose.SchemaTypes.Mixed,
+    alternateName: String,
+    logo: String,
+    name: String,
+    settings: mongoose.SchemaTypes.Mixed,
+    subscription: mongoose.SchemaTypes.Mixed,
     typeOf: {
         type: String,
         required: true
@@ -19,7 +25,7 @@ const schema = new mongoose.Schema({
     id: true,
     read: 'primaryPreferred',
     writeConcern: writeConcern,
-    strict: false,
+    strict: true,
     useNestedStrict: true,
     timestamps: {
         createdAt: 'createdAt',

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

@@ -10,7 +10,6 @@ export declare class MongoRepository {
     findById(conditions: {
         id: string;
     }, projection?: any): Promise<factory.project.IProject>;
-    count(params: factory.project.ISearchConditions): Promise<number>;
     /**
      * プロジェクト検索
      */
@@ -24,6 +23,9 @@ export declare class MongoRepository {
         settings?: {
             sendgridApiKey?: string;
         };
+        subscription?: {
+            useEventServiceAsProduct?: boolean;
+        };
     }): Promise<void>;
     updateAggregateReservation(params: {
         id: string;
@@ -32,4 +34,5 @@ export declare class MongoRepository {
     deleteById(params: {
         id: string;
     }): Promise<void>;
+    getCursor(conditions: any, projection: any): import("mongoose").QueryCursor<any>;
 }

package/lib/chevre/repo/project.js

@@ -61,14 +61,6 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    count(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            return this.projectModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-                .setOptions({ maxTimeMS: 10000 })
-                .exec();
-        });
-    }
     /**
      * プロジェクト検索
      */
@@ -98,12 +90,14 @@ class MongoRepository {
         });
     }
     findByIdAndIUpdate(params) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.projectModel.findOneAndUpdate({ _id: params.id }, Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ updatedAt: new Date() }, (typeof params.alternateName === 'string' && params.alternateName.length > 0)
+            yield this.projectModel.findOneAndUpdate({ _id: params.id }, Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ updatedAt: new Date() }, (typeof params.alternateName === 'string' && params.alternateName.length > 0)
                 ? { alternateName: params.alternateName }
                 : undefined), (typeof params.name === 'string' && params.name.length > 0) ? { name: params.name } : undefined), (typeof params.logo === 'string' && params.logo.length > 0) ? { logo: params.logo } : undefined), (typeof ((_a = params.settings) === null || _a === void 0 ? void 0 : _a.sendgridApiKey) === 'string')
                 ? { 'settings.sendgridApiKey': params.settings.sendgridApiKey }
+                : undefined), (typeof ((_b = params.subscription) === null || _b === void 0 ? void 0 : _b.useEventServiceAsProduct) === 'boolean')
+                ? { 'subscription.useEventServiceAsProduct': params.subscription.useEventServiceAsProduct }
                 : undefined), { 
                 // ↓customerUserPoolは廃止
                 $unset: {
@@ -131,5 +125,10 @@ class MongoRepository {
                 .exec();
         });
     }
+    getCursor(conditions, projection) {
+        return this.projectModel.find(conditions, projection)
+            .sort({ _id: factory.sortType.Ascending })
+            .cursor();
+    }
 }
 exports.MongoRepository = MongoRepository;

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.27"
 }

package/example/src/chevre/migratePaymentServicePaymentUrlExpiresInSeconds.ts

@@ -1,77 +0,0 @@
-// tslint:disable:no-console
-// import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const productRepo = new chevre.repository.Product(mongoose.connection);
-
-    const cursor = productRepo.getCursor(
-        {
-            // 'project.id': { $eq: project.id },
-            'project.id': { $ne: EXCLUDED_PROJECT_ID },
-            typeOf: { $eq: chevre.factory.service.paymentService.PaymentServiceType.CreditCard }
-        },
-        {
-            // _id: 1,
-        }
-    );
-    console.log('products found');
-
-    let i = 0;
-    let updateCount = 0;
-    // tslint:disable-next-line:max-func-body-length
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const paymentService: chevre.factory.service.paymentService.IService = doc.toObject();
-
-        const hasPaymentUrlExpiresInseconds = paymentService.provider?.some((provider) => {
-            return typeof (<any>provider).credentials?.paymentUrlExpiresInSeconds === 'number';
-        });
-
-        if (!hasPaymentUrlExpiresInseconds) {
-            console.log(
-                'no expiresInSeconds', paymentService.project.id, paymentService.id, paymentService.productID, i);
-
-            return;
-        }
-
-        const alreadyMigrated = paymentService.provider?.filter((provider) => {
-            return typeof (<any>provider).credentials?.paymentUrlExpiresInSeconds === 'number';
-        })
-            .every((provider) => {
-                return typeof provider.credentials?.paymentUrl?.expiresInSeconds === 'number';
-            });
-
-        if (alreadyMigrated) {
-            console.log(
-                'already exist...', paymentService.project.id, paymentService.id, paymentService.productID, i);
-        } else {
-            console.log(
-                'updating product...', paymentService.project.id, paymentService.id, paymentService.productID, i);
-            // await eventRepo.updatePartiallyById({
-            //     id: event.id,
-            //     attributes: <any>{
-            //         typeOf: event.typeOf,
-            //         'offers.itemOffered.availableChannel': newAvailableChannel
-            //     }
-            // });
-            updateCount += 1;
-            console.log(
-                'updated...', paymentService.project.id, paymentService.id, paymentService.productID, i);
-        }
-    });
-    console.log(i, 'products checked');
-    console.log(updateCount, 'products updated');
-}
-
-main()
-    .then()
-    .catch(console.error);