Changed Around The World and Shanghai to use multiplier as points

CHANGELOG.md

@@ -10,6 +10,7 @@
 #### Changed
 - Sort tournament best statistics by leg id for equal values
 - Use tournament elo if available for odds
+- Switched `Around the World` and `Shanghai` to count multiplers as points instead of value
 
 #### Fixed
 - Return `outshot_type` for `X01 Handicap`

cmd/fourtwenty.go

@@ -8,7 +8,7 @@ import (
 
 // fourtwentyCmd represents the fourtwenty command
 var fourtwentyCmd = &cobra.Command{
-	Use:   "fourtwenty",
+	Use:   "420",
 	Short: "Recalculate 420 statistics",
 	Run: func(cmd *cobra.Command, args []string) {
 		err := data.RecalculateStatistics(models.FOURTWENTY, legID, since, dryRun)

cmd/onesecenety.go

@@ -0,0 +1,23 @@
+package cmd
+
+import (
+	"github.com/kcapp/api/data"
+	"github.com/kcapp/api/models"
+	"github.com/spf13/cobra"
+)
+
+// oneseventyCmd represents the oneseventy command
+var oneseventyCmd = &cobra.Command{
+	Use:   "170",
+	Short: "Recalculate 170 statistics",
+	Run: func(cmd *cobra.Command, args []string) {
+		err := data.RecalculateStatistics(models.ONESEVENTY, legID, since, dryRun)
+		if err != nil {
+			panic(err)
+		}
+	},
+}
+
+func init() {
+	recalculateStatisticsCmd.AddCommand(oneseventyCmd)
+}

controllers/match_controller.go

@@ -98,7 +98,11 @@ func GetMatches(w http.ResponseWriter, r *http.Request) {
 // GetActiveMatches will return a list of active matches
 func GetActiveMatches(w http.ResponseWriter, r *http.Request) {
 	SetHeaders(w)
-	matches, err := data.GetActiveMatches()
+	since, err := strconv.Atoi(r.URL.Query().Get("since"))
+	if err != nil {
+		since = 2
+	}
+	matches, err := data.GetActiveMatches(since)
 	if err != nil {
 		log.Println("Unable to get active matches", err)
 		http.Error(w, err.Error(), http.StatusInternalServerError)

data/match.go

@@ -181,7 +181,7 @@ func GetMatchesCount() (int, error) {
 }
 
 // GetActiveMatches returns all active matches
-func GetActiveMatches() ([]*models.Match, error) {
+func GetActiveMatches(since int) ([]*models.Match, error) {
 	rows, err := models.DB.Query(`
 		SELECT
 			m.id, m.is_finished, m.is_abandoned, m.is_walkover, m.is_bye, m.current_leg_id, m.winner_id, m.office_id, m.is_practice,
@@ -196,10 +196,10 @@ func GetActiveMatches() ([]*models.Match, error) {
 			LEFT JOIN venue v on v.id = m.venue_id
 			LEFT JOIN player2leg p2l ON p2l.match_id = m.id
 		WHERE m.is_finished = 0
-			AND l.updated_at > NOW() - INTERVAL 2 MINUTE
+			AND l.updated_at > NOW() - INTERVAL ? MINUTE
 			AND m.is_bye <> 1
 		GROUP BY m.id
-		ORDER BY m.id DESC`)
+		ORDER BY m.id DESC`, since)
 	if err != nil {
 		return nil, err
 	}

data/recalculate.go

@@ -67,6 +67,8 @@ func RecalculateStatistics(matchType int, legID int, since string, dryRun bool)
 		queries, err = RecalculateKnockoutStatistics(legs)
 	case models.SCAM:
 		queries, err = ReCalculateScamStatistics(legs)
+	case models.ONESEVENTY:
+		queries, err = ReCalculate170Statistics(legs)
 	default:
 		return fmt.Errorf("cannot recalculate statistics for type %d", matchType)
 	}

data/statistics_around_the_world.go

@@ -493,6 +493,7 @@ func GetShanghaiStatisticsForMatch(id int) ([]*models.StatisticsAroundThe, error
 			CAST(SUM(s.score) / COUNT(DISTINCT l.id) AS SIGNED) as 'avg_score',
 			SUM(s.mpr) / COUNT(DISTINCT l.id) as 'mpr',
 			SUM(s.total_hit_rate) / COUNT(l.id) as 'total_hit_rate',
+			MAX(shanghai) as 'shanghai',
 			IFNULL(SUM(s.hit_rate_1) / SUM(IF(shanghai < 1, 0, 1)), 0) as 'hit_rate_1',
 			IFNULL(SUM(s.hit_rate_2) / SUM(IF(shanghai < 2, 0, 1)), 0) as 'hit_rate_2',
 			IFNULL(SUM(s.hit_rate_3) / SUM(IF(shanghai < 3, 0, 1)), 0) as 'hit_rate_3',
@@ -530,7 +531,7 @@ func GetShanghaiStatisticsForMatch(id int) ([]*models.StatisticsAroundThe, error
 	for rows.Next() {
 		s := new(models.StatisticsAroundThe)
 		h := make([]*null.Float, 21)
-		err := rows.Scan(&s.PlayerID, &s.DartsThrown, &s.Score, &s.MPR, &s.TotalHitRate,
+		err := rows.Scan(&s.PlayerID, &s.DartsThrown, &s.Score, &s.MPR, &s.TotalHitRate, &s.Shanghai,
 			&h[1], &h[2], &h[3], &h[4], &h[5], &h[6], &h[7], &h[8], &h[9], &h[10], &h[11],
 			&h[12], &h[13], &h[14], &h[15], &h[16], &h[17], &h[18], &h[19], &h[20])
 		if err != nil {

models/visit.go

@@ -441,13 +441,13 @@ func (visit *Visit) CalculateAroundTheClockScore(currentScore int) int {
 func (visit *Visit) CalculateAroundTheWorldScore(round int) int {
 	score := 0
 	if round == visit.FirstDart.ValueRaw() || (round == 21 && visit.FirstDart.IsBull()) {
-		score += visit.FirstDart.GetScore()
+		score += int(visit.FirstDart.Multiplier)
 	}
 	if round == visit.SecondDart.ValueRaw() || (round == 21 && visit.SecondDart.IsBull()) {
-		score += visit.SecondDart.GetScore()
+		score += int(visit.SecondDart.Multiplier)
 	}
 	if round == visit.ThirdDart.ValueRaw() || (round == 21 && visit.ThirdDart.IsBull()) {
-		score += visit.ThirdDart.GetScore()
+		score += int(visit.ThirdDart.Multiplier)
 	}
 	return score
 }