修复气站订单用户名称与合同上下文展示
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
// 功能描述:实现气站范围内的配送合同、合同气瓶和燃气配送订单接口。
|
||||
// 版本:v1.1.0
|
||||
// 版本:v1.2.0
|
||||
package gas
|
||||
|
||||
import (
|
||||
@@ -288,8 +288,34 @@ func ListGasorderBasic(ctx *gin.Context) {
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
listScoped(ctx, &models.GasorderBasic{}, common.ActiveRecords(impl.DBService.Model(&models.GasorderBasic{})).
|
||||
Where("gas_basic_id = ?", station.ID), "gasorder_basic.created_at desc")
|
||||
page, size := common.PageSize(ctx)
|
||||
query := common.ApplyKeywordFilter(ctx, scopedOrderDisplayQuery(impl.DBService, station.ID), &models.GasorderBasic{})
|
||||
var total int64
|
||||
if err := query.Count(&total).Error; err != nil {
|
||||
infra.Response.Error(ctx, err)
|
||||
return
|
||||
}
|
||||
var list []gasOrderListDisplay
|
||||
if err := query.Order("gasorder_basic.created_at desc").Offset((page - 1) * size).Limit(size).Scan(&list).Error; err != nil {
|
||||
infra.Response.Error(ctx, err)
|
||||
return
|
||||
}
|
||||
respondList(ctx, list, total)
|
||||
}
|
||||
|
||||
// gasOrderListDisplay 在订单主档上附加订单权限范围内的用户可读名称。
|
||||
type gasOrderListDisplay struct {
|
||||
models.GasorderBasic
|
||||
UserAccountDisplayName string `gorm:"column:user_account_display_name" json:"user_account_display_name"`
|
||||
}
|
||||
|
||||
// scopedOrderDisplayQuery 通过订单保存的用户主键读取名称,并始终限制在当前气站订单范围。
|
||||
func scopedOrderDisplayQuery(databaseService *gorm.DB, gasBasicID uint64) *gorm.DB {
|
||||
return common.ActiveRecords(databaseService.Model(&models.GasorderBasic{})).
|
||||
Select(`gasorder_basic.*,
|
||||
COALESCE(NULLIF(order_user.name, ''), NULLIF(order_user.real_name, ''), NULLIF(order_user.username, ''), '用户记录已失效') AS user_account_display_name`).
|
||||
Joins("LEFT JOIN user_account AS order_user ON order_user.id = gasorder_basic.user_account_id").
|
||||
Where("gasorder_basic.gas_basic_id = ?", gasBasicID)
|
||||
}
|
||||
|
||||
func GetGasorderBasic(ctx *gin.Context) {
|
||||
|
||||
37
backend/api/internal/logic/gas/gasorder_test.go
Normal file
37
backend/api/internal/logic/gas/gasorder_test.go
Normal file
@@ -0,0 +1,37 @@
|
||||
// 功能描述:验证气站合同与配送订单展示查询的对象权限范围。
|
||||
// 版本:v1.0.0
|
||||
package gas
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/DATA-DOG/go-sqlmock"
|
||||
"gorm.io/driver/postgres"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
// TestScopedOrderDisplayQuery 验证订单用户名称直接按订单主键读取且查询受当前气站约束。
|
||||
func TestScopedOrderDisplayQuery(t *testing.T) {
|
||||
connection, _, err := sqlmock.New()
|
||||
if err != nil {
|
||||
t.Fatalf("create SQL mock: %v", err)
|
||||
}
|
||||
t.Cleanup(func() { _ = connection.Close() })
|
||||
databaseService, err := gorm.Open(postgres.New(postgres.Config{Conn: connection}), &gorm.Config{DryRun: true})
|
||||
if err != nil {
|
||||
t.Fatalf("open GORM database: %v", err)
|
||||
}
|
||||
|
||||
statement := scopedOrderDisplayQuery(databaseService, 42).
|
||||
Find(&[]gasOrderListDisplay{}).Statement.SQL.String()
|
||||
for _, fragment := range []string{
|
||||
"LEFT JOIN user_account AS order_user",
|
||||
"user_account_display_name",
|
||||
"gasorder_basic.gas_basic_id =",
|
||||
} {
|
||||
if !strings.Contains(statement, fragment) {
|
||||
t.Fatalf("scoped order display SQL must include %q, got: %s", fragment, statement)
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user