scouting: Fix style in some flatbuffer files
We're currently seeing warnings like this when compiling the
flatbuffer files:
warning:
/home/jenkins/repos/971-Robot-Code-2/scouting/webserver/requests/messages/request_shift_schedule_response.fbs:5: 13: warning: field names should be lowercase snake_case, got: R1scouter
/home/jenkins/repos/971-Robot-Code-2/scouting/webserver/requests/messages/request_shift_schedule_response.fbs:6: 13: warning: field names should be lowercase snake_case, got: R2scouter
/home/jenkins/repos/971-Robot-Code-2/scouting/webserver/requests/messages/request_shift_schedule_response.fbs:7: 13: warning: field names should be lowercase snake_case, got: R3scouter
/home/jenkins/repos/971-Robot-Code-2/scouting/webserver/requests/messages/request_shift_schedule_response.fbs:8: 13: warning: field names should be lowercase snake_case, got: B1scouter
/home/jenkins/repos/971-Robot-Code-2/scouting/webserver/requests/messages/request_shift_schedule_response.fbs:9: 13: warning: field names should be lowercase snake_case, got: B2scouter
/home/jenkins/repos/971-Robot-Code-2/scouting/webserver/requests/messages/request_shift_schedule_response.fbs:10: 13: warning: field names should be lowercase snake_case, got: B3scouter
Those warnings are annoying so this patch fixes them.
There are no functional changes.
Signed-off-by: Philipp Schrader <philipp.schrader@gmail.com>
Change-Id: I0370dfaf6cabd34b646de74c55f6bfa3992ee453
diff --git a/scouting/webserver/requests/messages/request_shift_schedule_response.fbs b/scouting/webserver/requests/messages/request_shift_schedule_response.fbs
index 611db49..fe44ef0 100644
--- a/scouting/webserver/requests/messages/request_shift_schedule_response.fbs
+++ b/scouting/webserver/requests/messages/request_shift_schedule_response.fbs
@@ -2,16 +2,16 @@
table MatchAssignment {
match_number:int (id:0);
- R1scouter:string (id:1);
- R2scouter:string (id:2);
- R3scouter:string (id:3);
- B1scouter:string (id:4);
- B2scouter:string (id:5);
- B3scouter:string (id:6);
+ r1_scouter:string (id:1);
+ r2_scouter:string (id:2);
+ r3_scouter:string (id:3);
+ b1_scouter:string (id:4);
+ b2_scouter:string (id:5);
+ b3_scouter:string (id:6);
}
table RequestShiftScheduleResponse {
shift_schedule:[MatchAssignment] (id:0);
}
-root_type RequestShiftScheduleResponse;
\ No newline at end of file
+root_type RequestShiftScheduleResponse;
diff --git a/scouting/webserver/requests/messages/submit_shift_schedule.fbs b/scouting/webserver/requests/messages/submit_shift_schedule.fbs
index 1f1833e..5292544 100644
--- a/scouting/webserver/requests/messages/submit_shift_schedule.fbs
+++ b/scouting/webserver/requests/messages/submit_shift_schedule.fbs
@@ -2,16 +2,16 @@
table MatchAssignment {
match_number:int (id:0);
- R1scouter:string (id:1);
- R2scouter:string (id:2);
- R3scouter:string (id:3);
- B1scouter:string (id:4);
- B2scouter:string (id:5);
- B3scouter:string (id:6);
+ r1_scouter:string (id:1);
+ r2_scouter:string (id:2);
+ r3_scouter:string (id:3);
+ b1_scouter:string (id:4);
+ b2_scouter:string (id:5);
+ b3_scouter:string (id:6);
}
table SubmitShiftSchedule {
shift_schedule:[MatchAssignment] (id:0);
}
-root_type SubmitShiftSchedule;
\ No newline at end of file
+root_type SubmitShiftSchedule;
diff --git a/scouting/webserver/requests/requests.go b/scouting/webserver/requests/requests.go
index 86a09d1..4950999 100644
--- a/scouting/webserver/requests/requests.go
+++ b/scouting/webserver/requests/requests.go
@@ -628,12 +628,12 @@
for _, shifts := range shiftData {
response.ShiftSchedule = append(response.ShiftSchedule, &request_shift_schedule_response.MatchAssignmentT{
MatchNumber: shifts.MatchNumber,
- R1scouter: shifts.R1scouter,
- R2scouter: shifts.R2scouter,
- R3scouter: shifts.R3scouter,
- B1scouter: shifts.B1scouter,
- B2scouter: shifts.B2scouter,
- B3scouter: shifts.B3scouter,
+ R1Scouter: shifts.R1scouter,
+ R2Scouter: shifts.R2scouter,
+ R3Scouter: shifts.R3scouter,
+ B1Scouter: shifts.B1scouter,
+ B2Scouter: shifts.B2scouter,
+ B3Scouter: shifts.B3scouter,
})
}
@@ -668,12 +668,12 @@
request.ShiftSchedule(&match_assignment, i)
current_shift := db.Shift{
MatchNumber: match_assignment.MatchNumber(),
- R1scouter: string(match_assignment.R1scouter()),
- R2scouter: string(match_assignment.R2scouter()),
- R3scouter: string(match_assignment.R3scouter()),
- B1scouter: string(match_assignment.B1scouter()),
- B2scouter: string(match_assignment.B2scouter()),
- B3scouter: string(match_assignment.B3scouter()),
+ R1scouter: string(match_assignment.R1Scouter()),
+ R2scouter: string(match_assignment.R2Scouter()),
+ R3scouter: string(match_assignment.R3Scouter()),
+ B1scouter: string(match_assignment.B1Scouter()),
+ B2scouter: string(match_assignment.B2Scouter()),
+ B3scouter: string(match_assignment.B3Scouter()),
}
err = handler.db.AddToShift(current_shift)
if err != nil {
diff --git a/scouting/webserver/requests/requests_test.go b/scouting/webserver/requests/requests_test.go
index ae017d2..290221a 100644
--- a/scouting/webserver/requests/requests_test.go
+++ b/scouting/webserver/requests/requests_test.go
@@ -553,21 +553,21 @@
ShiftSchedule: []*request_shift_schedule_response.MatchAssignmentT{
{
MatchNumber: 1,
- R1scouter: "Bob",
- R2scouter: "James",
- R3scouter: "Robert",
- B1scouter: "Alice",
- B2scouter: "Mary",
- B3scouter: "Patricia",
+ R1Scouter: "Bob",
+ R2Scouter: "James",
+ R3Scouter: "Robert",
+ B1Scouter: "Alice",
+ B2Scouter: "Mary",
+ B3Scouter: "Patricia",
},
{
MatchNumber: 2,
- R1scouter: "Liam",
- R2scouter: "Noah",
- R3scouter: "Oliver",
- B1scouter: "Emma",
- B2scouter: "Charlotte",
- B3scouter: "Amelia",
+ R1Scouter: "Liam",
+ R2Scouter: "Noah",
+ R3Scouter: "Oliver",
+ B1Scouter: "Emma",
+ B2Scouter: "Charlotte",
+ B3Scouter: "Amelia",
},
},
}
@@ -592,12 +592,12 @@
builder.Finish((&submit_shift_schedule.SubmitShiftScheduleT{
ShiftSchedule: []*submit_shift_schedule.MatchAssignmentT{
{MatchNumber: 1,
- R1scouter: "Bob",
- R2scouter: "James",
- R3scouter: "Robert",
- B1scouter: "Alice",
- B2scouter: "Mary",
- B3scouter: "Patricia"},
+ R1Scouter: "Bob",
+ R2Scouter: "James",
+ R3Scouter: "Robert",
+ B1Scouter: "Alice",
+ B2Scouter: "Mary",
+ B3Scouter: "Patricia"},
},
}).Pack(builder))