refactor: rename submodule
refactor: rename submodule refactor: rename submodule
This commit is contained in:
parent
01ed1de8c3
commit
672764f236
7 changed files with 7 additions and 25 deletions
2
.gitmodules
vendored
2
.gitmodules
vendored
|
@ -1,3 +1,3 @@
|
||||||
[submodule "proto"]
|
[submodule "proto"]
|
||||||
path = proto
|
path = contracts
|
||||||
url = https://git.sch9.ru/new_gate/contracts
|
url = https://git.sch9.ru/new_gate/contracts
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -1,7 +1,7 @@
|
||||||
tag = latest
|
tag = latest
|
||||||
|
|
||||||
gen:
|
gen:
|
||||||
@oapi-codegen --config=config.yaml ./proto/tester/v1/openapi.yaml
|
@oapi-codegen --config=config.yaml ./contracts/tester/v1/openapi.yaml
|
||||||
dev: gen
|
dev: gen
|
||||||
@go run main.go
|
@go run main.go
|
||||||
build: gen
|
build: gen
|
||||||
|
|
|
@ -2,4 +2,4 @@ package: testerv1
|
||||||
generate:
|
generate:
|
||||||
fiber-server: true
|
fiber-server: true
|
||||||
models: true
|
models: true
|
||||||
output: ./proto/tester/v1/tester.go
|
output: ./contracts/tester/v1/tester.go
|
|
@ -1,7 +1,7 @@
|
||||||
package tester
|
package tester
|
||||||
|
|
||||||
import (
|
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"
|
"github.com/gofiber/fiber/v2"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,12 @@
|
||||||
package rest
|
package rest
|
||||||
|
|
||||||
import (
|
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/models"
|
||||||
"git.sch9.ru/new_gate/ms-tester/internal/tester"
|
"git.sch9.ru/new_gate/ms-tester/internal/tester"
|
||||||
"git.sch9.ru/new_gate/ms-tester/pkg"
|
"git.sch9.ru/new_gate/ms-tester/pkg"
|
||||||
testerv1 "git.sch9.ru/new_gate/ms-tester/proto/tester/v1"
|
|
||||||
"github.com/gofiber/fiber/v2"
|
"github.com/gofiber/fiber/v2"
|
||||||
|
"io"
|
||||||
)
|
)
|
||||||
|
|
||||||
type TesterHandlers struct {
|
type TesterHandlers struct {
|
||||||
|
@ -241,23 +240,6 @@ func (h *TesterHandlers) UpdateProblem(c *fiber.Ctx, id int32) error {
|
||||||
return c.SendStatus(fiber.StatusOK)
|
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 {
|
func (h *TesterHandlers) UpdateContest(c *fiber.Ctx, id int32) error {
|
||||||
var req testerv1.UpdateContestRequest
|
var req testerv1.UpdateContestRequest
|
||||||
err := c.BodyParser(&req)
|
err := c.BodyParser(&req)
|
||||||
|
|
2
main.go
2
main.go
|
@ -3,11 +3,11 @@ package main
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"git.sch9.ru/new_gate/ms-tester/config"
|
"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"
|
"git.sch9.ru/new_gate/ms-tester/internal/tester/delivery/rest"
|
||||||
problemsRepository "git.sch9.ru/new_gate/ms-tester/internal/tester/repository"
|
problemsRepository "git.sch9.ru/new_gate/ms-tester/internal/tester/repository"
|
||||||
testerUseCase "git.sch9.ru/new_gate/ms-tester/internal/tester/usecase"
|
testerUseCase "git.sch9.ru/new_gate/ms-tester/internal/tester/usecase"
|
||||||
"git.sch9.ru/new_gate/ms-tester/pkg"
|
"git.sch9.ru/new_gate/ms-tester/pkg"
|
||||||
testerv1 "git.sch9.ru/new_gate/ms-tester/proto/tester/v1"
|
|
||||||
"github.com/gofiber/fiber/v2"
|
"github.com/gofiber/fiber/v2"
|
||||||
fiberlogger "github.com/gofiber/fiber/v2/middleware/logger"
|
fiberlogger "github.com/gofiber/fiber/v2/middleware/logger"
|
||||||
"github.com/ilyakaznacheev/cleanenv"
|
"github.com/ilyakaznacheev/cleanenv"
|
||||||
|
|
Loading…
Add table
Reference in a new issue