Pass judger in docker-compose

.gitignore

@@ -24,4 +24,6 @@ dist.zip
 
 # Ignore generated files
 *.pb.go
-**/swaggo-gen/docs.go
+**/swaggo-gen/docs.go
+
+environment/rclone-minio.conf

.vscode/settings.json

@@ -8,5 +8,9 @@
     "postman": "api",
     ".github/workflows": "github",
     "test-collection": "resource"
-  }
+  },
+  "go.testFlags": [
+    "-v",
+    "-count=1"
+  ],
 }

environment/docker-compose.yml

@@ -30,14 +30,15 @@ services:
     ports:
       - "6379:6379"
 
-  judger-1:
+  judger:
     image: ghcr.io/oj-lab/judger/judger-server:main
+    pull_policy: always
     restart: always
     ports:
       - "8000:8000"
-
-  judger-2:
-    image: ghcr.io/oj-lab/judger/judger-server:main
-    restart: always
-    ports:
-      - "8001:8000"
+    environment:
+      - BASE_URL=http://host.docker.internal:8080/api/v1/judge
+      - INTERVAL=10
+      - RUST_LOG=DEBUG
+    volumes:
+      - ../environment/rclone-minio.conf:/workspace/data/rclone-minio.conf

environment/rclone-minio.example.conf

@@ -0,0 +1,9 @@
+[minio]
+type = s3
+provider = Minio
+env_auth = false
+access_key_id = your_access_key_id
+secret_access_key = your_access_key_id
+endpoint = http://host.docker.internal:9000
+location_constraint =
+acl = private

src/application/migrate_db/main.go

@@ -20,7 +20,7 @@ func main() {
 		Title:       "Hello World!",
 		Description: &description,
 		Tags: []*model.AlgorithmTag{
-			{Slug: "primer", Name: "Primer"},
+			{Name: "Primer"},
 		},
 	})
 
@@ -30,8 +30,8 @@ func main() {
 		Title:       "A + B",
 		Description: &description,
 		Tags: []*model.AlgorithmTag{
-			{Slug: "primer", Name: "Primer"},
-			{Slug: "math", Name: "Math"},
+			{Name: "Primer"},
+			{Name: "Math"},
 		},
 	})
 

src/service/mapper/problem.go

@@ -39,15 +39,15 @@ type GetProblemOptions struct {
 func buildGetProblemTXByOptions(tx *gorm.DB, options GetProblemOptions, isCount bool) *gorm.DB {
 	tagsList := []string{}
 	for _, tag := range options.Tags {
-		tagsList = append(tagsList, tag.Slug)
+		tagsList = append(tagsList, tag.Name)
 	}
 	tx = tx.Model(&model.Problem{})
 	if len(options.Selection) > 0 {
 		tx = tx.Select(options.Selection)
 	}
 	if len(tagsList) > 0 {
 		tx = tx.Joins("JOIN problem_algorithm_tags ON problem_algorithm_tags.problem_slug = problems.slug").
-			Where("problem_algorithm_tags.algorithm_tag_slug in ?", tagsList)
+			Where("problem_algorithm_tags.algorithm_tag_name in ?", tagsList)
 	}
 	if options.Slug != nil {
 		tx = tx.Where("slug = ?", *options.Slug)
@@ -98,7 +98,7 @@ func GetProblemListByOptions(tx *gorm.DB, options GetProblemOptions) ([]model.Pr
 func GetTagsList(problem model.Problem) []string {
 	tagsList := []string{}
 	for _, tag := range problem.Tags {
-		tagsList = append(tagsList, tag.Slug)
+		tagsList = append(tagsList, tag.Name)
 	}
 	return tagsList
 }

src/service/model/problem.go

@@ -10,8 +10,7 @@ type Problem struct {
 
 type AlgorithmTag struct {
 	MetaFields
-	Slug     string     `gorm:"primaryKey" json:"slug"`
-	Name     string     `gorm:"not null" json:"name"`
+	Name     string     `gorm:"primaryKey" json:"name"`
 	Problems []*Problem `gorm:"many2many:problem_algorithm_tags;" json:"problems,omitempty"`
 }
 

tests/core/minio_test.go

@@ -33,7 +33,7 @@ func TestMinio(T *testing.T) {
 	}
 
 	// Upload package files
-	packagePath := "tests/data/packages/icpc/hello_world"
+	packagePath := "../data/packages/icpc/hello-world"
 	filepath.Walk(packagePath, func(path string, info fs.FileInfo, err error) error {
 		if info == nil {
 			return fmt.Errorf("file info is nil")

tests/mapper/problem_test.go

@@ -17,7 +17,7 @@ func TestProblemMapper(t *testing.T) {
 		Slug:        "a-plus-b-problem",
 		Title:       "A+B Problem",
 		Description: &description,
-		Tags:        []*model.AlgorithmTag{{Slug: "tag1"}, {Slug: "tag2"}},
+		Tags:        []*model.AlgorithmTag{{Name: "tag1"}, {Name: "tag2"}},
 	}
 
 	err := mapper.CreateProblem(db, problem)
@@ -38,7 +38,7 @@ func TestProblemMapper(t *testing.T) {
 
 	problemOption := mapper.GetProblemOptions{
 		Selection: model.ProblemInfoSelection,
-		Tags:      []*model.AlgorithmTag{{Slug: "tag1"}},
+		Tags:      []*model.AlgorithmTag{{Name: "tag1"}},
 		Slug:      &problem.Slug,
 	}