Perf code structure

packages/agent/judger/judge.go

@@ -0,0 +1,54 @@
+package judger
+
+import (
+	"bytes"
+	"encoding/json"
+	"net/http"
+	"net/url"
+
+	"github.com/OJ-lab/oj-lab-services/packages/application"
+)
+
+const JUDGER_HOST_PROP = "judger.host"
+const JUDGER_JUDGE_PATH = "/api/v1/judge"
+
+var judgerHost string
+
+func init() {
+	judgerHost = application.AppConfig.GetString(JUDGER_HOST_PROP)
+}
+
+type JudgeRequest struct {
+	Src         string `json:"src"`
+	SrcLanguage string `json:"src_language"`
+}
+
+func PostJudgeSync(packageSlug string, judgeRequest JudgeRequest) ([]map[string]interface{}, error) {
+	url, err := url.JoinPath(judgerHost, JUDGER_JUDGE_PATH, packageSlug)
+	if err != nil {
+		return nil, err
+	}
+	payloadBytes, err := json.Marshal(judgeRequest)
+	if err != nil {
+		return nil, err
+	}
+	client := &http.Client{}
+	innerRequest, err := http.NewRequest("POST", url, bytes.NewReader(payloadBytes))
+	if err != nil {
+		return nil, err
+	}
+	innerRequest.Header.Set("Content-Type", "application/json")
+	innerRequest.Header.Set("Accept", "application/json")
+	innerResponse, err := client.Do(innerRequest)
+	if err != nil {
+		return nil, err
+	}
+	defer innerResponse.Body.Close()
+
+	innerBody := []map[string]interface{}{}
+	if err := json.NewDecoder(innerResponse.Body).Decode(&innerBody); err != nil {
+		return nil, err
+	}
+
+	return innerBody, nil
+}

service/application.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/OJ-lab/oj-lab-services/packages/application"
-	"github.com/OJ-lab/oj-lab-services/service/router"
+	"github.com/OJ-lab/oj-lab-services/service/handler"
 	"github.com/gin-gonic/gin"
 )
 
@@ -25,8 +25,8 @@ func main() {
 	r := gin.Default()
 	r.Use(application.HandleError)
 	gin.SetMode(serviceMode)
-	router.SetupUserRouter(r)
-	router.SetupProblemRoute(r)
+	handler.SetupUserRouter(r)
+	handler.SetupProblemRoute(r)
 
 	err := r.Run(servicePort)
 	if err != nil {

service/handler/problem.go

@@ -0,0 +1,23 @@
+package handler
+
+import (
+	"github.com/OJ-lab/oj-lab-services/packages/mapper"
+	"github.com/gin-gonic/gin"
+)
+
+func GetProblemInfo(ctx *gin.Context) {
+	slug := ctx.Param("slug")
+
+	problem, err := mapper.GetProblem(slug)
+	if err != nil {
+		ctx.Error(err)
+		return
+	}
+
+	ctx.JSON(200, gin.H{
+		"slug":        problem.Slug,
+		"title":       problem.Title,
+		"description": problem.Description,
+		"tags":        mapper.GetTagsList(problem),
+	})
+}

service/router/setup.go → service/handler/routes.go

@@ -1,4 +1,4 @@
-package router
+package handler
 
 import (
 	"net/http"
@@ -8,7 +8,7 @@ import (
 )
 
 func SetupUserRouter(r *gin.Engine) {
-	g := r.Group("/api/user")
+	g := r.Group("/api/v1/user")
 	{
 		g.GET("/health", func(c *gin.Context) {
 			c.String(http.StatusOK, "Hello, this is user service")

service/problem/judge.go

@@ -1,68 +1,24 @@
 package problem
 
 import (
-	"bytes"
-	"encoding/json"
-	"net/http"
-	"net/url"
-
-	"github.com/OJ-lab/oj-lab-services/packages/application"
 	"github.com/gin-gonic/gin"
-)
-
-const JUDGER_HOST_PROP = "judger.host"
-const JUDGER_JUDGE_PATH = "/api/v1/judge"
-
-var judgerHost string
 
-func init() {
-	judgerHost = application.AppConfig.GetString(JUDGER_HOST_PROP)
-}
-
-type JudgeRequest struct {
-	Src         string `json:"src"`
-	SrcLanguage string `json:"src_language"`
-}
+	"github.com/OJ-lab/oj-lab-services/packages/agent/judger"
+)
 
 func Judge(ctx *gin.Context) {
 	packageSlug := ctx.Param("slug")
-
-	judgeRequest := JudgeRequest{}
+	judgeRequest := judger.JudgeRequest{}
 	if err := ctx.ShouldBindJSON(&judgeRequest); err != nil {
 		ctx.Error(err)
 		return
 	}
 
-	url, err := url.JoinPath(judgerHost, JUDGER_JUDGE_PATH, packageSlug)
-	if err != nil {
-		ctx.Error(err)
-		return
-	}
-	payloadBytes, err := json.Marshal(judgeRequest)
+	body, err := judger.PostJudgeSync(packageSlug, judgeRequest)
 	if err != nil {
 		ctx.Error(err)
 		return
 	}
-	client := &http.Client{}
-	innerRequest, err := http.NewRequest("POST", url, bytes.NewReader(payloadBytes))
-	if err != nil {
-		ctx.Error(err)
-		return
-	}
-	innerRequest.Header.Set("Content-Type", "application/json")
-	innerRequest.Header.Set("Accept", "application/json")
-	innerResponse, err := client.Do(innerRequest)
-	if err != nil {
-		ctx.Error(err)
-		return
-	}
-	defer innerResponse.Body.Close()
-
-	innerBody := []map[string]interface{}{}
-	if err := json.NewDecoder(innerResponse.Body).Decode(&innerBody); err != nil {
-		ctx.Error(err)
-		return
-	}
 
-	ctx.JSON(innerResponse.StatusCode, innerBody)
+	ctx.JSON(200, body)
 }