From be874c330f444dc11961c1ef3b792d86a612d263 Mon Sep 17 00:00:00 2001
From: MartialBE <me@xiao5.info>
Date: Wed, 15 May 2024 15:16:43 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=96=20chore:=20logs=20list=20displays?=
 =?UTF-8?q?=20channel=20name.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 model/log.go                                | 20 ++++++++++++--------
 web/src/views/Log/component/TableRow.js     |  2 +-
 web/src/views/Log/component/TableToolBar.js |  8 ++++----
 web/src/views/Log/index.js                  |  4 ++--
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/model/log.go b/model/log.go
index 83c9a647..20a55ac7 100644
--- a/model/log.go
+++ b/model/log.go
@@ -20,8 +20,10 @@ type Log struct {
 	Quota            int    `json:"quota" gorm:"default:0"`
 	PromptTokens     int    `json:"prompt_tokens" gorm:"default:0"`
 	CompletionTokens int    `json:"completion_tokens" gorm:"default:0"`
-	ChannelId        int    `json:"channel" gorm:"index"`
+	ChannelId        int    `json:"channel_id" gorm:"index"`
 	RequestTime      int    `json:"request_time" gorm:"default:0"`
+
+	Channel *Channel `json:"channel" gorm:"foreignKey:Id;references:ChannelId"`
 }
 
 const (
@@ -82,7 +84,7 @@ type LogsListParams struct {
 	ModelName      string `form:"model_name"`
 	Username       string `form:"username"`
 	TokenName      string `form:"token_name"`
-	Channel        int    `form:"channel"`
+	ChannelId      int    `form:"channel_id"`
 }
 
 var allowedLogsOrderFields = map[string]bool{
@@ -98,10 +100,12 @@ func GetLogsList(params *LogsListParams) (*DataResult[Log], error) {
 	var tx *gorm.DB
 	var logs []*Log
 
-	if params.LogType == LogTypeUnknown {
-		tx = DB
-	} else {
-		tx = DB.Where("type = ?", params.LogType)
+	tx = DB.Preload("Channel", func(db *gorm.DB) *gorm.DB {
+		return db.Select("id, name")
+	})
+
+	if params.LogType != LogTypeUnknown {
+		tx = tx.Where("type = ?", params.LogType)
 	}
 	if params.ModelName != "" {
 		tx = tx.Where("model_name = ?", params.ModelName)
@@ -118,8 +122,8 @@ func GetLogsList(params *LogsListParams) (*DataResult[Log], error) {
 	if params.EndTimestamp != 0 {
 		tx = tx.Where("created_at <= ?", params.EndTimestamp)
 	}
-	if params.Channel != 0 {
-		tx = tx.Where("channel_id = ?", params.Channel)
+	if params.ChannelId != 0 {
+		tx = tx.Where("channel_id = ?", params.ChannelId)
 	}
 
 	return PaginateAndOrder[Log](tx, &params.PaginationParams, &logs, allowedLogsOrderFields)
diff --git a/web/src/views/Log/component/TableRow.js b/web/src/views/Log/component/TableRow.js
index 08fc99c6..3ba20bfb 100644
--- a/web/src/views/Log/component/TableRow.js
+++ b/web/src/views/Log/component/TableRow.js
@@ -70,7 +70,7 @@ export default function LogTableRow({ item, userIsAdmin }) {
       <TableRow tabIndex={item.id}>
         <TableCell>{timestamp2string(item.created_at)}</TableCell>
 
-        {userIsAdmin && <TableCell>{item.channel || ''}</TableCell>}
+        {userIsAdmin && <TableCell>{(item.channel_id || '') + '(' + (item.channel?.name || '未知') + ')'}</TableCell>}
         {userIsAdmin && (
           <TableCell>
             <Label color="default" variant="outlined">
diff --git a/web/src/views/Log/component/TableToolBar.js b/web/src/views/Log/component/TableToolBar.js
index def609f7..4f6f87dc 100644
--- a/web/src/views/Log/component/TableToolBar.js
+++ b/web/src/views/Log/component/TableToolBar.js
@@ -133,15 +133,15 @@ export default function TableToolBar({ filterName, handleFilterName, userIsAdmin
       {userIsAdmin && (
         <Stack direction={{ xs: 'column', sm: 'row' }} spacing={{ xs: 3, sm: 2, md: 4 }} padding={'24px'}>
           <FormControl>
-            <InputLabel htmlFor="channel-channel-label">渠道ID</InputLabel>
+            <InputLabel htmlFor="channel-channel_id-label">渠道ID</InputLabel>
             <OutlinedInput
-              id="channel"
-              name="channel"
+              id="channel_id"
+              name="channel_id"
               sx={{
                 minWidth: '100%'
               }}
               label="渠道ID"
-              value={filterName.channel}
+              value={filterName.channel_id}
               onChange={handleFilterName}
               placeholder="渠道ID"
               startAdornment={
diff --git a/web/src/views/Log/index.js b/web/src/views/Log/index.js
index 23799bf1..3424b3f5 100644
--- a/web/src/views/Log/index.js
+++ b/web/src/views/Log/index.js
@@ -29,7 +29,7 @@ export default function Log() {
     start_timestamp: 0,
     end_timestamp: dayjs().unix() + 3600,
     log_type: 0,
-    channel: ''
+    channel_id: ''
   };
 
   const [page, setPage] = useState(0);
@@ -82,7 +82,7 @@ export default function Log() {
         const url = userIsAdmin ? '/api/log/' : '/api/log/self/';
         if (!userIsAdmin) {
           delete keyword.username;
-          delete keyword.channel;
+          delete keyword.channel_id;
         }
 
         const res = await API.get(url, {