Fix rebase conflicts

Author: grphil

invoker/handler.go

@@ -38,63 +38,3 @@ func (i *Invoker) HandleNewJob(c *gin.Context) {
 	i.Mutex.Unlock() // We unlock mutex without defer because getStatus uses mutex
 	connector.RespOK(c, i.getStatus())
 }
-
-func (i *Invoker) initJob(c *gin.Context, job *Job) bool {
-	var submission models.Submission
-	if err := i.TS.DB.WithContext(c).Find(&submission, job.SubmitID).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			connector.RespErr(c, http.StatusBadRequest, "Submission %d not found", job.SubmitID)
-		} else {
-			logger.Error("Error while finding submission in db, error: %s", err.Error())
-			connector.RespErr(c, http.StatusInternalServerError, "DB Error")
-			return false
-		}
-	}
-	job.Submission = &submission
-
-	var problem models.Problem
-	if err := i.TS.DB.WithContext(c).Find(&problem, job.Submission.ProblemID).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			connector.RespErr(c, http.StatusBadRequest, "Problem %d not found", job.Submission.ProblemID)
-		} else {
-			logger.Error("Error while finding problem in db, error: %s", err.Error())
-			connector.RespErr(c, http.StatusInternalServerError, "DB Error")
-			return false
-		}
-	}
-	job.Problem = &problem
-	return true
-}
-
-func (i *Invoker) newCompileJob(c *gin.Context, job *Job) {
-	i.Storage.Source.Lock(uint64(job.Submission.ID))
-	job.Defers = append(job.Defers, func() { i.Storage.Source.Unlock(uint64(job.Submission.ID)) })
-
-	i.JobQueue <- job
-}
-
-func (i *Invoker) newTestJob(c *gin.Context, job *Job) bool {
-	if job.Test <= 0 || job.Test > job.Problem.TestsNumber {
-		connector.RespErr(c,
-			http.StatusBadRequest,
-			"%d test required, tests in problem %d are numbered from 1 to %d",
-			job.Test, job.Problem.ID, job.Problem.TestsNumber)
-		return false
-	}
-
-	i.Storage.Binary.Lock(uint64(job.Submission.ID))
-	job.Defers = append(job.Defers, func() { i.Storage.Binary.Unlock(uint64(job.Submission.ID)) })
-
-	i.Storage.TestInput.Lock(uint64(job.Problem.ID), job.Test)
-	job.Defers = append(job.Defers, func() { i.Storage.TestInput.Unlock(uint64(job.Problem.ID), job.Test) })
-
-	i.Storage.TestAnswer.Lock(uint64(job.Problem.ID), job.Test)
-	job.Defers = append(job.Defers, func() { i.Storage.TestAnswer.Unlock(uint64(job.Problem.ID), job.Test) })
-
-	i.Storage.Checker.Lock(uint64(job.Problem.ID))
-	job.Defers = append(job.Defers, func() { i.Storage.Checker.Unlock(uint64(job.Problem.ID)) })
-
-	// TODO: interactor
-	i.JobQueue <- job
-	return true
-}