Add rpcs and handling for notes scouting
Change-Id: Ia392cda78f934a542d03c8f3e883271f72d60604
Signed-off-by: Alex Perry <alex.perry96@gmail.com>
diff --git a/scouting/webserver/requests/BUILD b/scouting/webserver/requests/BUILD
index df487f2..744772c 100644
--- a/scouting/webserver/requests/BUILD
+++ b/scouting/webserver/requests/BUILD
@@ -18,8 +18,12 @@
"//scouting/webserver/requests/messages:request_data_scouting_response_go_fbs",
"//scouting/webserver/requests/messages:request_matches_for_team_go_fbs",
"//scouting/webserver/requests/messages:request_matches_for_team_response_go_fbs",
+ "//scouting/webserver/requests/messages:request_notes_for_team_go_fbs",
+ "//scouting/webserver/requests/messages:request_notes_for_team_response_go_fbs",
"//scouting/webserver/requests/messages:submit_data_scouting_go_fbs",
"//scouting/webserver/requests/messages:submit_data_scouting_response_go_fbs",
+ "//scouting/webserver/requests/messages:submit_notes_go_fbs",
+ "//scouting/webserver/requests/messages:submit_notes_response_go_fbs",
"//scouting/webserver/server",
"@com_github_google_flatbuffers//go:go_default_library",
],
@@ -43,8 +47,10 @@
"//scouting/webserver/requests/messages:request_data_scouting_response_go_fbs",
"//scouting/webserver/requests/messages:request_matches_for_team_go_fbs",
"//scouting/webserver/requests/messages:request_matches_for_team_response_go_fbs",
+ "//scouting/webserver/requests/messages:request_notes_for_team_go_fbs",
"//scouting/webserver/requests/messages:submit_data_scouting_go_fbs",
"//scouting/webserver/requests/messages:submit_data_scouting_response_go_fbs",
+ "//scouting/webserver/requests/messages:submit_notes_go_fbs",
"//scouting/webserver/server",
"@com_github_google_flatbuffers//go:go_default_library",
],
diff --git a/scouting/webserver/requests/debug/BUILD b/scouting/webserver/requests/debug/BUILD
index 402503f..e5f5234 100644
--- a/scouting/webserver/requests/debug/BUILD
+++ b/scouting/webserver/requests/debug/BUILD
@@ -12,6 +12,8 @@
"//scouting/webserver/requests/messages:request_all_matches_response_go_fbs",
"//scouting/webserver/requests/messages:request_data_scouting_response_go_fbs",
"//scouting/webserver/requests/messages:request_matches_for_team_response_go_fbs",
+ "//scouting/webserver/requests/messages:request_notes_for_team_response_go_fbs",
"//scouting/webserver/requests/messages:submit_data_scouting_response_go_fbs",
+ "//scouting/webserver/requests/messages:submit_notes_response_go_fbs",
],
)
diff --git a/scouting/webserver/requests/debug/debug.go b/scouting/webserver/requests/debug/debug.go
index 81be3d1..f005f0d 100644
--- a/scouting/webserver/requests/debug/debug.go
+++ b/scouting/webserver/requests/debug/debug.go
@@ -13,7 +13,9 @@
"github.com/frc971/971-Robot-Code/scouting/webserver/requests/messages/request_all_matches_response"
"github.com/frc971/971-Robot-Code/scouting/webserver/requests/messages/request_data_scouting_response"
"github.com/frc971/971-Robot-Code/scouting/webserver/requests/messages/request_matches_for_team_response"
+ "github.com/frc971/971-Robot-Code/scouting/webserver/requests/messages/request_notes_for_team_response"
"github.com/frc971/971-Robot-Code/scouting/webserver/requests/messages/submit_data_scouting_response"
+ "github.com/frc971/971-Robot-Code/scouting/webserver/requests/messages/submit_notes_response"
)
// Use aliases to make the rest of the code more readable.
@@ -141,3 +143,23 @@
response := refresh_match_list_response.GetRootAsRefreshMatchListResponse(responseBytes, 0)
return response.UnPack(), nil
}
+
+func SubmitNotes(server string, requestBytes []byte) (*submit_notes_response.SubmitNotesResponseT, error) {
+ responseBytes, err := performPost(server+"/requests/submit/submit_notes", requestBytes)
+ if err != nil {
+ return nil, err
+ }
+
+ response := submit_notes_response.GetRootAsSubmitNotesResponse(responseBytes, 0)
+ return response.UnPack(), nil
+}
+
+func RequestNotes(server string, requestBytes []byte) (*request_notes_for_team_response.RequestNotesForTeamResponseT, error) {
+ responseBytes, err := performPost(server+"/requests/request/notes_for_team", requestBytes)
+ if err != nil {
+ return nil, err
+ }
+
+ response := request_notes_for_team_response.GetRootAsRequestNotesForTeamResponse(responseBytes, 0)
+ return response.UnPack(), nil
+}
diff --git a/scouting/webserver/requests/messages/BUILD b/scouting/webserver/requests/messages/BUILD
index c27f730..f7e194b 100644
--- a/scouting/webserver/requests/messages/BUILD
+++ b/scouting/webserver/requests/messages/BUILD
@@ -12,6 +12,10 @@
"request_data_scouting_response",
"refresh_match_list",
"refresh_match_list_response",
+ "submit_notes",
+ "submit_notes_response",
+ "request_notes_for_team",
+ "request_notes_for_team_response",
)
filegroup(
diff --git a/scouting/webserver/requests/messages/request_notes_for_team.fbs b/scouting/webserver/requests/messages/request_notes_for_team.fbs
new file mode 100644
index 0000000..9bda6d3
--- /dev/null
+++ b/scouting/webserver/requests/messages/request_notes_for_team.fbs
@@ -0,0 +1,8 @@
+namespace scouting.webserver.requests;
+
+table RequestNotesForTeam {
+ team:int (id: 0);
+}
+
+root_type RequestNotesForTeam;
+
diff --git a/scouting/webserver/requests/messages/request_notes_for_team_response.fbs b/scouting/webserver/requests/messages/request_notes_for_team_response.fbs
new file mode 100644
index 0000000..5c73098
--- /dev/null
+++ b/scouting/webserver/requests/messages/request_notes_for_team_response.fbs
@@ -0,0 +1,13 @@
+namespace scouting.webserver.requests;
+
+// A repeated table is better when we expect each index to have various data points
+table Note {
+ data:string (id: 0);
+}
+
+table RequestNotesForTeamResponse {
+ notes:[Note] (id: 0);
+}
+
+root_type RequestNotesForTeamResponse;
+
diff --git a/scouting/webserver/requests/messages/submit_notes.fbs b/scouting/webserver/requests/messages/submit_notes.fbs
new file mode 100644
index 0000000..cf111b3
--- /dev/null
+++ b/scouting/webserver/requests/messages/submit_notes.fbs
@@ -0,0 +1,8 @@
+namespace scouting.webserver.requests;
+
+table SubmitNotes {
+ team:int (id: 0);
+ notes:string (id: 1);
+}
+
+root_type SubmitNotes;
diff --git a/scouting/webserver/requests/messages/submit_notes_response.fbs b/scouting/webserver/requests/messages/submit_notes_response.fbs
new file mode 100644
index 0000000..2a5bea2
--- /dev/null
+++ b/scouting/webserver/requests/messages/submit_notes_response.fbs
@@ -0,0 +1,8 @@
+namespace scouting.webserver.requests;
+
+table SubmitNotesResponse {
+ // empty response
+}
+
+root_type SubmitNotesResponse;
+
diff --git a/scouting/webserver/requests/requests.go b/scouting/webserver/requests/requests.go
index 6c4bdd1..07b7d8a 100644
--- a/scouting/webserver/requests/requests.go
+++ b/scouting/webserver/requests/requests.go
@@ -19,8 +19,12 @@
"github.com/frc971/971-Robot-Code/scouting/webserver/requests/messages/request_data_scouting_response"
"github.com/frc971/971-Robot-Code/scouting/webserver/requests/messages/request_matches_for_team"
"github.com/frc971/971-Robot-Code/scouting/webserver/requests/messages/request_matches_for_team_response"
+ "github.com/frc971/971-Robot-Code/scouting/webserver/requests/messages/request_notes_for_team"
+ "github.com/frc971/971-Robot-Code/scouting/webserver/requests/messages/request_notes_for_team_response"
"github.com/frc971/971-Robot-Code/scouting/webserver/requests/messages/submit_data_scouting"
"github.com/frc971/971-Robot-Code/scouting/webserver/requests/messages/submit_data_scouting_response"
+ "github.com/frc971/971-Robot-Code/scouting/webserver/requests/messages/submit_notes"
+ "github.com/frc971/971-Robot-Code/scouting/webserver/requests/messages/submit_notes_response"
"github.com/frc971/971-Robot-Code/scouting/webserver/server"
flatbuffers "github.com/google/flatbuffers/go"
)
@@ -35,6 +39,10 @@
type RequestDataScoutingResponseT = request_data_scouting_response.RequestDataScoutingResponseT
type RefreshMatchList = refresh_match_list.RefreshMatchList
type RefreshMatchListResponseT = refresh_match_list_response.RefreshMatchListResponseT
+type SubmitNotes = submit_notes.SubmitNotes
+type SubmitNotesResponseT = submit_notes_response.SubmitNotesResponseT
+type RequestNotesForTeam = request_notes_for_team.RequestNotesForTeam
+type RequestNotesForTeamResponseT = request_notes_for_team_response.RequestNotesForTeamResponseT
// The interface we expect the database abstraction to conform to.
// We use an interface here because it makes unit testing easier.
@@ -45,6 +53,8 @@
ReturnStats() ([]db.Stats, error)
QueryMatches(int32) ([]db.Match, error)
QueryStats(int) ([]db.Stats, error)
+ QueryNotes(int32) (db.NotesData, error)
+ AddNotes(db.NotesData) error
}
type ScrapeMatchList func(int32, string) ([]scraping.Match, error)
@@ -392,6 +402,93 @@
w.Write(builder.FinishedBytes())
}
+func parseSubmitNotes(w http.ResponseWriter, buf []byte) (*SubmitNotes, bool) {
+ success := true
+ defer func() {
+ if r := recover(); r != nil {
+ respondWithError(w, http.StatusBadRequest, fmt.Sprintf("Failed to parse RefreshMatchList: %v", r))
+ success = false
+ }
+ }()
+ result := submit_notes.GetRootAsSubmitNotes(buf, 0)
+ return result, success
+}
+
+type submitNoteScoutingHandler struct {
+ db Database
+}
+
+func (handler submitNoteScoutingHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+ requestBytes, err := io.ReadAll(req.Body)
+ if err != nil {
+ respondWithError(w, http.StatusBadRequest, fmt.Sprint("Failed to read request bytes:", err))
+ return
+ }
+
+ request, success := parseSubmitNotes(w, requestBytes)
+ if !success {
+ return
+ }
+
+ err = handler.db.AddNotes(db.NotesData{
+ TeamNumber: request.Team(),
+ Notes: []string{string(request.Notes())},
+ })
+ if err != nil {
+ respondWithError(w, http.StatusInternalServerError, fmt.Sprintf("Failed to insert notes: %v", err))
+ return
+ }
+
+ var response SubmitNotesResponseT
+ builder := flatbuffers.NewBuilder(10)
+ builder.Finish((&response).Pack(builder))
+ w.Write(builder.FinishedBytes())
+}
+
+func parseRequestNotesForTeam(w http.ResponseWriter, buf []byte) (*RequestNotesForTeam, bool) {
+ success := true
+ defer func() {
+ if r := recover(); r != nil {
+ respondWithError(w, http.StatusBadRequest, fmt.Sprintf("Failed to parse RefreshMatchList: %v", r))
+ success = false
+ }
+ }()
+ result := request_notes_for_team.GetRootAsRequestNotesForTeam(buf, 0)
+ return result, success
+}
+
+type requestNotesForTeamHandler struct {
+ db Database
+}
+
+func (handler requestNotesForTeamHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+ requestBytes, err := io.ReadAll(req.Body)
+ if err != nil {
+ respondWithError(w, http.StatusBadRequest, fmt.Sprint("Failed to read request bytes:", err))
+ return
+ }
+
+ request, success := parseRequestNotesForTeam(w, requestBytes)
+ if !success {
+ return
+ }
+
+ notesData, err := handler.db.QueryNotes(request.Team())
+ if err != nil {
+ respondWithError(w, http.StatusInternalServerError, fmt.Sprintf("Failed to query notes: %v", err))
+ return
+ }
+
+ var response RequestNotesForTeamResponseT
+ for _, data := range notesData.Notes {
+ response.Notes = append(response.Notes, &request_notes_for_team_response.NoteT{data})
+ }
+
+ builder := flatbuffers.NewBuilder(1024)
+ builder.Finish((&response).Pack(builder))
+ w.Write(builder.FinishedBytes())
+}
+
func HandleRequests(db Database, scrape ScrapeMatchList, scoutingServer server.ScoutingServer) {
scoutingServer.HandleFunc("/requests", unknown)
scoutingServer.Handle("/requests/submit/data_scouting", submitDataScoutingHandler{db})
@@ -399,4 +496,6 @@
scoutingServer.Handle("/requests/request/matches_for_team", requestMatchesForTeamHandler{db})
scoutingServer.Handle("/requests/request/data_scouting", requestDataScoutingHandler{db})
scoutingServer.Handle("/requests/refresh_match_list", refreshMatchListHandler{db, scrape})
+ scoutingServer.Handle("/requests/submit/submit_notes", submitNoteScoutingHandler{db})
+ scoutingServer.Handle("/requests/request/notes_for_team", requestNotesForTeamHandler{db})
}
diff --git a/scouting/webserver/requests/requests_test.go b/scouting/webserver/requests/requests_test.go
index 60bee0e..e4169c0 100644
--- a/scouting/webserver/requests/requests_test.go
+++ b/scouting/webserver/requests/requests_test.go
@@ -19,8 +19,10 @@
"github.com/frc971/971-Robot-Code/scouting/webserver/requests/messages/request_data_scouting_response"
"github.com/frc971/971-Robot-Code/scouting/webserver/requests/messages/request_matches_for_team"
"github.com/frc971/971-Robot-Code/scouting/webserver/requests/messages/request_matches_for_team_response"
+ "github.com/frc971/971-Robot-Code/scouting/webserver/requests/messages/request_notes_for_team"
"github.com/frc971/971-Robot-Code/scouting/webserver/requests/messages/submit_data_scouting"
"github.com/frc971/971-Robot-Code/scouting/webserver/requests/messages/submit_data_scouting_response"
+ "github.com/frc971/971-Robot-Code/scouting/webserver/requests/messages/submit_notes"
"github.com/frc971/971-Robot-Code/scouting/webserver/server"
flatbuffers "github.com/google/flatbuffers/go"
)
@@ -274,6 +276,59 @@
}
}
+func TestSubmitNotes(t *testing.T) {
+ database := MockDatabase{}
+ scoutingServer := server.NewScoutingServer()
+ HandleRequests(&database, scrapeEmtpyMatchList, scoutingServer)
+ scoutingServer.Start(8080)
+ defer scoutingServer.Stop()
+
+ builder := flatbuffers.NewBuilder(1024)
+ builder.Finish((&submit_notes.SubmitNotesT{
+ Team: 971,
+ Notes: "Notes",
+ }).Pack(builder))
+
+ _, err := debug.SubmitNotes("http://localhost:8080", builder.FinishedBytes())
+ if err != nil {
+ t.Fatal("Failed to submit notes: ", err)
+ }
+
+ expected := []db.NotesData{
+ {TeamNumber: 971, Notes: []string{"Notes"}},
+ }
+
+ if !reflect.DeepEqual(database.notes, expected) {
+ t.Fatal("Submitted notes did not match", expected, database.notes)
+ }
+}
+
+func TestRequestNotes(t *testing.T) {
+ database := MockDatabase{
+ notes: []db.NotesData{{
+ TeamNumber: 971,
+ Notes: []string{"Notes"},
+ }},
+ }
+ scoutingServer := server.NewScoutingServer()
+ HandleRequests(&database, scrapeEmtpyMatchList, scoutingServer)
+ scoutingServer.Start(8080)
+ defer scoutingServer.Stop()
+
+ builder := flatbuffers.NewBuilder(1024)
+ builder.Finish((&request_notes_for_team.RequestNotesForTeamT{
+ Team: 971,
+ }).Pack(builder))
+ response, err := debug.RequestNotes("http://localhost:8080", builder.FinishedBytes())
+ if err != nil {
+ t.Fatal("Failed to submit notes: ", err)
+ }
+
+ if response.Notes[0].Data != "Notes" {
+ t.Fatal("requested notes did not match", response)
+ }
+}
+
// Validates that we can download the schedule from The Blue Alliance.
func TestRefreshMatchList(t *testing.T) {
scrapeMockSchedule := func(int32, string) ([]scraping.Match, error) {
@@ -353,6 +408,7 @@
type MockDatabase struct {
matches []db.Match
stats []db.Stats
+ notes []db.NotesData
}
func (database *MockDatabase) AddToMatch(match db.Match) error {
@@ -390,6 +446,21 @@
return []db.Stats{}, nil
}
+func (database *MockDatabase) QueryNotes(requestedTeam int32) (db.NotesData, error) {
+ var results []string
+ for _, data := range database.notes {
+ if data.TeamNumber == requestedTeam {
+ results = append(results, data.Notes[0])
+ }
+ }
+ return db.NotesData{TeamNumber: requestedTeam, Notes: results}, nil
+}
+
+func (database *MockDatabase) AddNotes(data db.NotesData) error {
+ database.notes = append(database.notes, data)
+ return nil
+}
+
// Returns an empty match list from the fake The Blue Alliance scraping.
func scrapeEmtpyMatchList(int32, string) ([]scraping.Match, error) {
return nil, nil