Merge pull request #177 from HyperloopUPV-H8/backend/array-to-map

[backend][3] ADJ alpha.1 - Add array-to-map logic

Author: msanlli

backend/internal/adj/adj.go

@@ -3,6 +3,7 @@ package adj
 import (
 	"encoding/json"
 	"errors"
+	"github.com/HyperloopUPV-H8/h9-backend/internal/utils"
 	"github.com/go-git/go-git/v5"
 	"os"
 )
@@ -18,11 +19,17 @@ func NewADJ() (*ADJ, error) {
 		return nil, err
 	}
 
+	var JsonInfo JSON_Info
 	var info Info
-	if err := json.Unmarshal(infoRaw, &info); err != nil {
+	if err := json.Unmarshal(infoRaw, &JsonInfo); err != nil {
 		return nil, err
 	}
 
+	info.Ports = utils.ConvertToMap_Str_Uint16(JsonInfo.Ports)
+	info.Addresses = utils.ConvertToMap_Str_Str(JsonInfo.Addresses)
+	info.Units = utils.ConvertToMap_Str_Op(JsonInfo.Units)
+	info.MessageIds = utils.ConvertToMap_Str_Uint16(JsonInfo.MessageIds)
+
 	var boardsList map[string]string
 	if err := json.Unmarshal(boardsRaw, &boardsList); err != nil {
 		return nil, err

backend/internal/adj/models.go

@@ -7,12 +7,19 @@ type ADJ struct {
 	Boards map[string]Board
 }
 
-type Info struct {
+type JSON_Info struct {
 	Ports      []map[string]uint16           `json:"ports"`
 	Addresses  []map[string]string           `json:"addresses"`
 	Units      []map[string]utils.Operations `json:"units"`
 	MessageIds []map[string]uint16           `json:"message_ids"`
-	BoardIds   []map[string]uint16
+}
+
+type Info struct {
+	Ports      map[string]uint16
+	Addresses  map[string]string
+	Units      map[string]utils.Operations
+	MessageIds map[string]uint16
+	BoardIds   map[string]uint16
 }
 
 type Board struct {

backend/internal/pod_data/models.go

@@ -28,14 +28,14 @@ type Measurement interface {
 }
 
 type NumericMeasurement struct {
-	Id           string        `json:"id"` // Remove json tags
-	Name         string        `json:"name"`
-	Type         string        `json:"type"`
-	Units        []string      `json:"units"`
-	DisplayUnits []utils.Units `json:"-"`
-	PodUnits     []utils.Units `json:"-"`
-	SafeRange    []*float64    `json:"safeRange"`
-	WarningRange []*float64    `json:"warningRange"`
+	Id           string      `json:"id"` // Remove json tags
+	Name         string      `json:"name"`
+	Type         string      `json:"type"`
+	Units        string      `json:"units"`
+	DisplayUnits utils.Units `json:"-"`
+	PodUnits     utils.Units `json:"-"`
+	SafeRange    []*float64  `json:"safeRange"`
+	WarningRange []*float64  `json:"warningRange"`
 }
 
 func (m NumericMeasurement) GetId() string {

backend/internal/utils/arrayToMap.go

@@ -0,0 +1,31 @@
+package utils
+
+func ConvertToMap_Str_Uint16(array []map[string]uint16) map[string]uint16 {
+	result := make(map[string]uint16)
+	for _, item := range array {
+		for k, v := range item {
+			result[k] = v
+		}
+	}
+	return result
+}
+
+func ConvertToMap_Str_Str(array []map[string]string) map[string]string {
+	result := make(map[string]string)
+	for _, item := range array {
+		for k, v := range item {
+			result[k] = v
+		}
+	}
+	return result
+}
+
+func ConvertToMap_Str_Op(array []map[string]Operations) map[string]Operations {
+	result := make(map[string]Operations)
+	for _, item := range array {
+		for k, v := range item {
+			result[k] = v
+		}
+	}
+	return result
+}