@qingfu/core-env 0.1.37 → 0.1.39

package/lib/database.js

@@ -16,6 +16,7 @@ if ( process.env.DATABASE_URI ) {
     mongoose.plugin( leanGetters );
     mongoose.plugin( castAggregate );
     mongoose.summaryPlugin = summaryPlugin;
+    mongoose.statisticsPlugin = statisticsPlugin;
     mongoose.batchPlugin = batchPlugin;
     mongoose.qrcodePlugin = qrcodePlugin;
 
@@ -67,6 +68,35 @@ function summaryPlugin( schema, options = {}) {
     };
 }
 
+function statisticsPlugin( schema, options = {}) {
+    let { timeFields = [], valueFields = [], forbidsFields = [] } = options;
+    schema.statics.statistics = async function( query = {}, opts = {}) {
+        let { group = null, first = null, format = '%Y-%m-%d', timezone = process.env.TZ } = opts;
+        if ( _.isObject( group )) throw new Error( 422 );
+        if ( forbidsFields.some( v => _.includes( group, v ))) throw new Error( 422 );
+        if ( forbidsFields.some( v => _.includes( first, v ))) throw new Error( 422 );
+        if ( _.isString( group )) {
+            let keys = group.split( /\s+/ ).map( v => _.trimStart( v, '$' ));
+            let trans0 = v => v.replace( '.', '-' );
+            let trans1 = v => !timeFields.includes( v ) ? '$' + v :
+                { '$dateToString': { date: '$' + v, format, timezone }};
+            group = keys.length === 1 ? trans1( keys[ 0 ]) :
+                _.zipObject( keys.map( trans0 ), keys.map( trans1 ));
+        }
+        let $group = { _id: group, count: { $sum: 1 }}, defaultRes = { count: 0 };
+        valueFields.forEach( v => {
+            $group[ v ] = { $sum: '$' + v };
+            defaultRes[ v ] = 0;
+        });
+        if ( _.isString( first )) {
+            let keys = first.split( /\s+/ ).map( v => _.trimStart( v, '$' ));
+            keys.forEach( v => { $group[ v ] = { $first: '$' + v }; });
+        }
+        let results = await this.aggregate([{ $match: query }, { $group }]);
+        return group && results || results.length && _.omit( results[ 0 ], '_id' ) || defaultRes;
+    };
+}
+
 function batchPlugin( schema ) {
     schema.statics.pathCreate = async function({ query, update, path, subpath, data }) {
         if ( _.isEmpty( query ) || !path || !subpath || !data ) throw new Error( 422 );

package/lib/helper.js

@@ -96,32 +96,6 @@ helper.parseLike = ( ...fields ) => {
     };
 };
 
-helper.checkRestrict = async ( ctx, next ) => {
-    let scene = ctx.state.user ? ctx.state.user.id : ctx.ip;
-    let count = await brokers( 'core' ).call( 'check.count', scene );
-    if ( count > 50 ) return ctx.throw( 429 );
-    try {
-        await next();
-    } catch ( err ) {
-        await brokers( 'core' ).call( 'check.increase', scene );
-        throw err;
-    }
-};
-
-helper.validatePassword = async ( ctx, next ) => {
-    let userID = ctx.state.user.id, password = ctx.header.password;
-    if ( !password ) return ctx.throw( 428, 'PASSWORD_REQUIRED' );
-    let count = await brokers( 'core' ).call( 'check.count', userID );
-    if ( count > 50 ) return ctx.throw( 429 );
-    let match = await broker.call( 'user.validatePassword', { userID, password });
-    if ( match ) {
-        return await next();
-    } else {
-        await brokers( 'core' ).call( 'check.increase', userID );
-        return ctx.throw( 412, 'PASSWORD_WRONG' );
-    }
-};
-
 helper.wmpTestGet = async ctx => {
     let { signature, timestamp, nonce, echostr } = ctx.query;
     let platform = await brokers( 'core' ).call( 'platform.findOne', { appID: ctx.params.appID });
@@ -200,6 +174,12 @@ helper.wmpTransform = async ( ctx, next ) => {
     } else if ( MsgType === 'event' && Event === 'annual_renew' ) {
         let { ExpiredTime } = ctx.request.body;
         ctx.request.body = { service: 'platform', event: 'ANNUAL_RENEW', expired: ExpiredTime * 1000 };
+    } else if ( MsgType === 'event' && Event === 'verify_expired' ) {
+        let { ExpiredTime } = ctx.request.body;
+        ctx.request.body = { service: 'platform', event: 'VERIFY_EXPIRED', expired: ExpiredTime * 1000 };
+    } else if ( MsgType === 'event' && Event === 'qualification_verify_success' ) {
+        let { ExpiredTime } = ctx.request.body;
+        ctx.request.body = { service: 'platform', event: 'VERIFY_SUCCESS', expired: ExpiredTime * 1000 };
     }
     let base = { ToUserName: FromUserName, FromUserName: ToUserName, CreateTime: parseInt( Date.now() / 1000 )};
     ctx.sendText = ({ content }) => ctx.body = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qingfu/core-env",
-  "version": "0.1.37",
+  "version": "0.1.39",
   "readmeFilename": "README.md",
   "dependencies": {
     "@koa/cors": "4.0.0",