mirror of
https://github.com/NginxProxyManager/nginx-proxy-manager.git
synced 2025-06-18 18:16:26 +00:00
Fix schema responses not matching tests
This commit is contained in:
@ -40,7 +40,7 @@ func List(pageInfo model.PageInfo, filters []model.Filter) (entity.ListResponse,
|
||||
Total: totalRows,
|
||||
Limit: pageInfo.Limit,
|
||||
Offset: pageInfo.Offset,
|
||||
Sort: pageInfo.Sort,
|
||||
Sort: pageInfo.GetSort(defaultSort),
|
||||
Filter: filters,
|
||||
}
|
||||
|
||||
|
@ -65,7 +65,7 @@ func List(pageInfo model.PageInfo, filters []model.Filter, expand []string) (ent
|
||||
Total: totalRows,
|
||||
Limit: pageInfo.Limit,
|
||||
Offset: pageInfo.Offset,
|
||||
Sort: pageInfo.Sort,
|
||||
Sort: pageInfo.GetSort(defaultSort),
|
||||
Filter: filters,
|
||||
}
|
||||
|
||||
|
@ -40,7 +40,7 @@ func List(pageInfo model.PageInfo, filters []model.Filter) (entity.ListResponse,
|
||||
Total: totalRows,
|
||||
Limit: pageInfo.Limit,
|
||||
Offset: pageInfo.Offset,
|
||||
Sort: pageInfo.Sort,
|
||||
Sort: pageInfo.GetSort(defaultSort),
|
||||
Filter: filters,
|
||||
}
|
||||
|
||||
|
@ -40,7 +40,7 @@ func List(pageInfo model.PageInfo, filters []model.Filter) (entity.ListResponse,
|
||||
Total: totalRows,
|
||||
Limit: pageInfo.Limit,
|
||||
Offset: pageInfo.Offset,
|
||||
Sort: pageInfo.Sort,
|
||||
Sort: pageInfo.GetSort(defaultSort),
|
||||
Filter: filters,
|
||||
}
|
||||
|
||||
|
@ -51,7 +51,7 @@ func List(pageInfo model.PageInfo, filters []model.Filter, expand []string) (ent
|
||||
Total: totalRows,
|
||||
Limit: pageInfo.Limit,
|
||||
Offset: pageInfo.Offset,
|
||||
Sort: pageInfo.Sort,
|
||||
Sort: pageInfo.GetSort(defaultSort),
|
||||
Filter: filters,
|
||||
}
|
||||
|
||||
|
@ -40,7 +40,7 @@ func List(pageInfo model.PageInfo, filters []model.Filter) (entity.ListResponse,
|
||||
Total: totalRows,
|
||||
Limit: pageInfo.Limit,
|
||||
Offset: pageInfo.Offset,
|
||||
Sort: pageInfo.Sort,
|
||||
Sort: pageInfo.GetSort(defaultSort),
|
||||
Filter: filters,
|
||||
}
|
||||
|
||||
|
@ -4,6 +4,7 @@ import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"npm/internal/logger"
|
||||
"npm/internal/model"
|
||||
|
||||
"gorm.io/gorm"
|
||||
@ -36,6 +37,8 @@ func ScopeOrderBy(pageInfo *model.PageInfo, defaultSort model.Sort) func(db *gor
|
||||
}
|
||||
|
||||
func ScopeFilters(filters []model.Filter, filterMap map[string]filterMapValue) func(db *gorm.DB) *gorm.DB {
|
||||
logger.Debug("FILTERS: %+v", filters)
|
||||
logger.Debug("FILTERMAP: %+v", filterMap)
|
||||
return func(db *gorm.DB) *gorm.DB {
|
||||
for _, f := range filters {
|
||||
// Lookup this filter field from the name map
|
||||
|
@ -49,7 +49,7 @@ func List(pageInfo model.PageInfo, filters []model.Filter) (entity.ListResponse,
|
||||
Total: totalRows,
|
||||
Limit: pageInfo.Limit,
|
||||
Offset: pageInfo.Offset,
|
||||
Sort: pageInfo.Sort,
|
||||
Sort: pageInfo.GetSort(defaultSort),
|
||||
Filter: filters,
|
||||
}
|
||||
|
||||
|
@ -40,7 +40,7 @@ func List(pageInfo model.PageInfo, filters []model.Filter) (entity.ListResponse,
|
||||
Total: totalRows,
|
||||
Limit: pageInfo.Limit,
|
||||
Offset: pageInfo.Offset,
|
||||
Sort: pageInfo.Sort,
|
||||
Sort: pageInfo.GetSort(defaultSort),
|
||||
Filter: filters,
|
||||
}
|
||||
|
||||
|
@ -46,7 +46,7 @@ func List(pageInfo model.PageInfo, filters []model.Filter, expand []string) (ent
|
||||
Total: totalRows,
|
||||
Limit: pageInfo.Limit,
|
||||
Offset: pageInfo.Offset,
|
||||
Sort: pageInfo.Sort,
|
||||
Sort: pageInfo.GetSort(defaultSort),
|
||||
Filter: filters,
|
||||
}
|
||||
|
||||
|
@ -49,7 +49,7 @@ func List(pageInfo model.PageInfo, filters []model.Filter) (entity.ListResponse,
|
||||
Total: totalRows,
|
||||
Limit: pageInfo.Limit,
|
||||
Offset: pageInfo.Offset,
|
||||
Sort: pageInfo.Sort,
|
||||
Sort: pageInfo.GetSort(defaultSort),
|
||||
Filter: filters,
|
||||
}
|
||||
|
||||
|
@ -73,7 +73,7 @@ func List(pageInfo model.PageInfo, filters []model.Filter, expand []string) (ent
|
||||
Total: totalRows,
|
||||
Limit: pageInfo.Limit,
|
||||
Offset: pageInfo.Offset,
|
||||
Sort: pageInfo.Sort,
|
||||
Sort: pageInfo.GetSort(defaultSort),
|
||||
Filter: filters,
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user