Merged in feature/jobcrud (pull request #35)
Job CRUD + Collector Integration * startedcreate * openapispec * createjobintegration * jobgetcontroller * jobcreateclient * updatejob * job * collector
This commit is contained in:
@@ -5,8 +5,8 @@ import (
|
||||
"net/http"
|
||||
"queryorchestration/internal/client"
|
||||
|
||||
"github.com/google/uuid"
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/oapi-codegen/runtime/types"
|
||||
)
|
||||
|
||||
func (s *Controllers) CreateClient(ctx echo.Context) error {
|
||||
@@ -21,41 +21,31 @@ func (s *Controllers) CreateClient(ctx echo.Context) error {
|
||||
}
|
||||
|
||||
return ctx.JSON(http.StatusCreated, IdMessage{
|
||||
Id: id.String(),
|
||||
Id: id,
|
||||
})
|
||||
}
|
||||
|
||||
func (s *Controllers) GetClient(ctx echo.Context, id string) error {
|
||||
uid, err := uuid.Parse(id)
|
||||
if err != nil {
|
||||
return echo.NewHTTPError(http.StatusBadRequest, "Invalid ID")
|
||||
}
|
||||
|
||||
client, err := s.svc.Client.Get(ctx.Request().Context(), uid)
|
||||
func (s *Controllers) GetClient(ctx echo.Context, id types.UUID) error {
|
||||
client, err := s.svc.Client.Get(ctx.Request().Context(), id)
|
||||
if err != nil {
|
||||
return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Unable to get client: %s", err))
|
||||
}
|
||||
|
||||
return ctx.JSON(http.StatusOK, JobClient{
|
||||
Id: client.ID.String(),
|
||||
Id: client.ID,
|
||||
Name: client.Name,
|
||||
CanSync: client.CanSync,
|
||||
})
|
||||
}
|
||||
|
||||
func (s *Controllers) UpdateClient(ctx echo.Context, id string) error {
|
||||
func (s *Controllers) UpdateClient(ctx echo.Context, id types.UUID) error {
|
||||
req := ClientUpdate{}
|
||||
if err := ctx.Bind(&req); err != nil {
|
||||
return echo.NewHTTPError(http.StatusBadRequest, err)
|
||||
}
|
||||
|
||||
uid, err := uuid.Parse(id)
|
||||
if err != nil {
|
||||
return echo.NewHTTPError(http.StatusBadRequest, "Invalid ID")
|
||||
}
|
||||
|
||||
err = s.svc.Client.Update(ctx.Request().Context(), &client.Update{
|
||||
ID: uid,
|
||||
err := s.svc.Client.Update(ctx.Request().Context(), &client.Update{
|
||||
ID: id,
|
||||
Name: req.Name,
|
||||
CanSync: req.CanSync,
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user