minor changes

Author: msanlli

backend/internal/adj/adj.go

@@ -20,25 +20,54 @@ func NewADJ() (*ADJ, error) {
 
 	var infoJSON InfoJSON
 	if err := json.Unmarshal(infoRaw, &infoJSON); err != nil {
+		println("Info JSON unmarshal error")
 		return nil, err
 	}
 
+	// TESTING
+	for key, value := range infoJSON.Ports {
+		println("Ports: ", key, value)
+	}
+	for key, value := range infoJSON.Addresses {
+		println("Addresses: ", key, value)
+	}
+	for key, value := range infoJSON.Units {
+		println("Units: ", key, value)
+	}
+	for key, value := range infoJSON.MessageIds {
+		println("MessageIds: ", key, value)
+	}
+	for key, value := range infoJSON.BoardIds {
+		println("BoardIds: ", key, value)
+	}
+
 	var info Info
 	for key, value := range infoJSON.Units {
+		info.Units = make(map[string]utils.Operations)
+
 		info.Units[key], err = utils.NewOperations(value)
 		if err != nil {
 			return nil, err
 		}
 	}
 
-	var boardsList map[string]string
+	type BoardList struct {
+		Boards map[string]string `json:"boards"`
+	}
+
+	var boardsList BoardList
 	if err := json.Unmarshal(boardsRaw, &boardsList); err != nil {
 		return nil, err
 	}
 
-	boards, err := getBoards(boardsList)
+	// TESTING
+	for key, value := range boardsList.Boards {
+		println("Boards: ", key, value)
+	}
+
+	boards, err := getBoards(boardsList.Boards)
 
-	info.BoardIds, err = getBoardIds(boardsList)
+	info.BoardIds, err = getBoardIds(boardsList.Boards)
 
 	info.Addresses, err = getAddresses(boards)
 

backend/internal/adj/models.go

@@ -23,6 +23,13 @@ type Info struct {
 	BoardIds   map[string]uint16
 }
 
+type BoardJSON struct {
+	ID                uint16   `json:"board_id"`
+	IP                string   `json:"board_ip"`
+	MeasurementsPaths []string `json:"measurements"`
+	PacketsPaths      []string `json:"packets"`
+}
+
 type Board struct {
 	Name         string
 	IP           string
@@ -31,27 +38,20 @@ type Board struct {
 	Structures   []Structure
 }
 
-type BoardJSON struct {
-	ID                uint16   `json:"board_id"`
-	IP                string   `json:"board_ip"`
-	MeasurementsPaths []string `json:"measurements"`
-	PacketsPaths      []string `json:"packets"`
-}
-
 type Packet struct {
-	Id   string
-	Name string
-	Type string
+	Id   string `json:"id"`
+	Name string `json:"name"`
+	Type string `json:"type"`
 }
 
 type Measurement struct {
-	Id           string
-	Name         string
-	Type         string
-	PodUnits     string
-	DisplayUnits string
-	SafeRange    string
-	WarningRange string
+	Id           string     `json:"id"`
+	Name         string     `json:"name"`
+	Type         string     `json:"type"`
+	PodUnits     string     `json:"podUnits"`
+	DisplayUnits string     `json:"displayUnits"`
+	SafeRange    []*float64 `json:"safeRange"`
+	WarningRange []*float64 `json:"warningRange"`
 }
 
 type Structure struct {

backend/internal/pod_data/measurement.go

@@ -48,17 +48,9 @@ func getMeasurement(adeMeas adj.Measurement, globalUnits map[string]utils.Operat
 func getNumericMeasurement(adeMeas adj.Measurement, globalUnits map[string]utils.Operations) (NumericMeasurement, error) {
 	measErrs := common.NewErrorList()
 
-	safeRange, err := utils.ParseRange(adeMeas.SafeRange)
+	safeRange := adeMeas.SafeRange
 
-	if err != nil {
-		measErrs.Add(err)
-	}
-
-	warningRange, err := utils.ParseRange(adeMeas.WarningRange)
-
-	if err != nil {
-		measErrs.Add(err)
-	}
+	warningRange := adeMeas.WarningRange
 
 	displayUnits, err := utils.ParseUnits(adeMeas.DisplayUnits, globalUnits)