Fix bug in result listing

internal/database/actions.go

@@ -80,6 +80,7 @@ func GetMeasurementCounts(sess sqlbuilder.Database, resultID int64) (uint64, uin
 		return totalCount, anmlyCount, err
 	}
 
+	log.Debugf("counts: %d, %d, %d", resultID, totalCount, anmlyCount)
 	return totalCount, anmlyCount, err
 }
 
@@ -90,8 +91,9 @@ func ListResults(sess sqlbuilder.Database) ([]ResultNetwork, []ResultNetwork, er
 
 	req := sess.Select(
 		"networks.id AS network_id",
-		db.Raw("results.*"),
+		"results.id AS result_id",
 		db.Raw("networks.*"),
+		db.Raw("results.*"),
 	).From("results").
 		Join("networks").On("results.network_id = networks.id").
 		OrderBy("results.start_time")

internal/database/models.go

@@ -13,8 +13,10 @@ import (
 // ResultNetwork is used to represent the structure made from the JOIN
 // between the results and networks tables.
 type ResultNetwork struct {
-	Result  `db:",inline"`
-	Network `db:",inline"`
+	Result    `db:",inline"`
+	ResultID  int64 `db:"result_id"`
+	Network   `db:",inline"`
+	NetworkID int64 `db:"network_id"`
 }
 
 // MeasurementURLNetwork is used for the JOIN between Measurement and URL