tcjlj/nginx-proxy-manager-zh
1
0
Fork 0
mirror of https://github.com/xiaoxinpro/nginx-proxy-manager-zh.git synced 2025-01-22 12:58:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support table names in filter tags

Browse Source
This commit is contained in:
Jamie Curnow 2024-09-11 15:01:28 +10:00
parent 514520ce1a
commit 833dd23dce
No known key found for this signature in database
GPG Key ID: FFBB624C43388E9E
2 changed files with 52 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
backend/internal/entity/filters.go
View File

@ -7,21 +7,23 @@ import (
// GetFilterMap returns the filter map
func GetFilterMap(m interface{}, includeBaseEntity bool) map[string]model.FilterMapValue {
filterMap := tags.GetFilterMap(m)
if includeBaseEntity {
return mergeFilterMaps(tags.GetFilterMap(model.ModelBase{}), filterMap)
}
filterMap := tags.GetFilterMap(m, "")
// TODO: this is done in GetFilterMap isn't it?
// if includeBaseEntity {
// return mergeFilterMaps(tags.GetFilterMap(model.ModelBase{}, ""), filterMap)
// }
return filterMap
}
func mergeFilterMaps(m1 map[string]model.FilterMapValue, m2 map[string]model.FilterMapValue) map[string]model.FilterMapValue {
merged := make(map[string]model.FilterMapValue, 0)
for k, v := range m1 {
merged[k] = v
}
for key, value := range m2 {
merged[key] = value
}
return merged
}
// func mergeFilterMaps(m1 map[string]model.FilterMapValue, m2 map[string]model.FilterMapValue) map[string]model.FilterMapValue {
// merged := make(map[string]model.FilterMapValue, 0)
// for k, v := range m1 {
// merged[k] = v
// }
// for key, value := range m2 {
// merged[key] = value
// }
// return merged
// }

52
backend/internal/tags/filters.go
View File

@ -13,24 +13,39 @@ import (
"github.com/rotisserie/eris"
)
func GetFilterMap(m interface{}) map[string]model.FilterMapValue {
func GetFilterMap(m interface{}, globalTablePrefix string) map[string]model.FilterMapValue {
name := getName(m)
if val, exists := getCache(name); exists {
return val
}
var filterMap = make(map[string]model.FilterMapValue)
// If this is an entity model (and it probably is)
// then include the base model as well
if strings.Contains(name, ".Model") && !strings.Contains(name, "ModelBase") {
filterMap = GetFilterMap(model.ModelBase{})
}
filterMap := make(map[string]model.FilterMapValue)
// TypeOf returns the reflection Type that represents the dynamic type of variable.
// If variable is a nil interface value, TypeOf returns nil.
t := reflect.TypeOf(m)
// Get the table name from the model function, if it exists
if globalTablePrefix == "" {
v := reflect.ValueOf(m)
tableNameFunc, ok := t.MethodByName("TableName")
if ok {
n := tableNameFunc.Func.Call([]reflect.Value{v})
if len(n) > 0 {
globalTablePrefix = fmt.Sprintf(
`"%s".`,
n[0].String(),
)
}
}
}
// If this is an entity model (and it probably is)
// then include the base model as well
if strings.Contains(name, ".Model") && !strings.Contains(name, "ModelBase") {
filterMap = GetFilterMap(model.ModelBase{}, globalTablePrefix)
}
if t.Kind() != reflect.Struct {
logger.Error("GetFilterMapError", eris.Errorf("%v type can't have attributes inspected", t.Kind()))
return nil
@ -55,17 +70,22 @@ func GetFilterMap(m interface{}) map[string]model.FilterMapValue {
// Filter -> DB Field mapping
if dbTag != "" && dbTag != "-" {
// Filter tag can be a 2 part thing: name,type
// ie: account_id,integer
// So we need to split and use the first part
tablePrefix := globalTablePrefix
if len(parts) > 1 {
f.Type = parts[1]
if len(parts) > 2 {
tablePrefix = fmt.Sprintf(`"%s".`, parts[2])
}
}
// db can have many parts, we need to pull out the "column:value" part
f.Field = field.Name
r := regexp.MustCompile(`(?:^|;)column:([^;|$]+)(?:$|;)`)
if matches := r.FindStringSubmatch(dbTag); len(matches) > 1 {
f.Field = matches[1]
}
// Filter tag can be a 2 part thing: name,type
// ie: account_id,integer
// So we need to split and use the first part
if len(parts) > 1 {
f.Type = parts[1]
f.Field = fmt.Sprintf("%s%s", tablePrefix, matches[1])
}
}
filterMap[parts[0]] = f
@ -111,7 +131,7 @@ func getFilterTagSchema(filterTag string) string {
// GetFilterSchema creates a jsonschema for validating filters, based on the model
// object given and by reading the struct "filter" tags.
func GetFilterSchema(m interface{}) string {
filterMap := GetFilterMap(m)
filterMap := GetFilterMap(m, "")
schemas := make([]string, 0)
for _, f := range filterMap {