From 3232cce1b4b6daaa62311a02cf7ba39e4b42d40f Mon Sep 17 00:00:00 2001
From: mr <mr>
Date: Thu, 22 Aug 2024 16:28:21 +0200
Subject: [PATCH] Discovery Nats automate

---
 models/discovery/discovery.go |  2 +-
 models/peer/peer_cache.go     | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/models/discovery/discovery.go b/models/discovery/discovery.go
index 93f9226..57eaa82 100644
--- a/models/discovery/discovery.go
+++ b/models/discovery/discovery.go
@@ -31,7 +31,7 @@ func (d *Discovery) GetName() string {
 
 func (d *Discovery) GetAccessor(caller *tools.HTTPCaller) utils.Accessor {
 	data := New()
-	data.Init(utils.BOOKING, caller)
+	data.Init(utils.DISCOVERY, caller)
 	return data
 }
 
diff --git a/models/peer/peer_cache.go b/models/peer/peer_cache.go
index 9719d14..89e487a 100644
--- a/models/peer/peer_cache.go
+++ b/models/peer/peer_cache.go
@@ -79,24 +79,30 @@ 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) {
-	url = p.urlFormat(url, dt)
 	var err error
 	b := []byte{}
 	methods := caller.URLS[dt.String()]
 	if _, ok := methods[method]; !ok {
 		return nil, errors.New("no path found")
 	}
+	meth := methods[method]
+	if meth == "" {
+		return nil, errors.New("no path found")
+	} else {
+		meth = strings.ReplaceAll(meth, ":id", dataID)
+	}
+	url = p.urlFormat(url+meth, dt)
 	if !p.checkPeerStatus(peerID, caller) {
 		return nil, errors.New("peer is not reachable")
 	}
 	if method == tools.POST {
-		b, err = caller.CallPost(url, methods[method], body)
+		b, err = caller.CallPost(url, "", body)
 	}
 	if method == tools.GET {
-		b, err = caller.CallGet(url, strings.ReplaceAll(methods[method], ":id", dataID))
+		b, err = caller.CallGet(url, "")
 	}
 	if method == tools.DELETE {
-		b, err = caller.CallDelete(url, strings.ReplaceAll(methods[method], ":id", dataID))
+		b, err = caller.CallDelete(url, "")
 	}
 	var m map[string]interface{}
 	json.Unmarshal(b, &m)