Merge pull request #22

Now testing system works!

Author: grphil

common/config/db.go

@@ -1,5 +1,8 @@
 package config
 
 type DBConfig struct {
-	Dsn string `yaml:"dsn"`
+	Dsn string `yaml:"Dsn"`
+
+	// InMemory should be used only for tests
+	InMemory bool `yaml:"InMemory"`
 }

common/connectors/connector_base.go

@@ -15,7 +15,7 @@ func NewConnectorBase(connection *config.Connection) *ConnectorBase {
 		Connection: connection,
 		client:     resty.New(),
 	}
-	// TODO: Add host initialization from connection
+	c.client.SetBaseURL(connection.Address)
 	// TODO: Add auth
 	// TODO: Add retry configuration
 	return c

common/connectors/invokerconn/jobtype_string.go

@@ -1,9 +1,13 @@
+//go:generate go run golang.org/x/tools/cmd/stringer@latest -type=JobType
+
 package invokerconn
 
+import "fmt"
+
 type JobType int
 
 const (
-	CompileJob JobType = iota
+	CompileJob JobType = iota + 1
 	TestJob
 )
 
@@ -16,6 +20,10 @@ type Job struct {
 	// TODO: Add job dependency
 }
 
+func (j Job) String() string {
+	return fmt.Sprintf("ID: %s Submit: %d Type %v Test: %d", j.ID, j.SubmitID, j.Type, j.Test)
+}
+
 type Status struct {
 	MaxNewJobs   uint64   `json:"MaxNewJobs"`
 	ActiveJobIDs []string `json:"ActiveJobIDs"`

common/connectors/invokerconn/structs.go

@@ -3,13 +3,15 @@ package storageconn
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/go-resty/resty/v2"
 	"io"
 	"mime"
 	"net/http"
 	"os"
 	"path/filepath"
 	"testing_system/common/config"
 	"testing_system/common/connectors"
+	"testing_system/lib/connector"
 )
 
 type Connector struct {
@@ -31,9 +33,12 @@ func (s *Connector) Download(request *Request) *FileResponse {
 		return response
 	}
 
-	path := "/storage/get"
 	r := s.connection.R()
 
+	if request.Ctx != nil {
+		r.SetContext(request.Ctx)
+	}
+
 	requestJSON, err := json.Marshal(request)
 	if err != nil {
 		response.Error = fmt.Errorf("failed to form request to storage: %v", err)
@@ -43,8 +48,9 @@ func (s *Connector) Download(request *Request) *FileResponse {
 	r.SetQueryParams(map[string]string{
 		"request": string(requestJSON),
 	})
+	r.SetDoNotParseResponse(true)
 
-	resp, err := r.SetDoNotParseResponse(true).Execute("GET", path)
+	resp, err := r.Get("/storage/get")
 	if err != nil {
 		response.Error = fmt.Errorf("failed to send request: %v", err)
 		return response
@@ -55,7 +61,15 @@ func (s *Connector) Download(request *Request) *FileResponse {
 		if resp.StatusCode() == http.StatusNotFound {
 			response.Error = ErrStorageFileNotFound
 		} else {
-			response.Error = fmt.Errorf("get request failed with status: %v", resp.Status())
+			body, err := io.ReadAll(resp.RawBody())
+			if err != nil {
+				response.Error = &connector.Error{
+					Code:    resp.StatusCode(),
+					Message: err.Error(),
+					Path:    resp.Request.URL,
+				}
+			}
+			response.Error = connector.ParseRespError(body, resp)
 		}
 		return response
 	}
@@ -107,8 +121,10 @@ func (s *Connector) Upload(request *Request) *Response {
 		return response
 	}
 
-	path := "/storage/upload"
 	r := s.connection.R()
+	if request.Ctx != nil {
+		r.SetContext(request.Ctx)
+	}
 
 	requestJSON, err := json.Marshal(request)
 	if err != nil {
@@ -120,28 +136,24 @@ func (s *Connector) Upload(request *Request) *Response {
 		"request": string(requestJSON),
 	})
 
-	// request.StorageFilename can be empty
-	r.SetFileReader("file", request.StorageFilename, request.File)
-
-	resp, err := r.Post(path)
-	if err != nil {
-		response.Error = fmt.Errorf("failed to send request: %v", err)
-		return response
-	}
-
-	if resp.IsError() {
-		response.Error = fmt.Errorf("upload failed with status: %v", resp.Status())
-		return response
+	requestFileName := request.StorageFilename
+	// request.StorageFilename can be empty but http requires filename to be specified
+	if requestFileName == "" {
+		requestFileName = "noname"
 	}
+	r.SetFileReader("file", requestFileName, request.File)
 
+	response.Error = connector.ReceiveEmpty(r, "/storage/upload", resty.MethodPost)
 	return response
 }
 
 func (s *Connector) Delete(request *Request) *Response {
 	response := &Response{R: *request}
 
-	path := "/storage/remove"
 	r := s.connection.R()
+	if request.Ctx != nil {
+		r.SetContext(request.Ctx)
+	}
 
 	requestJSON, err := json.Marshal(request)
 	if err != nil {
@@ -153,16 +165,7 @@ func (s *Connector) Delete(request *Request) *Response {
 		"request": string(requestJSON),
 	})
 
-	resp, err := r.Delete(path)
-	if err != nil {
-		response.Error = fmt.Errorf("failed to send request: %v", err)
-		return response
-	}
-
-	if resp.IsError() {
-		response.Error = fmt.Errorf("delete failed with status: %v", resp.Status())
-		return response
-	}
+	response.Error = connector.ReceiveEmpty(r, "/storage/remove", resty.MethodDelete)
 
 	return response
 }

common/connectors/storageconn/connector.go

@@ -1,6 +1,7 @@
 package storageconn
 
 import (
+	"context"
 	"io"
 	"os"
 	"path/filepath"
@@ -13,7 +14,7 @@ type Request struct {
 	Resource resource.Type `json:"resource"`
 
 	/*
-		Resource must always has exactly one of ProblemId and SubmitID
+		Resource must always have exactly one of ProblemId and SubmitID
 		Including, only TestID cannot be specified
 		ID=0 is considered absent
 	*/
@@ -36,6 +37,9 @@ type Request struct {
 
 	// If StorageFilename is not specified, Storage tries to get the filename automatically
 	StorageFilename string `json:"storageFilename"`
+
+	// Context may be specified for requests
+	Ctx context.Context `json:"-"`
 }
 
 type Response struct {

common/connectors/storageconn/structs.go

@@ -22,7 +22,5 @@ const (
 	CF Verdict = "CF" // Check failed
 	SK Verdict = "SK" // Skipped
 
-	QD Verdict = "QD" // Queued
-	CL Verdict = "CL" // Compiling
 	RU Verdict = "RU" // Running
 )

common/constants/verdict/verdict.go

@@ -2,17 +2,25 @@ package db
 
 import (
 	"gorm.io/driver/postgres"
+	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
 	"testing_system/common/config"
 	"testing_system/common/db/models"
 	"testing_system/lib/logger"
 )
 
 func NewDB(config config.DBConfig) (*gorm.DB, error) {
-	db, err := gorm.Open(postgres.Open(config.Dsn), &gorm.Config{})
+	var db *gorm.DB
+	var err error
+	if config.InMemory {
+		db, err = newInMemoryDB()
+	} else {
+		db, err = newPostgresDB(config)
+	}
 	if err != nil {
-		return nil, logger.Error("Can't open database with dsn=\"%v\" because of %v:", config.Dsn, err)
+		return nil, err
 	}
+
 	if err = db.AutoMigrate(&models.Problem{}); err != nil {
 		return nil, logger.Error("Can't migrate Problem: %v", err)
 	}
@@ -21,3 +29,20 @@ func NewDB(config config.DBConfig) (*gorm.DB, error) {
 	}
 	return db, err
 }
+
+func newPostgresDB(config config.DBConfig) (*gorm.DB, error) {
+	db, err := gorm.Open(postgres.Open(config.Dsn), &gorm.Config{})
+	if err != nil {
+		return nil, logger.Error("Can't open database with dsn=\"%v\" because of %v:", config.Dsn, err)
+	}
+	return db, nil
+}
+
+func newInMemoryDB() (*gorm.DB, error) {
+	db, err := gorm.Open(sqlite.Open("file:ts?mode=memory&cache=shared"), &gorm.Config{})
+	if err != nil {
+		return nil, err
+	}
+	logger.Warn("InMemory DB should not be used in production, consider using postgres db instead")
+	return db, nil
+}

common/db/db.go

@@ -37,7 +37,7 @@ func TestTestResultSerialization(t *testing.T) {
 	t.Run("json", func(t *testing.T) {
 		b, err := json.Marshal(testResult)
 		require.Nil(t, err)
-		require.Equal(t, `{"testNumber":1,"verdict":"OK","time":"5s","memory":"5m"}`, string(b))
+		require.Equal(t, `{"TestNumber":1,"Verdict":"OK","Time":"5s","Memory":"5m"}`, string(b))
 
 		var newTestResult TestResult
 		err = json.Unmarshal(b, &newTestResult)
@@ -48,10 +48,10 @@ func TestTestResultSerialization(t *testing.T) {
 	t.Run("yaml", func(t *testing.T) {
 		b, err := yaml.Marshal(testResult)
 		require.Nil(t, err)
-		require.Equal(t, `testNumber: 1
-verdict: OK
-time: 5s
-memory: 5m
+		require.Equal(t, `TestNumber: 1
+Verdict: OK
+Time: 5s
+Memory: 5m
 `, string(b))
 		var newTestResult TestResult
 		err = yaml.Unmarshal(b, &newTestResult)

common/db/models/models_test.go

@@ -15,27 +15,27 @@ const (
 type Problem struct {
 	gorm.Model
 
-	ProblemType ProblemType
+	ProblemType ProblemType `yaml:"ProblemType"`
 
-	TimeLimit   customfields.Time
-	MemoryLimit customfields.Memory
+	TimeLimit   customfields.Time   `yaml:"TimeLimit"`
+	MemoryLimit customfields.Memory `yaml:"MemoryLimit"`
 
-	TestsNumber uint64
+	TestsNumber uint64 `yaml:"TestsNumber"`
 
 	// WallTimeLimit specifies maximum execution and wait time.
 	// By default, it is max(5s, TimeLimit * 2)
-	WallTimeLimit *customfields.Time
+	WallTimeLimit *customfields.Time `yaml:"WallTimeLimit,omitempty"`
 
 	// MaxOpenFiles specifies maximum number of files, opened by testing system.
 	// By default, it is 64
-	MaxOpenFiles *uint64
+	MaxOpenFiles *uint64 `yaml:"MaxOpenFiles,omitempty"`
 
 	// MaxThreads specifies maximum number of threads and/or processes
 	// By default, it is single thread
 	// If MaxThreads equals to -1, any number of threads allowed
-	MaxThreads *int64
+	MaxThreads *int64 `yaml:"MaxThreads,omitempty"`
 
 	// MaxOutputSize specifies maximum output in EACH file.
 	// By default, it is 1g
-	MaxOutputSize *customfields.Memory
+	MaxOutputSize *customfields.Memory `yaml:"MaxOutputSize,omitempty"`
 }