From 977f3902b767bc44443db06bf5505e7a67b2aba2 Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Fri, 28 Mar 2025 14:48:27 -0700
Subject: [PATCH 1/6] openapi: split trigger-validate into two cases
---
openapi.yaml | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/openapi.yaml b/openapi.yaml
index d12abf5..21e2748 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -247,7 +247,7 @@ paths:
$ref: "#/components/schemas/Error"
/submissions/{SubmissionID}/status/trigger-validate:
post:
- summary: Role Reviewer triggers validation and changes status from Submitted|Accepted -> Validating
+ summary: Role Reviewer triggers validation and changes status from Submitted -> Validating
operationId: actionSubmissionTriggerValidate
tags:
- Submissions
@@ -262,6 +262,23 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/Error"
+ /submissions/{SubmissionID}/status/retry-validate:
+ post:
+ summary: Role Reviewer re-runs validation and changes status from Accepted -> Validating
+ operationId: actionSubmissionRetryValidate
+ tags:
+ - Submissions
+ parameters:
+ - $ref: '#/components/parameters/SubmissionID'
+ responses:
+ "204":
+ description: Successful response
+ default:
+ description: General Error
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/Error"
/submissions/{SubmissionID}/status/reset-validating:
post:
summary: Role Reviewer manually resets validating softlock and changes status from Validating -> Accepted
--
2.47.1
From e7a66ebe0dba208451baee8b263341a37eb71d9f Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Fri, 28 Mar 2025 14:48:48 -0700
Subject: [PATCH 2/6] openapi: generate
---
pkg/api/oas_client_gen.go | 134 +++++++++++++++++-
pkg/api/oas_handlers_gen.go | 199 ++++++++++++++++++++++++++-
pkg/api/oas_operations_gen.go | 1 +
pkg/api/oas_parameters_gen.go | 66 +++++++++
pkg/api/oas_response_decoders_gen.go | 51 +++++++
pkg/api/oas_response_encoders_gen.go | 7 +
pkg/api/oas_router_gen.go | 48 ++++++-
pkg/api/oas_schemas_gen.go | 3 +
pkg/api/oas_server_gen.go | 8 +-
pkg/api/oas_unimplemented_gen.go | 11 +-
10 files changed, 521 insertions(+), 7 deletions(-)
diff --git a/pkg/api/oas_client_gen.go b/pkg/api/oas_client_gen.go
index ae66da5..c7eff2d 100644
--- a/pkg/api/oas_client_gen.go
+++ b/pkg/api/oas_client_gen.go
@@ -47,6 +47,12 @@ type Invoker interface {
//
// POST /submissions/{SubmissionID}/status/request-changes
ActionSubmissionRequestChanges(ctx context.Context, params ActionSubmissionRequestChangesParams) error
+ // ActionSubmissionRetryValidate invokes actionSubmissionRetryValidate operation.
+ //
+ // Role Reviewer re-runs validation and changes status from Accepted -> Validating.
+ //
+ // POST /submissions/{SubmissionID}/status/retry-validate
+ ActionSubmissionRetryValidate(ctx context.Context, params ActionSubmissionRetryValidateParams) error
// ActionSubmissionRevoke invokes actionSubmissionRevoke operation.
//
// Role Submitter changes status from Submitted|ChangesRequested -> UnderConstruction.
@@ -67,7 +73,7 @@ type Invoker interface {
ActionSubmissionTriggerUpload(ctx context.Context, params ActionSubmissionTriggerUploadParams) error
// ActionSubmissionTriggerValidate invokes actionSubmissionTriggerValidate operation.
//
- // Role Reviewer triggers validation and changes status from Submitted|Accepted -> Validating.
+ // Role Reviewer triggers validation and changes status from Submitted -> Validating.
//
// POST /submissions/{SubmissionID}/status/trigger-validate
ActionSubmissionTriggerValidate(ctx context.Context, params ActionSubmissionTriggerValidateParams) error
@@ -614,6 +620,130 @@ func (c *Client) sendActionSubmissionRequestChanges(ctx context.Context, params
return result, nil
}
+// ActionSubmissionRetryValidate invokes actionSubmissionRetryValidate operation.
+//
+// Role Reviewer re-runs validation and changes status from Accepted -> Validating.
+//
+// POST /submissions/{SubmissionID}/status/retry-validate
+func (c *Client) ActionSubmissionRetryValidate(ctx context.Context, params ActionSubmissionRetryValidateParams) error {
+ _, err := c.sendActionSubmissionRetryValidate(ctx, params)
+ return err
+}
+
+func (c *Client) sendActionSubmissionRetryValidate(ctx context.Context, params ActionSubmissionRetryValidateParams) (res *ActionSubmissionRetryValidateNoContent, err error) {
+ otelAttrs := []attribute.KeyValue{
+ otelogen.OperationID("actionSubmissionRetryValidate"),
+ semconv.HTTPRequestMethodKey.String("POST"),
+ semconv.HTTPRouteKey.String("/submissions/{SubmissionID}/status/retry-validate"),
+ }
+
+ // Run stopwatch.
+ startTime := time.Now()
+ defer func() {
+ // Use floating point division here for higher precision (instead of Millisecond method).
+ elapsedDuration := time.Since(startTime)
+ c.duration.Record(ctx, float64(elapsedDuration)/float64(time.Millisecond), metric.WithAttributes(otelAttrs...))
+ }()
+
+ // Increment request counter.
+ c.requests.Add(ctx, 1, metric.WithAttributes(otelAttrs...))
+
+ // Start a span for this request.
+ ctx, span := c.cfg.Tracer.Start(ctx, ActionSubmissionRetryValidateOperation,
+ trace.WithAttributes(otelAttrs...),
+ clientSpanKind,
+ )
+ // Track stage for error reporting.
+ var stage string
+ defer func() {
+ if err != nil {
+ span.RecordError(err)
+ span.SetStatus(codes.Error, stage)
+ c.errors.Add(ctx, 1, metric.WithAttributes(otelAttrs...))
+ }
+ span.End()
+ }()
+
+ stage = "BuildURL"
+ u := uri.Clone(c.requestURL(ctx))
+ var pathParts [3]string
+ pathParts[0] = "/submissions/"
+ {
+ // Encode "SubmissionID" parameter.
+ e := uri.NewPathEncoder(uri.PathEncoderConfig{
+ Param: "SubmissionID",
+ Style: uri.PathStyleSimple,
+ Explode: false,
+ })
+ if err := func() error {
+ return e.EncodeValue(conv.Int64ToString(params.SubmissionID))
+ }(); err != nil {
+ return res, errors.Wrap(err, "encode path")
+ }
+ encoded, err := e.Result()
+ if err != nil {
+ return res, errors.Wrap(err, "encode path")
+ }
+ pathParts[1] = encoded
+ }
+ pathParts[2] = "/status/retry-validate"
+ uri.AddPathParts(u, pathParts[:]...)
+
+ stage = "EncodeRequest"
+ r, err := ht.NewRequest(ctx, "POST", u)
+ if err != nil {
+ return res, errors.Wrap(err, "create request")
+ }
+
+ {
+ type bitset = [1]uint8
+ var satisfied bitset
+ {
+ stage = "Security:CookieAuth"
+ switch err := c.securityCookieAuth(ctx, ActionSubmissionRetryValidateOperation, r); {
+ case err == nil: // if NO error
+ satisfied[0] |= 1 << 0
+ case errors.Is(err, ogenerrors.ErrSkipClientSecurity):
+ // Skip this security.
+ default:
+ return res, errors.Wrap(err, "security \"CookieAuth\"")
+ }
+ }
+
+ if ok := func() bool {
+ nextRequirement:
+ for _, requirement := range []bitset{
+ {0b00000001},
+ } {
+ for i, mask := range requirement {
+ if satisfied[i]&mask != mask {
+ continue nextRequirement
+ }
+ }
+ return true
+ }
+ return false
+ }(); !ok {
+ return res, ogenerrors.ErrSecurityRequirementIsNotSatisfied
+ }
+ }
+
+ stage = "SendRequest"
+ resp, err := c.cfg.Client.Do(r)
+ if err != nil {
+ return res, errors.Wrap(err, "do request")
+ }
+ defer resp.Body.Close()
+
+ stage = "DecodeResponse"
+ result, err := decodeActionSubmissionRetryValidateResponse(resp)
+ if err != nil {
+ return res, errors.Wrap(err, "decode response")
+ }
+
+ return result, nil
+}
+
// ActionSubmissionRevoke invokes actionSubmissionRevoke operation.
//
// Role Submitter changes status from Submitted|ChangesRequested -> UnderConstruction.
@@ -988,7 +1118,7 @@ func (c *Client) sendActionSubmissionTriggerUpload(ctx context.Context, params A
// ActionSubmissionTriggerValidate invokes actionSubmissionTriggerValidate operation.
//
-// Role Reviewer triggers validation and changes status from Submitted|Accepted -> Validating.
+// Role Reviewer triggers validation and changes status from Submitted -> Validating.
//
// POST /submissions/{SubmissionID}/status/trigger-validate
func (c *Client) ActionSubmissionTriggerValidate(ctx context.Context, params ActionSubmissionTriggerValidateParams) error {
diff --git a/pkg/api/oas_handlers_gen.go b/pkg/api/oas_handlers_gen.go
index f237b03..8b423e8 100644
--- a/pkg/api/oas_handlers_gen.go
+++ b/pkg/api/oas_handlers_gen.go
@@ -615,6 +615,201 @@ func (s *Server) handleActionSubmissionRequestChangesRequest(args [1]string, arg
}
}
+// handleActionSubmissionRetryValidateRequest handles actionSubmissionRetryValidate operation.
+//
+// Role Reviewer re-runs validation and changes status from Accepted -> Validating.
+//
+// POST /submissions/{SubmissionID}/status/retry-validate
+func (s *Server) handleActionSubmissionRetryValidateRequest(args [1]string, argsEscaped bool, w http.ResponseWriter, r *http.Request) {
+ statusWriter := &codeRecorder{ResponseWriter: w}
+ w = statusWriter
+ otelAttrs := []attribute.KeyValue{
+ otelogen.OperationID("actionSubmissionRetryValidate"),
+ semconv.HTTPRequestMethodKey.String("POST"),
+ semconv.HTTPRouteKey.String("/submissions/{SubmissionID}/status/retry-validate"),
+ }
+
+ // Start a span for this request.
+ ctx, span := s.cfg.Tracer.Start(r.Context(), ActionSubmissionRetryValidateOperation,
+ trace.WithAttributes(otelAttrs...),
+ serverSpanKind,
+ )
+ defer span.End()
+
+ // Add Labeler to context.
+ labeler := &Labeler{attrs: otelAttrs}
+ ctx = contextWithLabeler(ctx, labeler)
+
+ // Run stopwatch.
+ startTime := time.Now()
+ defer func() {
+ elapsedDuration := time.Since(startTime)
+
+ attrSet := labeler.AttributeSet()
+ attrs := attrSet.ToSlice()
+ code := statusWriter.status
+ if code != 0 {
+ codeAttr := semconv.HTTPResponseStatusCode(code)
+ attrs = append(attrs, codeAttr)
+ span.SetAttributes(codeAttr)
+ }
+ attrOpt := metric.WithAttributes(attrs...)
+
+ // Increment request counter.
+ s.requests.Add(ctx, 1, attrOpt)
+
+ // Use floating point division here for higher precision (instead of Millisecond method).
+ s.duration.Record(ctx, float64(elapsedDuration)/float64(time.Millisecond), attrOpt)
+ }()
+
+ var (
+ recordError = func(stage string, err error) {
+ span.RecordError(err)
+
+ // https://opentelemetry.io/docs/specs/semconv/http/http-spans/#status
+ // Span Status MUST be left unset if HTTP status code was in the 1xx, 2xx or 3xx ranges,
+ // unless there was another error (e.g., network error receiving the response body; or 3xx codes with
+ // max redirects exceeded), in which case status MUST be set to Error.
+ code := statusWriter.status
+ if code >= 100 && code < 500 {
+ span.SetStatus(codes.Error, stage)
+ }
+
+ attrSet := labeler.AttributeSet()
+ attrs := attrSet.ToSlice()
+ if code != 0 {
+ attrs = append(attrs, semconv.HTTPResponseStatusCode(code))
+ }
+
+ s.errors.Add(ctx, 1, metric.WithAttributes(attrs...))
+ }
+ err error
+ opErrContext = ogenerrors.OperationContext{
+ Name: ActionSubmissionRetryValidateOperation,
+ ID: "actionSubmissionRetryValidate",
+ }
+ )
+ {
+ type bitset = [1]uint8
+ var satisfied bitset
+ {
+ sctx, ok, err := s.securityCookieAuth(ctx, ActionSubmissionRetryValidateOperation, r)
+ if err != nil {
+ err = &ogenerrors.SecurityError{
+ OperationContext: opErrContext,
+ Security: "CookieAuth",
+ Err: err,
+ }
+ if encodeErr := encodeErrorResponse(s.h.NewError(ctx, err), w, span); encodeErr != nil {
+ defer recordError("Security:CookieAuth", err)
+ }
+ return
+ }
+ if ok {
+ satisfied[0] |= 1 << 0
+ ctx = sctx
+ }
+ }
+
+ if ok := func() bool {
+ nextRequirement:
+ for _, requirement := range []bitset{
+ {0b00000001},
+ } {
+ for i, mask := range requirement {
+ if satisfied[i]&mask != mask {
+ continue nextRequirement
+ }
+ }
+ return true
+ }
+ return false
+ }(); !ok {
+ err = &ogenerrors.SecurityError{
+ OperationContext: opErrContext,
+ Err: ogenerrors.ErrSecurityRequirementIsNotSatisfied,
+ }
+ if encodeErr := encodeErrorResponse(s.h.NewError(ctx, err), w, span); encodeErr != nil {
+ defer recordError("Security", err)
+ }
+ return
+ }
+ }
+ params, err := decodeActionSubmissionRetryValidateParams(args, argsEscaped, r)
+ if err != nil {
+ err = &ogenerrors.DecodeParamsError{
+ OperationContext: opErrContext,
+ Err: err,
+ }
+ defer recordError("DecodeParams", err)
+ s.cfg.ErrorHandler(ctx, w, r, err)
+ return
+ }
+
+ var response *ActionSubmissionRetryValidateNoContent
+ if m := s.cfg.Middleware; m != nil {
+ mreq := middleware.Request{
+ Context: ctx,
+ OperationName: ActionSubmissionRetryValidateOperation,
+ OperationSummary: "Role Reviewer re-runs validation and changes status from Accepted -> Validating",
+ OperationID: "actionSubmissionRetryValidate",
+ Body: nil,
+ Params: middleware.Parameters{
+ {
+ Name: "SubmissionID",
+ In: "path",
+ }: params.SubmissionID,
+ },
+ Raw: r,
+ }
+
+ type (
+ Request = struct{}
+ Params = ActionSubmissionRetryValidateParams
+ Response = *ActionSubmissionRetryValidateNoContent
+ )
+ response, err = middleware.HookMiddleware[
+ Request,
+ Params,
+ Response,
+ ](
+ m,
+ mreq,
+ unpackActionSubmissionRetryValidateParams,
+ func(ctx context.Context, request Request, params Params) (response Response, err error) {
+ err = s.h.ActionSubmissionRetryValidate(ctx, params)
+ return response, err
+ },
+ )
+ } else {
+ err = s.h.ActionSubmissionRetryValidate(ctx, params)
+ }
+ if err != nil {
+ if errRes, ok := errors.Into[*ErrorStatusCode](err); ok {
+ if err := encodeErrorResponse(errRes, w, span); err != nil {
+ defer recordError("Internal", err)
+ }
+ return
+ }
+ if errors.Is(err, ht.ErrNotImplemented) {
+ s.cfg.ErrorHandler(ctx, w, r, err)
+ return
+ }
+ if err := encodeErrorResponse(s.h.NewError(ctx, err), w, span); err != nil {
+ defer recordError("Internal", err)
+ }
+ return
+ }
+
+ if err := encodeActionSubmissionRetryValidateResponse(response, w, span); err != nil {
+ defer recordError("EncodeResponse", err)
+ if !errors.Is(err, ht.ErrInternalServerErrorResponse) {
+ s.cfg.ErrorHandler(ctx, w, r, err)
+ }
+ return
+ }
+}
+
// handleActionSubmissionRevokeRequest handles actionSubmissionRevoke operation.
//
// Role Submitter changes status from Submitted|ChangesRequested -> UnderConstruction.
@@ -1202,7 +1397,7 @@ func (s *Server) handleActionSubmissionTriggerUploadRequest(args [1]string, args
// handleActionSubmissionTriggerValidateRequest handles actionSubmissionTriggerValidate operation.
//
-// Role Reviewer triggers validation and changes status from Submitted|Accepted -> Validating.
+// Role Reviewer triggers validation and changes status from Submitted -> Validating.
//
// POST /submissions/{SubmissionID}/status/trigger-validate
func (s *Server) handleActionSubmissionTriggerValidateRequest(args [1]string, argsEscaped bool, w http.ResponseWriter, r *http.Request) {
@@ -1336,7 +1531,7 @@ func (s *Server) handleActionSubmissionTriggerValidateRequest(args [1]string, ar
mreq := middleware.Request{
Context: ctx,
OperationName: ActionSubmissionTriggerValidateOperation,
- OperationSummary: "Role Reviewer triggers validation and changes status from Submitted|Accepted -> Validating",
+ OperationSummary: "Role Reviewer triggers validation and changes status from Submitted -> Validating",
OperationID: "actionSubmissionTriggerValidate",
Body: nil,
Params: middleware.Parameters{
diff --git a/pkg/api/oas_operations_gen.go b/pkg/api/oas_operations_gen.go
index 604c4ff..bc77238 100644
--- a/pkg/api/oas_operations_gen.go
+++ b/pkg/api/oas_operations_gen.go
@@ -9,6 +9,7 @@ const (
ActionSubmissionAcceptedOperation OperationName = "ActionSubmissionAccepted"
ActionSubmissionRejectOperation OperationName = "ActionSubmissionReject"
ActionSubmissionRequestChangesOperation OperationName = "ActionSubmissionRequestChanges"
+ ActionSubmissionRetryValidateOperation OperationName = "ActionSubmissionRetryValidate"
ActionSubmissionRevokeOperation OperationName = "ActionSubmissionRevoke"
ActionSubmissionSubmitOperation OperationName = "ActionSubmissionSubmit"
ActionSubmissionTriggerUploadOperation OperationName = "ActionSubmissionTriggerUpload"
diff --git a/pkg/api/oas_parameters_gen.go b/pkg/api/oas_parameters_gen.go
index 4e0a1fc..870fdf0 100644
--- a/pkg/api/oas_parameters_gen.go
+++ b/pkg/api/oas_parameters_gen.go
@@ -213,6 +213,72 @@ func decodeActionSubmissionRequestChangesParams(args [1]string, argsEscaped bool
return params, nil
}
+// ActionSubmissionRetryValidateParams is parameters of actionSubmissionRetryValidate operation.
+type ActionSubmissionRetryValidateParams struct {
+ // The unique identifier for a submission.
+ SubmissionID int64
+}
+
+func unpackActionSubmissionRetryValidateParams(packed middleware.Parameters) (params ActionSubmissionRetryValidateParams) {
+ {
+ key := middleware.ParameterKey{
+ Name: "SubmissionID",
+ In: "path",
+ }
+ params.SubmissionID = packed[key].(int64)
+ }
+ return params
+}
+
+func decodeActionSubmissionRetryValidateParams(args [1]string, argsEscaped bool, r *http.Request) (params ActionSubmissionRetryValidateParams, _ error) {
+ // Decode path: SubmissionID.
+ if err := func() error {
+ param := args[0]
+ if argsEscaped {
+ unescaped, err := url.PathUnescape(args[0])
+ if err != nil {
+ return errors.Wrap(err, "unescape path")
+ }
+ param = unescaped
+ }
+ if len(param) > 0 {
+ d := uri.NewPathDecoder(uri.PathDecoderConfig{
+ Param: "SubmissionID",
+ Value: param,
+ Style: uri.PathStyleSimple,
+ Explode: false,
+ })
+
+ if err := func() error {
+ val, err := d.DecodeValue()
+ if err != nil {
+ return err
+ }
+
+ c, err := conv.ToInt64(val)
+ if err != nil {
+ return err
+ }
+
+ params.SubmissionID = c
+ return nil
+ }(); err != nil {
+ return err
+ }
+ } else {
+ return validate.ErrFieldRequired
+ }
+ return nil
+ }(); err != nil {
+ return params, &ogenerrors.DecodeParamError{
+ Name: "SubmissionID",
+ In: "path",
+ Err: err,
+ }
+ }
+ return params, nil
+}
+
// ActionSubmissionRevokeParams is parameters of actionSubmissionRevoke operation.
type ActionSubmissionRevokeParams struct {
// The unique identifier for a submission.
diff --git a/pkg/api/oas_response_decoders_gen.go b/pkg/api/oas_response_decoders_gen.go
index faa01e6..cacfcbe 100644
--- a/pkg/api/oas_response_decoders_gen.go
+++ b/pkg/api/oas_response_decoders_gen.go
@@ -168,6 +168,57 @@ func decodeActionSubmissionRequestChangesResponse(resp *http.Response) (res *Act
return res, errors.Wrap(defRes, "error")
}
+func decodeActionSubmissionRetryValidateResponse(resp *http.Response) (res *ActionSubmissionRetryValidateNoContent, _ error) {
+ switch resp.StatusCode {
+ case 204:
+ // Code 204.
+ return &ActionSubmissionRetryValidateNoContent{}, nil
+ }
+ // Convenient error response.
+ defRes, err := func() (res *ErrorStatusCode, err error) {
+ ct, _, err := mime.ParseMediaType(resp.Header.Get("Content-Type"))
+ if err != nil {
+ return res, errors.Wrap(err, "parse media type")
+ }
+ switch {
+ case ct == "application/json":
+ buf, err := io.ReadAll(resp.Body)
+ if err != nil {
+ return res, err
+ }
+ d := jx.DecodeBytes(buf)
+
+ var response Error
+ if err := func() error {
+ if err := response.Decode(d); err != nil {
+ return err
+ }
+ if err := d.Skip(); err != io.EOF {
+ return errors.New("unexpected trailing data")
+ }
+ return nil
+ }(); err != nil {
+ err = &ogenerrors.DecodeBodyError{
+ ContentType: ct,
+ Body: buf,
+ Err: err,
+ }
+ return res, err
+ }
+ return &ErrorStatusCode{
+ StatusCode: resp.StatusCode,
+ Response: response,
+ }, nil
+ default:
+ return res, validate.InvalidContentType(ct)
+ }
+ }()
+ if err != nil {
+ return res, errors.Wrapf(err, "default (code %d)", resp.StatusCode)
+ }
+ return res, errors.Wrap(defRes, "error")
+}
+
func decodeActionSubmissionRevokeResponse(resp *http.Response) (res *ActionSubmissionRevokeNoContent, _ error) {
switch resp.StatusCode {
case 204:
diff --git a/pkg/api/oas_response_encoders_gen.go b/pkg/api/oas_response_encoders_gen.go
index ad080a4..7a79958 100644
--- a/pkg/api/oas_response_encoders_gen.go
+++ b/pkg/api/oas_response_encoders_gen.go
@@ -34,6 +34,13 @@ func encodeActionSubmissionRequestChangesResponse(response *ActionSubmissionRequ
return nil
}
+func encodeActionSubmissionRetryValidateResponse(response *ActionSubmissionRetryValidateNoContent, w http.ResponseWriter, span trace.Span) error {
+ w.WriteHeader(204)
+ span.SetStatus(codes.Ok, http.StatusText(204))
+
+ return nil
+}
+
func encodeActionSubmissionRevokeResponse(response *ActionSubmissionRevokeNoContent, w http.ResponseWriter, span trace.Span) error {
w.WriteHeader(204)
span.SetStatus(codes.Ok, http.StatusText(204))
diff --git a/pkg/api/oas_router_gen.go b/pkg/api/oas_router_gen.go
index 554e110..feac3c9 100644
--- a/pkg/api/oas_router_gen.go
+++ b/pkg/api/oas_router_gen.go
@@ -538,6 +538,28 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
+ case 't': // Prefix: "try-validate"
+
+ if l := len("try-validate"); len(elem) >= l && elem[0:l] == "try-validate" {
+ elem = elem[l:]
+ } else {
+ break
+ }
+
+ if len(elem) == 0 {
+ // Leaf node.
+ switch r.Method {
+ case "POST":
+ s.handleActionSubmissionRetryValidateRequest([1]string{
+ args[0],
+ }, elemIsEscaped, w, r)
+ default:
+ s.notAllowed(w, r, "POST")
+ }
+
+ return
+ }
+
case 'v': // Prefix: "voke"
if l := len("voke"); len(elem) >= l && elem[0:l] == "voke" {
@@ -1303,6 +1325,30 @@ func (s *Server) FindPath(method string, u *url.URL) (r Route, _ bool) {
}
+ case 't': // Prefix: "try-validate"
+
+ if l := len("try-validate"); len(elem) >= l && elem[0:l] == "try-validate" {
+ elem = elem[l:]
+ } else {
+ break
+ }
+
+ if len(elem) == 0 {
+ // Leaf node.
+ switch method {
+ case "POST":
+ r.name = ActionSubmissionRetryValidateOperation
+ r.summary = "Role Reviewer re-runs validation and changes status from Accepted -> Validating"
+ r.operationID = "actionSubmissionRetryValidate"
+ r.pathPattern = "/submissions/{SubmissionID}/status/retry-validate"
+ r.args = args
+ r.count = 1
+ return r, true
+ default:
+ return
+ }
+ }
+
case 'v': // Prefix: "voke"
if l := len("voke"); len(elem) >= l && elem[0:l] == "voke" {
@@ -1402,7 +1448,7 @@ func (s *Server) FindPath(method string, u *url.URL) (r Route, _ bool) {
switch method {
case "POST":
r.name = ActionSubmissionTriggerValidateOperation
- r.summary = "Role Reviewer triggers validation and changes status from Submitted|Accepted -> Validating"
+ r.summary = "Role Reviewer triggers validation and changes status from Submitted -> Validating"
r.operationID = "actionSubmissionTriggerValidate"
r.pathPattern = "/submissions/{SubmissionID}/status/trigger-validate"
r.args = args
diff --git a/pkg/api/oas_schemas_gen.go b/pkg/api/oas_schemas_gen.go
index 6e5c55c..b463864 100644
--- a/pkg/api/oas_schemas_gen.go
+++ b/pkg/api/oas_schemas_gen.go
@@ -20,6 +20,9 @@ type ActionSubmissionRejectNoContent struct{}
// ActionSubmissionRequestChangesNoContent is response for ActionSubmissionRequestChanges operation.
type ActionSubmissionRequestChangesNoContent struct{}
+// ActionSubmissionRetryValidateNoContent is response for ActionSubmissionRetryValidate operation.
+type ActionSubmissionRetryValidateNoContent struct{}
+
// ActionSubmissionRevokeNoContent is response for ActionSubmissionRevoke operation.
type ActionSubmissionRevokeNoContent struct{}
diff --git a/pkg/api/oas_server_gen.go b/pkg/api/oas_server_gen.go
index 505264f..2d4a249 100644
--- a/pkg/api/oas_server_gen.go
+++ b/pkg/api/oas_server_gen.go
@@ -26,6 +26,12 @@ type Handler interface {
//
// POST /submissions/{SubmissionID}/status/request-changes
ActionSubmissionRequestChanges(ctx context.Context, params ActionSubmissionRequestChangesParams) error
+ // ActionSubmissionRetryValidate implements actionSubmissionRetryValidate operation.
+ //
+ // Role Reviewer re-runs validation and changes status from Accepted -> Validating.
+ //
+ // POST /submissions/{SubmissionID}/status/retry-validate
+ ActionSubmissionRetryValidate(ctx context.Context, params ActionSubmissionRetryValidateParams) error
// ActionSubmissionRevoke implements actionSubmissionRevoke operation.
//
// Role Submitter changes status from Submitted|ChangesRequested -> UnderConstruction.
@@ -46,7 +52,7 @@ type Handler interface {
ActionSubmissionTriggerUpload(ctx context.Context, params ActionSubmissionTriggerUploadParams) error
// ActionSubmissionTriggerValidate implements actionSubmissionTriggerValidate operation.
//
- // Role Reviewer triggers validation and changes status from Submitted|Accepted -> Validating.
+ // Role Reviewer triggers validation and changes status from Submitted -> Validating.
//
// POST /submissions/{SubmissionID}/status/trigger-validate
ActionSubmissionTriggerValidate(ctx context.Context, params ActionSubmissionTriggerValidateParams) error
diff --git a/pkg/api/oas_unimplemented_gen.go b/pkg/api/oas_unimplemented_gen.go
index 735853f..a74716b 100644
--- a/pkg/api/oas_unimplemented_gen.go
+++ b/pkg/api/oas_unimplemented_gen.go
@@ -40,6 +40,15 @@ func (UnimplementedHandler) ActionSubmissionRequestChanges(ctx context.Context,
return ht.ErrNotImplemented
}
+// ActionSubmissionRetryValidate implements actionSubmissionRetryValidate operation.
+//
+// Role Reviewer re-runs validation and changes status from Accepted -> Validating.
+//
+// POST /submissions/{SubmissionID}/status/retry-validate
+func (UnimplementedHandler) ActionSubmissionRetryValidate(ctx context.Context, params ActionSubmissionRetryValidateParams) error {
+ return ht.ErrNotImplemented
+}
+
// ActionSubmissionRevoke implements actionSubmissionRevoke operation.
//
// Role Submitter changes status from Submitted|ChangesRequested -> UnderConstruction.
@@ -69,7 +78,7 @@ func (UnimplementedHandler) ActionSubmissionTriggerUpload(ctx context.Context, p
// ActionSubmissionTriggerValidate implements actionSubmissionTriggerValidate operation.
//
-// Role Reviewer triggers validation and changes status from Submitted|Accepted -> Validating.
+// Role Reviewer triggers validation and changes status from Submitted -> Validating.
//
// POST /submissions/{SubmissionID}/status/trigger-validate
func (UnimplementedHandler) ActionSubmissionTriggerValidate(ctx context.Context, params ActionSubmissionTriggerValidateParams) error {
--
2.47.1
From cc1d5f4bda2a7e1287175e72bbe988ed670b2d9a Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Fri, 28 Mar 2025 15:00:41 -0700
Subject: [PATCH 3/6] submissions: remove Accepted from valid src status in
ActionSubmissionTriggerValidate
---
pkg/service/submissions.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkg/service/submissions.go b/pkg/service/submissions.go
index 54b2d5f..42a62aa 100644
--- a/pkg/service/submissions.go
+++ b/pkg/service/submissions.go
@@ -489,7 +489,7 @@ func (svc *Service) ActionSubmissionValidated(ctx context.Context, params api.Ac
// ActionSubmissionTriggerValidate invokes actionSubmissionTriggerValidate operation.
//
-// Role Reviewer triggers validation and changes status from Submitted|Accepted -> Validating.
+// Role Reviewer triggers validation and changes status from Submitted -> Validating.
//
// POST /submissions/{SubmissionID}/status/trigger-validate
func (svc *Service) ActionSubmissionTriggerValidate(ctx context.Context, params api.ActionSubmissionTriggerValidateParams) error {
@@ -525,7 +525,7 @@ func (svc *Service) ActionSubmissionTriggerValidate(ctx context.Context, params
// transaction
smap := datastore.Optional()
smap.Add("status_id", model.StatusValidating)
- submission, err = svc.DB.Submissions().IfStatusThenUpdateAndGet(ctx, params.SubmissionID, []model.Status{model.StatusSubmitted, model.StatusAccepted}, smap)
+ submission, err = svc.DB.Submissions().IfStatusThenUpdateAndGet(ctx, params.SubmissionID, []model.Status{model.StatusSubmitted}, smap)
if err != nil {
return err
}
--
2.47.1
From 661fa17fa7ea7e59b2f9bf810e0fa27221dc0a8d Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Fri, 28 Mar 2025 15:00:35 -0700
Subject: [PATCH 4/6] submissions: implement ActionSubmissionRetryValidate
---
pkg/service/submissions.go | 50 ++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/pkg/service/submissions.go b/pkg/service/submissions.go
index 42a62aa..637fc7f 100644
--- a/pkg/service/submissions.go
+++ b/pkg/service/submissions.go
@@ -552,6 +552,56 @@ func (svc *Service) ActionSubmissionTriggerValidate(ctx context.Context, params
return nil
}
+// ActionSubmissionRetryValidate invokes actionSubmissionRetryValidate operation.
+//
+// Role Reviewer re-runs validation and changes status from Accepted -> Validating.
+//
+// POST /submissions/{SubmissionID}/status/retry-validate
+func (svc *Service) ActionSubmissionRetryValidate(ctx context.Context, params api.ActionSubmissionRetryValidateParams) error {
+ userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
+ if !ok {
+ return ErrUserInfo
+ }
+
+ has_role, err := userInfo.HasRoleSubmissionReview()
+ if err != nil {
+ return err
+ }
+ // check if caller has required role
+ if !has_role {
+ return ErrPermissionDeniedNeedRoleSubmissionReview
+ }
+
+ // transaction
+ smap := datastore.Optional()
+ smap.Add("status_id", model.StatusValidating)
+ submission, err := svc.DB.Submissions().IfStatusThenUpdateAndGet(ctx, params.SubmissionID, []model.Status{model.StatusAccepted}, smap)
+ if err != nil {
+ return err
+ }
+
+ validate_request := model.ValidateRequest{
+ SubmissionID: submission.ID,
+ ModelID: submission.AssetID,
+ ModelVersion: submission.AssetVersion,
+ ValidatedModelID: nil,
+ }
+
+ // sentinel values because we're not using rust
+ if submission.ValidatedAssetID != 0 {
+ validate_request.ValidatedModelID = &submission.ValidatedAssetID
+ }
+
+ j, err := json.Marshal(validate_request)
+ if err != nil {
+ return err
+ }
+
+ svc.Nats.Publish("maptest.submissions.validate", []byte(j))
+
+ return nil
+}
+
// ActionSubmissionAccepted implements actionSubmissionAccepted operation.
//
// Role SubmissionReview changes status from Validating -> Accepted.
--
2.47.1
From f0e18a5963dbea1e214472c3be7e9cc354f1331c Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Fri, 28 Mar 2025 15:07:07 -0700
Subject: [PATCH 5/6] web: Validate button calls retry-validate endpoint
---
web/src/app/submissions/[submissionId]/_reviewButtons.tsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/web/src/app/submissions/[submissionId]/_reviewButtons.tsx b/web/src/app/submissions/[submissionId]/_reviewButtons.tsx
index fd51d73..44c6e9c 100644
--- a/web/src/app/submissions/[submissionId]/_reviewButtons.tsx
+++ b/web/src/app/submissions/[submissionId]/_reviewButtons.tsx
@@ -2,7 +2,7 @@ import { Button, ButtonOwnProps } from "@mui/material";
type Actions = "Completed" | "Submit" | "Reject" | "Revoke" | "Reset Uploading (fix softlocked status)" | "Reset Validating (fix softlocked status)"
type Review = Actions | "Accept" | "Validate" | "Upload"
-type Action = Lowercase<Actions> | "trigger-validate" | "trigger-upload" | "reset-uploading" | "reset-validating"
+type Action = Lowercase<Actions> | "trigger-validate" | "retry-validate" | "trigger-upload" | "reset-uploading" | "reset-validating"
interface ReviewButton {
name: Review,
@@ -64,7 +64,7 @@ export default function ReviewButtons(props: ReviewId) {
<ReviewButton color="info" name="Submit" action="submit" submissionId={submissionId}/>
<ReviewButton color="info" name="Revoke" action="revoke" submissionId={submissionId}/>
<ReviewButton color="info" name="Accept" action="trigger-validate" submissionId={submissionId}/>
- <ReviewButton color="info" name="Validate" action="trigger-validate" submissionId={submissionId}/>
+ <ReviewButton color="info" name="Validate" action="retry-validate" submissionId={submissionId}/>
<ReviewButton color="error" name="Reject" action="reject" submissionId={submissionId}/>
<ReviewButton color="info" name="Upload" action="trigger-upload" submissionId={submissionId}/>
<ReviewButton color="error" name="Reset Uploading (fix softlocked status)" action="reset-uploading" submissionId={submissionId}/>
--
2.47.1
From a7784bdaf5a05344a65f606ce7f1494c07a76af1 Mon Sep 17 00:00:00 2001
From: rhpidfyre <brandon@rhpidfyre.io>
Date: Fri, 28 Mar 2025 18:26:59 -0400
Subject: [PATCH 6/6] web: fix api types
---
.../app/submissions/[submissionId]/_reviewButtons.tsx | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/web/src/app/submissions/[submissionId]/_reviewButtons.tsx b/web/src/app/submissions/[submissionId]/_reviewButtons.tsx
index 44c6e9c..822327c 100644
--- a/web/src/app/submissions/[submissionId]/_reviewButtons.tsx
+++ b/web/src/app/submissions/[submissionId]/_reviewButtons.tsx
@@ -1,12 +1,12 @@
import { Button, ButtonOwnProps } from "@mui/material";
-type Actions = "Completed" | "Submit" | "Reject" | "Revoke" | "Reset Uploading (fix softlocked status)" | "Reset Validating (fix softlocked status)"
-type Review = Actions | "Accept" | "Validate" | "Upload"
-type Action = Lowercase<Actions> | "trigger-validate" | "retry-validate" | "trigger-upload" | "reset-uploading" | "reset-validating"
+type Actions = "Completed" | "Submit" | "Reject" | "Revoke"
+type ApiActions = Lowercase<Actions> | "trigger-validate" | "retry-validate" | "trigger-upload" | "reset-uploading" | "reset-validating"
+type Review = Actions | "Accept" | "Validate" | "Upload" | "Reset Uploading (fix softlocked status)" | "Reset Validating (fix softlocked status)" | "Request Changes"
interface ReviewButton {
name: Review,
- action: Action,
+ action: ApiActions,
submissionId: string,
color: ButtonOwnProps["color"]
}
@@ -15,7 +15,7 @@ interface ReviewId {
submissionId: string
}
-async function ReviewButtonClicked(action: Action, submissionId: string) {
+async function ReviewButtonClicked(action: ApiActions, submissionId: string) {
try {
const response = await fetch(`/api/submissions/${submissionId}/status/${action}`, {
method: "POST",
--
2.47.1