Merge pull request #166 from HyperloopUPV-H8/backend/adj

[backend][1] ADJ

Author: msanlli

backend/cmd/main.go

@@ -6,6 +6,7 @@ import (
 	"encoding/binary"
 	"flag"
 	"fmt"
+	"github.com/HyperloopUPV-H8/h9-backend/internal/adj"
 	"log"
 	"net"
 	"net/http"
@@ -87,22 +88,14 @@ func main() {
 	runtime.SetBlockProfileRate(*blockprofile)
 	config := getConfig("./config.toml")
 
-	file, err := excel.Download(excel.DownloadConfig(config.Excel.Download))
-	if err != nil {
-		trace.Fatal().Err(err).Msg("downloading file")
-	}
-
-	ade, err := ade.CreateADE(file)
-	if err != nil {
-		trace.Fatal().Err(err).Msg("creating ade")
-	}
+	// <--- ADJ --->
 
-	info, err := info.NewInfo(ade.Info)
+	adj, err := adj.NewADJ()
 	if err != nil {
-		trace.Fatal().Err(err).Msg("creating info")
+		trace.Fatal().Err(err).Msg("setting up ADJ")
 	}
 
-	podData, err := pod_data.NewPodData(ade.Boards, info.Units)
+	podData, err := pod_data.NewPodData(adj.Boards, adj.Info.Units)
 	if err != nil {
 		fmt.Println(err)
 		trace.Fatal().Err(err).Msg("creating podData")

backend/go.mod

@@ -4,6 +4,7 @@ go 1.21.3
 
 require (
 	github.com/HyperloopUPV-H8/ade-linter v0.0.0-20230530153315-3379f05a664f
+	github.com/go-git/go-git/v5 v5.12.0
 	github.com/google/gopacket v1.1.19
 	github.com/google/uuid v1.3.0
 	github.com/gorilla/websocket v1.5.0
@@ -20,29 +21,46 @@ require (
 require (
 	cloud.google.com/go/compute v1.19.1 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	dario.cat/mergo v1.0.0 // indirect
+	github.com/Microsoft/go-winio v0.6.1 // indirect
+	github.com/ProtonMail/go-crypto v1.0.0 // indirect
+	github.com/cloudflare/circl v1.3.7 // indirect
+	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
+	github.com/emirpasic/gods v1.18.1 // indirect
+	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
+	github.com/go-git/go-billy/v5 v5.5.0 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
 	github.com/googleapis/gax-go/v2 v2.7.1 // indirect
+	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
+	github.com/kevinburke/ssh_config v1.2.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
+	github.com/pjbgf/sha1cd v0.3.0 // indirect
 	github.com/richardlehane/mscfb v1.0.4 // indirect
 	github.com/richardlehane/msoleps v1.0.3 // indirect
+	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
+	github.com/skeema/knownhosts v1.2.2 // indirect
+	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	github.com/xuri/efp v0.0.0-20220603152613-6918739fd470 // indirect
 	github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/mod v0.12.0 // indirect
 	golang.org/x/oauth2 v0.7.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/tools v0.13.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
 	google.golang.org/grpc v1.56.3 // indirect
 	google.golang.org/protobuf v1.30.0 // indirect
+	gopkg.in/warnings.v0 v0.1.2 // indirect
 )
 
 require (
 	github.com/fatih/color v1.15.0
-	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/net v0.22.0 // indirect
 )

backend/go.sum

@@ -0,0 +1,56 @@
+package adj
+
+import (
+	"encoding/json"
+	"github.com/go-git/go-git/v5"
+	"os"
+)
+
+const (
+	RepoUrl = "https://github.com/HyperloopUPV-H8/JSON_ADE.git" // URL of the ADJ repository
+)
+
+func downloadADJ() (json.RawMessage, json.RawMessage, error) {
+	_, err := git.PlainClone("", false, &git.CloneOptions{
+		URL: RepoUrl,
+	})
+	if err != nil {
+		return nil, nil, err
+	}
+
+	info, err := os.ReadFile("general_info.json")
+	if err != nil {
+		return nil, nil, err
+	}
+
+	boards, err := os.ReadFile("boards.json")
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return info, boards, nil
+}
+
+func NewADJ() (*ADJ, error) {
+	infoRaw, boardsRaw, err := downloadADJ()
+	if err != nil {
+		return nil, err
+	}
+
+	var info Info
+	if err := json.Unmarshal(infoRaw, &info); err != nil {
+		return nil, err
+	}
+
+	var boards map[string]Board
+	if err := json.Unmarshal(boardsRaw, &boards); err != nil {
+		return nil, err
+	}
+
+	adj := &ADJ{
+		Info:   info,
+		Boards: boards,
+	}
+
+	return adj, nil
+}

backend/internal/adj/adj.go

@@ -1,16 +1,16 @@
-package ade
+package adj
 
-type ADE struct {
+type ADJ struct {
 	Info   Info
 	Boards map[string]Board
 }
 
 type Info struct {
-	Addresses  map[string]string
-	Units      map[string]string
-	Ports      map[string]string
+	Ports      map[string]string `json:"ports"`
+	Addresses  map[string]string `json:"addresses"`
+	Units      map[string]string `json:"units"`
+	MessageIds map[string]string `json:"message_ids"`
 	BoardIds   map[string]string
-	MessageIds map[string]string
 }
 
 type Board struct {