Replace summary with test_keys

internal/database/actions.go

@@ -2,6 +2,7 @@ package database
 
 import (
 	"database/sql"
+	"encoding/json"
 	"time"
 
 	"github.com/apex/log"
@@ -36,6 +37,33 @@ func ListMeasurements(sess sqlbuilder.Database, resultID int64) ([]MeasurementUR
 	return measurements, nil
 }
 
+// GetMeasurementCounts returns the number of anomalous and total measurement for a given result
+func GetMeasurementCounts(sess sqlbuilder.Database, resultID int64) (uint64, uint64, error) {
+	var (
+		totalCount uint64
+		anmlyCount uint64
+		err        error
+	)
+	col := sess.Collection("measurements")
+
+	// XXX these two queries can be done with a single query
+	totalCount, err = col.Find("result_id", resultID).
+		Count()
+	if err != nil {
+		log.WithError(err).Error("failed to get total count")
+		return totalCount, anmlyCount, err
+	}
+
+	anmlyCount, err = col.Find("result_id", resultID).
+		And(db.Cond{"is_anomaly": true}).Count()
+	if err != nil {
+		log.WithError(err).Error("failed to get anmly count")
+		return totalCount, anmlyCount, err
+	}
+
+	return totalCount, anmlyCount, err
+}
+
 // ListResults return the list of results
 func ListResults(sess sqlbuilder.Database) ([]ResultNetwork, []ResultNetwork, error) {
 	doneResults := []ResultNetwork{}
@@ -168,6 +196,24 @@ func CreateOrUpdateURL(sess sqlbuilder.Database, url string, categoryCode string
 		}
 		urlID = lastID
 	}
+	log.Debugf("returning url %d", urlID)
 
 	return urlID, nil
 }
+
+// AddTestKeys writes the summary to the measurement
+func AddTestKeys(sess sqlbuilder.Database, msmt *Measurement, tk interface{}) error {
+	tkBytes, err := json.Marshal(tk)
+	if err != nil {
+		log.WithError(err).Error("failed to serialize summary")
+	}
+	isAnomaly := tk.(struct{ IsAnomaly bool }).IsAnomaly
+	msmt.TestKeys = string(tkBytes)
+	msmt.IsAnomaly = sql.NullBool{Bool: isAnomaly, Valid: true}
+
+	err = sess.Collection("measurements").Find("id", msmt.ID).Update(msmt)
+	if err != nil {
+		return errors.Wrap(err, "updating measurement")
+	}
+	return nil
+}

internal/database/actions_test.go

@@ -83,18 +83,48 @@ func TestMeasurementWorkflow(t *testing.T) {
 	}
 }
 
-func TestURLCreation(t *testing.T) {
+func TestNetworkCreate(t *testing.T) {
 	tmpfile, err := ioutil.TempFile("", "dbtest")
 	if err != nil {
 		t.Fatal(err)
 	}
 	defer os.Remove(tmpfile.Name())
 
-	tmpdir, err := ioutil.TempDir("", "oonitest")
+	sess, err := Connect(tmpfile.Name())
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer os.RemoveAll(tmpdir)
+
+	l1 := utils.LocationInfo{
+		ASN:         2,
+		CountryCode: "IT",
+		NetworkName: "Antaninet",
+	}
+
+	l2 := utils.LocationInfo{
+		ASN:         3,
+		CountryCode: "IT",
+		NetworkName: "Fufnet",
+	}
+
+	_, err = CreateNetwork(sess, &l1)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = CreateNetwork(sess, &l2)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+}
+
+func TestURLCreation(t *testing.T) {
+	tmpfile, err := ioutil.TempFile("", "dbtest")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.Remove(tmpfile.Name())
 
 	sess, err := Connect(tmpfile.Name())
 	if err != nil {

internal/database/models.go

@@ -6,7 +6,6 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/ooni/probe-cli/nettests/summary"
 	"github.com/pkg/errors"
 	"upper.io/db.v3/lib/sqlbuilder"
 )
@@ -28,7 +27,7 @@ type MeasurementURLNetwork struct {
 
 // Network represents a network tested by the user
 type Network struct {
-	ID          int64  `db:"id"`
+	ID          int64  `db:"id,omitempty"`
 	NetworkName string `db:"network_name"`
 	NetworkType string `db:"network_type"`
 	IP          string `db:"ip"`
@@ -38,7 +37,7 @@ type Network struct {
 
 // URL represents URLs from the testing lists
 type URL struct {
-	ID           sql.NullInt64  `db:"id"`
+	ID           sql.NullInt64  `db:"id,omitempty"`
 	URL          sql.NullString `db:"url"`
 	CategoryCode sql.NullString `db:"category_code"`
 	CountryCode  sql.NullString `db:"country_code"`
@@ -46,7 +45,7 @@ type URL struct {
 
 // Measurement model
 type Measurement struct {
-	ID               int64          `db:"id"`
+	ID               int64          `db:"id,omitempty"`
 	TestName         string         `db:"test_name"`
 	StartTime        time.Time      `db:"start_time"`
 	Runtime          float64        `db:"runtime"` // Fractional number of seconds
@@ -69,7 +68,7 @@ type Measurement struct {
 
 // Result model
 type Result struct {
-	ID             int64     `db:"id"`
+	ID             int64     `db:"id,omitempty"`
 	TestGroupName  string    `db:"test_group_name"`
 	StartTime      time.Time `db:"start_time"`
 	NetworkID      int64     `db:"network_id"` // Used to include a Network
@@ -82,7 +81,7 @@ type Result struct {
 }
 
 // Finished marks the result as done and sets the runtime
-func (r *Result) Finished(sess sqlbuilder.Database, makeSummary summary.ResultSummaryFunc) error {
+func (r *Result) Finished(sess sqlbuilder.Database) error {
 	if r.IsDone == true || r.Runtime != 0 {
 		return errors.New("Result is already finished")
 	}
@@ -147,17 +146,6 @@ func (m *Measurement) UploadSucceeded(sess sqlbuilder.Database) error {
 	return nil
 }
 
-// WriteSummary writes the summary to the measurement
-func (m *Measurement) WriteSummary(sess sqlbuilder.Database, summary string) error {
-	// XXX remove m.Summary = summary
-
-	err := sess.Collection("measurements").Find("id", m.ID).Update(m)
-	if err != nil {
-		return errors.Wrap(err, "updating measurement")
-	}
-	return nil
-}
-
 // AddToResult adds a measurement to a result
 func (m *Measurement) AddToResult(sess sqlbuilder.Database, result *Result) error {
 	var err error