From 457060d41a9da147eb03760ebdd6dec2a63a8dc1 Mon Sep 17 00:00:00 2001 From: Aceix Date: Wed, 14 Dec 2022 11:39:33 +0000 Subject: [PATCH] fix(GRA-752f): add address string to be sent to frontend --- models/node.go | 5 +++-- mq/handlers.go | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/models/node.go b/models/node.go index ae786498..a9bf208d 100644 --- a/models/node.go +++ b/models/node.go @@ -48,8 +48,9 @@ type NodeCheckin struct { // Iface struct for local interfaces of a node type Iface struct { - Name string - Address net.IPNet + Name string `json:"name"` + Address net.IPNet `json:"address"` + AddressString string `json:"addressString"` } // Node - struct for node model diff --git a/mq/handlers.go b/mq/handlers.go index ce36a49e..c5dc55e2 100644 --- a/mq/handlers.go +++ b/mq/handlers.go @@ -53,6 +53,9 @@ func Ping(client mqtt.Client, msg mqtt.Message) { node.Version = checkin.Version node.Connected = checkin.Connected node.Interfaces = checkin.Ifaces + for i := range node.Interfaces { + node.Interfaces[i].AddressString = node.Interfaces[i].Address.String() + } if err := logic.UpdateNode(&node, &node); err != nil { logger.Log(0, "error updating node", node.Name, node.ID, " on checkin", err.Error()) return