clear up useless env file

merge

.gitattributes

@@ -0,0 +1,3 @@
+# Force Go as the main language
+*.go linguist-detectable=true
+* linguist-language=Go

.gitignore

@@ -0,0 +1 @@
+env.env

Dockerfile

@@ -1,29 +1,44 @@
+FROM golang:alpine AS deps
+
+WORKDIR /app
+COPY go.mod go.sum ./
+RUN sed -i '/replace/d' go.mod
+RUN go mod download
+
+#----------------------------------------------------------------------------------------------
+
 FROM golang:alpine AS builder
 
 WORKDIR /app 
 
-COPY . .
-
 RUN apk add git
 
-RUN go get github.com/beego/bee/v2 && go install github.com/beego/bee/v2@master
+RUN go install github.com/beego/bee/v2@latest
 
-RUN timeout 15 bee run -gendoc=true -downdoc=true -runmode=dev || :
+WORKDIR /oc-catalog
 
-RUN sed -i 's/http:\/\/127.0.0.1:8080\/swagger\/swagger.json/swagger.json/g' swagger/index.html
+COPY --from=deps /go/pkg /go/pkg
+COPY --from=deps /app/go.mod /app/go.sum ./
 
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" .
+RUN export CGO_ENABLED=0 && \
+    export GOOS=linux && \
+    export GOARCH=amd64 && \
+    export BUILD_FLAGS="-ldflags='-w -s'"
 
-RUN ls /app
+COPY . .
 
-FROM scratch
+RUN sed -i '/replace/d' go.mod
+RUN bee pack
+RUN mkdir -p /app/extracted && tar -zxvf oc-catalog.tar.gz -C /app/extracted
+
+#----------------------------------------------------------------------------------------------
+
+FROM golang:alpine
 
 WORKDIR /app
-
-COPY --from=builder /app/oc-catalog /usr/bin/ 
-COPY --from=builder /app/swagger /app/swagger
-
-COPY docker_catalog.json /etc/oc/catalog.json
+COPY --from=builder /app/extracted/oc-catalog /usr/bin/ 
+COPY --from=builder /app/extracted/swagger /app/swagger
+COPY --from=builder /app/extracted/docker_catalog.json /etc/oc/catalog.json
 
 EXPOSE 8080
 

Makefile

@@ -0,0 +1,40 @@
+.DEFAULT_GOAL := all
+
+build: clean
+	bee pack
+
+run:
+	bee run -gendoc=true -downdoc=true
+
+purge:
+	lsof -t -i:8087 | xargs kill | true
+
+run-dev: 
+	bee generate routers && bee run -gendoc=true -downdoc=true
+
+debug:
+	bee run -downdebug -gendebug
+
+clean:
+	rm -rf oc-catalog.tar.gz
+
+docker:
+	DOCKER_BUILDKIT=1 docker build -t oc-catalog -f Dockerfile . --build-arg=HOST=$(HOST)
+	docker tag oc-catalog:latest oc/oc-catalog:0.0.1
+
+publish-kind:
+	kind load docker-image oc/oc-catalog:0.0.1 --name $(CLUSTER_NAME) | true
+
+publish-registry:
+	@echo "TODO"
+
+docker-deploy:
+	docker compose up -d
+
+run-docker: docker publish-kind publish-registry docker-deploy
+
+all: docker publish-kind publish-registry
+
+dev: purge run-dev
+
+.PHONY: build run clean docker publish-kind publish-registry

README.md

@@ -7,6 +7,9 @@ To build :
     bee generate routers
     bee run -gendoc=true -downdoc=true
 
+OR 
+    make dev
+
 If default Swagger page is displayed instead of tyour api, change url in swagger/index.html file to :
 
     url: "swagger.json"

catalog.json

@@ -1,5 +1,5 @@
 {
-    "port": 8080,
+    "port": 8087,
     "MONGO_URL":"mongodb://localhost:27017/", 
     "MONGO_DATABASE":"DC_myDC"
 }

conf/app.conf

@@ -1,5 +1,5 @@
 appname = oc-catalog
-httpport = 8080
+httpport = 8087
 runmode = dev
 autorender = false
 copyrequestbody = true

controllers/compute.go

@@ -0,0 +1,155 @@
+package controllers
+
+import (
+	"encoding/json"
+	"oc-catalog/infrastructure"
+
+	oclib "cloud.o-forge.io/core/oc-lib"
+	"cloud.o-forge.io/core/oc-lib/tools"
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+// Operations about compute
+type ComputeController struct {
+	beego.Controller
+}
+
+var comp_collection = oclib.LibDataEnum(oclib.COMPUTE_RESOURCE)
+var comp_dt = tools.COMPUTE_RESOURCE
+
+// @Title Update
+// @Description create computes
+// @Param	id		path 	string	true		"the compute id you want to get"
+// @Param	body		body 	models.compute	true		"The compute content"
+// @Success 200 {compute} models.compute
+// @router /:id [put]
+func (o *ComputeController) Put() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	// store and return Id or post with UUID
+	var res map[string]interface{}
+	id := o.Ctx.Input.Param(":id")
+	json.Unmarshal(o.Ctx.Input.CopyBody(10000), &res)
+	data := oclib.NewRequest(comp_collection, user, peerID, groups, nil).UpdateOne(res, id)
+	if data.Err == "" {
+		data, _ := json.Marshal(data.Data.Serialize(data.Data))
+		infrastructure.EmitNATS(user, tools.PropalgationMessage{
+			Action:   tools.PB_UPDATE,
+			DataType: comp_dt.EnumIndex(),
+			Payload:  data,
+		})
+	}
+	o.Data["json"] = data
+	o.ServeJSON()
+}
+
+// @Title Create
+// @Description create compute
+// @Param	compute		body 	json	true		"body for compute content (Json format)"
+// @Success 200 {compute} models.compute
+// @router / [post]
+func (o *ComputeController) Post() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	var res map[string]interface{}
+	json.Unmarshal(o.Ctx.Input.CopyBody(10000), &res)
+	data := oclib.NewRequest(comp_collection, user, peerID, groups, nil).StoreOne(res)
+	if data.Err == "" {
+		data, _ := json.Marshal(data.Data.Serialize(data.Data))
+		infrastructure.EmitNATS(user, tools.PropalgationMessage{
+			Action:   tools.PB_CREATE,
+			DataType: comp_dt.EnumIndex(),
+			Payload:  data,
+		})
+	}
+	o.Data["json"] = data
+	o.ServeJSON()
+}
+
+// @Title GetAll
+// @Description find compute by id
+// @Param	is_draft		query 	string	false		"draft wished"
+// @Success 200 {compute} models.compute
+// @router / [get]
+func (o *ComputeController) GetAll() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	isDraft := o.Ctx.Input.Query("is_draft")
+	o.Data["json"] = oclib.NewRequest(comp_collection, user, peerID, groups, nil).LoadAll(isDraft == "true")
+	o.ServeJSON()
+}
+
+// @Title Get
+// @Description find compute by key word
+// @Param	search		path 	string	true		"the search you want to get"
+// @Param	is_draft		query 	string	false		"draft wished"
+// @Success 200 {compute} models.compute
+// @router /search/:search [get]
+func (o *ComputeController) Search() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	isDraft := o.Ctx.Input.Query("is_draft")
+	search := o.Ctx.Input.Param(":search")
+	o.Data["json"] = oclib.NewRequest(comp_collection, user, peerID, groups, nil).Search(nil, search, isDraft == "true")
+	o.ServeJSON()
+}
+
+// @Title Get
+// @Description find compute by id
+// @Param	id		path 	string	true		"the id you want to get"
+// @Success 200 {compute} models.compute
+// @router /:id [get]
+func (o *ComputeController) Get() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	id := o.Ctx.Input.Param(":id")
+	o.Data["json"] = oclib.NewRequest(comp_collection, user, peerID, groups, nil).LoadOne(id)
+	o.ServeJSON()
+}
+
+// @Title Delete
+// @Description delete the compute
+// @Param	id		path 	string	true		"The id you want to delete"
+// @Success 200 {compute} delete success!
+// @router /:id [delete]
+func (o *ComputeController) Delete() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	id := o.Ctx.Input.Param(":id")
+	data := oclib.NewRequest(comp_collection, user, peerID, groups, nil).DeleteOne(id)
+	if data.Err == "" {
+		data, _ := json.Marshal(data.Data.Serialize(data.Data))
+		infrastructure.EmitNATS(user, tools.PropalgationMessage{
+			Action:   tools.PB_DELETE,
+			DataType: comp_dt.EnumIndex(),
+			Payload:  data,
+		})
+	}
+	o.Data["json"] = oclib.NewRequest(comp_collection, user, peerID, groups, nil).DeleteOne(id)
+	o.ServeJSON()
+}
+
+// @Title Search Decentralized
+// @Description find workflow by key word
+// @Param	search		path 	string	true		"the search you want to get"
+// @Param	is_draft		query 	string	false		"draft wished"
+// @Success 200 {workflow} models.workflow
+// @router /search/:search/decentralized/:type [get]
+func (o *ComputeController) SearchDecentralized() {
+	user, _, _ := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	search := o.Ctx.Input.Param(":search")
+	t := o.Ctx.Input.Param(":type")
+	b, err := json.Marshal(map[string]string{
+		"search": search,
+		"type":   t,
+	})
+	infrastructure.EmitNATS(user, tools.PropalgationMessage{
+		Action:   tools.PB_SEARCH,
+		DataType: comp_dt.EnumIndex(),
+		Payload:  b,
+	})
+	if err != nil {
+		o.Data["json"] = map[string]interface{}{
+			"data":  nil,
+			"code":  400,
+			"error": err,
+		}
+		o.ServeJSON()
+		return
+	}
+	Websocket(o.Ctx.Request.Context(), user, o.Ctx.ResponseWriter, o.Ctx.Request)
+}

controllers/data.go

@@ -2,8 +2,10 @@ package controllers
 
 import (
 	"encoding/json"
+	"oc-catalog/infrastructure"
 
 	oclib "cloud.o-forge.io/core/oc-lib"
+	"cloud.o-forge.io/core/oc-lib/tools"
 	beego "github.com/beego/beego/v2/server/web"
 )
 
@@ -12,6 +14,9 @@ type DataController struct {
 	beego.Controller
 }
 
+var data_collection = oclib.LibDataEnum(oclib.DATA_RESOURCE)
+var data_dt = tools.DATA_RESOURCE
+
 // @Title Update
 // @Description create datas
 // @Param	id		path 	string	true		"the data id you want to get"
@@ -20,10 +25,20 @@ type DataController struct {
 // @router /:id [put]
 func (o *DataController) Put() {
 	// store and return Id or post with UUID
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	var res map[string]interface{}
 	id := o.Ctx.Input.Param(":id")
 	json.Unmarshal(o.Ctx.Input.CopyBody(10000), &res)
-	o.Data["json"] = oclib.UpdateOne(oclib.LibDataEnum(oclib.DATA_RESOURCE), res, id)
+	data := oclib.NewRequest(data_collection, user, peerID, groups, nil).UpdateOne(res, id)
+	if data.Err == "" {
+		data, _ := json.Marshal(data.Data.Serialize(data.Data))
+		infrastructure.EmitNATS(user, tools.PropalgationMessage{
+			Action:   tools.PB_UPDATE,
+			DataType: data_dt.EnumIndex(),
+			Payload:  data,
+		})
+	}
+	o.Data["json"] = data
 	o.ServeJSON()
 }
 
@@ -33,29 +48,46 @@ func (o *DataController) Put() {
 // @Success 200 {data} models.data
 // @router / [post]
 func (o *DataController) Post() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	var res map[string]interface{}
 	json.Unmarshal(o.Ctx.Input.CopyBody(10000), &res)
-	o.Data["json"] = oclib.StoreOne(oclib.LibDataEnum(oclib.DATA_RESOURCE), res)
+	data := oclib.NewRequest(data_collection, user, peerID, groups, nil).StoreOne(res)
+	if data.Err == "" {
+		data, _ := json.Marshal(data.Data.Serialize(data.Data))
+		infrastructure.EmitNATS(user, tools.PropalgationMessage{
+			Action:   tools.PB_CREATE,
+			DataType: data_dt.EnumIndex(),
+			Payload:  data,
+		})
+	}
+	o.Data["json"] = data
 	o.ServeJSON()
 }
 
 // @Title GetAll
 // @Description find data by id
+// @Param	is_draft		query 	string	false		"draft wished"
 // @Success 200 {data} models.data
 // @router / [get]
 func (o *DataController) GetAll() {
-	o.Data["json"] = oclib.LoadAll(oclib.LibDataEnum(oclib.DATA_RESOURCE))
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	isDraft := o.Ctx.Input.Query("is_draft")
+	o.Data["json"] = oclib.NewRequest(data_collection, user, peerID, groups, nil).LoadAll(isDraft == "true")
 	o.ServeJSON()
 }
 
 // @Title Get
 // @Description find data by key word
 // @Param	search		path 	string	true		"the search you want to get"
+// @Param	is_draft		query 	string	false		"draft wished"
+
 // @Success 200 {data} models.data
 // @router /search/:search [get]
 func (o *DataController) Search() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	search := o.Ctx.Input.Param(":search")
-	o.Data["json"] = oclib.Search(nil, search, oclib.LibDataEnum(oclib.DATA_RESOURCE))
+	isDraft := o.Ctx.Input.Query("is_draft")
+	o.Data["json"] = oclib.NewRequest(data_collection, user, peerID, groups, nil).Search(nil, search, isDraft == "true")
 	o.ServeJSON()
 }
 
@@ -65,8 +97,9 @@ func (o *DataController) Search() {
 // @Success 200 {data} models.data
 // @router /:id [get]
 func (o *DataController) Get() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	id := o.Ctx.Input.Param(":id")
-	o.Data["json"] = oclib.LoadOne(oclib.LibDataEnum(oclib.DATA_RESOURCE), id)
+	o.Data["json"] = oclib.NewRequest(data_collection, user, peerID, groups, nil).LoadOne(id)
 	o.ServeJSON()
 }
 
@@ -76,7 +109,48 @@ func (o *DataController) Get() {
 // @Success 200 {data} delete success!
 // @router /:id [delete]
 func (o *DataController) Delete() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	id := o.Ctx.Input.Param(":id")
-	o.Data["json"] = oclib.DeleteOne(oclib.LibDataEnum(oclib.DATA_RESOURCE), id)
+	data := oclib.NewRequest(data_collection, user, peerID, groups, nil).DeleteOne(id)
+	if data.Err == "" {
+		data, _ := json.Marshal(data.Data.Serialize(data.Data))
+		infrastructure.EmitNATS(user, tools.PropalgationMessage{
+			Action:   tools.PB_DELETE,
+			DataType: data_dt.EnumIndex(),
+			Payload:  data,
+		})
+	}
+	o.Data["json"] = data
 	o.ServeJSON()
 }
+
+// @Title Search Decentralized
+// @Description find workflow by key word
+// @Param	search		path 	string	true		"the search you want to get"
+// @Param	is_draft		query 	string	false		"draft wished"
+// @Success 200 {workflow} models.workflow
+// @router /search/:search/decentralized/:type [get]
+func (o *DataController) SearchDecentralized() {
+	user, _, _ := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	search := o.Ctx.Input.Param(":search")
+	t := o.Ctx.Input.Param(":type")
+	b, err := json.Marshal(map[string]string{
+		"search": search,
+		"type":   t,
+	})
+	infrastructure.EmitNATS(user, tools.PropalgationMessage{
+		Action:   tools.PB_SEARCH,
+		DataType: data_dt.EnumIndex(),
+		Payload:  b,
+	})
+	if err != nil {
+		o.Data["json"] = map[string]interface{}{
+			"data":  nil,
+			"code":  400,
+			"error": err,
+		}
+		o.ServeJSON()
+		return
+	}
+	Websocket(o.Ctx.Request.Context(), user, o.Ctx.ResponseWriter, o.Ctx.Request)
+}

controllers/datacenter.go

@@ -1,82 +0,0 @@
-package controllers
-
-import (
-	"encoding/json"
-
-	oclib "cloud.o-forge.io/core/oc-lib"
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-// Operations about datacenter
-type DatacenterController struct {
-	beego.Controller
-}
-
-// @Title Update
-// @Description create datacenters
-// @Param	id		path 	string	true		"the datacenter id you want to get"
-// @Param	body		body 	models.datacenter	true		"The datacenter content"
-// @Success 200 {datacenter} models.datacenter
-// @router /:id [put]
-func (o *DatacenterController) Put() {
-	// store and return Id or post with UUID
-	var res map[string]interface{}
-	id := o.Ctx.Input.Param(":id")
-	json.Unmarshal(o.Ctx.Input.CopyBody(10000), &res)
-	o.Data["json"] = oclib.UpdateOne(oclib.LibDataEnum(oclib.DATACENTER_RESOURCE), res, id)
-	o.ServeJSON()
-}
-
-// @Title Create
-// @Description create datacenter
-// @Param	datacenter		body 	json	true		"body for datacenter content (Json format)"
-// @Success 200 {datacenter} models.datacenter
-// @router / [post]
-func (o *DatacenterController) Post() {
-	var res map[string]interface{}
-	json.Unmarshal(o.Ctx.Input.CopyBody(10000), &res)
-	o.Data["json"] = oclib.StoreOne(oclib.LibDataEnum(oclib.DATACENTER_RESOURCE), res)
-	o.ServeJSON()
-}
-
-// @Title GetAll
-// @Description find datacenter by id
-// @Success 200 {datacenter} models.datacenter
-// @router / [get]
-func (o *DatacenterController) GetAll() {
-	o.Data["json"] = oclib.LoadAll(oclib.LibDataEnum(oclib.DATACENTER_RESOURCE))
-	o.ServeJSON()
-}
-
-// @Title Get
-// @Description find datacenter by key word
-// @Param	search		path 	string	true		"the search you want to get"
-// @Success 200 {datacenter} models.datacenter
-// @router /search/:search [get]
-func (o *DatacenterController) Search() {
-	search := o.Ctx.Input.Param(":search")
-	o.Data["json"] = oclib.Search(nil, search, oclib.LibDataEnum(oclib.DATACENTER_RESOURCE))
-	o.ServeJSON()
-}
-
-// @Title Get
-// @Description find datacenter by id
-// @Param	id		path 	string	true		"the id you want to get"
-// @Success 200 {datacenter} models.datacenter
-// @router /:id [get]
-func (o *DatacenterController) Get() {
-	id := o.Ctx.Input.Param(":id")
-	o.Data["json"] = oclib.LoadOne(oclib.LibDataEnum(oclib.DATACENTER_RESOURCE), id)
-	o.ServeJSON()
-}
-
-// @Title Delete
-// @Description delete the datacenter
-// @Param	id		path 	string	true		"The id you want to delete"
-// @Success 200 {datacenter} delete success!
-// @router /:id [delete]
-func (o *DatacenterController) Delete() {
-	id := o.Ctx.Input.Param(":id")
-	o.Data["json"] = oclib.DeleteOne(oclib.LibDataEnum(oclib.DATACENTER_RESOURCE), id)
-	o.ServeJSON()
-}

controllers/enum.go

@@ -0,0 +1,183 @@
+package controllers
+
+import (
+	"cloud.o-forge.io/core/oc-lib/models/common/enum"
+	"cloud.o-forge.io/core/oc-lib/models/common/pricing"
+	"cloud.o-forge.io/core/oc-lib/models/resources"
+	"cloud.o-forge.io/core/oc-lib/tools"
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+// Operations about resource
+type EnumController struct {
+	beego.Controller
+}
+
+// @Title EnumStorageType
+// @Description get list of StorageType
+// @Success 200 {resource} models.resource
+// @router /storage/type [get]
+func (o *EnumController) EnumStorageType() {
+	enumMap := map[int]string{}
+	for _, d := range enum.TypeList() {
+		enumMap[int(d)] = d.String()
+	}
+	o.Data["json"] = map[string]interface{}{"data": enumMap, "code": 200, "error": ""}
+	o.ServeJSON()
+}
+
+// @Title EnumStorageSize
+// @Description get list of StorageSize
+// @Success 200 {resource} models.resource
+// @router /storage/size [get]
+func (o *EnumController) EnumStorageSize() {
+	enumMap := map[int]string{}
+	for _, d := range enum.SizeList() {
+		enumMap[int(d)] = d.String()
+	}
+	o.Data["json"] = map[string]interface{}{"data": enumMap, "code": 200, "error": ""}
+	o.ServeJSON()
+}
+
+// @Title EnumInfrastructure
+// @Description get list of Infrastructure
+// @Success 200 {resource} models.resource
+// @router /infrastructure [get]
+func (o *EnumController) EnumInfrastructure() {
+	enumMap := map[int]string{}
+	for _, d := range enum.InfrastructureList() {
+		enumMap[int(d)] = d.String()
+	}
+	o.Data["json"] = map[string]interface{}{"data": enumMap, "code": 200, "error": ""}
+	o.ServeJSON()
+}
+
+// @Title BookingStatus
+// @Description get list of Infrastructure
+// @Success 200 {resource} models.resource
+// @router /booking/status [get]
+func (o *EnumController) EnumBookingStatus() {
+	enumMap := map[int]string{}
+	for _, d := range enum.StatusList() {
+		enumMap[int(d)] = d.String()
+	}
+	o.Data["json"] = map[string]interface{}{"data": enumMap, "code": 200, "error": ""}
+	o.ServeJSON()
+}
+
+// @Title EnumStatus
+// @Description get list of status
+// @Success 200 {resource} models.resource
+// @router /status [get]
+func (o *EnumController) EnumStatus() {
+	enumMap := map[int]string{}
+	for _, d := range enum.StatusList() {
+		enumMap[int(d)] = d.String()
+	}
+	o.Data["json"] = map[string]interface{}{"data": enumMap, "code": 200, "error": ""}
+	o.ServeJSON()
+}
+
+// @Title EnumStrategyBuy
+// @Description get list of status
+// @Success 200 {resource} models.resource
+// @router /pricing/strategy/buy [get]
+func (o *EnumController) EnumStrategyBuy() {
+	enumMap := map[int]string{}
+	for _, d := range pricing.BuyingStrategyList() {
+		enumMap[int(d)] = d.String()
+	}
+	o.Data["json"] = map[string]interface{}{"data": enumMap, "code": 200, "error": ""}
+	o.ServeJSON()
+}
+
+// @Title EnumStrategyTime
+// @Description get list of status
+// @Success 200 {resource} models.resource
+// @router /pricing/strategy/time [get]
+func (o *EnumController) EnumStrategyTime() {
+	enumMap := map[int]string{}
+	for _, d := range pricing.TimePricingStrategyList() {
+		enumMap[int(d)] = d.String()
+	}
+	o.Data["json"] = map[string]interface{}{"data": enumMap, "code": 200, "error": ""}
+	o.ServeJSON()
+}
+
+// @Title EnumStrategyPrivilege
+// @Description get list of status
+// @Success 200 {resource} models.resource
+// @router /pricing/strategy/privilege [get]
+func (o *EnumController) EnumStrategyPrivilege() {
+	enumMap := map[int]string{}
+	for _, d := range pricing.ExploitPrivilegeStrategyList() {
+		enumMap[int(d)] = d.String()
+	}
+	o.Data["json"] = map[string]interface{}{"data": enumMap, "code": 200, "error": ""}
+	o.ServeJSON()
+}
+
+// @Title EnumRefundType
+// @Description get list of status
+// @Success 200 {resource} models.resource
+// @router /pricing/refund/type [get]
+func (o *EnumController) EnumRefundType() {
+	enumMap := map[int]string{}
+	for _, d := range pricing.RefundTypeList() {
+		enumMap[int(d)] = d.String()
+	}
+	o.Data["json"] = map[string]interface{}{"data": enumMap, "code": 200, "error": ""}
+	o.ServeJSON()
+}
+
+// @Title EnumStrategyPrivilegeStorage
+// @Description get list of status
+// @Success 200 {resource} models.resource
+// @router /pricing/strategy/privilege/storage [get]
+func (o *EnumController) EnumStrategyPrivilegeStorage() {
+	enumMap := map[int]string{}
+	for _, d := range resources.PrivilegeStoragePricingStrategyList() {
+		enumMap[int(d)] = d.String()
+	}
+	o.Data["json"] = map[string]interface{}{"data": enumMap, "code": 200, "error": ""}
+	o.ServeJSON()
+}
+
+// @Title EnumStrategyStorage
+// @Description get list of status
+// @Success 200 {resource} models.resource
+// @router /pricing/strategy/storage [get]
+func (o *EnumController) EnumStrategyStorage() {
+	enumMap := map[int]string{}
+	for _, d := range resources.StorageResourcePricingStrategyList() {
+		enumMap[int(d)] = d.String()
+	}
+	o.Data["json"] = map[string]interface{}{"data": enumMap, "code": 200, "error": ""}
+	o.ServeJSON()
+}
+
+// @Title EnumStrategyData
+// @Description get list of status
+// @Success 200 {resource} models.resource
+// @router /pricing/strategy/data [get]
+func (o *EnumController) EnumStrategyData() {
+	enumMap := map[int]string{}
+	for _, d := range resources.DataResourcePricingStrategyList() {
+		enumMap[int(d)] = d.String()
+	}
+	o.Data["json"] = map[string]interface{}{"data": enumMap, "code": 200, "error": ""}
+	o.ServeJSON()
+}
+
+// @Title EnumResourceType
+// @Description get list of status
+// @Success 200 {resource} models.resource
+// @router /resource/type [get]
+func (o *EnumController) EnumResourceType() {
+	enumMap := map[int]string{}
+	for _, d := range tools.DataTypeList() {
+		enumMap[int(d)] = d.String()
+	}
+	o.Data["json"] = map[string]interface{}{"data": enumMap, "code": 200, "error": ""}
+	o.ServeJSON()
+}

controllers/general.go

@@ -0,0 +1,74 @@
+package controllers
+
+import (
+	cx "context"
+	"net/http"
+	"oc-catalog/infrastructure"
+
+	oclib "cloud.o-forge.io/core/oc-lib"
+	w "cloud.o-forge.io/core/oc-lib/models/workflow"
+	tools "cloud.o-forge.io/core/oc-lib/tools"
+	beego "github.com/beego/beego/v2/server/web"
+	"github.com/beego/beego/v2/server/web/context"
+	"golang.org/x/net/websocket"
+)
+
+// Operations about compute
+type GeneralController struct {
+	beego.Controller
+}
+
+// @Title GetAll
+// @Description find compute by id
+// @Param file formData file true "File to upload"
+// @Success 200 {compute} models.workflow
+// @Failure 406 {string} string "Bad request"
+// @router / [get]
+func (o *GeneralController) GetAll() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	file, _, err := o.Ctx.Request.FormFile("file")
+	if err != nil {
+		o.Data["json"] = map[string]interface{}{
+			"data":  nil,
+			"code":  406,
+			"error": err.Error(),
+		}
+		o.ServeJSON()
+		return
+	}
+	newWorkflow := &w.Workflow{}
+	req := &tools.APIRequest{
+		Username: user,
+		PeerID:   peerID,
+		Groups:   groups,
+	}
+	newWorkflow, err = newWorkflow.ExtractFromPlantUML(file, req)
+	if err != nil {
+		o.Data["json"] = map[string]interface{}{
+			"data":  nil,
+			"code":  406,
+			"error": err.Error(),
+		}
+		o.ServeJSON()
+		return
+	}
+
+	o.Data["json"] = map[string]interface{}{
+		"data":  newWorkflow,
+		"code":  200,
+		"error": nil,
+	}
+
+	o.ServeJSON()
+}
+
+func Websocket(ctx cx.Context, user string, r *context.Response, w *http.Request) {
+	websocket.Handler(func(ws *websocket.Conn) {
+		defer ws.Close()
+		for {
+			if msg, ok := <-infrastructure.SearchStream[user]; !ok || websocket.Message.Send(ws, msg) != nil {
+				return
+			}
+		}
+	}).ServeHTTP(r, w)
+}

controllers/processing.go

@@ -2,8 +2,10 @@ package controllers
 
 import (
 	"encoding/json"
+	"oc-catalog/infrastructure"
 
 	oclib "cloud.o-forge.io/core/oc-lib"
+	"cloud.o-forge.io/core/oc-lib/tools"
 	beego "github.com/beego/beego/v2/server/web"
 )
 
@@ -12,6 +14,9 @@ type ProcessingController struct {
 	beego.Controller
 }
 
+var processing_collection = oclib.LibDataEnum(oclib.PROCESSING_RESOURCE)
+var processing_dt = tools.PROCESSING_RESOURCE
+
 // @Title Update
 // @Description create processings
 // @Param	id		path 	string	true		"the processing id you want to get"
@@ -20,10 +25,20 @@ type ProcessingController struct {
 // @router /:id [put]
 func (o *ProcessingController) Put() {
 	// store and return Id or post with UUID
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	var res map[string]interface{}
 	id := o.Ctx.Input.Param(":id")
 	json.Unmarshal(o.Ctx.Input.CopyBody(10000), &res)
-	o.Data["json"] = oclib.UpdateOne(oclib.LibDataEnum(oclib.PROCESSING_RESOURCE), res, id)
+	data := oclib.NewRequest(processing_collection, user, peerID, groups, nil).UpdateOne(res, id)
+	if data.Err == "" {
+		data, _ := json.Marshal(data.Data.Serialize(data.Data))
+		infrastructure.EmitNATS(user, tools.PropalgationMessage{
+			Action:   tools.PB_UPDATE,
+			DataType: processing_dt.EnumIndex(),
+			Payload:  data,
+		})
+	}
+	o.Data["json"] = data
 	o.ServeJSON()
 }
 
@@ -33,29 +48,45 @@ func (o *ProcessingController) Put() {
 // @Success 200 {processing} models.processing
 // @router / [post]
 func (o *ProcessingController) Post() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	var res map[string]interface{}
 	json.Unmarshal(o.Ctx.Input.CopyBody(10000), &res)
-	o.Data["json"] = oclib.StoreOne(oclib.LibDataEnum(oclib.PROCESSING_RESOURCE), res)
+	data := oclib.NewRequest(processing_collection, user, peerID, groups, nil).StoreOne(res)
+	if data.Err == "" {
+		data, _ := json.Marshal(data.Data.Serialize(data.Data))
+		infrastructure.EmitNATS(user, tools.PropalgationMessage{
+			Action:   tools.PB_CREATE,
+			DataType: processing_dt.EnumIndex(),
+			Payload:  data,
+		})
+	}
+	o.Data["json"] = data
 	o.ServeJSON()
 }
 
 // @Title GetAll
 // @Description find processing by id
+// @Param	is_draft		query 	string	false		"draft wished"
 // @Success 200 {processing} models.processing
 // @router / [get]
 func (o *ProcessingController) GetAll() {
-	o.Data["json"] = oclib.LoadAll(oclib.LibDataEnum(oclib.PROCESSING_RESOURCE))
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	isDraft := o.Ctx.Input.Query("is_draft")
+	o.Data["json"] = oclib.NewRequest(processing_collection, user, peerID, groups, nil).LoadAll(isDraft == "true")
 	o.ServeJSON()
 }
 
 // @Title Get
 // @Description find processing by key word
 // @Param	search		path 	string	true		"the search you want to get"
+// @Param	is_draft		query 	string	false		"draft wished"
 // @Success 200 {processing} models.processing
 // @router /search/:search [get]
 func (o *ProcessingController) Search() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	search := o.Ctx.Input.Param(":search")
-	o.Data["json"] = oclib.Search(nil, search, oclib.LibDataEnum(oclib.PROCESSING_RESOURCE))
+	isDraft := o.Ctx.Input.Query("is_draft")
+	o.Data["json"] = oclib.NewRequest(processing_collection, user, peerID, groups, nil).Search(nil, search, isDraft == "true")
 	o.ServeJSON()
 }
 
@@ -65,8 +96,9 @@ func (o *ProcessingController) Search() {
 // @Success 200 {processing} models.processing
 // @router /:id [get]
 func (o *ProcessingController) Get() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	id := o.Ctx.Input.Param(":id")
-	o.Data["json"] = oclib.LoadOne(oclib.LibDataEnum(oclib.PROCESSING_RESOURCE), id)
+	o.Data["json"] = oclib.NewRequest(processing_collection, user, peerID, groups, nil).LoadOne(id)
 	o.ServeJSON()
 }
 
@@ -76,7 +108,48 @@ func (o *ProcessingController) Get() {
 // @Success 200 {processing} delete success!
 // @router /:id [delete]
 func (o *ProcessingController) Delete() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	id := o.Ctx.Input.Param(":id")
-	o.Data["json"] = oclib.DeleteOne(oclib.LibDataEnum(oclib.PROCESSING_RESOURCE), id)
+	data := oclib.NewRequest(processing_collection, user, peerID, groups, nil).DeleteOne(id)
+	if data.Err == "" {
+		data, _ := json.Marshal(data.Data.Serialize(data.Data))
+		infrastructure.EmitNATS(user, tools.PropalgationMessage{
+			Action:   tools.PB_DELETE,
+			DataType: processing_dt.EnumIndex(),
+			Payload:  data,
+		})
+	}
+	o.Data["json"] = data
 	o.ServeJSON()
 }
+
+// @Title Search Decentralized
+// @Description find workflow by key word
+// @Param	search		path 	string	true		"the search you want to get"
+// @Param	is_draft		query 	string	false		"draft wished"
+// @Success 200 {workflow} models.workflow
+// @router /search/:search/decentralized/:type [get]
+func (o *ProcessingController) SearchDecentralized() {
+	user, _, _ := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	search := o.Ctx.Input.Param(":search")
+	t := o.Ctx.Input.Param(":type")
+	b, err := json.Marshal(map[string]string{
+		"search": search,
+		"type":   t,
+	})
+	infrastructure.EmitNATS(user, tools.PropalgationMessage{
+		Action:   tools.PB_SEARCH,
+		DataType: processing_dt.EnumIndex(),
+		Payload:  b,
+	})
+	if err != nil {
+		o.Data["json"] = map[string]interface{}{
+			"data":  nil,
+			"code":  400,
+			"error": err,
+		}
+		o.ServeJSON()
+		return
+	}
+	Websocket(o.Ctx.Request.Context(), user, o.Ctx.ResponseWriter, o.Ctx.Request)
+}

controllers/purchase.go

@@ -0,0 +1,72 @@
+package controllers
+
+import (
+	"encoding/json"
+
+	oclib "cloud.o-forge.io/core/oc-lib"
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+// Operations about compute
+type PurchaseController struct {
+	beego.Controller
+}
+
+var order_collection = oclib.LibDataEnum(oclib.ORDER)
+var purchase_collection = oclib.LibDataEnum(oclib.PURCHASE_RESOURCE)
+
+// @Title Create
+// @Description create compute
+// @Param	compute		body 	json	true		"body for compute content (Json format)"
+// @Success 200 {compute} models.compute
+// @router / [post]
+func (o *PurchaseController) Post() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	var res map[string]interface{}
+	json.Unmarshal(o.Ctx.Input.CopyBody(10000), &res)
+	stored := oclib.NewRequest(purchase_collection, user, peerID, groups, nil).StoreOne(res)
+	if stored.Err != "" {
+		o.Data["json"] = stored
+		o.ServeJSON()
+		return
+	}
+	o.ServeJSON()
+}
+
+// @Title GetAll
+// @Description find compute by id
+// @Param	is_draft		query 	string	false		"draft wished"
+// @Success 200 {compute} models.compute
+// @router / [get]
+func (o *PurchaseController) GetAll() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	isDraft := o.Ctx.Input.Query("is_draft")
+	o.Data["json"] = oclib.NewRequest(purchase_collection, user, peerID, groups, nil).LoadAll(isDraft == "true")
+	o.ServeJSON()
+}
+
+// @Title Get
+// @Description find compute by key word
+// @Param	search		path 	string	true		"the search you want to get"
+// @Param	is_draft		query 	string	false		"draft wished"
+// @Success 200 {compute} models.compute
+// @router /search/:search [get]
+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")
+	o.Data["json"] = oclib.NewRequest(purchase_collection, user, peerID, groups, nil).Search(nil, search, isDraft == "true")
+	o.ServeJSON()
+}
+
+// @Title Get
+// @Description find compute by id
+// @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)
+	o.ServeJSON()
+}

controllers/resource.go

@@ -1,7 +1,12 @@
 package controllers
 
 import (
+	"encoding/json"
+	"fmt"
+	"oc-catalog/infrastructure"
+
 	oclib "cloud.o-forge.io/core/oc-lib"
+	"cloud.o-forge.io/core/oc-lib/tools"
 	beego "github.com/beego/beego/v2/server/web"
 )
 
@@ -12,12 +17,17 @@ type ResourceController struct {
 
 // @Title GetAll
 // @Description find resource by id
+// @Param	is_draft		query 	string	false		"draft wished"
 // @Success 200 {resource} models.resource
 // @router / [get]
 func (o *ResourceController) GetAll() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	results := map[string]interface{}{}
-	for _, resource := range []oclib.LibDataEnum{oclib.LibDataEnum(oclib.DATACENTER_RESOURCE), oclib.LibDataEnum(oclib.DATACENTER_RESOURCE), oclib.LibDataEnum(oclib.STORAGE_RESOURCE), oclib.LibDataEnum(oclib.PROCESSING_RESOURCE), oclib.LibDataEnum(oclib.WORKFLOW_RESOURCE)} {
-		d := oclib.LoadAll(resource)
+	isDraft := o.Ctx.Input.Query("is_draft")
+	for _, resource := range []oclib.LibDataEnum{
+		data_collection, comp_collection, storage_collection,
+		processing_collection, workflow_collection} {
+		d := oclib.NewRequest(resource, user, peerID, groups, nil).LoadAll(isDraft == "true")
 		if d.Code != 200 || len(d.Data) == 0 {
 			results[resource.String()] = []interface{}{}
 		} else {
@@ -31,13 +41,19 @@ func (o *ResourceController) GetAll() {
 // @Title Get
 // @Description find resource by key word
 // @Param	search		path 	string	true		"the search you want to get"
+// @Param	is_draft		query 	string	false		"draft wished"
 // @Success 200 {resource} models.resource
 // @router /search/:search [get]
 func (o *ResourceController) Search() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	search := o.Ctx.Input.Param(":search")
+	isDraft := o.Ctx.Input.Query("is_draft")
 	results := map[string]interface{}{}
-	for _, resource := range []oclib.LibDataEnum{oclib.LibDataEnum(oclib.DATACENTER_RESOURCE), oclib.LibDataEnum(oclib.DATACENTER_RESOURCE), oclib.LibDataEnum(oclib.STORAGE_RESOURCE), oclib.LibDataEnum(oclib.PROCESSING_RESOURCE), oclib.LibDataEnum(oclib.WORKFLOW_RESOURCE)} {
-		d := oclib.Search(nil, search, resource)
+	for _, resource := range []oclib.LibDataEnum{
+		data_collection, comp_collection, storage_collection,
+		processing_collection, workflow_collection} {
+		fmt.Println("search", search)
+		d := oclib.NewRequest(resource, user, peerID, groups, nil).Search(nil, search, isDraft == "true")
 		if d.Code != 200 || len(d.Data) == 0 {
 			results[resource.String()] = []interface{}{}
 		} else {
@@ -54,11 +70,13 @@ func (o *ResourceController) Search() {
 // @Success 200 {resource} models.resource
 // @router /:id [get]
 func (o *ResourceController) Get() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	id := o.Ctx.Input.Param(":id")
 	results := map[string]interface{}{}
-	for _, resource := range []oclib.LibDataEnum{oclib.LibDataEnum(oclib.DATACENTER_RESOURCE),
-		oclib.LibDataEnum(oclib.DATACENTER_RESOURCE), oclib.LibDataEnum(oclib.STORAGE_RESOURCE), oclib.LibDataEnum(oclib.PROCESSING_RESOURCE), oclib.LibDataEnum(oclib.WORKFLOW_RESOURCE)} {
-		d := oclib.LoadOne(resource, id)
+	for _, resource := range []oclib.LibDataEnum{
+		data_collection, comp_collection, storage_collection,
+		processing_collection, workflow_collection} {
+		d := oclib.NewRequest(resource, user, peerID, groups, nil).LoadOne(id)
 		if d.Code != 200 {
 			results[resource.String()] = nil
 		} else {
@@ -69,22 +87,33 @@ func (o *ResourceController) Get() {
 	o.ServeJSON()
 }
 
-// @Title Delete
-// @Description delete the resource
-// @Param	id		path 	string	true		"The id you want to delete"DeleteOne
-// @Success 200 {resource} delete success!
-// @router /:id [delete]
-func (o *ResourceController) Delete() {
-	id := o.Ctx.Input.Param(":id")
-	results := map[string]interface{}{}
-	for _, resource := range []oclib.LibDataEnum{oclib.LibDataEnum(oclib.DATACENTER_RESOURCE), oclib.LibDataEnum(oclib.DATACENTER_RESOURCE), oclib.LibDataEnum(oclib.STORAGE_RESOURCE), oclib.LibDataEnum(oclib.PROCESSING_RESOURCE), oclib.LibDataEnum(oclib.WORKFLOW_RESOURCE)} {
-		d := oclib.DeleteOne(resource, id)
-		if d.Code != 200 {
-			results[resource.String()] = nil
-		} else {
-			results[resource.String()] = d.Data
+// @Title Search Decentralized
+// @Description find workflow by key word
+// @Param	search		path 	string	true		"the search you want to get"
+// @Param	is_draft		query 	string	false		"draft wished"
+// @Success 200 {workflow} models.workflow
+// @router /search/:search/decentralized/:type [get]
+func (o *ResourceController) SearchDecentralized() {
+	user, _, _ := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	search := o.Ctx.Input.Param(":search")
+	t := o.Ctx.Input.Param(":type")
+	b, err := json.Marshal(map[string]string{
+		"search": search,
+		"type":   t,
+	})
+	infrastructure.EmitNATS(user, tools.PropalgationMessage{
+		Action:   tools.PB_SEARCH,
+		DataType: -1,
+		Payload:  b,
+	})
+	if err != nil {
+		o.Data["json"] = map[string]interface{}{
+			"data":  nil,
+			"code":  400,
+			"error": err,
 		}
+		o.ServeJSON()
+		return
 	}
-	o.Data["json"] = map[string]interface{}{"data": results, "code": 200, "error": ""}
-	o.ServeJSON()
+	Websocket(o.Ctx.Request.Context(), user, o.Ctx.ResponseWriter, o.Ctx.Request)
 }

controllers/storage.go

@@ -2,8 +2,10 @@ package controllers
 
 import (
 	"encoding/json"
+	"oc-catalog/infrastructure"
 
 	oclib "cloud.o-forge.io/core/oc-lib"
+	"cloud.o-forge.io/core/oc-lib/tools"
 	beego "github.com/beego/beego/v2/server/web"
 )
 
@@ -12,6 +14,9 @@ type StorageController struct {
 	beego.Controller
 }
 
+var storage_collection = oclib.LibDataEnum(oclib.STORAGE_RESOURCE)
+var storage_dt = tools.STORAGE_RESOURCE
+
 // @Title Update
 // @Description create storages
 // @Param	id		path 	string	true		"the storage id you want to get"
@@ -20,21 +25,20 @@ type StorageController struct {
 // @router /:id [put]
 func (o *StorageController) Put() {
 	// store and return Id or post with UUID
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	var res map[string]interface{}
 	id := o.Ctx.Input.Param(":id")
 	json.Unmarshal(o.Ctx.Input.CopyBody(10000), &res)
-	o.Data["json"] = oclib.UpdateOne(oclib.LibDataEnum(oclib.STORAGE_RESOURCE), res, id)
-	o.ServeJSON()
-}
-
-// @Title Get
-// @Description find storage by key word
-// @Param	search		path 	string	true		"the search you want to get"
-// @Success 200 {storage} models.storage
-// @router /search/:search [get]
-func (o *StorageController) Search() {
-	search := o.Ctx.Input.Param(":search")
-	o.Data["json"] = oclib.Search(nil, search, oclib.LibDataEnum(oclib.STORAGE_RESOURCE))
+	data := oclib.NewRequest(storage_collection, user, peerID, groups, nil).UpdateOne(res, id)
+	if data.Err == "" {
+		data, _ := json.Marshal(data.Data.Serialize(data.Data))
+		infrastructure.EmitNATS(user, tools.PropalgationMessage{
+			Action:   tools.PB_UPDATE,
+			DataType: storage_dt.EnumIndex(),
+			Payload:  data,
+		})
+	}
+	o.Data["json"] = data
 	o.ServeJSON()
 }
 
@@ -44,18 +48,45 @@ func (o *StorageController) Search() {
 // @Success 200 {storage} models.storage
 // @router / [post]
 func (o *StorageController) Post() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	var res map[string]interface{}
 	json.Unmarshal(o.Ctx.Input.CopyBody(10000), &res)
-	o.Data["json"] = oclib.StoreOne(oclib.LibDataEnum(oclib.STORAGE_RESOURCE), res)
+	data := oclib.NewRequest(storage_collection, user, peerID, groups, nil).StoreOne(res)
+	if data.Err == "" {
+		data, _ := json.Marshal(data.Data.Serialize(data.Data))
+		infrastructure.EmitNATS(user, tools.PropalgationMessage{
+			Action:   tools.PB_CREATE,
+			DataType: storage_dt.EnumIndex(),
+			Payload:  data,
+		})
+	}
+	o.Data["json"] = data
 	o.ServeJSON()
 }
 
 // @Title GetAll
 // @Description find storage by id
+// @Param	is_draft		query 	string	false		"draft wished"
 // @Success 200 {storage} models.storage
 // @router / [get]
 func (o *StorageController) GetAll() {
-	o.Data["json"] = oclib.LoadAll(oclib.LibDataEnum(oclib.STORAGE_RESOURCE))
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	isDraft := o.Ctx.Input.Query("is_draft")
+	o.Data["json"] = oclib.NewRequest(storage_collection, user, peerID, groups, nil).LoadAll(isDraft == "true")
+	o.ServeJSON()
+}
+
+// @Title Get
+// @Description find storage by key word
+// @Param	search		path 	string	true		"the search you want to get"
+// @Param	is_draft		query 	string	false		"draft wished"
+// @Success 200 {storage} models.storage
+// @router /search/:search [get]
+func (o *StorageController) Search() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	search := o.Ctx.Input.Param(":search")
+	isDraft := o.Ctx.Input.Query("is_draft")
+	o.Data["json"] = oclib.NewRequest(storage_collection, user, peerID, groups, nil).Search(nil, search, isDraft == "true")
 	o.ServeJSON()
 }
 
@@ -65,8 +96,9 @@ func (o *StorageController) GetAll() {
 // @Success 200 {storage} models.storage
 // @router /:id [get]
 func (o *StorageController) Get() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	id := o.Ctx.Input.Param(":id")
-	o.Data["json"] = oclib.LoadOne(oclib.LibDataEnum(oclib.STORAGE_RESOURCE), id)
+	o.Data["json"] = oclib.NewRequest(storage_collection, user, peerID, groups, nil).LoadOne(id)
 	o.ServeJSON()
 }
 
@@ -76,7 +108,48 @@ func (o *StorageController) Get() {
 // @Success 200 {storage} delete success!
 // @router /:id [delete]
 func (o *StorageController) Delete() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	id := o.Ctx.Input.Param(":id")
-	o.Data["json"] = oclib.DeleteOne(oclib.LibDataEnum(oclib.STORAGE_RESOURCE), id)
+	data := oclib.NewRequest(storage_collection, user, peerID, groups, nil).DeleteOne(id)
+	if data.Err == "" {
+		data, _ := json.Marshal(data.Data.Serialize(data.Data))
+		infrastructure.EmitNATS(user, tools.PropalgationMessage{
+			Action:   tools.PB_DELETE,
+			DataType: storage_dt.EnumIndex(),
+			Payload:  data,
+		})
+	}
+	o.Data["json"] = data
 	o.ServeJSON()
 }
+
+// @Title Search Decentralized
+// @Description find workflow by key word
+// @Param	search		path 	string	true		"the search you want to get"
+// @Param	is_draft		query 	string	false		"draft wished"
+// @Success 200 {workflow} models.workflow
+// @router /search/:search/decentralized/:type [get]
+func (o *StorageController) SearchDecentralized() {
+	user, _, _ := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	search := o.Ctx.Input.Param(":search")
+	t := o.Ctx.Input.Param(":type")
+	b, err := json.Marshal(map[string]string{
+		"search": search,
+		"type":   t,
+	})
+	infrastructure.EmitNATS(user, tools.PropalgationMessage{
+		Action:   tools.PB_SEARCH,
+		DataType: storage_dt.EnumIndex(),
+		Payload:  b,
+	})
+	if err != nil {
+		o.Data["json"] = map[string]interface{}{
+			"data":  nil,
+			"code":  400,
+			"error": err,
+		}
+		o.ServeJSON()
+		return
+	}
+	Websocket(o.Ctx.Request.Context(), user, o.Ctx.ResponseWriter, o.Ctx.Request)
+}

controllers/version.go

@@ -15,7 +15,10 @@ type VersionController struct {
 // @Success 200
 // @router / [get]
 func (c *VersionController) GetAll() {
-	c.Data["json"] = map[string]string{"version": "1"}
+	c.Data["json"] = map[string]string{
+		"service": "oc-catalog",
+		"version": "1",
+	}
 	c.ServeJSON()
 }
 

controllers/workflow.go

@@ -2,8 +2,10 @@ package controllers
 
 import (
 	"encoding/json"
+	"oc-catalog/infrastructure"
 
 	oclib "cloud.o-forge.io/core/oc-lib"
+	"cloud.o-forge.io/core/oc-lib/tools"
 	beego "github.com/beego/beego/v2/server/web"
 )
 
@@ -12,6 +14,9 @@ type WorkflowController struct {
 	beego.Controller
 }
 
+var workflow_collection = oclib.LibDataEnum(oclib.WORKFLOW_RESOURCE)
+var workflow_dt = tools.WORKFLOW_RESOURCE
+
 // @Title Update
 // @Description create workflows
 // @Param	id		path 	string	true		"the workflow id you want to get"
@@ -20,21 +25,20 @@ type WorkflowController struct {
 // @router /:id [put]
 func (o *WorkflowController) Put() {
 	// store and return Id or post with UUID
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	var res map[string]interface{}
 	id := o.Ctx.Input.Param(":id")
 	json.Unmarshal(o.Ctx.Input.CopyBody(10000), &res)
-	o.Data["json"] = oclib.UpdateOne(oclib.LibDataEnum(oclib.WORKFLOW_RESOURCE), res, id)
-	o.ServeJSON()
-}
-
-// @Title Get
-// @Description find workflow by key word
-// @Param	search		path 	string	true		"the search you want to get"
-// @Success 200 {workflow} models.workflow
-// @router /search/:search [get]
-func (o *WorkflowController) Search() {
-	search := o.Ctx.Input.Param(":search")
-	o.Data["json"] = oclib.Search(nil, search, oclib.LibDataEnum(oclib.WORKFLOW_RESOURCE))
+	data := oclib.NewRequest(workflow_collection, user, peerID, groups, nil).UpdateOne(res, id)
+	if data.Err == "" {
+		data, _ := json.Marshal(data.Data.Serialize(data.Data))
+		infrastructure.EmitNATS(user, tools.PropalgationMessage{
+			Action:   tools.PB_UPDATE,
+			Payload:  data,
+			DataType: workflow_dt.EnumIndex(),
+		})
+	}
+	o.Data["json"] = data
 	o.ServeJSON()
 }
 
@@ -44,29 +48,88 @@ func (o *WorkflowController) Search() {
 // @Success 200 {workflow} models.workflow
 // @router / [post]
 func (o *WorkflowController) Post() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	var res map[string]interface{}
 	json.Unmarshal(o.Ctx.Input.CopyBody(10000), &res)
-	o.Data["json"] = oclib.StoreOne(oclib.LibDataEnum(oclib.WORKFLOW_RESOURCE), res)
+	data := oclib.NewRequest(workflow_collection, user, peerID, groups, nil).StoreOne(res)
+	if data.Err == "" {
+		data, _ := json.Marshal(data.Data.Serialize(data.Data))
+		infrastructure.EmitNATS(user, tools.PropalgationMessage{
+			Action:   tools.PB_CREATE,
+			DataType: workflow_dt.EnumIndex(),
+			Payload:  data,
+		})
+	}
+	o.Data["json"] = data
 	o.ServeJSON()
 }
 
 // @Title GetAll
 // @Description find workflow by id
+// @Param	is_draft		query 	string	false		"draft wished"
 // @Success 200 {workflow} models.workflow
 // @router / [get]
 func (o *WorkflowController) GetAll() {
-	o.Data["json"] = oclib.LoadAll(oclib.LibDataEnum(oclib.WORKFLOW_RESOURCE))
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	isDraft := o.Ctx.Input.Query("is_draft")
+	o.Data["json"] = oclib.NewRequest(workflow_collection, user, peerID, groups, nil).LoadAll(isDraft == "true")
 	o.ServeJSON()
 }
 
+// @Title Search
+// @Description find workflow by key word
+// @Param	search		path 	string	true		"the search you want to get"
+// @Param	is_draft		query 	string	false		"draft wished"
+// @Success 200 {workflow} models.workflow
+// @router /search/:search [get]
+func (o *WorkflowController) Search() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	search := o.Ctx.Input.Param(":search")
+	isDraft := o.Ctx.Input.Query("is_draft")
+	o.Data["json"] = oclib.NewRequest(workflow_collection, user, peerID, groups, nil).Search(nil, search, isDraft == "true")
+	o.ServeJSON()
+}
+
+// @Title Search Decentralized
+// @Description find workflow by key word
+// @Param	search		path 	string	true		"the search you want to get"
+// @Param	is_draft		query 	string	false		"draft wished"
+// @Success 200 {workflow} models.workflow
+// @router /search/:search/decentralized/:type [get]
+func (o *WorkflowController) SearchDecentralized() {
+	user, _, _ := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	search := o.Ctx.Input.Param(":search")
+	t := o.Ctx.Input.Param(":type")
+	b, err := json.Marshal(map[string]string{
+		"search": search,
+		"type":   t,
+	})
+	if err != nil {
+		o.Data["json"] = map[string]interface{}{
+			"data":  nil,
+			"code":  400,
+			"error": err,
+		}
+		o.ServeJSON()
+		return
+	}
+	infrastructure.EmitNATS(user, tools.PropalgationMessage{
+		Action:   tools.PB_SEARCH,
+		DataType: workflow_dt.EnumIndex(),
+		Payload:  b,
+	})
+	Websocket(o.Ctx.Request.Context(), user, o.Ctx.ResponseWriter, o.Ctx.Request)
+}
+
 // @Title Get
 // @Description find workflow by id
 // @Param	id		path 	string	true		"the id you want to get"
 // @Success 200 {workflow} models.workflow
 // @router /:id [get]
 func (o *WorkflowController) Get() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	id := o.Ctx.Input.Param(":id")
-	o.Data["json"] = oclib.LoadOne(oclib.LibDataEnum(oclib.WORKFLOW_RESOURCE), id)
+	o.Data["json"] = oclib.NewRequest(workflow_collection, user, peerID, groups, nil).LoadOne(id)
 	o.ServeJSON()
 }
 
@@ -76,7 +139,17 @@ func (o *WorkflowController) Get() {
 // @Success 200 {workflow} delete success!
 // @router /:id [delete]
 func (o *WorkflowController) Delete() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	id := o.Ctx.Input.Param(":id")
-	o.Data["json"] = oclib.DeleteOne(oclib.LibDataEnum(oclib.WORKFLOW_RESOURCE), id)
+	data := oclib.NewRequest(workflow_collection, user, peerID, groups, nil).DeleteOne(id)
+	if data.Err == "" {
+		data, _ := json.Marshal(data.Data.Serialize(data.Data))
+		infrastructure.EmitNATS(user, tools.PropalgationMessage{
+			DataType: workflow_dt.EnumIndex(),
+			Action:   tools.PB_DELETE,
+			Payload:  data,
+		})
+	}
+	o.Data["json"] = data
 	o.ServeJSON()
 }

demo.json

@@ -627,19 +627,19 @@
         ]
     },
     {
-        "api": "/oc/datacenter/",
+        "api": "/oc/compute/",
         "content": [
             {
-                "name": "Mundi datacenter",
+                "name": "Mundi compute",
                 "acronym": "DC_myDC",
                 "hosts": [
                     "localhost:49618",
                     "oc-catalog:49618"
                 ],
                 "short_description": "Mundi Opencloud Instance",
-                "logo": "https://cloud.o-forge.io/core/deperecated-oc-catalog/raw/branch/main/scripts/local_imgs/Mundi datacenter.png",
+                "logo": "https://cloud.o-forge.io/core/deperecated-oc-catalog/raw/branch/main/scripts/local_imgs/Mundi compute.png",
                 "description": "A very long description of what this data is",
-                "type": "datacenter",
+                "type": "compute",
                 "bookingPrice": 650,
                 "owner": "IRT",
                 "cpus": [{
@@ -662,16 +662,16 @@
                 "source_url": "http://www.google.com"
             },
             {
-                "name": "CNES datacenter",
+                "name": "CNES compute",
                 "acronym": "DC_superDC1",
                 "hosts": [
                     "localhost:49619",
                     "dc1:49618"
                 ],
                 "short_description": "CNES Opencloud Instance",
-                "logo": "https://cloud.o-forge.io/core/deperecated-oc-catalog/raw/branch/main/scripts/local_imgs/CNES datacenter.png",
+                "logo": "https://cloud.o-forge.io/core/deperecated-oc-catalog/raw/branch/main/scripts/local_imgs/CNES compute.png",
                 "description": "A very long description of what this data is",
-                "type": "datacenter",
+                "type": "compute",
                 "bookingPrice": 650,
                 "owner": "IRT",
                 "cpus": [{
@@ -687,16 +687,16 @@
                 "source_url": "http://www.google.com"
             },
             {
-                "name": "Meteo France datacenter",
+                "name": "Meteo France compute",
                 "acronym": "DC_superDC2",
                 "hosts": [
                     "localhost:49620",
                     "dc2:49618"
                 ],
                 "short_description": "Meteo France Opencloud Instance",
-                "logo": "https://cloud.o-forge.io/core/deperecated-oc-catalog/raw/branch/main/scripts/local_imgs/Meteo France datacenter.png",
+                "logo": "https://cloud.o-forge.io/core/deperecated-oc-catalog/raw/branch/main/scripts/local_imgs/Meteo France compute.png",
                 "description": "A very long description of what this data is",
-                "type": "datacenter",
+                "type": "compute",
                 "bookingPrice": 650,
                 "owner": "Meteo France",
                 "cpus": [{

docker-compose.base.yml

@@ -1,33 +0,0 @@
-version: '3.4'
-
-services:
-  mongo:
-    image: 'mongo:latest'
-    networks: 
-      - catalog
-    ports:
-      - 27017:27017
-    container_name: mongo
-    volumes: 
-      - oc-catalog-data:/data/db
-      - oc-catalog-data:/data/configdb
-  
-  mongo-express:
-    image: "mongo-express:latest"
-    restart: always
-    depends_on: 
-      - mongo
-    networks: 
-      - catalog
-    ports:
-      - 8081:8081
-    environment:
-      - ME_CONFIG_BASICAUTH_USERNAME=test
-      - ME_CONFIG_BASICAUTH_PASSWORD=test
-
-volumes:
-  oc-catalog-data:
-
-networks: 
-  catalog:
-    external: true

docker-compose.yml

@@ -9,8 +9,16 @@ services:
       - 8087:8080
     container_name: oc-catalog
     networks: 
-      - catalog
-
+      - oc
+    labels:
+        - "traefik.enable=true"
+        - "traefik.http.routers.catalog.entrypoints=web"
+        - "traefik.http.routers.catalog.rule=PathPrefix(`/catalog`)"
+        - "traefik.http.middlewares.catalog-rewrite.replacepathregex.regex=^/catalog(.*)"
+        - "traefik.http.middlewares.catalog-rewrite.replacepathregex.replacement=/oc$$1"
+        - "traefik.http.routers.catalog.middlewares=catalog-rewrite"
+        - "traefik.http.services.catalog.loadbalancer.server.port=8080"
+        - "traefik.http.middlewares.catalog.forwardauth.address=http://oc-auth:8080/oc/forward"
 networks: 
-  catalog:
+  oc:
     external: true

docker_catalog.json

@@ -1,4 +1,5 @@
 {
     "MONGO_URL":"mongodb://mongo:27017/", 
+    "NATS_URL":"nats://nats:4222",
     "MONGO_DATABASE":"DC_myDC"
 }

go.mod

@@ -1,60 +1,61 @@
 module oc-catalog
 
-go 1.22.0
+go 1.24
 
-toolchain go1.22.4
+toolchain go1.24.0
 
 require (
-	cloud.o-forge.io/core/oc-lib v0.0.0-20240927112324-cdf513c2c454
-	github.com/beego/beego/v2 v2.3.0
+	cloud.o-forge.io/core/oc-lib v0.0.0-20260129122033-186ba3e689c7
+	github.com/beego/beego/v2 v2.3.4
 	github.com/smartystreets/goconvey v1.7.2
 )
 
+require github.com/kr/text v0.2.0 // indirect
+
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/biter777/countries v1.7.5 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/gabriel-vasile/mimetype v1.4.5 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.9 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.22.1 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
+	github.com/go-playground/validator/v10 v10.27.0 // indirect
+	github.com/golang/snappy v1.0.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 // indirect
 	github.com/goraz/onion v0.1.3 // indirect
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
 	github.com/jtolds/gls v4.20.0+incompatible // indirect
-	github.com/klauspost/compress v1.17.10 // indirect
-	github.com/kr/text v0.2.0 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/montanaflynn/stats v0.7.1 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/nats-io/nats.go v1.37.0 // indirect
-	github.com/nats-io/nkeys v0.4.7 // indirect
+	github.com/nats-io/nats.go v1.43.0 // indirect
+	github.com/nats-io/nkeys v0.4.11 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_golang v1.20.2 // indirect
-	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.58.0 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
-	github.com/robfig/cron/v3 v3.0.1 // indirect
+	github.com/prometheus/client_golang v1.22.0 // indirect
+	github.com/prometheus/client_model v0.6.2 // indirect
+	github.com/prometheus/common v0.65.0 // indirect
+	github.com/prometheus/procfs v0.17.0 // indirect
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
-	github.com/rs/zerolog v1.33.0 // indirect
+	github.com/rs/zerolog v1.34.0 // indirect
 	github.com/shiena/ansicolor v0.0.0-20230509054315-a9deabde6e02 // indirect
 	github.com/smartystreets/assertions v1.2.0 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.1.2 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
-	go.mongodb.org/mongo-driver v1.17.0 // indirect
-	golang.org/x/crypto v0.27.0 // indirect
-	golang.org/x/net v0.29.0 // indirect
-	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.25.0 // indirect
-	golang.org/x/text v0.18.0 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	go.mongodb.org/mongo-driver v1.17.4 // indirect
+	golang.org/x/crypto v0.39.0 // indirect
+	golang.org/x/net v0.41.0
+	golang.org/x/sync v0.15.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/text v0.26.0 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,14 +1,16 @@
-cloud.o-forge.io/core/oc-lib v0.0.0-20240904121108-a0cbf9ac6f4e h1:G1GHiIRqTotMdI0LBzQCkafbj3pYLTFKVvb+CqOKmw8=
-cloud.o-forge.io/core/oc-lib v0.0.0-20240904121108-a0cbf9ac6f4e/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0=
-cloud.o-forge.io/core/oc-lib v0.0.0-20240904122101-ad96b5046415 h1:X1i4EW0N9UNLnJbI5cHFVm/vWGpnUAILBGWuNzEOOcQ=
-cloud.o-forge.io/core/oc-lib v0.0.0-20240904122101-ad96b5046415/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0=
-cloud.o-forge.io/core/oc-lib v0.0.0-20240927112324-cdf513c2c454 h1:F5/oBMypnb6Mdvcf6N8y8v/DgfglPQ6VsQUY7hjC2zA=
-cloud.o-forge.io/core/oc-lib v0.0.0-20240927112324-cdf513c2c454/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0=
+cloud.o-forge.io/core/oc-lib v0.0.0-20260128160440-c0d89ea9e1e8 h1:h7VHJktaTT8TxO4ld3Xjw3LzMsivr3m7mzbNxb44zes=
+cloud.o-forge.io/core/oc-lib v0.0.0-20260128160440-c0d89ea9e1e8/go.mod h1:vHWauJsS6ryf7UDqq8hRXoYD5RsONxcFTxeZPOztEuI=
+cloud.o-forge.io/core/oc-lib v0.0.0-20260128162702-97cf629e27ec h1:/uvrtEt7A5rwqFPHH8yjujlC33HMjQHhWDIK6I08DrA=
+cloud.o-forge.io/core/oc-lib v0.0.0-20260128162702-97cf629e27ec/go.mod h1:vHWauJsS6ryf7UDqq8hRXoYD5RsONxcFTxeZPOztEuI=
+cloud.o-forge.io/core/oc-lib v0.0.0-20260129122033-186ba3e689c7 h1:NRFGRqN+j5g3DrtXMYN5T5XSYICG+OU2DisjBdID3j8=
+cloud.o-forge.io/core/oc-lib v0.0.0-20260129122033-186ba3e689c7/go.mod h1:vHWauJsS6ryf7UDqq8hRXoYD5RsONxcFTxeZPOztEuI=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/beego/beego/v2 v2.3.0 h1:iECVwzm6egw6iw6tkWrEDqXG4NQtKLQ6QBSYqlM6T/I=
-github.com/beego/beego/v2 v2.3.0/go.mod h1:Ob/5BJ9fIKZLd4s9ZV3o9J6odkkIyL83et+p98gyYXo=
+github.com/beego/beego/v2 v2.3.4 h1:HurQEOGIEhLlPFCTR6ZDuQkybrUl2Ag2i6CdVD2rGiI=
+github.com/beego/beego/v2 v2.3.4/go.mod h1:5cqHsOHJIxkq44tBpRvtDe59GuVRVv/9/tyVDxd5ce4=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/biter777/countries v1.7.5 h1:MJ+n3+rSxWQdqVJU8eBy9RqcdH6ePPn4PJHocVWUa+Q=
+github.com/biter777/countries v1.7.5/go.mod h1:1HSpZ526mYqKJcpT5Ti1kcGQ0L0SrXWIaptUWjFfv2E=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/coreos/etcd v3.3.17+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
@@ -23,23 +25,21 @@ github.com/elazarl/go-bindata-assetfs v1.0.1 h1:m0kkaHRKEu7tUIUFVwhGGGYClXvyl4RE
 github.com/elazarl/go-bindata-assetfs v1.0.1/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
 github.com/etcd-io/etcd v3.3.17+incompatible/go.mod h1:cdZ77EstHBwVtD6iTgzgvogwcjo9m4iOqoijouPJ4bs=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/gabriel-vasile/mimetype v1.4.5 h1:J7wGKdGu33ocBOhGy0z653k/lFKLFDPJMG8Gql0kxn4=
-github.com/gabriel-vasile/mimetype v1.4.5/go.mod h1:ibHel+/kbxn9x2407k1izTA1S81ku1z/DlgOW2QE0M4=
+github.com/gabriel-vasile/mimetype v1.4.9 h1:5k+WDwEsD9eTLL8Tz3L0VnmVh9QxGjRmjBvAG7U/oYY=
+github.com/gabriel-vasile/mimetype v1.4.9/go.mod h1:WnSQhFKJuBlRyLiKohA/2DtIlPFAbguNaG7QCHcyGok=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.22.0 h1:k6HsTZ0sTnROkhS//R0O+55JgM8C4Bx7ia+JlgcnOao=
-github.com/go-playground/validator/v10 v10.22.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
-github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA=
-github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
+github.com/go-playground/validator/v10 v10.27.0 h1:w8+XrWVMhGkxOaaowyKH35gFydVHOvC0/uWoy2Fzwn4=
+github.com/go-playground/validator/v10 v10.27.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
-github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs=
+github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -53,10 +53,8 @@ github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ
 github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
-github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
-github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0=
-github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -66,8 +64,9 @@ github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
@@ -83,10 +82,10 @@ github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8
 github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/nats-io/nats.go v1.37.0 h1:07rauXbVnnJvv1gfIyghFEo6lUcYRY0WXc3x7x0vUxE=
-github.com/nats-io/nats.go v1.37.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8=
-github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI=
-github.com/nats-io/nkeys v0.4.7/go.mod h1:kqXRgRDPlGy7nGaEDMuYzmiJCIAAWDK0IMBtDmGD0nc=
+github.com/nats-io/nats.go v1.43.0 h1:uRFZ2FEoRvP64+UUhaTokyS18XBCR/xM2vQZKO4i8ug=
+github.com/nats-io/nats.go v1.43.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g=
+github.com/nats-io/nkeys v0.4.11 h1:q44qGV008kYd9W1b1nEBkNzvnWxtRSQ7A8BoqRrcfa0=
+github.com/nats-io/nkeys v0.4.11/go.mod h1:szDimtgmfOi9n25JpfIdGw12tZFYXqhGxjhVxsatHVE=
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/ogier/pflag v0.0.1/go.mod h1:zkFki7tvTa0tafRvTBIZTvzYyAu6kQhPZFnshFFPE+g=
@@ -95,21 +94,19 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg=
-github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
-github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
-github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
-github.com/prometheus/common v0.58.0 h1:N+N8vY4/23r6iYfD3UQZUoJPnUYAo7v6LG5XZxjZTXo=
-github.com/prometheus/common v0.58.0/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0=
-github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
-github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
-github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
-github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
+github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
+github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
+github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
+github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
+github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
+github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
+github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0=
+github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
-github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
-github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
+github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
+github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
+github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
 github.com/shiena/ansicolor v0.0.0-20230509054315-a9deabde6e02 h1:v9ezJDHA1XGxViAUSIoO/Id7Fl63u6d0YmsAm+/p2hs=
 github.com/shiena/ansicolor v0.0.0-20230509054315-a9deabde6e02/go.mod h1:RF16/A3L0xSa0oSERcnhd8Pu3IXSDZSK2gmGIMsttFE=
 github.com/skarademir/naturalsort v0.0.0-20150715044055-69a5d87bef62/go.mod h1:oIdVclZaltY1Nf7OQUkg1/2jImBJ+ZfKZuDIRSwk3p0=
@@ -121,8 +118,8 @@ github.com/smartystreets/goconvey v1.7.2 h1:9RBaZCeXEQ3UselpuwUQHltGVXvdwm6cv1hg
 github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
 github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=
@@ -132,31 +129,25 @@ github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gi
 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM=
 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.mongodb.org/mongo-driver v1.16.1 h1:rIVLL3q0IHM39dvE+z2ulZLp9ENZKThVfuvN/IiN4l8=
-go.mongodb.org/mongo-driver v1.16.1/go.mod h1:oB6AhJQvFQL4LEHyXi6aJzQJtBiTQHiAd83l0GdFaiw=
-go.mongodb.org/mongo-driver v1.17.0 h1:Hp4q2MCjvY19ViwimTs00wHi7G4yzxh4/2+nTx8r40k=
-go.mongodb.org/mongo-driver v1.17.0/go.mod h1:wwWm/+BuOddhcq3n68LKRmgk2wXzmF6s0SFOa0GINL4=
+go.mongodb.org/mongo-driver v1.17.4 h1:jUorfmVzljjr0FLzYQsGP8cgN/qzzxlY9Vh0C9KFXVw=
+go.mongodb.org/mongo-driver v1.17.4/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191112222119-e1110fd1c708/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
-golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
-golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
-golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
+golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
+golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
-golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
-golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
-golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
+golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
+golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
-golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
+golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -167,27 +158,23 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
-golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
-golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
-golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
-golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
+golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

infrastructure/nats.go

@@ -0,0 +1,56 @@
+package infrastructure
+
+import (
+	"encoding/json"
+	"fmt"
+
+	oclib "cloud.o-forge.io/core/oc-lib"
+	"cloud.o-forge.io/core/oc-lib/models/resources"
+	"cloud.o-forge.io/core/oc-lib/tools"
+)
+
+var SearchStream = map[string]chan resources.ResourceInterface{}
+
+func EmitNATS(user string, message tools.PropalgationMessage) {
+	b, _ := json.Marshal(message)
+	if message.Action == tools.PB_SEARCH {
+		SearchStream[user] = make(chan resources.ResourceInterface, 128)
+	}
+	tools.NewNATSCaller().SetNATSPub(tools.PROPALGATION_EVENT, tools.NATSResponse{
+		FromApp:  "oc-catalog",
+		Datatype: -1,
+		Method:   int(tools.PROPALGATION_EVENT),
+		Payload:  b,
+	})
+}
+
+func ListenNATS() {
+	tools.NewNATSCaller().ListenNats(map[tools.NATSMethod]func(tools.NATSResponse){
+		tools.CATALOG_SEARCH_EVENT: func(resp tools.NATSResponse) {
+			p, err := resources.ToResource(int(resp.Datatype), resp.Payload)
+			if err == nil {
+				SearchStream[resp.User] <- p
+			}
+		},
+		tools.CREATE_RESOURCE: func(resp tools.NATSResponse) {
+			p := map[string]interface{}{}
+			err := json.Unmarshal(resp.Payload, &p)
+			if err == nil {
+				access := oclib.NewRequestAdmin(oclib.LibDataEnum(resp.Datatype), nil)
+				if data := access.LoadOne(fmt.Sprintf("%v", p["id"])); data.Data != nil {
+					access.UpdateOne(p, fmt.Sprintf("%v", p["id"]))
+				} else {
+					access.StoreOne(p)
+				}
+			}
+		},
+		tools.REMOVE_RESOURCE: func(resp tools.NATSResponse) {
+			p := map[string]interface{}{}
+			access := oclib.NewRequestAdmin(oclib.LibDataEnum(resp.Datatype), nil)
+			err := json.Unmarshal(resp.Payload, &p)
+			if err == nil {
+				access.DeleteOne(fmt.Sprintf("%v", p["id"]))
+			}
+		},
+	})
+}

main.go

@@ -4,7 +4,9 @@ import (
 	_ "oc-catalog/routers"
 
 	oclib "cloud.o-forge.io/core/oc-lib"
+	"cloud.o-forge.io/core/oc-lib/tools"
 	beego "github.com/beego/beego/v2/server/web"
+	"github.com/beego/beego/v2/server/web/filter/cors"
 )
 
 const appname = "oc-catalog"
@@ -20,15 +22,25 @@ func main() {
 	oclib.SetConfig(
 		o.GetStringDefault("MONGO_URL", "mongodb://127.0.0.1:27017"),
 		o.GetStringDefault("MONGO_DATABASE", "DC_myDC"),
-		"",
+		o.GetStringDefault("NATS_URL", "nats://localhost:4222"),
 		o.GetStringDefault("LOKI_URL", ""),
 		o.GetStringDefault("LOG_LEVEL", "info"),
 	)
-	// Beego init
+	// Beego initialization
 	beego.BConfig.AppName = appname
-	beego.BConfig.Listen.HTTPPort = 8080
+	beego.BConfig.Listen.HTTPPort = o.GetIntDefault("port", 8080)
 	beego.BConfig.WebConfig.DirectoryIndex = true
 	beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
-
+	api := &tools.API{}
+	api.Discovered(beego.BeeApp.Handlers.GetAllControllerInfo())
+	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
+		AllowAllOrigins:  true,
+		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
+		AllowHeaders:     []string{"Origin", "Authorization", "Content-Type"},
+		ExposeHeaders:    []string{"Content-Length", "Content-Type"},
+		AllowCredentials: true,
+	}))
 	beego.Run()
 }
+
+// TODO VERIFY IF LOOP OF GET VALUE is ENOUGH TO REFRESH

populate.sh

@@ -4,6 +4,11 @@
 # Must specify a JSON with a following structure:
 
 ENDPOINT="http://localhost:8087"
+
+if [[ $K8S_ENVIRONMENT ]]; then
+  ENDPOINT="http://beta.opencloud.com/catalog"
+fi
+
 if [[ $DOCKER_ENVIRONMENT ]]; then
   ENDPOINT="http://oc-catalog:8087"
 fi

routers/commentsRouter.go

@@ -7,6 +7,60 @@ import (
 
 func init() {
 
+    beego.GlobalControllerRouter["oc-catalog/controllers:ComputeController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:ComputeController"],
+        beego.ControllerComments{
+            Method: "Post",
+            Router: `/`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["oc-catalog/controllers:ComputeController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:ComputeController"],
+        beego.ControllerComments{
+            Method: "GetAll",
+            Router: `/`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["oc-catalog/controllers:ComputeController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:ComputeController"],
+        beego.ControllerComments{
+            Method: "Put",
+            Router: `/:id`,
+            AllowHTTPMethods: []string{"put"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["oc-catalog/controllers:ComputeController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:ComputeController"],
+        beego.ControllerComments{
+            Method: "Get",
+            Router: `/:id`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["oc-catalog/controllers:ComputeController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:ComputeController"],
+        beego.ControllerComments{
+            Method: "Delete",
+            Router: `/:id`,
+            AllowHTTPMethods: []string{"delete"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["oc-catalog/controllers:ComputeController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:ComputeController"],
+        beego.ControllerComments{
+            Method: "Search",
+            Router: `/search/:search`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["oc-catalog/controllers:DataController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:DataController"],
         beego.ControllerComments{
             Method: "Post",
@@ -61,16 +115,124 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["oc-catalog/controllers:DatacenterController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:DatacenterController"],
+    beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"],
         beego.ControllerComments{
-            Method: "Post",
-            Router: `/`,
-            AllowHTTPMethods: []string{"post"},
+            Method: "EnumBookingStatus",
+            Router: `/booking/status`,
+            AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["oc-catalog/controllers:DatacenterController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:DatacenterController"],
+    beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"],
+        beego.ControllerComments{
+            Method: "EnumInfrastructure",
+            Router: `/infrastructure`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"],
+        beego.ControllerComments{
+            Method: "EnumRefundType",
+            Router: `/pricing/refund/type`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"],
+        beego.ControllerComments{
+            Method: "EnumStrategyBuy",
+            Router: `/pricing/strategy/buy`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"],
+        beego.ControllerComments{
+            Method: "EnumStrategyData",
+            Router: `/pricing/strategy/data`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"],
+        beego.ControllerComments{
+            Method: "EnumStrategyPrivilege",
+            Router: `/pricing/strategy/privilege`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"],
+        beego.ControllerComments{
+            Method: "EnumStrategyPrivilegeStorage",
+            Router: `/pricing/strategy/privilege/storage`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"],
+        beego.ControllerComments{
+            Method: "EnumStrategyStorage",
+            Router: `/pricing/strategy/storage`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"],
+        beego.ControllerComments{
+            Method: "EnumStrategyTime",
+            Router: `/pricing/strategy/time`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"],
+        beego.ControllerComments{
+            Method: "EnumResourceType",
+            Router: `/resource/type`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"],
+        beego.ControllerComments{
+            Method: "EnumStatus",
+            Router: `/status`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"],
+        beego.ControllerComments{
+            Method: "EnumStorageSize",
+            Router: `/storage/size`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:EnumController"],
+        beego.ControllerComments{
+            Method: "EnumStorageType",
+            Router: `/storage/type`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["oc-catalog/controllers:GeneralController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:GeneralController"],
         beego.ControllerComments{
             Method: "GetAll",
             Router: `/`,
@@ -79,7 +241,25 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["oc-catalog/controllers:DatacenterController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:DatacenterController"],
+    beego.GlobalControllerRouter["oc-catalog/controllers:ProcessingController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:ProcessingController"],
+        beego.ControllerComments{
+            Method: "Post",
+            Router: `/`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["oc-catalog/controllers:ProcessingController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:ProcessingController"],
+        beego.ControllerComments{
+            Method: "GetAll",
+            Router: `/`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["oc-catalog/controllers:ProcessingController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:ProcessingController"],
         beego.ControllerComments{
             Method: "Put",
             Router: `/:id`,
@@ -88,7 +268,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["oc-catalog/controllers:DatacenterController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:DatacenterController"],
+    beego.GlobalControllerRouter["oc-catalog/controllers:ProcessingController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:ProcessingController"],
         beego.ControllerComments{
             Method: "Get",
             Router: `/:id`,
@@ -97,7 +277,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["oc-catalog/controllers:DatacenterController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:DatacenterController"],
+    beego.GlobalControllerRouter["oc-catalog/controllers:ProcessingController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:ProcessingController"],
         beego.ControllerComments{
             Method: "Delete",
             Router: `/:id`,
@@ -106,7 +286,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["oc-catalog/controllers:DatacenterController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:DatacenterController"],
+    beego.GlobalControllerRouter["oc-catalog/controllers:ProcessingController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:ProcessingController"],
         beego.ControllerComments{
             Method: "Search",
             Router: `/search/:search`,
@@ -115,7 +295,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["oc-catalog/controllers:ProcessingController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:ProcessingController"],
+    beego.GlobalControllerRouter["oc-catalog/controllers:PurchaseController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:PurchaseController"],
         beego.ControllerComments{
             Method: "Post",
             Router: `/`,
@@ -124,7 +304,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["oc-catalog/controllers:ProcessingController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:ProcessingController"],
+    beego.GlobalControllerRouter["oc-catalog/controllers:PurchaseController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:PurchaseController"],
         beego.ControllerComments{
             Method: "GetAll",
             Router: `/`,
@@ -133,16 +313,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["oc-catalog/controllers:ProcessingController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:ProcessingController"],
-        beego.ControllerComments{
-            Method: "Put",
-            Router: `/:id`,
-            AllowHTTPMethods: []string{"put"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["oc-catalog/controllers:ProcessingController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:ProcessingController"],
+    beego.GlobalControllerRouter["oc-catalog/controllers:PurchaseController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:PurchaseController"],
         beego.ControllerComments{
             Method: "Get",
             Router: `/:id`,
@@ -151,16 +322,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["oc-catalog/controllers:ProcessingController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:ProcessingController"],
-        beego.ControllerComments{
-            Method: "Delete",
-            Router: `/:id`,
-            AllowHTTPMethods: []string{"delete"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["oc-catalog/controllers:ProcessingController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:ProcessingController"],
+    beego.GlobalControllerRouter["oc-catalog/controllers:PurchaseController"] = append(beego.GlobalControllerRouter["oc-catalog/controllers:PurchaseController"],
         beego.ControllerComments{
             Method: "Search",
             Router: `/search/:search`,

routers/router.go

@@ -15,6 +15,16 @@ import (
 
 func init() {
 	ns := beego.NewNamespace("/oc/",
+		beego.NSNamespace("/generic",
+			beego.NSInclude(
+				&controllers.GeneralController{},
+			),
+		),
+		beego.NSNamespace("/purchase",
+			beego.NSInclude(
+				&controllers.PurchaseController{},
+			),
+		),
 		beego.NSNamespace("/resource",
 			beego.NSInclude(
 				&controllers.ResourceController{},
@@ -25,9 +35,9 @@ func init() {
 				&controllers.DataController{},
 			),
 		),
-		beego.NSNamespace("/datacenter",
+		beego.NSNamespace("/compute",
 			beego.NSInclude(
-				&controllers.DatacenterController{},
+				&controllers.ComputeController{},
 			),
 		),
 		beego.NSNamespace("/storage",
@@ -45,6 +55,11 @@ func init() {
 				&controllers.WorkflowController{},
 			),
 		),
+		beego.NSNamespace("/enum",
+			beego.NSInclude(
+				&controllers.EnumController{},
+			),
+		),
 		beego.NSNamespace("/version",
 			beego.NSInclude(
 				&controllers.VersionController{},

swagger/index.html

@@ -39,7 +39,7 @@
     window.onload = function() {
       // Begin Swagger UI call region
       const ui = SwaggerUIBundle({
-        url: "swagger.json",
+        url: "https://petstore.swagger.io/v2/swagger.json",
         dom_id: '#swagger-ui',
         deepLinking: true,
         presets: [

swagger/swagger.json

@@ -9,12 +9,160 @@
             "email": "admin@o-cloud.io"
         },
         "license": {
-            "name": "MIT",
-            "url": "https://opensource.org/license/mit"
+            "name": "AGPL",
+            "url": "https://www.gnu.org/licenses/agpl-3.0.html"
         }
     },
     "basePath": "/oc/",
     "paths": {
+        "/compute/": {
+            "get": {
+                "tags": [
+                    "compute"
+                ],
+                "description": "find compute by id\n\u003cbr\u003e",
+                "operationId": "ComputeController.GetAll",
+                "parameters": [
+                    {
+                        "in": "query",
+                        "name": "is_draft",
+                        "description": "draft wished",
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{compute} models.compute"
+                    }
+                }
+            },
+            "post": {
+                "tags": [
+                    "compute"
+                ],
+                "description": "create compute\n\u003cbr\u003e",
+                "operationId": "ComputeController.Create",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "compute",
+                        "description": "body for compute content (Json format)",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/json"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{compute} models.compute"
+                    }
+                }
+            }
+        },
+        "/compute/search/{search}": {
+            "get": {
+                "tags": [
+                    "compute"
+                ],
+                "description": "find compute by key word\n\u003cbr\u003e",
+                "operationId": "ComputeController.Get",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "search",
+                        "description": "the search you want to get",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "query",
+                        "name": "is_draft",
+                        "description": "draft wished",
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{compute} models.compute"
+                    }
+                }
+            }
+        },
+        "/compute/{id}": {
+            "get": {
+                "tags": [
+                    "compute"
+                ],
+                "description": "find compute by id\n\u003cbr\u003e",
+                "operationId": "ComputeController.Get",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "description": "the id you want to get",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{compute} models.compute"
+                    }
+                }
+            },
+            "put": {
+                "tags": [
+                    "compute"
+                ],
+                "description": "create computes\n\u003cbr\u003e",
+                "operationId": "ComputeController.Update",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "description": "the compute id you want to get",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "description": "The compute content",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/models.compute"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{compute} models.compute"
+                    }
+                }
+            },
+            "delete": {
+                "tags": [
+                    "compute"
+                ],
+                "description": "delete the compute\n\u003cbr\u003e",
+                "operationId": "ComputeController.Delete",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "description": "The id you want to delete",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{compute} delete success!"
+                    }
+                }
+            }
+        },
         "/data/": {
             "get": {
                 "tags": [
@@ -22,6 +170,14 @@
                 ],
                 "description": "find data by id\n\u003cbr\u003e",
                 "operationId": "DataController.GetAll",
+                "parameters": [
+                    {
+                        "in": "query",
+                        "name": "is_draft",
+                        "description": "draft wished",
+                        "type": "string"
+                    }
+                ],
                 "responses": {
                     "200": {
                         "description": "{data} models.data"
@@ -57,17 +213,6 @@
                 "tags": [
                     "data"
                 ],
-                "description": "find data by key word\n\u003cbr\u003e",
-                "operationId": "DataController.Get",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "search",
-                        "description": "the search you want to get",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
                 "responses": {
                     "200": {
                         "description": "{data} models.data"
@@ -149,136 +294,210 @@
                 }
             }
         },
-        "/datacenter/": {
+        "/enum/booking/status": {
             "get": {
                 "tags": [
-                    "datacenter"
+                    "enum"
                 ],
-                "description": "find datacenter by id\n\u003cbr\u003e",
-                "operationId": "DatacenterController.GetAll",
+                "description": "get list of Infrastructure\n\u003cbr\u003e",
+                "operationId": "EnumController.BookingStatus",
                 "responses": {
                     "200": {
-                        "description": "{datacenter} models.datacenter"
-                    }
-                }
-            },
-            "post": {
-                "tags": [
-                    "datacenter"
-                ],
-                "description": "create datacenter\n\u003cbr\u003e",
-                "operationId": "DatacenterController.Create",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "datacenter",
-                        "description": "body for datacenter content (Json format)",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/json"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "{datacenter} models.datacenter"
+                        "description": "{resource} models.resource"
                     }
                 }
             }
         },
-        "/datacenter/search/{search}": {
+        "/enum/infrastructure": {
             "get": {
                 "tags": [
-                    "datacenter"
-                ],
-                "description": "find datacenter by key word\n\u003cbr\u003e",
-                "operationId": "DatacenterController.Get",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "search",
-                        "description": "the search you want to get",
-                        "required": true,
-                        "type": "string"
-                    }
+                    "enum"
                 ],
+                "description": "get list of Infrastructure\n\u003cbr\u003e",
+                "operationId": "EnumController.EnumInfrastructure",
                 "responses": {
                     "200": {
-                        "description": "{datacenter} models.datacenter"
+                        "description": "{resource} models.resource"
                     }
                 }
             }
         },
-        "/datacenter/{id}": {
+        "/enum/pricing/refund/type": {
             "get": {
                 "tags": [
-                    "datacenter"
+                    "enum"
                 ],
-                "description": "find datacenter by id\n\u003cbr\u003e",
-                "operationId": "DatacenterController.Get",
+                "description": "get list of status\n\u003cbr\u003e",
+                "operationId": "EnumController.EnumRefundType",
+                "responses": {
+                    "200": {
+                        "description": "{resource} models.resource"
+                    }
+                }
+            }
+        },
+        "/enum/pricing/strategy/buy": {
+            "get": {
+                "tags": [
+                    "enum"
+                ],
+                "description": "get list of status\n\u003cbr\u003e",
+                "operationId": "EnumController.EnumStrategyBuy",
+                "responses": {
+                    "200": {
+                        "description": "{resource} models.resource"
+                    }
+                }
+            }
+        },
+        "/enum/pricing/strategy/data": {
+            "get": {
+                "tags": [
+                    "enum"
+                ],
+                "description": "get list of status\n\u003cbr\u003e",
+                "operationId": "EnumController.EnumStrategyData",
+                "responses": {
+                    "200": {
+                        "description": "{resource} models.resource"
+                    }
+                }
+            }
+        },
+        "/enum/pricing/strategy/privilege": {
+            "get": {
+                "tags": [
+                    "enum"
+                ],
+                "description": "get list of status\n\u003cbr\u003e",
+                "operationId": "EnumController.EnumStrategyPrivilege",
+                "responses": {
+                    "200": {
+                        "description": "{resource} models.resource"
+                    }
+                }
+            }
+        },
+        "/enum/pricing/strategy/privilege/storage": {
+            "get": {
+                "tags": [
+                    "enum"
+                ],
+                "description": "get list of status\n\u003cbr\u003e",
+                "operationId": "EnumController.EnumStrategyPrivilegeStorage",
+                "responses": {
+                    "200": {
+                        "description": "{resource} models.resource"
+                    }
+                }
+            }
+        },
+        "/enum/pricing/strategy/storage": {
+            "get": {
+                "tags": [
+                    "enum"
+                ],
+                "description": "get list of status\n\u003cbr\u003e",
+                "operationId": "EnumController.EnumStrategyStorage",
+                "responses": {
+                    "200": {
+                        "description": "{resource} models.resource"
+                    }
+                }
+            }
+        },
+        "/enum/pricing/strategy/time": {
+            "get": {
+                "tags": [
+                    "enum"
+                ],
+                "description": "get list of status\n\u003cbr\u003e",
+                "operationId": "EnumController.EnumStrategyTime",
+                "responses": {
+                    "200": {
+                        "description": "{resource} models.resource"
+                    }
+                }
+            }
+        },
+        "/enum/resource/type": {
+            "get": {
+                "tags": [
+                    "enum"
+                ],
+                "description": "get list of status\n\u003cbr\u003e",
+                "operationId": "EnumController.EnumResourceType",
+                "responses": {
+                    "200": {
+                        "description": "{resource} models.resource"
+                    }
+                }
+            }
+        },
+        "/enum/status": {
+            "get": {
+                "tags": [
+                    "enum"
+                ],
+                "description": "get list of status\n\u003cbr\u003e",
+                "operationId": "EnumController.EnumStatus",
+                "responses": {
+                    "200": {
+                        "description": "{resource} models.resource"
+                    }
+                }
+            }
+        },
+        "/enum/storage/size": {
+            "get": {
+                "tags": [
+                    "enum"
+                ],
+                "description": "get list of StorageSize\n\u003cbr\u003e",
+                "operationId": "EnumController.EnumStorageSize",
+                "responses": {
+                    "200": {
+                        "description": "{resource} models.resource"
+                    }
+                }
+            }
+        },
+        "/enum/storage/type": {
+            "get": {
+                "tags": [
+                    "enum"
+                ],
+                "description": "get list of StorageType\n\u003cbr\u003e",
+                "operationId": "EnumController.EnumStorageType",
+                "responses": {
+                    "200": {
+                        "description": "{resource} models.resource"
+                    }
+                }
+            }
+        },
+        "/generic/": {
+            "get": {
+                "tags": [
+                    "generic"
+                ],
+                "description": "find compute by id\n\u003cbr\u003e",
+                "operationId": "GeneralController.GetAll",
                 "parameters": [
                     {
-                        "in": "path",
-                        "name": "id",
-                        "description": "the id you want to get",
+                        "in": "formData",
+                        "name": "file",
+                        "description": "File to upload",
                         "required": true,
-                        "type": "string"
+                        "type": "file"
                     }
                 ],
                 "responses": {
                     "200": {
-                        "description": "{datacenter} models.datacenter"
-                    }
-                }
-            },
-            "put": {
-                "tags": [
-                    "datacenter"
-                ],
-                "description": "create datacenters\n\u003cbr\u003e",
-                "operationId": "DatacenterController.Update",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "description": "the datacenter id you want to get",
-                        "required": true,
-                        "type": "string"
+                        "description": "{compute} models.workflow"
                     },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "description": "The datacenter content",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/models.datacenter"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "{datacenter} models.datacenter"
-                    }
-                }
-            },
-            "delete": {
-                "tags": [
-                    "datacenter"
-                ],
-                "description": "delete the datacenter\n\u003cbr\u003e",
-                "operationId": "DatacenterController.Delete",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "description": "The id you want to delete",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "{datacenter} delete success!"
+                    "406": {
+                        "description": "{string} string \"Bad request\""
                     }
                 }
             }
@@ -290,6 +509,14 @@
                 ],
                 "description": "find processing by id\n\u003cbr\u003e",
                 "operationId": "ProcessingController.GetAll",
+                "parameters": [
+                    {
+                        "in": "query",
+                        "name": "is_draft",
+                        "description": "draft wished",
+                        "type": "string"
+                    }
+                ],
                 "responses": {
                     "200": {
                         "description": "{processing} models.processing"
@@ -334,6 +561,12 @@
                         "description": "the search you want to get",
                         "required": true,
                         "type": "string"
+                    },
+                    {
+                        "in": "query",
+                        "name": "is_draft",
+                        "description": "draft wished",
+                        "type": "string"
                     }
                 ],
                 "responses": {
@@ -417,6 +650,103 @@
                 }
             }
         },
+        "/purchase/": {
+            "get": {
+                "tags": [
+                    "purchase"
+                ],
+                "description": "find compute by id\n\u003cbr\u003e",
+                "operationId": "PurchaseController.GetAll",
+                "parameters": [
+                    {
+                        "in": "query",
+                        "name": "is_draft",
+                        "description": "draft wished",
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{compute} models.compute"
+                    }
+                }
+            },
+            "post": {
+                "tags": [
+                    "purchase"
+                ],
+                "description": "create compute\n\u003cbr\u003e",
+                "operationId": "PurchaseController.Create",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "compute",
+                        "description": "body for compute content (Json format)",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/json"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{compute} models.compute"
+                    }
+                }
+            }
+        },
+        "/purchase/search/{search}": {
+            "get": {
+                "tags": [
+                    "purchase"
+                ],
+                "description": "find compute by key word\n\u003cbr\u003e",
+                "operationId": "PurchaseController.Get",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "search",
+                        "description": "the search you want to get",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "query",
+                        "name": "is_draft",
+                        "description": "draft wished",
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{compute} models.compute"
+                    }
+                }
+            }
+        },
+        "/purchase/{id}": {
+            "get": {
+                "tags": [
+                    "purchase"
+                ],
+                "description": "find compute by id\n\u003cbr\u003e",
+                "operationId": "PurchaseController.Get",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "description": "the id you want to get",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{compute} models.compute"
+                    }
+                }
+            }
+        },
         "/resource/": {
             "get": {
                 "tags": [
@@ -424,6 +754,14 @@
                 ],
                 "description": "find resource by id\n\u003cbr\u003e",
                 "operationId": "ResourceController.GetAll",
+                "parameters": [
+                    {
+                        "in": "query",
+                        "name": "is_draft",
+                        "description": "draft wished",
+                        "type": "string"
+                    }
+                ],
                 "responses": {
                     "200": {
                         "description": "{resource} models.resource"
@@ -445,6 +783,12 @@
                         "description": "the search you want to get",
                         "required": true,
                         "type": "string"
+                    },
+                    {
+                        "in": "query",
+                        "name": "is_draft",
+                        "description": "draft wished",
+                        "type": "string"
                     }
                 ],
                 "responses": {
@@ -505,6 +849,14 @@
                 ],
                 "description": "find storage by id\n\u003cbr\u003e",
                 "operationId": "StorageController.GetAll",
+                "parameters": [
+                    {
+                        "in": "query",
+                        "name": "is_draft",
+                        "description": "draft wished",
+                        "type": "string"
+                    }
+                ],
                 "responses": {
                     "200": {
                         "description": "{storage} models.storage"
@@ -549,6 +901,12 @@
                         "description": "the search you want to get",
                         "required": true,
                         "type": "string"
+                    },
+                    {
+                        "in": "query",
+                        "name": "is_draft",
+                        "description": "draft wished",
+                        "type": "string"
                     }
                 ],
                 "responses": {
@@ -667,6 +1025,14 @@
                 ],
                 "description": "find workflow by id\n\u003cbr\u003e",
                 "operationId": "WorkflowController.GetAll",
+                "parameters": [
+                    {
+                        "in": "query",
+                        "name": "is_draft",
+                        "description": "draft wished",
+                        "type": "string"
+                    }
+                ],
                 "responses": {
                     "200": {
                         "description": "{workflow} models.workflow"
@@ -711,6 +1077,12 @@
                         "description": "the search you want to get",
                         "required": true,
                         "type": "string"
+                    },
+                    {
+                        "in": "query",
+                        "name": "is_draft",
+                        "description": "draft wished",
+                        "type": "string"
                     }
                 ],
                 "responses": {
@@ -800,12 +1172,12 @@
             "title": "json",
             "type": "object"
         },
-        "models.data": {
-            "title": "data",
+        "models.compute": {
+            "title": "compute",
             "type": "object"
         },
-        "models.datacenter": {
-            "title": "datacenter",
+        "models.data": {
+            "title": "data",
             "type": "object"
         },
         "models.processing": {
@@ -822,6 +1194,14 @@
         }
     },
     "tags": [
+        {
+            "name": "generic",
+            "description": "Operations about compute\n"
+        },
+        {
+            "name": "purchase",
+            "description": "Operations about compute\n"
+        },
         {
             "name": "resource",
             "description": "Operations about resource\n"
@@ -831,8 +1211,8 @@
             "description": "Operations about data\n"
         },
         {
-            "name": "datacenter",
-            "description": "Operations about datacenter\n"
+            "name": "compute",
+            "description": "Operations about compute\n"
         },
         {
             "name": "storage",
@@ -846,6 +1226,10 @@
             "name": "workflow",
             "description": "Operations about workflow\n"
         },
+        {
+            "name": "enum",
+            "description": "Operations about resource\n"
+        },
         {
             "name": "version",
             "description": "VersionController operations for Version\n"

swagger/swagger.yml

@@ -8,10 +8,119 @@ info:
   contact:
     email: admin@o-cloud.io
   license:
-    name: MIT
-    url: https://opensource.org/license/mit
+    name: AGPL
+    url: https://www.gnu.org/licenses/agpl-3.0.html
 basePath: /oc/
 paths:
+  /compute/:
+    get:
+      tags:
+      - compute
+      description: |-
+        find compute by id
+        <br>
+      operationId: ComputeController.GetAll
+      parameters:
+      - in: query
+        name: is_draft
+        description: draft wished
+        type: string
+      responses:
+        "200":
+          description: '{compute} models.compute'
+    post:
+      tags:
+      - compute
+      description: |-
+        create compute
+        <br>
+      operationId: ComputeController.Create
+      parameters:
+      - in: body
+        name: compute
+        description: body for compute content (Json format)
+        required: true
+        schema:
+          $ref: '#/definitions/json'
+      responses:
+        "200":
+          description: '{compute} models.compute'
+  /compute/{id}:
+    get:
+      tags:
+      - compute
+      description: |-
+        find compute by id
+        <br>
+      operationId: ComputeController.Get
+      parameters:
+      - in: path
+        name: id
+        description: the id you want to get
+        required: true
+        type: string
+      responses:
+        "200":
+          description: '{compute} models.compute'
+    put:
+      tags:
+      - compute
+      description: |-
+        create computes
+        <br>
+      operationId: ComputeController.Update
+      parameters:
+      - in: path
+        name: id
+        description: the compute id you want to get
+        required: true
+        type: string
+      - in: body
+        name: body
+        description: The compute content
+        required: true
+        schema:
+          $ref: '#/definitions/models.compute'
+      responses:
+        "200":
+          description: '{compute} models.compute'
+    delete:
+      tags:
+      - compute
+      description: |-
+        delete the compute
+        <br>
+      operationId: ComputeController.Delete
+      parameters:
+      - in: path
+        name: id
+        description: The id you want to delete
+        required: true
+        type: string
+      responses:
+        "200":
+          description: '{compute} delete success!'
+  /compute/search/{search}:
+    get:
+      tags:
+      - compute
+      description: |-
+        find compute by key word
+        <br>
+      operationId: ComputeController.Get
+      parameters:
+      - in: path
+        name: search
+        description: the search you want to get
+        required: true
+        type: string
+      - in: query
+        name: is_draft
+        description: draft wished
+        type: string
+      responses:
+        "200":
+          description: '{compute} models.compute'
   /data/:
     get:
       tags:
@@ -20,6 +129,11 @@ paths:
         find data by id
         <br>
       operationId: DataController.GetAll
+      parameters:
+      - in: query
+        name: is_draft
+        description: draft wished
+        type: string
       responses:
         "200":
           description: '{data} models.data'
@@ -99,119 +213,171 @@ paths:
     get:
       tags:
       - data
-      description: |-
-        find data by key word
-        <br>
-      operationId: DataController.Get
-      parameters:
-      - in: path
-        name: search
-        description: the search you want to get
-        required: true
-        type: string
       responses:
         "200":
           description: '{data} models.data'
-  /datacenter/:
+  /enum/booking/status:
     get:
       tags:
-      - datacenter
+      - enum
       description: |-
-        find datacenter by id
+        get list of Infrastructure
         <br>
-      operationId: DatacenterController.GetAll
+      operationId: EnumController.BookingStatus
       responses:
         "200":
-          description: '{datacenter} models.datacenter'
-    post:
-      tags:
-      - datacenter
-      description: |-
-        create datacenter
-        <br>
-      operationId: DatacenterController.Create
-      parameters:
-      - in: body
-        name: datacenter
-        description: body for datacenter content (Json format)
-        required: true
-        schema:
-          $ref: '#/definitions/json'
-      responses:
-        "200":
-          description: '{datacenter} models.datacenter'
-  /datacenter/{id}:
+          description: '{resource} models.resource'
+  /enum/infrastructure:
     get:
       tags:
-      - datacenter
+      - enum
       description: |-
-        find datacenter by id
+        get list of Infrastructure
         <br>
-      operationId: DatacenterController.Get
-      parameters:
-      - in: path
-        name: id
-        description: the id you want to get
-        required: true
-        type: string
+      operationId: EnumController.EnumInfrastructure
       responses:
         "200":
-          description: '{datacenter} models.datacenter'
-    put:
-      tags:
-      - datacenter
-      description: |-
-        create datacenters
-        <br>
-      operationId: DatacenterController.Update
-      parameters:
-      - in: path
-        name: id
-        description: the datacenter id you want to get
-        required: true
-        type: string
-      - in: body
-        name: body
-        description: The datacenter content
-        required: true
-        schema:
-          $ref: '#/definitions/models.datacenter'
-      responses:
-        "200":
-          description: '{datacenter} models.datacenter'
-    delete:
-      tags:
-      - datacenter
-      description: |-
-        delete the datacenter
-        <br>
-      operationId: DatacenterController.Delete
-      parameters:
-      - in: path
-        name: id
-        description: The id you want to delete
-        required: true
-        type: string
-      responses:
-        "200":
-          description: '{datacenter} delete success!'
-  /datacenter/search/{search}:
+          description: '{resource} models.resource'
+  /enum/pricing/refund/type:
     get:
       tags:
-      - datacenter
+      - enum
       description: |-
-        find datacenter by key word
+        get list of status
         <br>
-      operationId: DatacenterController.Get
-      parameters:
-      - in: path
-        name: search
-        description: the search you want to get
-        required: true
-        type: string
+      operationId: EnumController.EnumRefundType
       responses:
         "200":
-          description: '{datacenter} models.datacenter'
+          description: '{resource} models.resource'
+  /enum/pricing/strategy/buy:
+    get:
+      tags:
+      - enum
+      description: |-
+        get list of status
+        <br>
+      operationId: EnumController.EnumStrategyBuy
+      responses:
+        "200":
+          description: '{resource} models.resource'
+  /enum/pricing/strategy/data:
+    get:
+      tags:
+      - enum
+      description: |-
+        get list of status
+        <br>
+      operationId: EnumController.EnumStrategyData
+      responses:
+        "200":
+          description: '{resource} models.resource'
+  /enum/pricing/strategy/privilege:
+    get:
+      tags:
+      - enum
+      description: |-
+        get list of status
+        <br>
+      operationId: EnumController.EnumStrategyPrivilege
+      responses:
+        "200":
+          description: '{resource} models.resource'
+  /enum/pricing/strategy/privilege/storage:
+    get:
+      tags:
+      - enum
+      description: |-
+        get list of status
+        <br>
+      operationId: EnumController.EnumStrategyPrivilegeStorage
+      responses:
+        "200":
+          description: '{resource} models.resource'
+  /enum/pricing/strategy/storage:
+    get:
+      tags:
+      - enum
+      description: |-
+        get list of status
+        <br>
+      operationId: EnumController.EnumStrategyStorage
+      responses:
+        "200":
+          description: '{resource} models.resource'
+  /enum/pricing/strategy/time:
+    get:
+      tags:
+      - enum
+      description: |-
+        get list of status
+        <br>
+      operationId: EnumController.EnumStrategyTime
+      responses:
+        "200":
+          description: '{resource} models.resource'
+  /enum/resource/type:
+    get:
+      tags:
+      - enum
+      description: |-
+        get list of status
+        <br>
+      operationId: EnumController.EnumResourceType
+      responses:
+        "200":
+          description: '{resource} models.resource'
+  /enum/status:
+    get:
+      tags:
+      - enum
+      description: |-
+        get list of status
+        <br>
+      operationId: EnumController.EnumStatus
+      responses:
+        "200":
+          description: '{resource} models.resource'
+  /enum/storage/size:
+    get:
+      tags:
+      - enum
+      description: |-
+        get list of StorageSize
+        <br>
+      operationId: EnumController.EnumStorageSize
+      responses:
+        "200":
+          description: '{resource} models.resource'
+  /enum/storage/type:
+    get:
+      tags:
+      - enum
+      description: |-
+        get list of StorageType
+        <br>
+      operationId: EnumController.EnumStorageType
+      responses:
+        "200":
+          description: '{resource} models.resource'
+  /generic/:
+    get:
+      tags:
+      - generic
+      description: |-
+        find compute by id
+        <br>
+      operationId: GeneralController.GetAll
+      parameters:
+      - in: formData
+        name: file
+        description: File to upload
+        required: true
+        type: file
+      responses:
+        "200":
+          description: '{compute} models.workflow'
+        "406":
+          description: '{string} string "Bad request"'
   /processing/:
     get:
       tags:
@@ -220,6 +386,11 @@ paths:
         find processing by id
         <br>
       operationId: ProcessingController.GetAll
+      parameters:
+      - in: query
+        name: is_draft
+        description: draft wished
+        type: string
       responses:
         "200":
           description: '{processing} models.processing'
@@ -309,9 +480,84 @@ paths:
         description: the search you want to get
         required: true
         type: string
+      - in: query
+        name: is_draft
+        description: draft wished
+        type: string
       responses:
         "200":
           description: '{processing} models.processing'
+  /purchase/:
+    get:
+      tags:
+      - purchase
+      description: |-
+        find compute by id
+        <br>
+      operationId: PurchaseController.GetAll
+      parameters:
+      - in: query
+        name: is_draft
+        description: draft wished
+        type: string
+      responses:
+        "200":
+          description: '{compute} models.compute'
+    post:
+      tags:
+      - purchase
+      description: |-
+        create compute
+        <br>
+      operationId: PurchaseController.Create
+      parameters:
+      - in: body
+        name: compute
+        description: body for compute content (Json format)
+        required: true
+        schema:
+          $ref: '#/definitions/json'
+      responses:
+        "200":
+          description: '{compute} models.compute'
+  /purchase/{id}:
+    get:
+      tags:
+      - purchase
+      description: |-
+        find compute by id
+        <br>
+      operationId: PurchaseController.Get
+      parameters:
+      - in: path
+        name: id
+        description: the id you want to get
+        required: true
+        type: string
+      responses:
+        "200":
+          description: '{compute} models.compute'
+  /purchase/search/{search}:
+    get:
+      tags:
+      - purchase
+      description: |-
+        find compute by key word
+        <br>
+      operationId: PurchaseController.Get
+      parameters:
+      - in: path
+        name: search
+        description: the search you want to get
+        required: true
+        type: string
+      - in: query
+        name: is_draft
+        description: draft wished
+        type: string
+      responses:
+        "200":
+          description: '{compute} models.compute'
   /resource/:
     get:
       tags:
@@ -320,6 +566,11 @@ paths:
         find resource by id
         <br>
       operationId: ResourceController.GetAll
+      parameters:
+      - in: query
+        name: is_draft
+        description: draft wished
+        type: string
       responses:
         "200":
           description: '{resource} models.resource'
@@ -370,6 +621,10 @@ paths:
         description: the search you want to get
         required: true
         type: string
+      - in: query
+        name: is_draft
+        description: draft wished
+        type: string
       responses:
         "200":
           description: '{resource} models.resource'
@@ -381,6 +636,11 @@ paths:
         find storage by id
         <br>
       operationId: StorageController.GetAll
+      parameters:
+      - in: query
+        name: is_draft
+        description: draft wished
+        type: string
       responses:
         "200":
           description: '{storage} models.storage'
@@ -470,6 +730,10 @@ paths:
         description: the search you want to get
         required: true
         type: string
+      - in: query
+        name: is_draft
+        description: draft wished
+        type: string
       responses:
         "200":
           description: '{storage} models.storage'
@@ -503,6 +767,11 @@ paths:
         find workflow by id
         <br>
       operationId: WorkflowController.GetAll
+      parameters:
+      - in: query
+        name: is_draft
+        description: draft wished
+        type: string
       responses:
         "200":
           description: '{workflow} models.workflow'
@@ -592,6 +861,10 @@ paths:
         description: the search you want to get
         required: true
         type: string
+      - in: query
+        name: is_draft
+        description: draft wished
+        type: string
       responses:
         "200":
           description: '{workflow} models.workflow'
@@ -599,12 +872,12 @@ definitions:
   json:
     title: json
     type: object
+  models.compute:
+    title: compute
+    type: object
   models.data:
     title: data
     type: object
-  models.datacenter:
-    title: datacenter
-    type: object
   models.processing:
     title: processing
     type: object
@@ -615,15 +888,21 @@ definitions:
     title: workflow
     type: object
 tags:
+- name: generic
+  description: |
+    Operations about compute
+- name: purchase
+  description: |
+    Operations about compute
 - name: resource
   description: |
     Operations about resource
 - name: data
   description: |
     Operations about data
-- name: datacenter
+- name: compute
   description: |
-    Operations about datacenter
+    Operations about compute
 - name: storage
   description: |
     Operations about storage
@@ -633,6 +912,9 @@ tags:
 - name: workflow
   description: |
     Operations about workflow
+- name: enum
+  description: |
+    Operations about resource
 - name: version
   description: |
     VersionController operations for Version