chore: Add submission deadline

Author: jus1d

internal/app/handler/contest.go

@@ -134,6 +134,9 @@ func (h *Handler) GetContestByID(c echo.Context) error {
 
 	cdetailed.IsParticipant = true
 
+	_, deadline := AllowSubmitAt(contest, entry)
+	cdetailed.SubmissionDeadline = &deadline
+
 	statuses, err := h.repo.Submission.GetProblemStatuses(ctx, entry.ID)
 	if err != nil {
 		return fmt.Errorf("%s: can't get submissions: %v", op, err)

internal/app/handler/dto/response/response.go

@@ -43,19 +43,20 @@ type User struct {
 }
 
 type ContestDetailed struct {
-	ID            int32                    `json:"id"`
-	Creator       User                     `json:"creator"`
-	Title         string                   `json:"title"`
-	Description   string                   `json:"description"`
-	StartTime     time.Time                `json:"start_time"`
-	EndTime       time.Time                `json:"end_time"`
-	DurationMins  int32                    `json:"duration_mins"`
-	MaxEntries    int32                    `json:"max_entries,omitempty"`
-	Participants  int32                    `json:"participants"`
-	AllowLateJoin bool                     `json:"allow_late_join"`
-	IsParticipant bool                     `json:"is_participant,omitempty"`
-	Problems      []ContestProblemListItem `json:"problems"`
-	CreatedAt     time.Time                `json:"created_at"`
+	ID                 int32                    `json:"id"`
+	Creator            User                     `json:"creator"`
+	Title              string                   `json:"title"`
+	Description        string                   `json:"description"`
+	StartTime          time.Time                `json:"start_time"`
+	EndTime            time.Time                `json:"end_time"`
+	DurationMins       int32                    `json:"duration_mins"`
+	MaxEntries         int32                    `json:"max_entries,omitempty"`
+	Participants       int32                    `json:"participants"`
+	AllowLateJoin      bool                     `json:"allow_late_join"`
+	IsParticipant      bool                     `json:"is_participant,omitempty"`
+	SubmissionDeadline *time.Time               `json:"submission_deadline,omitempty"`
+	Problems           []ContestProblemListItem `json:"problems"`
+	CreatedAt          time.Time                `json:"created_at"`
 }
 
 type ContestListItem struct {
@@ -97,17 +98,18 @@ type Test struct {
 }
 
 type ContestProblemDetailed struct {
-	ID          int32     `json:"id"`
-	Charcode    string    `json:"charcode"`
-	ContestID   int32     `json:"contest_id"`
-	Writer      User      `json:"writer"`
-	Title       string    `json:"title"`
-	Statement   string    `json:"statement"`
-	Examples    []TC      `json:"examples,omitempty"`
-	Difficulty  string    `json:"difficulty"`
-	Status      string    `json:"status,omitempty"`
-	TimeLimitMS int32     `json:"time_limit_ms"`
-	CreatedAt   time.Time `json:"created_at"`
+	ID                 int32      `json:"id"`
+	Charcode           string     `json:"charcode"`
+	ContestID          int32      `json:"contest_id"`
+	Writer             User       `json:"writer"`
+	Title              string     `json:"title"`
+	Statement          string     `json:"statement"`
+	Examples           []TC       `json:"examples,omitempty"`
+	Difficulty         string     `json:"difficulty"`
+	Status             string     `json:"status,omitempty"`
+	TimeLimitMS        int32      `json:"time_limit_ms"`
+	SubmissionDeadline *time.Time `json:"submission_deadline,omitempty"`
+	CreatedAt          time.Time  `json:"created_at"`
 }
 
 type ContestProblemListItem struct {

internal/app/handler/problem.go

@@ -167,17 +167,25 @@ func (h *Handler) GetContestProblem(c echo.Context) error {
 		return err
 	}
 
+	contest, err := h.repo.Contest.GetByID(ctx, int32(contestID))
+	if err != nil {
+		return err
+	}
+
+	_, deadline := AllowSubmitAt(contest, entry)
+
 	pdetailed := response.ContestProblemDetailed{
-		ID:          p.ID,
-		Charcode:    p.Charcode,
-		ContestID:   int32(contestID),
-		Title:       p.Title,
-		Statement:   p.Statement,
-		Examples:    examples,
-		Difficulty:  p.Difficulty,
-		Status:      status,
-		CreatedAt:   p.CreatedAt,
-		TimeLimitMS: p.TimeLimitMS,
+		ID:                 p.ID,
+		Charcode:           p.Charcode,
+		ContestID:          int32(contestID),
+		Title:              p.Title,
+		Statement:          p.Statement,
+		Examples:           examples,
+		Difficulty:         p.Difficulty,
+		Status:             status,
+		CreatedAt:          p.CreatedAt,
+		TimeLimitMS:        p.TimeLimitMS,
+		SubmissionDeadline: &deadline,
 		Writer: response.User{
 			ID:       p.WriterID,
 			Username: p.WriterUsername,

internal/app/handler/submission.go

@@ -12,6 +12,7 @@ import (
 	"github.com/voidcontests/api/internal/app/handler/dto/request"
 	"github.com/voidcontests/api/internal/app/handler/dto/response"
 	"github.com/voidcontests/api/internal/lib/logger/sl"
+	"github.com/voidcontests/api/internal/storage/models"
 	"github.com/voidcontests/api/internal/storage/models/status"
 	"github.com/voidcontests/api/pkg/requestid"
 	"github.com/voidcontests/api/pkg/validate"
@@ -49,15 +50,6 @@ func (h *Handler) CreateSubmission(c echo.Context) error {
 		return err
 	}
 
-	if contest.StartTime.After(time.Now()) {
-		return Error(http.StatusForbidden, "contest is not started yet")
-	}
-
-	// TODO: maybe allow to submit solutions after end time if `contest.keep_as_training` is enabled
-	if contest.EndTime.Before(time.Now()) {
-		return Error(http.StatusForbidden, "contest alreay ended")
-	}
-
 	entry, err := h.repo.Entry.Get(ctx, int32(contestID), claims.UserID)
 	if errors.Is(err, pgx.ErrNoRows) {
 		log.Debug("trying to create submission without entry")
@@ -68,6 +60,12 @@ func (h *Handler) CreateSubmission(c echo.Context) error {
 		return err
 	}
 
+	now := time.Now()
+	earliest, deadline := AllowSubmitAt(contest, entry)
+	if earliest.After(now) || deadline.Before(now) {
+		return Error(http.StatusForbidden, "submission window is currently closed")
+	}
+
 	problem, err := h.repo.Problem.Get(ctx, int32(contestID), charcode)
 	if errors.Is(err, pgx.ErrNoRows) {
 		return Error(http.StatusNotFound, "problem not found")
@@ -254,3 +252,15 @@ func (h *Handler) GetSubmissions(c echo.Context) error {
 		Items: items,
 	})
 }
+
+func AllowSubmitAt(contest models.Contest, entry models.Entry) (earliest time.Time, deadline time.Time) {
+	if contest.DurationMins == 0 {
+		return contest.StartTime, contest.EndTime
+	}
+
+	deadline = entry.CreatedAt.Add(time.Duration(contest.DurationMins) * time.Minute)
+	if deadline.Before(contest.EndTime) {
+		return entry.CreatedAt, deadline
+	}
+	return entry.CreatedAt, contest.EndTime
+}