Scouting: Ignore prescouted teams in match list
Some prescoutes teams that had the same match number and team number
are showing up as scouted already even though the match hasn't happened yet.
This patch ignores prescouted teams when checking if a match has been fully scouted.
Signed-off-by: Filip Kujawa <filip.j.kujawa@gmail.com>
Change-Id: I586f9d6d31251af18a958e05152a04e2cad5d7b2
diff --git a/scouting/webserver/requests/requests.go b/scouting/webserver/requests/requests.go
index e5b4680..86a09d1 100644
--- a/scouting/webserver/requests/requests.go
+++ b/scouting/webserver/requests/requests.go
@@ -70,7 +70,7 @@
ReturnAllDriverRankings() ([]db.DriverRankingData, error)
ReturnAllShifts() ([]db.Shift, error)
ReturnStats2023() ([]db.Stats2023, error)
- ReturnStats2023ForTeam(teamNumber string, matchNumber int32, setNumber int32, compLevel string) ([]db.Stats2023, error)
+ ReturnStats2023ForTeam(teamNumber string, matchNumber int32, setNumber int32, compLevel string, preScouting bool) ([]db.Stats2023, error)
QueryAllShifts(int) ([]db.Shift, error)
QueryNotes(int32) ([]string, error)
AddNotes(db.NotesData) error
@@ -162,7 +162,7 @@
func (handler requestAllMatchesHandler) teamHasBeenDataScouted(key MatchAssemblyKey, teamNumber string) (bool, error) {
stats, err := handler.db.ReturnStats2023ForTeam(
- teamNumber, key.MatchNumber, key.SetNumber, key.CompLevel)
+ teamNumber, key.MatchNumber, key.SetNumber, key.CompLevel, false)
if err != nil {
return false, err
}
diff --git a/scouting/webserver/requests/requests_test.go b/scouting/webserver/requests/requests_test.go
index 9a07726..ae017d2 100644
--- a/scouting/webserver/requests/requests_test.go
+++ b/scouting/webserver/requests/requests_test.go
@@ -936,10 +936,10 @@
return database.stats2023, nil
}
-func (database *MockDatabase) ReturnStats2023ForTeam(teamNumber string, matchNumber int32, setNumber int32, compLevel string) ([]db.Stats2023, error) {
+func (database *MockDatabase) ReturnStats2023ForTeam(teamNumber string, matchNumber int32, setNumber int32, compLevel string, preScouting bool) ([]db.Stats2023, error) {
var results []db.Stats2023
for _, stats := range database.stats2023 {
- if stats.TeamNumber == teamNumber && stats.MatchNumber == matchNumber && stats.SetNumber == setNumber && stats.CompLevel == compLevel {
+ if stats.TeamNumber == teamNumber && stats.MatchNumber == matchNumber && stats.SetNumber == setNumber && stats.CompLevel == compLevel && stats.PreScouting == preScouting {
results = append(results, stats)
}
}