Merge pull request #15 from teambition/fix/labelHit

Fix when multiple label are hit, one is randomly selected
teambition · Jan 12, 2021 · 20e7aaa · 20e7aaa
2 parents 7fdf905 + 081bf7c
commit 20e7aaa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/model/common.go b/src/model/common.go
@@ -3,6 +3,7 @@ package model
 import (
 	"context"
 	"fmt"
+	"math/rand"
 	"sort"
 	"strings"
 	"time"
@@ -18,6 +19,7 @@ import (
 
 func init() {
 	util.DigProvide(NewModels)
+	rand.Seed(time.Now().UnixNano())
 }
 
 type dbMode string

diff --git a/src/model/label_rule.go b/src/model/label_rule.go
@@ -3,6 +3,7 @@ package model
 import (
 	"context"
 	"hash/crc32"
+	"math/rand"
 	"time"
 
 	"github.com/doug-martin/goqu/v9"
@@ -77,6 +78,10 @@ func (m *LabelRule) ComputeUserRule(ctx context.Context, userID int64, excludeLa
 	}
 
 	if len(ids) > 0 {
+		index := rand.Intn(len(ids))
+		ids = []interface{}{ids[index]}
+		labelIDs = []int64{labelIDs[index]}
+
 		sd := m.DB.Insert(schema.TableUserLabel).Cols("user_id", "label_id", "rls").
 			FromQuery(goqu.From(goqu.T(schema.TableLabelRule).As("t1")).
 				Select(goqu.V(userID), goqu.I("t1.label_id"), goqu.I("t1.id")).