Fix models, migration, resources and routes for cause

EduOJ · Aug 31, 2021 · d084bfd · d084bfd
1 parent b6ecae5
commit d084bfd
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 19 deletions.
diff --git a/app/response/resource/cause.go b/app/response/resource/cause.go
@@ -1,6 +1,8 @@
 package resource
 
-import "github.com/EduOJ/backend/database/models"
+import (
+	"github.com/EduOJ/backend/database/models"
+)
 
 type CauseForAdmin struct {
 	ID         uint `son:"id"`
@@ -9,11 +11,12 @@ type CauseForAdmin struct {
 
 	Hash        string `json:"output_stripped_hash"`
 	Description string `json:"description"`
+	Marked      bool   `json:"marked"`
 
 	// Point: Points to be subtracted for this cause
-	Point  uint `json:"point"`
-	Marked bool `json:"marked"`
-	Count  uint `json:"count"`
+	Point     uint   `json:"point"`
+	Count     uint   `json:"count"`
+	OutputURL string `json:"output_url"`
 }
 
 type Cause struct {
@@ -37,6 +40,7 @@ func (c *CauseForAdmin) convert(cause *models.Cause) {
 	c.Point = cause.Point
 	c.Marked = cause.Marked
 	c.Count = cause.Count
+	c.OutputURL = cause.OutputURL
 }
 
 func (c *Cause) convert(cause *models.Cause) {

diff --git a/app/routes.go b/app/routes.go
@@ -135,18 +135,24 @@ func Register(e *echo.Echo) {
 	updateProblem.PUT("/admin/problem/:id/test_case/:test_case_id", controller.UpdateTestCase).Name = "problem.updateTestCase"
 	updateProblem.DELETE("/admin/problem/:id/test_case/all", controller.DeleteTestCases).Name = "problem.deleteTestCases"
 	updateProblem.DELETE("/admin/problem/:id/test_case/:test_case_id", controller.DeleteTestCase).Name = "problem.deleteTestCase"
+
 	// cause APIs
-	api.GET("/problem/:id/test_case/:test_case_id/cause/:cause_id", controller.Todo,
+	cause := api.Group("",
 		middleware.ValidateParams(map[string]string{
-			"id":           "NOT_FOUND",
-			"test_case_id": "TEST_CASE_NOT_FOUND",
-			"cause_id":     "CAUSE_NOT_FOUND",
+			"problem_id": "NOT_FOUND",
+			"id":         "NOT_FOUND",
 		}),
 		middleware.Logged,
-	).Name = "problem.getCause"
-	readProblemSecret.GET("/problem/:id/test_case/:test_case_id/causes", controller.Todo).Name = "problem.getCauses"
-	updateProblem.PUT("/problem/:id/test_case/:test_case_id/cause/:cause_id", controller.Todo).Name = "problem.updateCause"
-	updateProblem.DELETE("/problem/:id/test_case/:test_case_id/cause/:cause_id", controller.Todo).Name = "problem.deleteCause"
+		middleware.HasPermission(middleware.OrPermission{
+			A: middleware.UnscopedPermission{P: "mark_causes"},
+			B: middleware.ScopedPermission{P: "mark_causes", T: "problem", IdFieldName: "problem_id"},
+		}),
+	)
+	cause.GET("/problem/:problem_id/cause/:id", controller.Todo).Name = "problem.getCause"
+	cause.GET("/problem/:problem_id/causes", controller.Todo).Name = "problem.getCauses"
+	cause.GET("/causes", controller.Todo).Name = "problem.getAllCauses"
+	cause.PUT("/problem/:problem_id/cause/:id", controller.Todo).Name = "problem.updateCause"
+	cause.DELETE("/problem/:problem_id/cause/:id", controller.Todo).Name = "problem.deleteCause"
 
 	// submission APIs
 	submission := api.Group("",

diff --git a/database/migrate.go b/database/migrate.go
@@ -1206,13 +1206,14 @@ func GetMigration() *gormigrate.Gormigrate {
 					TestCaseID uint      `sql:"index" json:"test_case_id"`
 					TestCase   *TestCase `json:"test_case"`
 
-					Hash        string `json:"hash" gorm:"index;not null;size:255;default:''"`
+					Hash        string `json:"output_stripped_hash" gorm:"index;not null;size:255;default:''"`
 					Description string `json:"description"`
+					Marked      bool   `json:"marked" gorm:"default:false;not null"`
 
 					// Point: Points to be subtracted for this cause
-					Point  uint `json:"point" gorm:"default:0;not null"`
-					Marked bool `json:"marked" gorm:"default:false;not null"`
-					Count  uint `json:"count" gorm:"default:0;not null"`
+					Point     uint   `json:"point" gorm:"default:0;not null"`
+					Count     uint   `json:"count" gorm:"default:0;not null"`
+					OutputURL string `json:"output_url" gorm:"-"`
 
 					CreatedAt time.Time      `json:"created_at"`
 					UpdatedAt time.Time      `json:"-"`

diff --git a/database/models/cause.go b/database/models/cause.go
@@ -14,11 +14,12 @@ type Cause struct {
 
 	Hash        string `json:"output_stripped_hash" gorm:"index;not null;size:255;default:''"`
 	Description string `json:"description"`
+	Marked      bool   `json:"marked" gorm:"default:false;not null"`
 
 	// Point: Points to be subtracted for this cause
-	Point  uint `json:"point" gorm:"default:0;not null"`
-	Marked bool `json:"marked" gorm:"default:false;not null"`
-	Count  uint `json:"count" gorm:"default:0;not null"`
+	Point     uint   `json:"point" gorm:"default:0;not null"`
+	Count     uint   `json:"count" gorm:"default:0;not null"`
+	OutputURL string `json:"output_url" gorm:"-"`
 
 	CreatedAt time.Time      `json:"created_at"`
 	UpdatedAt time.Time      `json:"-"`