Feat: card_mark repo

models/main.go

@@ -128,6 +128,7 @@ type BotPlayer struct {
 type CardMark struct {
 	CardID   uint32 `db:"card_id"`
 	Username string `db:"username"`
+	MarkType string `db:"mark_type"`
 	Active   bool   `db:"active"`
 }
 
@@ -147,15 +148,13 @@ type Room struct {
 	TeamWon        UserTeam  `db:"team_won"`
 	RoomLink       string    `db:"room_link"`
 	// fields not in db
-	ActionHistory []Action   `db:"-"`
-	RedTeam       Team       `db:"-"`
-	BlueTeam      Team       `db:"-"`
-	Cards         []WordCard `db:"-"`
-	// WCMap         map[string]WordColor `db:"-"`
-	BotMap     map[string]BotPlayer `db:"-"`
-	Mark       CardMark             `db:"-"`
-	LogJournal []string             `db:"-"`
-	Settings   GameSettings         `db:"-"`
+	ActionHistory []Action             `db:"-"`
+	RedTeam       Team                 `db:"-"`
+	BlueTeam      Team                 `db:"-"`
+	Cards         []WordCard           `db:"-"`
+	BotMap        map[string]BotPlayer `db:"-"`
+	LogJournal    []string             `db:"-"`
+	Settings      GameSettings         `db:"-"`
 }
 
 func (r *Room) FindColor(word string) (WordColor, bool) {
@@ -169,7 +168,7 @@ func (r *Room) FindColor(word string) (WordColor, bool) {
 
 func (r *Room) ClearMarks() {
 	for i, _ := range r.Cards {
-		r.Cards[i].Mark = []CardMark{}
+		r.Cards[i].Marks = []CardMark{}
 	}
 }
 
@@ -393,7 +392,7 @@ type WordCard struct {
 	Color    WordColor  `json:"color" db:"color"`
 	Revealed bool       `json:"revealed" db:"revealed"`
 	Mime     bool       `json:"mime" db:"mime_view"` // user who sees that card is mime
-	Mark     []CardMark `json:"marks" db:"-"`
+	Marks    []CardMark `json:"marks" db:"-"`
 }
 
 // table: settings