core/oc-lib
6
0
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

Kick extend treatment

Browse Source
This commit is contained in:
mr
2026-04-21 14:45:04 +02:00
parent bbaea4fec4
commit 0c6efee276
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
entrypoint.go
View File

@@ -196,7 +196,7 @@ type Claims struct {
Session SessionClaims `json:"session"` Session SessionClaims `json:"session"`
} }
func GetExtend(obj utils.DBObject, extends map[string][]tools.DataType) utils.DBObject { func GetExtend(obj utils.DBObject, extends map[string][]tools.DataType) map[string]interface{} {
base := obj.Serialize(obj) base := obj.Serialize(obj)
for k, v := range extends { for k, v := range extends {
if base[k+"_id"] == nil || base[k+"_id"] == "" { if base[k+"_id"] == nil || base[k+"_id"] == "" {
@@ -211,7 +211,7 @@ func GetExtend(obj utils.DBObject, extends map[string][]tools.DataType) utils.DB
} }
} }
} }
return obj.Deserialize(base, obj) return base
} }
func ExtractTokenInfo(request http.Request) (string, string, []string) { func ExtractTokenInfo(request http.Request) (string, string, []string) {
reqToken := request.Header.Get("Authorization") reqToken := request.Header.Get("Authorization")
@@ -379,7 +379,7 @@ func (r *Request) PaymentTunnel(o *order.Order, scheduler *workflow_execution.Wo
* @param c ...*tools.HTTPCaller * @param c ...*tools.HTTPCaller
* @return data LibDataShallow * @return data LibDataShallow
*/ */
func (r *Request) Search(filters *dbs.Filters, word string, isDraft bool, offset int64, limit int64, extend ...string) (data LibDataShallow) { func (r *Request) Search(filters *dbs.Filters, word string, isDraft bool, offset int64, limit int64) (data LibDataShallow) {
defer func() { // recover the panic defer func() { // recover the panic
if r := recover(); r != nil { if r := recover(); r != nil {
tools.UncatchedError = append(tools.UncatchedError, errors.New("Panic recovered in Search : "+fmt.Sprintf("%v", r))) tools.UncatchedError = append(tools.UncatchedError, errors.New("Panic recovered in Search : "+fmt.Sprintf("%v", r)))
@@ -397,9 +397,6 @@ func (r *Request) Search(filters *dbs.Filters, word string, isDraft bool, offset
data = LibDataShallow{Data: d, Code: code, Err: err.Error()} data = LibDataShallow{Data: d, Code: code, Err: err.Error()}
return return
} }
for _, dd := range d {
dd = GetExtend(dd, dd.Extend(extend...))
}
data = LibDataShallow{Data: d, Code: code} data = LibDataShallow{Data: d, Code: code}
return return
} }
@@ -410,7 +407,7 @@ func (r *Request) Search(filters *dbs.Filters, word string, isDraft bool, offset
* @param c ...*tools.HTTPCaller * @param c ...*tools.HTTPCaller
* @return data LibDataShallow * @return data LibDataShallow
*/ */
func (r *Request) LoadAll(isDraft bool, offset int64, limit int64, extend ...string) (data LibDataShallow) { func (r *Request) LoadAll(isDraft bool, offset int64, limit int64) (data LibDataShallow) {
defer func() { // recover the panic defer func() { // recover the panic
if r := recover(); r != nil { if r := recover(); r != nil {
tools.UncatchedError = append(tools.UncatchedError, errors.New("Panic recovered in LoadAll : "+fmt.Sprintf("%v", r)+" - "+string(debug.Stack()))) tools.UncatchedError = append(tools.UncatchedError, errors.New("Panic recovered in LoadAll : "+fmt.Sprintf("%v", r)+" - "+string(debug.Stack())))
@@ -428,9 +425,6 @@ func (r *Request) LoadAll(isDraft bool, offset int64, limit int64, extend ...str
data = LibDataShallow{Data: d, Code: code, Err: err.Error()} data = LibDataShallow{Data: d, Code: code, Err: err.Error()}
return return
} }
for _, dd := range d {
dd = GetExtend(dd, dd.Extend(extend...))
}
data = LibDataShallow{Data: d, Code: code} data = LibDataShallow{Data: d, Code: code}
return return
} }
@@ -442,7 +436,7 @@ func (r *Request) LoadAll(isDraft bool, offset int64, limit int64, extend ...str
* @param c ...*tools.HTTPCaller * @param c ...*tools.HTTPCaller
* @return data LibData * @return data LibData
*/ */
func (r *Request) LoadOne(id string, extend ...string) (data LibData) { func (r *Request) LoadOne(id string) (data LibData) {
defer func() { // recover the panic defer func() { // recover the panic
if r := recover(); r != nil { if r := recover(); r != nil {
tools.UncatchedError = append(tools.UncatchedError, errors.New("Panic recovered in LoadOne : "+fmt.Sprintf("%v", r)+" - "+string(debug.Stack()))) tools.UncatchedError = append(tools.UncatchedError, errors.New("Panic recovered in LoadOne : "+fmt.Sprintf("%v", r)+" - "+string(debug.Stack())))
@@ -460,7 +454,7 @@ func (r *Request) LoadOne(id string, extend ...string) (data LibData) {
data = LibData{Data: d, Code: code, Err: err.Error()} data = LibData{Data: d, Code: code, Err: err.Error()}
return return
} }
data = LibData{Data: GetExtend(d, d.Extend(extend...)), Code: code} data = LibData{Data: d, Code: code}
return return
} }