oclib latest majr version

This commit is contained in:
mr
2024-08-21 12:35:06 +02:00
parent 1be4d79c75
commit ad46694516
9 changed files with 78 additions and 43 deletions

View File

@@ -1,6 +1,8 @@
package controllers
import (
oclib "cloud.o-forge.io/core/oc-lib"
"cloud.o-forge.io/core/oc-lib/tools"
beego "github.com/beego/beego/v2/server/web"
)
@@ -17,3 +19,31 @@ func (c *VersionController) GetAll() {
c.Data["json"] = map[string]string{"version": "1"}
c.ServeJSON()
}
// @Title Status
// @Description get status
// @Success 200
// @router /status [get]
func (c *VersionController) Status() {
errStr := ""
api := tools.API{}
state, code, err := api.GetState()
if state == tools.ALIVE {
state, _, err = api.CheckRemoteAPIs([]string{
"http://" + oclib.LibDataEnum(oclib.BOOKING).String() + oclib.GetPath(oclib.LibDataEnum(oclib.BOOKING)),
})
}
if err != nil {
errStr = err.Error()
}
c.Data["json"] = map[string]interface{}{
"data": map[string]interface{}{
"state": state.String(),
"code": state,
},
"error": errStr,
"code": code,
}
c.ServeJSON()
}

View File

@@ -3,7 +3,6 @@ package controllers
import (
"encoding/json"
"errors"
"fmt"
"time"
oclib "cloud.o-forge.io/core/oc-lib"
@@ -11,7 +10,6 @@ import (
w "cloud.o-forge.io/core/oc-lib/models/workflow"
"cloud.o-forge.io/core/oc-lib/tools"
beego "github.com/beego/beego/v2/server/web"
"github.com/nats-io/nats.go"
)
// Operations about workflow
@@ -50,46 +48,10 @@ func (o *WorkflowController) Put() {
json.Unmarshal(o.Ctx.Input.CopyBody(10000), &res)
caller := tools.NewHTTPCaller(paths)
data := oclib.UpdateOne(oclib.LibDataEnum(oclib.WORKFLOW), res, id, caller)
data.Err += o.SetNATSPub(res, data)
o.Data["json"] = data
o.ServeJSON()
}
var NATS_SERVER = "nats://localhost:4222"
func (o *WorkflowController) SetNATSPub(res map[string]interface{}, data oclib.LibData) string {
if sched, ok := res["schedule"]; ok && sched != nil && data.Code == 200 {
workflow := data.ToWorkflow()
if workflow != nil && workflow.Schedule != nil {
// HERE NATS
fmt.Println("NATS_SERVER", NATS_SERVER)
nc, err := nats.Connect(NATS_SERVER)
if err != nil {
return " -> Could not reach NATS server : " + err.Error()
}
start := ""
if workflow.Schedule.Start != nil {
start = workflow.Schedule.Start.String()
}
end := ""
if workflow.Schedule.End != nil {
end = workflow.Schedule.End.String()
}
str_description, _ := json.Marshal(map[string]string{
"workflow_id": workflow.UUID,
"start_date": start,
"stop_date": end,
})
err = nc.Publish("workflowsUpdate", str_description)
time.Sleep(time.Second * 2)
if err != nil {
return " -> " + err.Error()
}
}
}
return ""
}
// @Title Create
// @Description create workflows
// @Param data body json true "body for data content (Json format)"
@@ -106,7 +68,6 @@ func (o *WorkflowController) Post() {
json.Unmarshal(o.Ctx.Input.CopyBody(10000), &res)
caller := tools.NewHTTPCaller(paths)
data := oclib.StoreOne(oclib.LibDataEnum(oclib.WORKFLOW), res, caller)
data.Err += o.SetNATSPub(res, data)
o.Data["json"] = data
o.ServeJSON()
}