fix: keep token log filters exact
This commit is contained in:
+7
-9
@@ -329,8 +329,8 @@ func GetAllLogs(logType int, startTimestamp int64, endTimestamp int64, modelName
|
|||||||
if tx, err = applyExplicitLogTextFilter(tx, "logs.username", username); err != nil {
|
if tx, err = applyExplicitLogTextFilter(tx, "logs.username", username); err != nil {
|
||||||
return nil, 0, err
|
return nil, 0, err
|
||||||
}
|
}
|
||||||
if tx, err = applyExplicitLogTextFilter(tx, "logs.token_name", tokenName); err != nil {
|
if tokenName != "" {
|
||||||
return nil, 0, err
|
tx = tx.Where("logs.token_name = ?", tokenName)
|
||||||
}
|
}
|
||||||
if requestId != "" {
|
if requestId != "" {
|
||||||
tx = tx.Where("logs.request_id = ?", requestId)
|
tx = tx.Where("logs.request_id = ?", requestId)
|
||||||
@@ -415,8 +415,8 @@ func GetUserLogs(userId int, logType int, startTimestamp int64, endTimestamp int
|
|||||||
if tx, err = applyExplicitLogTextFilter(tx, "logs.model_name", modelName); err != nil {
|
if tx, err = applyExplicitLogTextFilter(tx, "logs.model_name", modelName); err != nil {
|
||||||
return nil, 0, err
|
return nil, 0, err
|
||||||
}
|
}
|
||||||
if tx, err = applyExplicitLogTextFilter(tx, "logs.token_name", tokenName); err != nil {
|
if tokenName != "" {
|
||||||
return nil, 0, err
|
tx = tx.Where("logs.token_name = ?", tokenName)
|
||||||
}
|
}
|
||||||
if requestId != "" {
|
if requestId != "" {
|
||||||
tx = tx.Where("logs.request_id = ?", requestId)
|
tx = tx.Where("logs.request_id = ?", requestId)
|
||||||
@@ -466,11 +466,9 @@ func SumUsedQuota(logType int, startTimestamp int64, endTimestamp int64, modelNa
|
|||||||
if rpmTpmQuery, err = applyExplicitLogTextFilter(rpmTpmQuery, "username", username); err != nil {
|
if rpmTpmQuery, err = applyExplicitLogTextFilter(rpmTpmQuery, "username", username); err != nil {
|
||||||
return stat, err
|
return stat, err
|
||||||
}
|
}
|
||||||
if tx, err = applyExplicitLogTextFilter(tx, "token_name", tokenName); err != nil {
|
if tokenName != "" {
|
||||||
return stat, err
|
tx = tx.Where("token_name = ?", tokenName)
|
||||||
}
|
rpmTpmQuery = rpmTpmQuery.Where("token_name = ?", tokenName)
|
||||||
if rpmTpmQuery, err = applyExplicitLogTextFilter(rpmTpmQuery, "token_name", tokenName); err != nil {
|
|
||||||
return stat, err
|
|
||||||
}
|
}
|
||||||
if startTimestamp != 0 {
|
if startTimestamp != 0 {
|
||||||
tx = tx.Where("created_at >= ?", startTimestamp)
|
tx = tx.Where("created_at >= ?", startTimestamp)
|
||||||
|
|||||||
Reference in New Issue
Block a user