Extend

controllers/general.go

@@ -63,7 +63,7 @@ func (o *GeneralController) GetAll() {
 	o.ServeJSON()
 }
 
-func Websocket(ctx context.Context, user string, groups []string, dataType int, conn *websocket.Conn) {
+func Websocket(ctx context.Context, user string, groups []string, dataType int, conn *websocket.Conn, extend ...string) {
 	defer conn.Close()
 	done := make(chan struct{})
 	go func() {
@@ -80,6 +80,8 @@ func Websocket(ctx context.Context, user string, groups []string, dataType int,
 			close(ch)
 			infrastructure.SearchMu.Lock()
 			delete(infrastructure.SearchStream, user)
+			delete(infrastructure.SearchStreamSeen, user)
+			delete(infrastructure.SearchStreamExtend, user)
 			infrastructure.SearchMu.Unlock()
 		}
 		fmt.Println("CLOSE !")

controllers/purchase.go

@@ -3,8 +3,10 @@ package controllers
 import (
 	"encoding/json"
 	"strconv"
+	"strings"
 
 	oclib "cloud.o-forge.io/core/oc-lib"
+	"cloud.o-forge.io/core/oc-lib/tools"
 	beego "github.com/beego/beego/v2/server/web"
 )
 
@@ -36,6 +38,7 @@ func (o *PurchaseController) Post() {
 
 // @Title GetAll
 // @Description find compute by id
+// @Param	extend		query 	string	false		"extend"
 // @Param	is_draft		query 	string	false		"draft wished"
 // @Param	offset		query 	string	false		"offset wished"
 // @Param	limit		query 	string	false		"limit wished"
@@ -44,14 +47,21 @@ func (o *PurchaseController) Post() {
 func (o *PurchaseController) GetAll() {
 	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	isDraft := o.Ctx.Input.Query("is_draft")
+	extend := strings.Split(o.Ctx.Input.Query("extend"), ",")
 	offset, _ := strconv.Atoi(o.Ctx.Input.Query("offset"))
 	limit, _ := strconv.Atoi(o.Ctx.Input.Query("limit"))
-	o.Data["json"] = oclib.NewRequest(purchase_collection, user, peerID, groups, nil).LoadAll(isDraft == "true", int64(offset), int64(limit))
+	s := oclib.NewRequest(purchase_collection, user, peerID, groups, nil).LoadAll(isDraft == "true", int64(offset), int64(limit))
+	o.Data["json"] = map[string]interface{}{
+		"data": oclib.GetExtends(s.Data, extend...),
+		"code": 200,
+		"err":  nil,
+	}
 	o.ServeJSON()
 }
 
 // @Title Get
 // @Description find compute by key word
+// @Param	extend		query 	string	false		"extend"
 // @Param	search		path 	string	true		"the search you want to get"
 // @Param	is_draft		query 	string	false		"draft wished"
 // @Param	offset		query 	string	false		"offset wished"
@@ -62,20 +72,38 @@ func (o *PurchaseController) Search() {
 	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	isDraft := o.Ctx.Input.Query("is_draft")
 	search := o.Ctx.Input.Param(":search")
+	extend := strings.Split(o.Ctx.Input.Query("extend"), ",")
 	offset, _ := strconv.Atoi(o.Ctx.Input.Query("offset"))
 	limit, _ := strconv.Atoi(o.Ctx.Input.Query("limit"))
-	o.Data["json"] = oclib.NewRequest(purchase_collection, user, peerID, groups, nil).Search(nil, search, isDraft == "true", int64(offset), int64(limit))
+	s := oclib.NewRequest(purchase_collection, user, peerID, groups, nil).Search(nil, search, isDraft == "true", int64(offset), int64(limit))
+	o.Data["json"] = map[string]interface{}{
+		"data": oclib.GetExtends(s.Data, extend...),
+		"code": 200,
+		"err":  nil,
+	}
 	o.ServeJSON()
 }
 
 // @Title Get
 // @Description find compute by id
+// @Param	extend		query 	string	false		"extend"
 // @Param	id		path 	string	true		"the id you want to get"
 // @Success 200 {compute} models.compute
 // @router /:id [get]
 func (o *PurchaseController) Get() {
 	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	id := o.Ctx.Input.Param(":id")
-	o.Data["json"] = oclib.NewRequest(purchase_collection, user, peerID, groups, nil).LoadOne(id)
+	extend := strings.Split(o.Ctx.Input.Query("extend"), ",")
+	data := oclib.NewRequest(purchase_collection, user, peerID, groups, nil).LoadOne(id)
+	if data.Data != nil {
+		m := oclib.GetExtend(data.Data, data.Data.Extend(extend...), map[tools.DataType]map[string]interface{}{})
+		o.Data["json"] = map[string]interface{}{
+			"data": m,
+			"code": 200,
+			"err":  nil,
+		}
+	} else {
+		o.Data["json"] = data
+	}
 	o.ServeJSON()
 }

controllers/resource.go

@@ -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