wdevs/ResolveSpec
3
0
Fork 0
mirror of https://github.com/bitechdev/ResolveSpec.git synced 2026-02-14 20:36:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed formatting issues
Some checks failed
Tests / Run Tests (1.23.x) (push) Has been cancelled
Details
Tests / Run Tests (1.24.x) (push) Has been cancelled
Details
Tests / Lint Code (push) Has been cancelled
Details
Tests / Build (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Hein
2025-12-01 14:56:30 +02:00
parent 1643a5e920
commit 78029fb34f
10 changed files with 77 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/funcspec/function_api.go
View File

@@ -109,7 +109,7 @@ func (h *Handler) SqlQueryList(sqlquery string, pNoCount, pBlankparms, pAllowFil
// Use potentially modified SQL query and variables from hooks
sqlquery = hookCtx.SQLQuery
variables = hookCtx.Variables
complexAPI = hookCtx.ComplexAPI
// complexAPI = hookCtx.ComplexAPI
// Extract input variables from SQL query (placeholders like [variable])
sqlquery = h.extractInputVariables(sqlquery, &inputvars)
@@ -299,7 +299,7 @@ func (h *Handler) SqlQueryList(sqlquery string, pNoCount, pBlankparms, pAllowFil
}
if len(dbobjlist) == 0 {
w.Write([]byte("[]"))
_, _ = w.Write([]byte("[]"))
return
}
@@ -318,7 +318,7 @@ func (h *Handler) SqlQueryList(sqlquery string, pNoCount, pBlankparms, pAllowFil
if int64(len(dbobjlist)) < total {
w.WriteHeader(http.StatusPartialContent)
}
w.Write(data)
_, _ = w.Write(data)
}
case "detail":
@@ -337,7 +337,7 @@ func (h *Handler) SqlQueryList(sqlquery string, pNoCount, pBlankparms, pAllowFil
if int64(len(dbobjlist)) < total {
w.WriteHeader(http.StatusPartialContent)
}
w.Write(data)
_, _ = w.Write(data)
}
default:
@@ -357,7 +357,7 @@ func (h *Handler) SqlQueryList(sqlquery string, pNoCount, pBlankparms, pAllowFil
if int64(len(dbobjlist)) < total {
w.WriteHeader(http.StatusPartialContent)
}
w.Write(data)
_, _ = w.Write(data)
}
} else {
data, err := json.Marshal(dbobjlist)
@@ -367,7 +367,7 @@ func (h *Handler) SqlQueryList(sqlquery string, pNoCount, pBlankparms, pAllowFil
if int64(len(dbobjlist)) < total {
w.WriteHeader(http.StatusPartialContent)
}
w.Write(data)
_, _ = w.Write(data)
}
}
}
@@ -578,7 +578,7 @@ func (h *Handler) SqlQuery(sqlquery string, pBlankparms bool) HTTPFuncType {
if err != nil {
sendError(w, http.StatusInternalServerError, "json_error", "Could not marshal response", err)
} else {
w.Write(data)
_, _ = w.Write(data)
}
return
}
@@ -588,7 +588,7 @@ func (h *Handler) SqlQuery(sqlquery string, pBlankparms bool) HTTPFuncType {
if err != nil {
sendError(w, http.StatusInternalServerError, "json_error", "Could not marshal response", err)
} else {
w.Write(data)
_, _ = w.Write(data)
}
}
}
@@ -597,9 +597,9 @@ func (h *Handler) SqlQuery(sqlquery string, pBlankparms bool) HTTPFuncType {
// extractInputVariables extracts placeholders like [variable] from the SQL query
func (h *Handler) extractInputVariables(sqlquery string, inputvars *[]string) string {
max := strings.Count(sqlquery, "[") * 4
testsqlquery := sqlquery
for i := 0; i <= max; i++ {
for i := 0; i <= strings.Count(sqlquery, "[")*4; i++ {
iStart := strings.Index(testsqlquery, "[")
if iStart < 0 {
break
@@ -722,7 +722,7 @@ func (h *Handler) mergeHeaderParams(r *http.Request, sqlquery string, variables
}
if strings.Contains(k, "x-simpleapi") {
*complexAPI = !(val == "1" || strings.ToLower(val) == "true")
*complexAPI = !strings.EqualFold(val, "1") && !strings.EqualFold(val, "true")
}
}
return sqlquery
@@ -904,5 +904,5 @@ func sendError(w http.ResponseWriter, status int, code, message string, err erro
"success": false,
"error": errObj,
})
w.Write(data)
_, _ = w.Write(data)
}

10
pkg/funcspec/hooks.go
View File

@@ -37,11 +37,11 @@ type HookContext struct {
Writer http.ResponseWriter
// SQL query and variables
SQLQuery string // The SQL query being executed (can be modified by hooks)
Variables map[string]interface{} // Variables extracted from request
InputVars []string // Input variable placeholders found in query
MetaInfo map[string]interface{} // Metadata about the request
PropQry map[string]string // Property query parameters
SQLQuery string // The SQL query being executed (can be modified by hooks)
Variables map[string]interface{} // Variables extracted from request
InputVars []string // Input variable placeholders found in query
MetaInfo map[string]interface{} // Metadata about the request
PropQry map[string]string // Property query parameters
// User context
UserContext *security.UserContext

14
pkg/funcspec/parameters.go
View File

@@ -18,9 +18,9 @@ type RequestParameters struct {
Distinct bool
// Filtering
FieldFilters map[string]string // column -> value (exact match)
SearchFilters map[string]string // column -> value (ILIKE)
SearchOps map[string]FilterOperator // column -> {operator, value, logic}
FieldFilters map[string]string // column -> value (exact match)
SearchFilters map[string]string // column -> value (ILIKE)
SearchOps map[string]FilterOperator // column -> {operator, value, logic}
CustomSQLWhere string
CustomSQLOr string
@@ -51,10 +51,10 @@ func (h *Handler) ParseParameters(r *http.Request) *RequestParameters {
FieldFilters: make(map[string]string),
SearchFilters: make(map[string]string),
SearchOps: make(map[string]FilterOperator),
Limit: 20, // Default limit
Offset: 0, // Default offset
Limit: 20, // Default limit
Offset: 0, // Default offset
ResponseFormat: "simple", // Default format
ComplexAPI: false, // Default to simple API
ComplexAPI: false, // Default to simple API
}
// Merge headers and query parameters
@@ -155,7 +155,7 @@ func (h *Handler) ParseParameters(r *http.Request) *RequestParameters {
// Response Format
case strings.HasPrefix(key, "x-simpleapi"):
params.ResponseFormat = "simple"
params.ComplexAPI = !(decodedValue == "1" || strings.EqualFold(decodedValue, "true"))
params.ComplexAPI = decodedValue != "1" && !strings.EqualFold(decodedValue, "true")
case strings.HasPrefix(key, "x-detailapi"):
params.ResponseFormat = "detail"
params.ComplexAPI = true