restore map-only logic

Author: msanlli

backend/internal/adj/adj.go

@@ -2,8 +2,6 @@ package adj
 
 import (
 	"encoding/json"
-	"errors"
-	"github.com/HyperloopUPV-H8/h9-backend/internal/utils"
 	"github.com/go-git/go-git/v5"
 	"os"
 )
@@ -19,17 +17,11 @@ func NewADJ() (*ADJ, error) {
 		return nil, err
 	}
 
-	var JsonInfo JsonInfo
 	var info Info
-	if err := json.Unmarshal(infoRaw, &JsonInfo); err != nil {
+	if err := json.Unmarshal(infoRaw, &info); 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
@@ -96,12 +88,7 @@ func getBoards(info Info, boardsList map[string]string) (map[string]Board, error
 			return nil, err
 		}
 
-		if info.Addresses[boardName] != boardJSON.IP {
-			return nil, errors.New("the IP of the board does not match the one in the general info")
-		}
-
 		var board Board
-
 		board.Name = boardName
 		board.IP = boardJSON.IP
 

backend/internal/adj/models.go

@@ -7,18 +7,11 @@ type ADJ struct {
 	Boards map[string]Board
 }
 
-type JsonInfo 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"`
-}
-
 type Info struct {
-	Ports      map[string]uint16
-	Addresses  map[string]string
-	Units      map[string]utils.Operations
-	MessageIds map[string]uint16
+	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
 }
 
@@ -35,7 +28,6 @@ type BoardJSON struct {
 	IP                string   `json:"board_ip"`
 	MeasurementsPaths []string `json:"measurements"`
 	PacketsPaths      []string `json:"packets"`
-	// StructuresPaths   []string `json:"structures"` // TODO: Issued in JSON_ADE #1
 }
 
 type Packet struct {