core/oc-catalog
6
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Extend

Browse Source
This commit is contained in:
mr
2026-04-29 07:47:44 +02:00
parent 6a3ce4a35b
commit c03b43f844
11 changed files with 194 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
controllers/resource.go
View File

@@ -9,6 +9,7 @@ import (
oclib "cloud.o-forge.io/core/oc-lib"
"cloud.o-forge.io/core/oc-lib/models/resources"
"cloud.o-forge.io/core/oc-lib/models/utils"
"cloud.o-forge.io/core/oc-lib/tools"
beego "github.com/beego/beego/v2/server/web"
)
@@ -26,6 +27,9 @@ func resourceTypeEnum(t string, special bool) []oclib.LibDataEnum {
if t == "compute" || t == "resource" {
e = append(e, oclib.LibDataEnum(oclib.COMPUTE_RESOURCE))
}
if t == "service" || t == "resource" {
e = append(e, oclib.LibDataEnum(oclib.SERVICE_RESOURCE))
}
if t == "data" || t == "resource" {
e = append(e, oclib.LibDataEnum(oclib.DATA_RESOURCE))
}
@@ -70,19 +74,20 @@ func (o *ResourceController) GetAll() {
offset, _ := strconv.Atoi(o.Ctx.Input.Query("offset"))
limit, _ := strconv.Atoi(o.Ctx.Input.Query("limit"))
m := map[string][]map[string]interface{}{}
m := map[string][]utils.ShallowDBObject{}
for _, col := range o.collection(false) {
if m[col.String()] == nil {
m[col.String()] = []map[string]interface{}{}
m[col.String()] = []utils.ShallowDBObject{}
}
s := oclib.NewRequest(col, user, peerID, groups, nil).LoadAll(isDraft == "true", int64(offset), int64(limit))
for _, d := range s.Data {
m[col.String()] = append(m[col.String()], oclib.GetExtend(d, d.Extend(extend...)))
}
m[col.String()] = append(m[col.String()], s.Data...)
}
mm := map[string]interface{}{}
for k, v := range m {
mm[k] = oclib.GetExtends(v, extend...)
}
o.Data["json"] = map[string]interface{}{
"data": m,
"data": mm,
"code": 200,
"err": nil,
}
@@ -107,19 +112,21 @@ func (o *ResourceController) Search() {
offset, _ := strconv.Atoi(o.Ctx.Input.Query("offset"))
limit, _ := strconv.Atoi(o.Ctx.Input.Query("limit"))
m := map[string][]map[string]interface{}{}
m := map[string][]utils.ShallowDBObject{}
fmt.Println(o.collection(false))
for _, col := range o.collection(false) {
if m[col.String()] == nil {
m[col.String()] = []map[string]interface{}{}
m[col.String()] = []utils.ShallowDBObject{}
}
s := oclib.NewRequest(col, user, peerID, groups, nil).Search(nil, search, isDraft == "true", int64(offset), int64(limit))
for _, d := range s.Data {
m[col.String()] = append(m[col.String()], oclib.GetExtend(d, d.Extend(extend...)))
}
m[col.String()] = append(m[col.String()], s.Data...)
}
mm := map[string]interface{}{}
for k, v := range m {
mm[k] = oclib.GetExtends(v, extend...)
}
o.Data["json"] = map[string]interface{}{
"data": m,
"data": mm,
"code": 200,
"err": nil,
}
@@ -163,22 +170,21 @@ func (o *ResourceController) SearchExtended() {
limit, _ := strconv.Atoi(o.Ctx.Input.Query("limit"))
var res map[string]interface{}
json.Unmarshal(o.Ctx.Input.CopyBody(100000), &res)
m := map[string][]map[string]interface{}{}
m := map[string][]utils.ShallowDBObject{}
for _, col := range o.collection(false) {
if m[col.String()] == nil {
m[col.String()] = []map[string]interface{}{}
m[col.String()] = []utils.ShallowDBObject{}
}
fmt.Println(res, oclib.FiltersFromFlatMap(res, GetResource(col)))
s := oclib.NewRequest(col, user, peerID, groups, nil).Search(
oclib.FiltersFromFlatMap(res, GetResource(col)), "", isDraft == "true", int64(offset), int64(limit))
for _, d := range s.Data {
m[col.String()] = append(m[col.String()], oclib.GetExtend(d, d.Extend(extend...)))
}
m[col.String()] = append(m[col.String()], s.Data...)
}
mm := map[string]interface{}{}
for k, v := range m {
mm[k] = oclib.GetExtends(v, extend...)
}
o.Data["json"] = map[string]interface{}{
"data": m,
"data": mm,
"code": 200,
"err": nil,
}
@@ -197,10 +203,11 @@ func (o *ResourceController) Get() {
user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
id := o.Ctx.Input.Param(":id")
extend := strings.Split(o.Ctx.Input.Query("extend"), ",")
fmt.Println(user, groups, peerID)
fmt.Println("COLLECTIOn", o.collection(false))
for _, col := range o.collection(false) {
if d := oclib.NewRequest(col, user, peerID, groups, nil).LoadOne(id); d.Data != nil {
o.Data["json"] = oclib.GetExtend(d.Data, d.Data.Extend(extend...))
fmt.Println("EXTEND", d.Data.Extend(extend...), extend)
o.Data["json"] = oclib.GetExtend(d.Data, d.Data.Extend(extend...), map[tools.DataType]map[string]interface{}{})
break
} else {
o.Data["json"] = d