schizophrenia mk2

backend/internal/adj/adj.go

@@ -114,6 +114,7 @@ func getBoards(boardsList map[string]string) (map[string]Board, error) {
 	boards := make(map[string]Board, len(boardsList))
 	for boardName, boardPath := range boardsList {
 		fullPath := path.Join(RepoPath, boardPath)
+		println("Full path: ", fullPath) // TESTING
 		boardRaw, err := os.ReadFile(fullPath)
 		if err != nil {
 			return nil, err
@@ -124,16 +125,33 @@ func getBoards(boardsList map[string]string) (map[string]Board, error) {
 			return nil, err
 		}
 
+		// Absolutely doing tricks on it - @msanlli
+		packetPathsFr := make([]string, 0)
+		for _, packetPath := range boardJSON.PacketsPaths {
+			println(path.Join(RepoPath, "boards", boardName, packetPath))
+			packetPathsFr = append(packetPathsFr, path.Join(RepoPath, "boards", boardName, packetPath))
+		}
+		boardJSON.PacketsPaths = packetPathsFr
+
 		board := Board{
 			Name: boardName,
 			IP:   boardJSON.IP,
 		}
 
+		// TESTING
+		println("Board name: ", boardName)
+		println("Board IP: ", board.IP)
+
 		board.Packets, err = getBoardPackets(boardJSON.PacketsPaths)
 		if err != nil {
 			return nil, err
 		}
 
+		// TESTING
+		for _, packet := range board.Packets {
+			println("Packet ID: ", packet.Id)
+		}
+
 		board.Measurements, err = getBoardMeasurements(boardJSON.MeasurementsPaths)
 		if err != nil {
 			return nil, err
@@ -148,9 +166,11 @@ func getBoards(boardsList map[string]string) (map[string]Board, error) {
 }
 
 func getBoardPackets(packetsPaths []string) ([]Packet, error) {
-	var packets []Packet
+	packets := make([]Packet, 0)
 	for _, packetPath := range packetsPaths {
+		println(packetPath)
 		if _, err := os.Stat(packetPath); os.IsNotExist(err) {
+			println("I suck at coding") // TESTING
 			continue
 		}
 
@@ -160,18 +180,28 @@ func getBoardPackets(packetsPaths []string) ([]Packet, error) {
 		}
 
 		var packet Packet
-		if err = json.Unmarshal(packetRaw, &packet); err != nil {
+		type PacketJSON struct {
+			Packet []Packet `json:"packets"`
+		}
+
+		packetJSON := PacketJSON{}
+		if err = json.Unmarshal(packetRaw, &packetJSON); err != nil {
 			return nil, err
 		}
+		for _, packetTMP := range packetJSON.Packet {
+			packet = packetTMP
 
-		packets = append(packets, packet)
+			println("Packet Name: ", packet.Name) // TESTING
+			packets = append(packets, packet)
+		}
 	}
 
 	return packets, nil
 }
 
 func getBoardMeasurements(measurementsPaths []string) ([]Measurement, error) {
-	var measurements []Measurement
+	measurements := make([]Measurement, len(measurementsPaths))
+
 	for _, measurementPath := range measurementsPaths {
 		if _, err := os.Stat(measurementPath); os.IsNotExist(err) {
 			continue

backend/internal/pod_data/measurement.go

@@ -15,6 +15,12 @@ func getMeasurements(boardMeasurements []adj.Measurement, globalUnits map[string
 	measurements := make([]Measurement, 0)
 	mErrors := common.NewErrorList()
 
+	// TESTING
+	println("I'm here")
+	for _, adjMeas := range boardMeasurements {
+		println(adjMeas.Id) // TESTING
+	}
+
 	for _, adjMeas := range boardMeasurements {
 		meas, err := getMeasurement(adjMeas, globalUnits)
 
@@ -34,6 +40,7 @@ func getMeasurements(boardMeasurements []adj.Measurement, globalUnits map[string
 }
 
 func getMeasurement(adeMeas adj.Measurement, globalUnits map[string]utils.Operations) (Measurement, error) {
+	println(adeMeas.Id) // TESTING
 	if isNumeric(adeMeas.Type) {
 		return getNumericMeasurement(adeMeas, globalUnits)
 	} else if adeMeas.Type == "bool" {

backend/internal/pod_data/pod_data.go

@@ -12,6 +12,12 @@ func NewPodData(adjBoards map[string]adj.Board, globalUnits map[string]utils.Ope
 	boards := make([]Board, 0)
 	boardErrs := common.NewErrorList()
 
+	// TESTING
+	for _, value := range adjBoards {
+		for _, val := range value.Packets {
+			println(val.Id)
+		}
+	}
 	for _, adjBoard := range adjBoards {
 		board, err := getBoard(adjBoard, globalUnits)
 
@@ -37,13 +43,20 @@ func getBoard(adjBoard adj.Board, globalUnits map[string]utils.Operations) (Boar
 
 	packets := make([]Packet, 0)
 
+	// TESTING
+	println("I'm here")
+
+	for _, adjPacket := range adjBoard.Packets {
+		println(adjPacket.Id)
+	}
+
 	for _, adjPacket := range adjBoard.Packets {
 		packet, err := getPacket(adjPacket)
 		if err != nil {
 			return Board{}, err
 		}
 
-		packet.Measurements, err = getMeasurements(adjBoard.Measurements, globalUnits)
+		packet.Measurements, err = getMeasurements(adjBoard.Measurements, globalUnits) // TODO: Check if this is correct
 
 		packets = append(packets, packet)
 	}