fixes

Author: misha567889

common/db/models/problem.go

@@ -49,10 +49,10 @@ type TestGroup struct {
 	// TestScore meaningful only in case of TestGroupScoringTypeEachTest
 	TestScore *float64 `json:"test_score" yaml:"test_score"`
 	// Score meaningful only in case of TestGroupScoringTypeComplete
-	Score          *float64              `json:"score" yaml:"score"`
-	ScoringType    TestGroupScoringType  `json:"scoring_type" yaml:"scoring_type"`
-	FeedbackType   TestGroupFeedbackType `json:"feedback_type" yaml:"feedback_type"`
-	RequiredGroups []string              `json:"required_groups" yaml:"required_groups"`
+	Score              *float64              `json:"score" yaml:"score"`
+	ScoringType        TestGroupScoringType  `json:"scoring_type" yaml:"scoring_type"`
+	FeedbackType       TestGroupFeedbackType `json:"feedback_type" yaml:"feedback_type"`
+	RequiredGroupNames []string              `json:"required_groups" yaml:"required_groups"`
 }
 
 func (t TestGroup) Value() (driver.Value, error) {
@@ -81,14 +81,14 @@ type Problem struct {
 	gorm.Model
 
 	ProblemType ProblemType
-	// TestGroups ignored for ICPC problems
-	TestGroups []TestGroup
 
 	TimeLimit     customfields.Time
 	MemoryLimit   customfields.Memory
 	WallTimeLimit *customfields.Time
 
 	TestsNumber uint64
+	// TestGroups ignored for ICPC problems
+	TestGroups []TestGroup
 
 	MaxOpenFiles  *uint64
 	MaxThreads    *uint64

common/db/models/submission.go

@@ -11,11 +11,12 @@ import (
 )
 
 type TestResult struct {
-	TestNumber uint64              `json:"testNumber" yaml:"testNumber"`
-	Points     *float64            `json:"points,omitempty" yaml:"points,omitempty"`
-	Verdict    verdict.Verdict     `json:"verdict" yaml:"verdict"`
-	Time       customfields.Time   `json:"time" yaml:"time"`
-	Memory     customfields.Memory `json:"memory" yaml:"memory"`
+	TestNumber uint64              `json:"TestNumber" yaml:"TestNumber"`
+	Points     *float64            `json:"Points,omitempty" yaml:"Points,omitempty"`
+	Verdict    verdict.Verdict     `json:"Verdict" yaml:"Verdict"`
+	Time       customfields.Time   `json:"Time" yaml:"Time"`
+	Memory     customfields.Memory `json:"Memory" yaml:"Memory"`
+	Error      string              `json:"Error,omitempty" yaml:"Error,omitempty"`
 }
 
 type TestResults []TestResult
@@ -42,12 +43,44 @@ func (t TestResults) GormDBDataType(db *gorm.DB, field *schema.Field) string {
 	return ""
 }
 
+type GroupResult struct {
+	GroupName string  `json:"GroupName" yaml:"GroupName"`
+	Points    float64 `json:"Points" yaml:"Points"`
+	Passed    bool    `json:"Passed" yaml:"Passed"`
+	// TODO maybe more fields
+}
+
+type GroupResults []GroupResult
+
+func (t GroupResults) Value() (driver.Value, error) {
+	return json.Marshal(t)
+}
+
+func (t *GroupResults) Scan(value interface{}) error {
+	bytes, ok := value.([]byte)
+	if !ok {
+		return errors.New("type assertion to []byte failed")
+	}
+	return json.Unmarshal(bytes, t)
+}
+
+func (t GroupResults) GormDBDataType(db *gorm.DB, field *schema.Field) string {
+	switch db.Dialector.Name() {
+	case "mysql", "sqlite":
+		return "JSON"
+	case "postgres":
+		return "JSONB"
+	}
+	return ""
+}
+
 type Submission struct {
 	gorm.Model
 	ProblemID uint64
 	Language  string
 
-	Score       float64
-	Verdict     verdict.Verdict
-	TestResults TestResults
+	Score        float64
+	Verdict      verdict.Verdict
+	TestResults  TestResults
+	GroupResults GroupResults
 }

master/queue/jobgenerators/common.go

@@ -0,0 +1,10 @@
+package jobgenerators
+
+// used in IOI and ICPC generators
+type generatorState int
+
+const (
+	compilationNotStarted generatorState = iota
+	compilationStarted
+	compilationFinished
+)