Use math/rand/v2 for game winner calculation (#30)

Author: ailinykh

internal/legacy/usecases/faggot_game.go

@@ -3,7 +3,6 @@ package usecases
 import (
 	"encoding/json"
 	"fmt"
-	"math/rand"
 	"os"
 	"regexp"
 	"sort"
@@ -131,7 +130,7 @@ func (flow *GameFlow) Play(message *legacy.Message, bot legacy.IBot) error {
 		}
 	}
 
-	winner := players[rand.Intn(len(players))]
+	winner := players[flow.r.GetRand(len(players))]
 
 	if !bot.IsUserMemberOfChat(winner, message.Chat.ID) {
 		_, err := bot.SendText(flow.t.I18n(message.Sender.LanguageCode, "faggot_winner_left"))
@@ -161,7 +160,7 @@ func (flow *GameFlow) Play(message *legacy.Message, bot legacy.IBot) error {
 				templates = append(templates, key)
 			}
 		}
-		template := templates[rand.Intn(len(templates))]
+		template := templates[flow.r.GetRand(len(templates))]
 		phrase := flow.t.I18n(message.Sender.LanguageCode, template)
 
 		if i == 3 {
@@ -179,7 +178,7 @@ func (flow *GameFlow) Play(message *legacy.Message, bot legacy.IBot) error {
 		}
 
 		if os.Getenv("GO_ENV") != "testing" {
-			r := rand.Intn(3) + 1
+			r := flow.r.GetRand(3) + 1
 			time.Sleep(time.Duration(r) * time.Second)
 		}
 	}

internal/legacy/usecases/faggot_game_test.go

@@ -97,10 +97,14 @@ func Test_Play_RespondsWithCurrentGameResult(t *testing.T) {
 	m1 := makeGameMessage(1, "")
 	m2 := makeGameMessage(2, "")
 	game, bot, storage := makeSUT(map[string]string{
-		"faggot_game_0_0": "0",
-		"faggot_game_1_0": "1",
-		"faggot_game_2_0": "2",
+		"faggot_game_0_0": "00",
+		"faggot_game_0_1": "01",
+		"faggot_game_1_0": "10",
+		"faggot_game_1_1": "11",
+		"faggot_game_2_0": "20",
+		"faggot_game_2_1": "21",
 		"faggot_game_3_0": "%s",
+		"faggot_game_3_1": "%s",
 	}, m1, m2)
 	bot.ChatMembers[0] = []string{""}
 
@@ -110,19 +114,23 @@ func Test_Play_RespondsWithCurrentGameResult(t *testing.T) {
 
 	winner := storage.rounds[0].Winner
 	phrase := fmt.Sprintf(`<a href="tg://user?id=%d">%s %s</a>`, winner.ID, winner.FirstName, winner.LastName)
-	assert.Equal(t, "0", bot.SentMessages[2])
-	assert.Equal(t, "1", bot.SentMessages[3])
-	assert.Equal(t, "2", bot.SentMessages[4])
+	assert.Equal(t, "01", bot.SentMessages[2])
+	assert.Equal(t, "11", bot.SentMessages[3])
+	assert.Equal(t, "21", bot.SentMessages[4])
 	assert.Equal(t, phrase, bot.SentMessages[5])
 }
 func Test_Play_RespondsWinnerAlreadyKnown(t *testing.T) {
 	m1 := makeGameMessage(1, "Faggot1")
 	m2 := makeGameMessage(2, "Faggot2")
 	game, bot, storage := makeSUT(map[string]string{
-		"faggot_game_0_0":     "0",
-		"faggot_game_1_0":     "1",
-		"faggot_game_2_0":     "2",
-		"faggot_game_3_0":     "3 %s",
+		"faggot_game_0_0":     "00",
+		"faggot_game_0_1":     "01",
+		"faggot_game_1_0":     "10",
+		"faggot_game_1_1":     "11",
+		"faggot_game_2_0":     "20",
+		"faggot_game_2_1":     "21",
+		"faggot_game_3_0":     "30 %s",
+		"faggot_game_3_1":     "31 %s",
 		"faggot_winner_known": "Winner already known %s",
 	}, m1)
 	bot.ChatMembers[0] = []string{"Faggot1", "Faggot2"}
@@ -132,10 +140,10 @@ func Test_Play_RespondsWinnerAlreadyKnown(t *testing.T) {
 	game.Play(m1, bot)
 
 	winner := storage.rounds[0].Winner.Username
-	assert.Equal(t, "0", bot.SentMessages[2])
-	assert.Equal(t, "1", bot.SentMessages[3])
-	assert.Equal(t, "2", bot.SentMessages[4])
-	assert.Equal(t, fmt.Sprintf("3 @%s", winner), bot.SentMessages[5])
+	assert.Equal(t, "01", bot.SentMessages[2])
+	assert.Equal(t, "11", bot.SentMessages[3])
+	assert.Equal(t, "21", bot.SentMessages[4])
+	assert.Equal(t, fmt.Sprintf("31 @%s", winner), bot.SentMessages[5])
 
 	game.Play(m1, bot)