limit QueryMatches use to db.go
doesn't really have use in being public and conflicts with my upcoming database change
Signed-off-by: Emily Markova <emily.markova@gmail.com>
Change-Id: Ibb6f4704084088cc51e5cf41538c700d613bb131
diff --git a/scouting/db/db.go b/scouting/db/db.go
index 8a28db4..85e3d98 100644
--- a/scouting/db/db.go
+++ b/scouting/db/db.go
@@ -149,7 +149,7 @@
}
func (database *Database) AddToStats(s Stats) error {
- matches, err := database.QueryMatches(s.TeamNumber)
+ matches, err := database.queryMatches(s.TeamNumber)
if err != nil {
return err
}
@@ -241,7 +241,7 @@
return rankins, result.Error
}
-func (database *Database) QueryMatches(teamNumber_ int32) ([]Match, error) {
+func (database *Database) queryMatches(teamNumber_ int32) ([]Match, error) {
var matches []Match
result := database.
Where("r1 = $1 OR r2 = $1 OR r3 = $1 OR b1 = $1 OR b2 = $1 OR b3 = $1", teamNumber_).
diff --git a/scouting/db/db_test.go b/scouting/db/db_test.go
index 460b177..47a0a90 100644
--- a/scouting/db/db_test.go
+++ b/scouting/db/db_test.go
@@ -234,41 +234,6 @@
}
}
-func TestQueryMatchDB(t *testing.T) {
- fixture := createDatabase(t)
- defer fixture.TearDown()
-
- testDatabase := []Match{
- Match{MatchNumber: 2, SetNumber: 1, CompLevel: "quals", R1: 251, R2: 169, R3: 286, B1: 253, B2: 538, B3: 149},
- Match{MatchNumber: 4, SetNumber: 1, CompLevel: "quals", R1: 198, R2: 135, R3: 777, B1: 999, B2: 434, B3: 698},
- Match{MatchNumber: 3, SetNumber: 1, CompLevel: "quals", R1: 147, R2: 421, R3: 538, B1: 126, B2: 448, B3: 262},
- Match{MatchNumber: 6, SetNumber: 1, CompLevel: "quals", R1: 191, R2: 132, R3: 773, B1: 994, B2: 435, B3: 696},
- }
-
- for i := 0; i < len(testDatabase); i++ {
- err := fixture.db.AddToMatch(testDatabase[i])
- check(t, err, fmt.Sprint("Failed to add match", i))
- }
-
- correct := []Match{
- Match{
- MatchNumber: 2, SetNumber: 1, CompLevel: "quals",
- R1: 251, R2: 169, R3: 286, B1: 253, B2: 538, B3: 149,
- },
- Match{
- MatchNumber: 3, SetNumber: 1, CompLevel: "quals",
- R1: 147, R2: 421, R3: 538, B1: 126, B2: 448, B3: 262,
- },
- }
-
- got, err := fixture.db.QueryMatches(538)
- check(t, err, "Failed to query matches for 538")
-
- if !reflect.DeepEqual(correct, got) {
- t.Fatalf("Got %#v,\nbut expected %#v.", got, correct)
- }
-}
-
func TestQueryShiftDB(t *testing.T) {
fixture := createDatabase(t)
defer fixture.TearDown()
diff --git a/scouting/webserver/requests/requests.go b/scouting/webserver/requests/requests.go
index 3e567b8..76a26de 100644
--- a/scouting/webserver/requests/requests.go
+++ b/scouting/webserver/requests/requests.go
@@ -73,7 +73,6 @@
ReturnAllDriverRankings() ([]db.DriverRankingData, error)
ReturnAllShifts() ([]db.Shift, error)
ReturnStats() ([]db.Stats, error)
- QueryMatches(int32) ([]db.Match, error)
QueryAllShifts(int) ([]db.Shift, error)
QueryStats(int) ([]db.Stats, error)
QueryNotes(int32) ([]string, error)
diff --git a/scouting/webserver/requests/requests_test.go b/scouting/webserver/requests/requests_test.go
index 54408e4..9775eae 100644
--- a/scouting/webserver/requests/requests_test.go
+++ b/scouting/webserver/requests/requests_test.go
@@ -702,19 +702,6 @@
return database.stats, nil
}
-func (database *MockDatabase) QueryMatches(requestedTeam int32) ([]db.Match, error) {
- var matches []db.Match
- for _, match := range database.matches {
- for _, team := range []int32{match.R1, match.R2, match.R3, match.B1, match.B2, match.B3} {
- if team == requestedTeam {
- matches = append(matches, match)
- break
- }
- }
- }
- return matches, nil
-}
-
func (database *MockDatabase) QueryStats(int) ([]db.Stats, error) {
return []db.Stats{}, nil
}