fix: batch fixes

- query/wiki projection
- search/wiki _total

Author: dragon-fish

api/query.ts

@@ -1,7 +1,7 @@
 import { VercelRequest, VercelResponse } from '@vercel/node'
 import { Document } from 'mongodb'
 import { getProjectSrotFromStr } from 'serverless-kit'
-import { router } from './utils'
+import { isValidUrl, router } from './utils'
 
 export default async (req: VercelRequest, res: VercelResponse) => {
   router.endpoint('/api/query')
@@ -337,47 +337,28 @@ export default async (req: VercelRequest, res: VercelResponse) => {
           $group: {
             _id: {
               siteUrl: '$siteUrl',
-              userName: '$userName',
               featureID: '$featureID',
             },
             _total: { $sum: 1 },
+            siteUrl: { $first: '$siteUrl' },
             siteName: { $first: '$siteName' },
           },
         },
-        // Group users
-        {
-          $group: {
-            _id: {
-              siteUrl: '$_id.siteUrl',
-              featureID: '$_id.featureID',
-            },
-            _total: { $sum: '$_total' },
-            siteUrl: { $first: '$_id.siteUrl' },
-            siteName: { $first: '$siteName' },
-            users: {
-              $push: {
-                userName: '$_id.userName',
-                count: '$_total',
-              },
-            },
-          },
-        },
         // Group features
         {
           $group: {
             _id: {
               siteUrl: '$_id.siteUrl',
             },
             _total: { $sum: '$_total' },
-            siteUrl: { $first: '$_id.siteUrl' },
+            siteUrl: { $first: '$siteUrl' },
             siteName: { $first: '$siteName' },
             features: {
               $addToSet: {
                 featureID: '$_id.featureID',
                 count: '$_total',
               },
             },
-            users: { $first: '$users' },
           },
         },
         {
@@ -397,6 +378,12 @@ export default async (req: VercelRequest, res: VercelResponse) => {
         })
       }
 
+      if (ctx.project) {
+        aggregate.unshift({
+          $project: ctx.project,
+        })
+      }
+
       const sites = await ctx.col.aggregate(aggregate).toArray()
       let hasNext = false
       if (sites.length > ctx.limit) {
@@ -413,6 +400,32 @@ export default async (req: VercelRequest, res: VercelResponse) => {
       }
     })
 
+  // GET /query/site/users
+  router
+    .addRoute()
+    .path(['site', 'wiki'])
+    .path('users')
+    .parseLimits()
+    .check((ctx) => {
+      if (!ctx.req.query.siteUrl) {
+        ctx.status = 400
+        ctx.message = 'Missing siteUrl'
+        return false
+      } else if (isValidUrl(ctx.req.query.siteUrl as string)) {
+        ctx.status = 400
+        ctx.message = 'Invalid siteUrl'
+        return false
+      }
+    })
+    .action((ctx) => {
+      const { siteUrl } = ctx.req.query
+      const aggregate: Document[] = [
+        {
+          $match: { siteUrl },
+        },
+      ]
+    })
+
   return router.init(req, res)
 }
 

api/search.ts

@@ -1,4 +1,5 @@
 import { VercelRequest, VercelResponse } from '@vercel/node'
+import { getProjectSrotFromStr } from 'serverless-kit'
 import { isValidUserName, router } from './utils'
 import { isValidUrl } from './utils'
 
@@ -81,6 +82,7 @@ export default async (req: VercelRequest, res: VercelResponse) => {
         return false
       }
     })
+    .parseLimits()
     .action(async (ctx) => {
       const siteUrl = ctx.req.query.siteUrl as string
       const siteName = ctx.req.query.siteName as string
@@ -93,23 +95,39 @@ export default async (req: VercelRequest, res: VercelResponse) => {
         $match.siteName = new RegExp(siteName, 'ig')
       }
 
-      const sites = (
-        await ctx.col
-          .aggregate([
-            {
-              $match,
+      const sites = await ctx.col
+        .aggregate([
+          {
+            $match,
+          },
+          {
+            $group: {
+              _id: {
+                siteUrl: '$siteUrl',
+                siteName: '$siteName',
+              },
+              _total: { $sum: 1 },
             },
-            {
-              $group: {
-                _id: {
-                  siteUrl: '$siteUrl',
-                  siteName: '$siteName',
-                },
+          },
+          {
+            $group: {
+              _id: {
+                siteUrl: '$_id.siteUrl',
               },
+              _total: { $sum: '$_total' },
+              siteUrl: { $first: '$_id.siteUrl' },
+              siteName: { $first: '$_id.siteName' },
             },
-          ])
-          .toArray()
-      ).map(({ _id }) => _id)
+          },
+          {
+            $project: { _id: false },
+          },
+        ])
+        .sort(ctx.sort)
+        .project(
+          ctx.project || getProjectSrotFromStr('_total|siteUrl|siteName')
+        )
+        .toArray()
 
       ctx.body = { search: sites, $match: { siteUrl, siteName } }
     })

docs/api-collections.http

@@ -2,15 +2,16 @@
 # Install humao.rest-client to make quick tests
 
 # Variables
-@PROD_URL = https://analytics.ipe.wiki/api
+# @ENDPOINT = https://analytics.ipe.wiki/api
+@ENDPOINT = http://localhost:3000/api
 # @BEGIN_TIME = {{$datetime iso8601}}
 
 ### Index
-GET {{PROD_URL}}
+GET {{ENDPOINT}}
     ?debug=true
 
 ### Query user
-GET {{PROD_URL}}/query/user
+GET {{ENDPOINT}}/query/user
     # required {string}
     ?userName=机智的小鱼君
     # required {string}
@@ -23,7 +24,7 @@ GET {{PROD_URL}}/query/user
     &project=*
 
 ### Query site
-GET {{PROD_URL}}/query/site
+GET {{ENDPOINT}}/query/site
     # required {string}
     ?siteUrl=https://zh.moegirl.org.cn/
     # {number}
@@ -32,9 +33,10 @@ GET {{PROD_URL}}/query/site
     &limit=5
     # {'*' | string}
     &project=*
+    &sort=!_total
 
 ### Search users
-GET {{PROD_URL}}/search/user
+GET {{ENDPOINT}}/search/user
     # required {string}
     ?userName=机智的小鱼君
     # {string}
@@ -47,7 +49,7 @@ GET {{PROD_URL}}/search/user
     &project=*
 
 ### Search sites
-GET {{PROD_URL}}/search/sites
+GET {{ENDPOINT}}/search/sites
     # {string}
     ?siteName=minecraft
     # {string}
@@ -56,15 +58,17 @@ GET {{PROD_URL}}/search/sites
     &offset=0
     # {number}
     &limit=5
+    # 
+    &sort=!_total
     # {'*' | string}
     &project=*
 
 ### Database status
-GET {{PROD_URL}}/status
+GET {{ENDPOINT}}/status
     ?debug=true
 
 ### Submit data
-POST {{PROD_URL}}/submit
+POST {{ENDPOINT}}/submit
 Content-Type: application/json
 
 {