From 339af2ebcae02aa811481442d210deb55db5ccc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20K=C3=A1n=C4=9B?= Date: Sun, 25 Apr 2021 14:09:08 +0200 Subject: [PATCH] Make breaks between questions --- pkg/model/ent/schema/askedQuestion.go | 2 +- pkg/model/model.go | 43 ++++++++++++++++----------- pkg/model/model_test.go | 38 +++++++++++++++++++++-- pkg/rtcomm/stateUpdate.go | 5 ++++ ui/html/game.page.tmpl.html | 4 +++ 5 files changed, 71 insertions(+), 21 deletions(-) diff --git a/pkg/model/ent/schema/askedQuestion.go b/pkg/model/ent/schema/askedQuestion.go index 8f03523..f80c126 100644 --- a/pkg/model/ent/schema/askedQuestion.go +++ b/pkg/model/ent/schema/askedQuestion.go @@ -15,7 +15,7 @@ func (AskedQuestion) Fields() []ent.Field { return []ent.Field{ field.UUID("id", uuid.Nil).Immutable(), field.Time("asked").Immutable(), - field.Time("ended"), + field.Time("ended").Optional().Nillable(), } } diff --git a/pkg/model/model.go b/pkg/model/model.go index 761fe27..e210d95 100644 --- a/pkg/model/model.go +++ b/pkg/model/model.go @@ -178,22 +178,27 @@ func (m *Model) GetQuestionStateUpdate(sessionId uuid.UUID, now time.Time, c con defer tx.Commit() if aq, err := tx.Question.Query().WithChoices().Where(question.HasAskedWith(askedquestion.HasSessionWith(session.ID(sessionId)))).QueryAsked().WithQuestion(func(q *ent.QuestionQuery) { q.WithChoices() }).Order(ent.Desc(askedquestion.FieldAsked)).First(c); err == nil { - var q = aq.Edges.Question - var qu rtcomm.QuestionUpdate - qu.Title = q.Title - if !aq.Ended.After(now) { - qu.RemainingTime = 0 + // either show the current question or hide the old one + if aq.Ended == nil { + var q = aq.Edges.Question + var qu rtcomm.QuestionUpdate + qu.Title = q.Title + if ends := aq.Asked.Add(time.Duration(q.DefaultLength) * time.Millisecond); !now.Before(ends) { + qu.RemainingTime = 0 + } else { + qu.RemainingTime = uint64(ends.Sub(now).Round(time.Millisecond).Milliseconds()) + } + qu.Answers = make([]rtcomm.Answer, 0, len(q.Edges.Choices)) + for i := 0; i < len(q.Edges.Choices); i++ { + qu.Answers = append(qu.Answers, rtcomm.Answer{ + ID: q.Edges.Choices[i].ID.String(), + Title: q.Edges.Choices[i].Title, + }) + } + return rtcomm.StateUpdate{Question: &qu}, nil } else { - qu.RemainingTime = uint64(aq.Ended.Sub(now).Round(time.Millisecond).Milliseconds()) + return rtcomm.StateUpdate{Break: &rtcomm.BreakUpdate{}}, nil } - qu.Answers = make([]rtcomm.Answer, 0, len(q.Edges.Choices)) - for i := 0; i < len(q.Edges.Choices); i++ { - qu.Answers = append(qu.Answers, rtcomm.Answer{ - ID: q.Edges.Choices[i].ID.String(), - Title: q.Edges.Choices[i].Title, - }) - } - return rtcomm.StateUpdate{Question: &qu}, nil } else if ent.IsNotFound(err) { // There is simply no current question, which is not an error return rtcomm.StateUpdate{}, nil @@ -238,8 +243,10 @@ func (m *Model) NextQuestion(sessionId uuid.UUID, now time.Time, c context.Conte if current, err := tx.AskedQuestion.Query().Where(askedquestion.HasSessionWith(session.ID(sessionId))).WithQuestion().Order(ent.Desc(askedquestion.FieldAsked)).First(c); err == nil { query.Where(question.OrderGT(current.Edges.Question.Order)) - if current.Ended.After(now) { - if _, err := current.Update().SetEnded(now).Save(c); err != nil { + if current.Ended == nil { + if _, err := current.Update().SetEnded(now).Save(c); err == nil { + return tx.Commit() + } else { return err } } @@ -248,7 +255,7 @@ func (m *Model) NextQuestion(sessionId uuid.UUID, now time.Time, c context.Conte } if next, err := query.First(c); err == nil { - if _, err := tx.AskedQuestion.Create().SetID(uuid.New()).SetAsked(now).SetSessionID(sessionId).SetQuestion(next).SetEnded(now.Add(time.Duration(int64(next.DefaultLength)) * time.Millisecond)).Save(c); err != nil { + if _, err := tx.AskedQuestion.Create().SetID(uuid.New()).SetAsked(now).SetSessionID(sessionId).SetQuestion(next).Save(c); err != nil { return err } } else if ent.IsNotFound(err) { @@ -292,7 +299,7 @@ func (m *Model) SaveAnswer(playerId uuid.UUID, choiceId uuid.UUID, now time.Time // check if the question is open // Asked[0] is guaranteed to exist thanks to the previous query - if !q.Edges.Asked[0].Ended.After(now) { + if q.Edges.Asked[0].Ended != nil || q.Edges.Asked[0].Asked.Add(time.Duration(q.DefaultLength)*time.Millisecond).Before(now) { return nil, QuestionClosed } diff --git a/pkg/model/model_test.go b/pkg/model/model_test.go index c01a166..82fef8a 100644 --- a/pkg/model/model_test.go +++ b/pkg/model/model_test.go @@ -86,7 +86,7 @@ func newTestModelWithData(t *testing.T) *Model { players := tx.Player.CreateBulk(playersC...).SaveX(c) var askedQuestionsC = []*ent.AskedQuestionCreate{ - tx.AskedQuestion.Create().SetID(uuid.MustParse("72a1bb9c-67e7-4d59-80fa-80ce729629d3")).SetAsked(time.Unix(1613387996, 0)).SetQuestion(questions[0]).SetSession(sessions[0]).SetEnded(time.Unix(1613388001, 0)), + tx.AskedQuestion.Create().SetID(uuid.MustParse("72a1bb9c-67e7-4d59-80fa-80ce729629d3")).SetAsked(time.Unix(1613387996, 0)).SetQuestion(questions[0]).SetSession(sessions[0]), } askedQuestions := tx.AskedQuestion.CreateBulk(askedQuestionsC...).SaveX(c) @@ -122,8 +122,16 @@ func TestModel_NextQuestion_noNextQuestion(t *testing.T) { m := newTestModelWithData(t) c := context.Background() + if err := m.NextQuestion(uuid.MustParse("b3d2f5b2-d5eb-4461-b352-622431a35b12"), time.Unix(1613388005, 0), c); err != nil { + t.Fatalf("Unexpected error when switching to next question (closing the current one): %v", err) + } + if err := m.NextQuestion(uuid.MustParse("b3d2f5b2-d5eb-4461-b352-622431a35b12"), time.Unix(1613388006, 0), c); err != nil { - t.Fatalf("Unexpected error when switching to next question: %v", err) + t.Fatalf("Unexpected error when switching to next question (from a break): %v", err) + } + + if err := m.NextQuestion(uuid.MustParse("b3d2f5b2-d5eb-4461-b352-622431a35b12"), time.Unix(1613388007, 0), c); err != nil { + t.Fatalf("Unexpected error when switching to next question (from a break): %v", err) } if err := m.NextQuestion(uuid.MustParse("b3d2f5b2-d5eb-4461-b352-622431a35b12"), time.Unix(1613388008, 0), c); err == nil { @@ -166,3 +174,29 @@ func TestModel_SaveAnswer_again(t *testing.T) { t.Fatalf("Saving answer again failed with unexpected error type: %v", err) } } + +func TestModel_SaveAnswer_late(t *testing.T) { + m := newTestModelWithData(t) + c := context.Background() + + if _, err := m.SaveAnswer(uuid.MustParse("321f3bb4-f789-49db-ad14-45299a4725a0"), uuid.MustParse("5155b997-eb2c-4cd0-a067-2bb01379730f"), time.Unix(1613388026, 1), c); err == nil { + t.Fatalf("Saving answer too late succeeded") + } else if !errors.Is(err, QuestionClosed) { + t.Fatalf("Saving answer too late failed with unexpected error type: %v", err) + } +} + +func TestModel_SaveAnswer_closed(t *testing.T) { + m := newTestModelWithData(t) + c := context.Background() + + if err := m.NextQuestion(uuid.MustParse("b3d2f5b2-d5eb-4461-b352-622431a35b12"), time.Unix(1613387997, 0), c); err != nil { + t.Fatalf("Unexpected error when switching to next question (closing the current one): %v", err) + } + + if _, err := m.SaveAnswer(uuid.MustParse("321f3bb4-f789-49db-ad14-45299a4725a0"), uuid.MustParse("5155b997-eb2c-4cd0-a067-2bb01379730f"), time.Unix(1613387998, 0), c); err == nil { + t.Fatalf("Saving answer to closed question succeeded") + } else if !errors.Is(err, QuestionClosed) { + t.Fatalf("Saving answer to closed question failed with unexpected error type: %v", err) + } +} diff --git a/pkg/rtcomm/stateUpdate.go b/pkg/rtcomm/stateUpdate.go index 1996402..5e5b64c 100644 --- a/pkg/rtcomm/stateUpdate.go +++ b/pkg/rtcomm/stateUpdate.go @@ -3,6 +3,7 @@ package rtcomm type StateUpdate struct { Players []Player `json:"players,omitempty"` Question *QuestionUpdate `json:"question,omitempty"` + Break *BreakUpdate `json:"break,omitempty"` Results bool `json:"results,omitempty"` } @@ -21,3 +22,7 @@ type Answer struct { ID string `json:"id"` Title string `json:"title"` } + +type BreakUpdate struct { + //TODO add interim results +} diff --git a/ui/html/game.page.tmpl.html b/ui/html/game.page.tmpl.html index 77b2113..e527265 100644 --- a/ui/html/game.page.tmpl.html +++ b/ui/html/game.page.tmpl.html @@ -127,6 +127,10 @@ } } + if ('break' in data) { + questionSection.innerHTML = ''; + } + if ('results' in data && data.results === true) { window.location.pathname = "/results/" + encodeURIComponent(playerId); }