diff --git a/.gitmodules b/.gitmodules index b358abe..6fd0375 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "proto"] - path = proto + path = contracts url = https://git.sch9.ru/new_gate/contracts diff --git a/Makefile b/Makefile index eb340fb..5a607f0 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ tag = latest gen: - @oapi-codegen --config=config.yaml ./proto/tester/v1/openapi.yaml + @oapi-codegen --config=config.yaml ./contracts/tester/v1/openapi.yaml dev: gen @go run main.go build: gen diff --git a/config.yaml b/config.yaml index 7e2a9cf..10eaf26 100644 --- a/config.yaml +++ b/config.yaml @@ -2,4 +2,4 @@ package: testerv1 generate: fiber-server: true models: true -output: ./proto/tester/v1/tester.go \ No newline at end of file +output: ./contracts/tester/v1/tester.go \ No newline at end of file diff --git a/proto b/contracts similarity index 100% rename from proto rename to contracts diff --git a/internal/tester/delivery.go b/internal/tester/delivery.go index a380e0d..44493b5 100644 --- a/internal/tester/delivery.go +++ b/internal/tester/delivery.go @@ -1,7 +1,7 @@ package tester import ( - testerv1 "git.sch9.ru/new_gate/ms-tester/proto/tester/v1" + testerv1 "git.sch9.ru/new_gate/ms-tester/contracts/tester/v1" "github.com/gofiber/fiber/v2" ) diff --git a/internal/tester/delivery/rest/handlers.go b/internal/tester/delivery/rest/handlers.go index 3be303f..fc7fdf5 100644 --- a/internal/tester/delivery/rest/handlers.go +++ b/internal/tester/delivery/rest/handlers.go @@ -1,13 +1,12 @@ package rest import ( - "io" - + testerv1 "git.sch9.ru/new_gate/ms-tester/contracts/tester/v1" "git.sch9.ru/new_gate/ms-tester/internal/models" "git.sch9.ru/new_gate/ms-tester/internal/tester" "git.sch9.ru/new_gate/ms-tester/pkg" - testerv1 "git.sch9.ru/new_gate/ms-tester/proto/tester/v1" "github.com/gofiber/fiber/v2" + "io" ) type TesterHandlers struct { @@ -241,23 +240,6 @@ func (h *TesterHandlers) UpdateProblem(c *fiber.Ctx, id int32) error { return c.SendStatus(fiber.StatusOK) } -func (h *TesterHandlers) UploadProblem(c *fiber.Ctx, id int32) error { - var req testerv1.UploadProblemRequest - err := c.BodyParser(&req) - if err != nil { - return err - } - - data, err := req.Archive.Bytes() - if err != nil { - return err - } - if err = h.problemsUC.UploadProblem(c.Context(), id, data); err != nil { - return err - } - return nil -} - func (h *TesterHandlers) UpdateContest(c *fiber.Ctx, id int32) error { var req testerv1.UpdateContestRequest err := c.BodyParser(&req) diff --git a/main.go b/main.go index cfb5686..ce4db72 100644 --- a/main.go +++ b/main.go @@ -3,11 +3,11 @@ package main import ( "fmt" "git.sch9.ru/new_gate/ms-tester/config" + testerv1 "git.sch9.ru/new_gate/ms-tester/contracts/tester/v1" "git.sch9.ru/new_gate/ms-tester/internal/tester/delivery/rest" problemsRepository "git.sch9.ru/new_gate/ms-tester/internal/tester/repository" testerUseCase "git.sch9.ru/new_gate/ms-tester/internal/tester/usecase" "git.sch9.ru/new_gate/ms-tester/pkg" - testerv1 "git.sch9.ru/new_gate/ms-tester/proto/tester/v1" "github.com/gofiber/fiber/v2" fiberlogger "github.com/gofiber/fiber/v2/middleware/logger" "github.com/ilyakaznacheev/cleanenv"