chore: allow filter user statistic(Close #378)

Author: Kerwin

service/src/index.ts

@@ -51,7 +51,7 @@ import { authLimiter, limiter } from './middleware/limiter'
 import { hasAnyRole, isEmail, isNotEmptyString } from './utils/is'
 import { sendNoticeMail, sendResetPasswordMail, sendTestMail, sendVerifyMail, sendVerifyMailAdmin } from './utils/mail'
 import { checkUserResetPassword, checkUserVerify, checkUserVerifyAdmin, getUserResetPasswordUrl, getUserVerifyUrl, getUserVerifyUrlAdmin, md5 } from './utils/security'
-import { rootAuth } from './middleware/rootAuth'
+import { isAdmin, rootAuth } from './middleware/rootAuth'
 
 dotenv.config()
 
@@ -553,9 +553,7 @@ router.post('/user-register', authLimiter, async (req, res) => {
 router.post('/config', rootAuth, async (req, res) => {
   try {
     const userId = req.headers.userId.toString()
-
-    const user = await getUserById(userId)
-    if (user == null || user.status !== Status.Normal || !user.roles.includes(UserRole.Admin))
+    if (!isAdmin(userId))
       throw new Error('无权限 | No permission.')
 
     const response = await chatConfig()
@@ -1107,8 +1105,11 @@ router.post('/setting-key-upsert', rootAuth, async (req, res) => {
 
 router.post('/statistics/by-day', auth, async (req, res) => {
   try {
-    const userId = req.headers.userId
-    const { start, end } = req.body as { start: number; end: number }
+    let { userId, start, end } = req.body as { userId?: string; start: number; end: number }
+    if (!userId)
+      userId = req.headers.userId as string
+    else if (!isAdmin(req.headers.userId as string))
+      throw new Error('无权限 | No permission')
 
     const data = await getUserStatisticsByDay(new ObjectId(userId as string), start, end)
     res.send({ status: 'Success', message: '', data })

service/src/middleware/rootAuth.ts

@@ -28,4 +28,9 @@ const rootAuth = async (req, res, next) => {
   }
 }
 
-export { rootAuth }
+const isAdmin = async (userId: string) => {
+  const user = await getUserById(userId)
+  return user != null && user.status === Status.Normal && user.roles.includes(UserRole.Admin)
+}
+
+export { rootAuth, isAdmin }

src/api/index.ts

@@ -288,10 +288,10 @@ export function fetchUpdateBaseSetting<T = any>(config: ConfigState) {
   })
 }
 
-export function fetchUserStatistics<T = any>(start: number, end: number) {
+export function fetchUserStatistics<T = any>(userId: string, start: number, end: number) {
   return post<T>({
     url: '/statistics/by-day',
-    data: { start, end },
+    data: { userId, start, end },
   })
 }
 

src/components/common/Setting/Statistics.vue

@@ -1,16 +1,21 @@
 <script setup lang='ts'>
+import type { Ref } from 'vue'
 import { nextTick, onMounted, reactive, ref } from 'vue'
-import { NCol, NDatePicker, NIcon, NNumberAnimation, NRow, NSpin, NStatistic } from 'naive-ui'
+import { NCol, NDatePicker, NIcon, NNumberAnimation, NRow, NSelect, NSpin, NStatistic } from 'naive-ui'
 import type { ChartData, ChartOptions } from 'chart.js'
 import { BarElement, CategoryScale, Chart as ChartJS, Legend, LinearScale, Title, Tooltip } from 'chart.js'
 import { Bar } from 'vue-chartjs'
 import dayjs from 'dayjs'
+import type { UserInfo } from './model'
 import { t } from '@/locales'
-import { fetchUserStatistics } from '@/api'
+import { fetchGetUsers, fetchUserStatistics } from '@/api'
 import { SvgIcon } from '@/components/common'
+import { useUserStore } from '@/store'
 
 ChartJS.register(Title, Tooltip, Legend, BarElement, CategoryScale, LinearScale)
 
+const userStore = useUserStore()
+
 const chartData: ChartData<'bar'> = reactive({
   labels: [],
   datasets: [
@@ -38,6 +43,10 @@ const summary = ref({
   completionTokens: 0,
   totalTokens: 0,
 })
+
+const usersOptions: Ref<{ label: string; filter: string; value: string }[]> = ref([])
+const user: Ref<string | null> = ref(null)
+
 const loading = ref(false)
 const range: any = ref([
   dayjs().subtract(30, 'day').startOf('day').valueOf(),
@@ -66,6 +75,7 @@ async function fetchStatistics() {
   try {
     loading.value = true
     const { data } = await fetchUserStatistics(
+      user.value as string,
       dayjs(range.value[0]).startOf('day').valueOf(),
       dayjs(range.value[1]).endOf('day').valueOf(),
     )
@@ -91,8 +101,25 @@ async function fetchStatistics() {
   }
 }
 
+async function fetchUsers() {
+  const result = await fetchGetUsers(1, 10000)
+  result.data.users.forEach((user: UserInfo) => {
+    usersOptions.value.push({
+      label: `${user.email}`,
+      value: `${user._id}`,
+      filter: `${user.email} ${user.remark}`,
+    })
+  })
+}
+
+function filter(pattern: string, option: object): boolean {
+  const a = option as { label: string; filter: string; value: string }
+  return !a.filter ? false : a.filter.includes(pattern)
+}
+
 onMounted(() => {
   fetchStatistics()
+  fetchUsers()
 })
 </script>
 
@@ -101,7 +128,16 @@ onMounted(() => {
     <div class="p-4 space-y-5 min-h-[200px]">
       <div class="space-y-6">
         <div class="flex items-center space-x-4">
-          <span class="flex-shrink-0 w-[100px]">{{ $t('setting.statisticsPeriod') }}</span>
+          <NSelect
+            v-if="userStore.userInfo.root"
+            v-model:value="user"
+            style="width: 250px"
+            filterable
+            :filter="filter"
+            placeholder="Email or remark"
+            :options="usersOptions"
+            @update-value="(value) => { user = value; fetchStatistics() }"
+          />
           <div class="flex-1">
             <NDatePicker
               v-model:value="range"