latest oclib that shared workflow on update / delete + comments

This commit is contained in:
mr
2024-08-30 10:49:07 +02:00
parent 5b320bb409
commit fe865b517b
4 changed files with 42 additions and 15 deletions

View File

@@ -3,7 +3,6 @@ package controllers
import (
"encoding/json"
"errors"
"fmt"
oclib "cloud.o-forge.io/core/oc-lib"
"cloud.o-forge.io/core/oc-lib/models/utils"
@@ -35,7 +34,7 @@ func (o *WorkflowController) Search() {
// @Success 200 {object} models.workflow
// @router /:id [put]
func (o *WorkflowController) Put() {
var paths = map[string]map[tools.METHOD]string{
var paths = map[string]map[tools.METHOD]string{ // paths to call other OC services
utils.BOOKING.String(): {
tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.BOOKING)) + "/oc/booking/",
tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.BOOKING)) + "/oc/booking/:id",
@@ -43,12 +42,16 @@ func (o *WorkflowController) Put() {
utils.PEER.String(): {
tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.PEER)) + "/oc",
},
utils.WORKFLOW.String(): {
tools.PUT: oclib.GetPath(oclib.LibDataEnum(oclib.WORKFLOW)) + "/oc/workflow/:id",
tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.WORKFLOW)) + "/oc/workflow/:id",
},
}
// 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)
caller := tools.NewHTTPCaller(paths)
json.Unmarshal(o.Ctx.Input.CopyBody(10000000), &res)
caller := tools.NewHTTPCaller(paths) // create a new HTTP caller
data := oclib.UpdateOne(oclib.LibDataEnum(oclib.WORKFLOW), res, id, caller)
o.Data["json"] = data
o.ServeJSON()
@@ -60,7 +63,7 @@ func (o *WorkflowController) Put() {
// @Success 200 {object} models.workflow
// @router / [post]
func (o *WorkflowController) Post() {
var paths = map[string]map[tools.METHOD]string{
var paths = map[string]map[tools.METHOD]string{ // paths to call other OC services
utils.BOOKING.String(): {
tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.BOOKING)) + "/oc/booking/",
tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.BOOKING)) + "/oc/booking/:id",
@@ -70,8 +73,8 @@ func (o *WorkflowController) Post() {
},
}
var res map[string]interface{}
json.Unmarshal(o.Ctx.Input.CopyBody(10000), &res)
caller := tools.NewHTTPCaller(paths)
json.Unmarshal(o.Ctx.Input.CopyBody(10000000), &res)
caller := tools.NewHTTPCaller(paths) // create a new HTTP caller
data := oclib.StoreOne(oclib.LibDataEnum(oclib.WORKFLOW), res, caller)
o.Data["json"] = data
o.ServeJSON()
@@ -85,7 +88,7 @@ func (o *WorkflowController) Post() {
func (o *WorkflowController) Publish() {
id := o.Ctx.Input.Param(":id")
data := oclib.LoadOne(oclib.LibDataEnum(oclib.WORKFLOW), id)
if data.Data != nil {
if data.Data != nil { // copy existing workflow as a resource
o.Data["json"] = oclib.CopyOne(oclib.LibDataEnum(oclib.WORKFLOW_RESOURCE), data.Data.Serialize())
} else {
o.Data["json"] = data
@@ -119,7 +122,7 @@ func (o *WorkflowController) Get() {
// @Success 200 {string} delete success!
// @router /:id [delete]
func (o *WorkflowController) Delete() {
var paths = map[string]map[tools.METHOD]string{
var paths = map[string]map[tools.METHOD]string{ // paths to call other OC services
utils.BOOKING.String(): {
tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.BOOKING)) + "/oc/booking/",
tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.BOOKING)) + "/oc/booking/:id",
@@ -127,9 +130,13 @@ func (o *WorkflowController) Delete() {
utils.PEER.String(): {
tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.PEER)) + "/oc",
},
utils.WORKFLOW.String(): {
tools.PUT: oclib.GetPath(oclib.LibDataEnum(oclib.WORKFLOW)) + "/oc/workflow/:id",
tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.WORKFLOW)) + "/oc/workflow/:id",
},
}
id := o.Ctx.Input.Param(":id")
caller := tools.NewHTTPCaller(paths)
caller := tools.NewHTTPCaller(paths) // create a new HTTP caller
o.Data["json"] = oclib.DeleteOne(oclib.LibDataEnum(oclib.WORKFLOW), id, caller)
o.ServeJSON()
}
@@ -143,6 +150,9 @@ func (o *WorkflowController) Delete() {
// @router /check/:id/:start_date/:end_date [get]
func (o *WorkflowController) Check() {
// store and return Id or post with UUID
/*
* Check if the booking is available
*/
id := o.Ctx.Input.Param(":id")
if id == "" {
o.Data["json"] = map[string]interface{}{
@@ -153,11 +163,10 @@ func (o *WorkflowController) Check() {
"error": errors.New("invalid date format"),
}
} else {
fmt.Println("id", id)
res := oclib.LoadOne(oclib.LibDataEnum(oclib.WORKFLOW), id)
if res.Code == 200 {
workflow := res.ToWorkflow()
caller := tools.NewHTTPCaller(map[string]map[tools.METHOD]string{
caller := tools.NewHTTPCaller(map[string]map[tools.METHOD]string{ // paths to call other OC services
utils.PEER.String(): {
tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.PEER)) + "/oc",
},
@@ -165,9 +174,9 @@ func (o *WorkflowController) Check() {
tools.GET: oclib.GetPath(oclib.LibDataEnum(oclib.BOOKING)) + "/oc/booking/check/:id/" + o.Ctx.Input.Param(":start_date") + "/" + o.Ctx.Input.Param(":end_date"),
},
})
isAvailable, err := workflow.CheckBooking(caller)
isAvailable, err := workflow.CheckBooking(caller) // check booking
code := 200
if !isAvailable {
if !isAvailable { // if not available then its a conflict
code = 409
}
o.Data["json"] = map[string]interface{}{