included different contetend types in round data

Author: Kesuaheli

quiz/types.go

@@ -48,8 +48,8 @@ type Question struct {
 }
 
 type DisplayableContent struct {
-	Type ContentType
-	Text string
+	Type ContentType `json:"type"`
+	Text string      `json:"text"`
 }
 
 type ContentType uint8
@@ -60,12 +60,13 @@ const (
 )
 
 type Round struct {
-	Question string   `json:"question"`
-	Answers  []string `json:"answers"`
-	Correct  int      `json:"correct,omitempty"`
-	Current  int      `json:"current_round"`
-	Max      int      `json:"max_round"`
-	Category string   `json:"category"`
+	Question DisplayableContent   `json:"question"`
+	Answers  []DisplayableContent `json:"answers"`
+	Correct  int                  `json:"correct,omitempty"`
+	Current  int                  `json:"current_round"`
+	Max      int                  `json:"max_round"`
+	Group    string               `json:"group"`
+	Category string               `json:"category"`
 }
 
 type RoundSummary struct {
@@ -204,26 +205,28 @@ func (c Category) GetRounds(n int) []*Round {
 }
 
 func (q Question) ToRound() Round {
-	var answers []string
+	var answers []DisplayableContent
 
 	// select one correct answer
 	if len(q.Correct) > 1 {
 		rand.Shuffle(len(q.Correct), func(i, j int) {
 			q.Correct[i], q.Correct[j] = q.Correct[j], q.Correct[i]
 		})
-		answers = append(answers, q.Correct[rand.Intn(len(q.Correct)-1)].Text)
+		answers = append(answers, q.Correct[rand.Intn(len(q.Correct)-1)])
 	} else {
-		answers = append(answers, q.Correct[0].Text)
+		answers = append(answers, q.Correct[0])
 	}
 
 	// select up to 3 wrong answers
 	if len(q.Wrong) > 3 {
 		rand.Shuffle(len(q.Wrong), func(i, j int) {
 			q.Wrong[i], q.Wrong[j] = q.Wrong[j], q.Wrong[i]
 		})
-	}
-	for _, a := range q.Wrong[:3] {
-		answers = append(answers, a.Text)
+		for _, a := range q.Wrong[:3] {
+			answers = append(answers, a)
+		}
+	} else {
+		answers = append(answers, q.Wrong...)
 	}
 
 	var correct int
@@ -235,7 +238,7 @@ func (q Question) ToRound() Round {
 	})
 
 	return Round{
-		Question: q.Question.Text,
+		Question: q.Question,
 		Answers:  answers,
 		Correct:  correct + 1,
 	}