kyc/quiz: align expiresAt with session deadline (#93)

ice-blockchain · Jan 14, 2024 · efc7d3b · efc7d3b
1 parent d388069
commit efc7d3b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/kyc/quiz/contract.go b/kyc/quiz/contract.go
@@ -7,7 +7,6 @@ import (
 	_ "embed"
 	"io"
 	"mime/multipart"
-	stdlibtime "time"
 
 	"github.com/ice-blockchain/eskimo/users"
 	"github.com/ice-blockchain/wintr/connectors/storage/v2"
@@ -89,11 +88,12 @@ type (
 		Msg string
 	}
 	userProgress struct {
-		StartedAt      stdlibtime.Time `db:"started_at"`
-		Lang           string          `db:"language"`
-		Questions      []uint8         `db:"questions"`
-		Answers        []uint8         `db:"answers"`
-		CorrectAnswers []uint8         `db:"correct_answers"`
+		StartedAt      *time.Time `db:"started_at"`
+		Deadline       *time.Time `db:"deadline"`
+		Lang           string     `db:"language"`
+		Questions      []uint8    `db:"questions"`
+		Answers        []uint8    `db:"answers"`
+		CorrectAnswers []uint8    `db:"correct_answers"`
 	}
 	repositoryImpl struct {
 		DB       *storage.DB

diff --git a/kyc/quiz/quiz.go b/kyc/quiz/quiz.go
@@ -363,9 +363,13 @@ func (r *repositoryImpl) CheckUserRunningSession( //nolint:funlen //.
 		Finished             bool `db:"finished"`
 		FinishedSuccessfully bool `db:"ended_successfully"`
 	}
+
+	// $1: user_id.
+	// $2: max session duration (seconds).
 	const stmt = `
 select
 	started_at,
+	started_at + make_interval(secs => $2) as deadline,
 	ended_at is not null as finished,
 	questions,
 	session.language,
@@ -389,7 +393,7 @@ group by
 	ended_successfully
 `
 
-	data, err := storage.Get[userSession](ctx, tx, stmt, userID)
+	data, err := storage.Get[userSession](ctx, tx, stmt, userID, r.config.MaxSessionDurationSeconds)
 	if err != nil {
 		if errors.Is(err, storage.ErrNotFound) {
 			return userProgress{}, ErrUnknownSession
@@ -587,7 +591,7 @@ func (r *repositoryImpl) ContinueQuizSession( //nolint:funlen,revive //.
 				return wrapErrorInTx(nErr)
 			}
 			nextQuestion.Number = question + 1
-			quiz.Progress.ExpiresAt = time.New(now.Add(stdlibtime.Duration(r.config.MaxSessionDurationSeconds) * stdlibtime.Second))
+			quiz.Progress.ExpiresAt = progress.Deadline
 			quiz.Progress.NextQuestion = nextQuestion
 
 			return nil

diff --git a/kyc/quiz/quiz_test.go b/kyc/quiz/quiz_test.go
@@ -312,6 +312,7 @@ func testManagerSessionContinueWithCorrectAnswers(ctx context.Context, t *testin
 	session, err := r.StartQuizSession(ctx, "bogus", "en")
 	require.NoError(t, err)
 	require.NotNil(t, session)
+	t.Logf("next q: %v, deadline %v", session.Progress.NextQuestion.Text, session.Progress.ExpiresAt)
 	require.NotNil(t, session.Progress)
 	require.NotNil(t, session.Progress.ExpiresAt)
 	require.NotEmpty(t, session.Progress.NextQuestion)
@@ -323,6 +324,7 @@ func testManagerSessionContinueWithCorrectAnswers(ctx context.Context, t *testin
 	session, err = r.ContinueQuizSession(ctx, "bogus", session.Progress.NextQuestion.Number, ans)
 	require.NoError(t, err)
 	require.NotNil(t, session)
+	t.Logf("next q: %v, deadline %v", session.Progress.NextQuestion.Text, session.Progress.ExpiresAt)
 	require.Empty(t, session.Result)
 	require.NotNil(t, session.Progress)
 	require.NotNil(t, session.Progress.ExpiresAt)
@@ -336,6 +338,7 @@ func testManagerSessionContinueWithCorrectAnswers(ctx context.Context, t *testin
 	session, err = r.ContinueQuizSession(ctx, "bogus", session.Progress.NextQuestion.Number, ans)
 	require.NoError(t, err)
 	require.NotNil(t, session)
+	t.Logf("next q: %v, deadline %v", session.Progress.NextQuestion.Text, session.Progress.ExpiresAt)
 	require.Empty(t, session.Result)
 	require.NotNil(t, session.Progress)
 	require.NotNil(t, session.Progress.ExpiresAt)