From 3f1ce8be7a79898438d5a00203461155ed6f4da9 Mon Sep 17 00:00:00 2001
From: worker-9 <dillon.carns@gmail.com>
Date: Thu, 5 Aug 2021 14:15:32 -0400
Subject: [PATCH] bug squashin

---
 controllers/nodeGrpcController.go | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/controllers/nodeGrpcController.go b/controllers/nodeGrpcController.go
index 05566ac4..d6287a33 100644
--- a/controllers/nodeGrpcController.go
+++ b/controllers/nodeGrpcController.go
@@ -18,17 +18,15 @@ type NodeServiceServer struct {
 
 func (s *NodeServiceServer) ReadNode(ctx context.Context, req *nodepb.Object) (*nodepb.Object, error) {
 	// convert string id (from proto) to mongoDB ObjectId
-	var node models.Node
-	if err := json.Unmarshal([]byte(req.Data), &node); err != nil {
-		return nil, err
-	}
-	macaddress := node.MacAddress
-	networkName := node.Network
+	macAndNetwork := strings.Split(req.Data, "###")
 
-	node, err := GetNode(macaddress, networkName)
+	if len(macAndNetwork) != 2 {
+		return nil, errors.New("could not read node, invalid node id given")
+	}
+	node, err := GetNode(macAndNetwork[0], macAndNetwork[1])
 
 	if err != nil {
-		log.Println("could not get node "+macaddress+" "+networkName, err)
+		log.Println("could not get node "+macAndNetwork[0]+" "+macAndNetwork[1], err)
 		return nil, err
 	}
 	// Cast to ReadNodeRes type