core/oc-lib
6
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Bug on Format date

Browse Source
This commit is contained in:
mr 2024-08-21 16:38:29 +02:00
parent cf6143887e
commit 498ec3e9d8
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
models/peer/peer_cache.go
View File

@ -64,13 +64,12 @@ func (p *PeerCache) GetAccessor(caller *tools.HTTPCaller) utils.Accessor {
func (p *PeerCache) LaunchPeerExecution(peerID string, isMySelf bool, dataID string, url string,
dt utils.DataType, method tools.METHOD, body map[string]interface{}, caller *tools.HTTPCaller) (*PeerExecution, error) {
fmt.Println("LaunchPeerExecution", url, strings.Contains(url, "localhost") || strings.Contains(url, "127.0.0.1"))
if strings.Contains(url, "localhost") || strings.Contains(url, "127.0.0.1") {
if isMySelf {
url = "http://" + dt.API() // default behavior on basic API container name
} else {
return nil, errors.New("Peer " + peerID + " is not reachable")
}
url = strings.ReplaceAll(url, "localhost", dt.API())
url = strings.ReplaceAll(url, "127.0.0.1", dt.API())
}
fmt.Println("LaunchPeerExecution AFT", url, dt.API())
var err error
b := []byte{}
methods := caller.URLS[dt.String()]

14
models/workflow/workflow.go
View File

@ -38,7 +38,7 @@ type Workflow struct {
AbstractWorkflow
}
func (wfa *Workflow) CheckBooking(subPath string) (bool, error) {
func (wfa *Workflow) CheckBooking(subPath string, caller *tools.HTTPCaller) (bool, error) {
// check if
if wfa.Schedule == nil || wfa.Schedule.Start == nil || wfa.Graph == nil {
return false, nil
@ -64,22 +64,12 @@ func (wfa *Workflow) CheckBooking(subPath string) (bool, error) {
if code != 200 {
return false, err
}
caller := tools.NewHTTPCaller(map[string]map[tools.METHOD]string{})
if strings.Contains(p.(*peer.Peer).Url, "localhost") || strings.Contains(p.(*peer.Peer).Url, "127.0.0.1") {
subPath = strings.ReplaceAll(subPath, "localhost", utils.BOOKING.API())
subPath = strings.ReplaceAll(subPath, "127.0.0.1", utils.BOOKING.API())
}
subPath = strings.ReplaceAll(subPath, ":start_date", wfa.getFormat(wfa.Schedule.Start))
subPath = strings.ReplaceAll(subPath, ":end_date", wfa.getFormat(&e))
resp, err := caller.CallGet(p.(*peer.Peer).Url, subPath)
_, err = p.(*peer.Peer).LaunchPeerExecution(peerID, "", p.(*peer.Peer).Url, utils.BOOKING, tools.POST, nil, caller)
if err != nil {
return false, err
}
var response map[string]interface{}
json.Unmarshal(resp, &response)
if code, ok := response["code"]; ok && code != 200 {
return false, errors.New(fmt.Sprintf("%v", response["error"]))
}
}
}
return true, nil