From 85a144e27632850520886a4815138fc0c0826e4b Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Wed, 26 Mar 2025 14:58:28 -0700
Subject: [PATCH 1/5] submissions-api: v0.6.1
---
Cargo.lock | 2 +-
validation/api/Cargo.toml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index ccbe6fb..667f43c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1833,7 +1833,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "submissions-api"
-version = "0.6.0"
+version = "0.6.1"
dependencies = [
"reqwest",
"serde",
diff --git a/validation/api/Cargo.toml b/validation/api/Cargo.toml
index 7c4c9ae..54c0f51 100644
--- a/validation/api/Cargo.toml
+++ b/validation/api/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "submissions-api"
-version = "0.6.0"
+version = "0.6.1"
edition = "2021"
publish = ["strafesnet"]
repository = "https://git.itzana.me/StrafesNET/maps-service"
--
2.47.1
From 2867da4b210328b948523231d2b9eaf25b9c3138 Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Wed, 26 Mar 2025 15:33:47 -0700
Subject: [PATCH 2/5] submissions: detect sentinel value
---
pkg/model/nats.go | 2 +-
pkg/service/submissions.go | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/pkg/model/nats.go b/pkg/model/nats.go
index 44d3cae..e193d10 100644
--- a/pkg/model/nats.go
+++ b/pkg/model/nats.go
@@ -10,7 +10,7 @@ type ValidateRequest struct {
SubmissionID int64
ModelID int64
ModelVersion int64
- ValidatedModelID int64 // optional value
+ ValidatedModelID *int64 // optional value
}
// Create a new map
diff --git a/pkg/service/submissions.go b/pkg/service/submissions.go
index 6e3bfb1..54b2d5f 100644
--- a/pkg/service/submissions.go
+++ b/pkg/service/submissions.go
@@ -534,7 +534,12 @@ func (svc *Service) ActionSubmissionTriggerValidate(ctx context.Context, params
SubmissionID: submission.ID,
ModelID: submission.AssetID,
ModelVersion: submission.AssetVersion,
- ValidatedModelID: submission.ValidatedAssetID,
+ 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)
--
2.47.1
From 1053719eab5b8301f7aed08475cf390eb0163d89 Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Wed, 26 Mar 2025 15:40:57 -0700
Subject: [PATCH 3/5] openapi: rename field
---
openapi-internal.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/openapi-internal.yaml b/openapi-internal.yaml
index b03e46b..83e24a4 100644
--- a/openapi-internal.yaml
+++ b/openapi-internal.yaml
@@ -21,7 +21,7 @@ paths:
schema:
type: integer
format: int64
- - name: VersionID
+ - name: ValidatedModelVersion
in: query
required: true
schema:
--
2.47.1
From 1468a9edc2a1f28098eb4e379e341fc8d8031ec8 Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Wed, 26 Mar 2025 15:41:19 -0700
Subject: [PATCH 4/5] openapi: generate
---
pkg/internal/oas_client_gen.go | 6 +++---
pkg/internal/oas_handlers_gen.go | 4 ++--
pkg/internal/oas_parameters_gen.go | 18 +++++++++---------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/pkg/internal/oas_client_gen.go b/pkg/internal/oas_client_gen.go
index f447073..7350ba5 100644
--- a/pkg/internal/oas_client_gen.go
+++ b/pkg/internal/oas_client_gen.go
@@ -1096,15 +1096,15 @@ func (c *Client) sendUpdateSubmissionValidatedModel(ctx context.Context, params
}
}
{
- // Encode "VersionID" parameter.
+ // Encode "ValidatedModelVersion" parameter.
cfg := uri.QueryParameterEncodingConfig{
- Name: "VersionID",
+ Name: "ValidatedModelVersion",
Style: uri.QueryStyleForm,
Explode: true,
}
if err := q.EncodeParam(cfg, func(e uri.Encoder) error {
- return e.EncodeValue(conv.Int64ToString(params.VersionID))
+ return e.EncodeValue(conv.Int64ToString(params.ValidatedModelVersion))
}); err != nil {
return res, errors.Wrap(err, "encode query")
}
diff --git a/pkg/internal/oas_handlers_gen.go b/pkg/internal/oas_handlers_gen.go
index 40cbf2d..0a85800 100644
--- a/pkg/internal/oas_handlers_gen.go
+++ b/pkg/internal/oas_handlers_gen.go
@@ -1369,9 +1369,9 @@ func (s *Server) handleUpdateSubmissionValidatedModelRequest(args [1]string, arg
In: "query",
}: params.ValidatedModelID,
{
- Name: "VersionID",
+ Name: "ValidatedModelVersion",
In: "query",
- }: params.VersionID,
+ }: params.ValidatedModelVersion,
},
Raw: r,
}
diff --git a/pkg/internal/oas_parameters_gen.go b/pkg/internal/oas_parameters_gen.go
index d138660..5bc3afd 100644
--- a/pkg/internal/oas_parameters_gen.go
+++ b/pkg/internal/oas_parameters_gen.go
@@ -1114,9 +1114,9 @@ func decodeListScriptsParams(args [0]string, argsEscaped bool, r *http.Request)
// UpdateSubmissionValidatedModelParams is parameters of updateSubmissionValidatedModel operation.
type UpdateSubmissionValidatedModelParams struct {
// The unique identifier for a submission.
- SubmissionID int64
- ValidatedModelID int64
- VersionID int64
+ SubmissionID int64
+ ValidatedModelID int64
+ ValidatedModelVersion int64
}
func unpackUpdateSubmissionValidatedModelParams(packed middleware.Parameters) (params UpdateSubmissionValidatedModelParams) {
@@ -1136,10 +1136,10 @@ func unpackUpdateSubmissionValidatedModelParams(packed middleware.Parameters) (p
}
{
key := middleware.ParameterKey{
- Name: "VersionID",
+ Name: "ValidatedModelVersion",
In: "query",
}
- params.VersionID = packed[key].(int64)
+ params.ValidatedModelVersion = packed[key].(int64)
}
return params
}
@@ -1227,10 +1227,10 @@ func decodeUpdateSubmissionValidatedModelParams(args [1]string, argsEscaped bool
Err: err,
}
}
- // Decode query: VersionID.
+ // Decode query: ValidatedModelVersion.
if err := func() error {
cfg := uri.QueryParameterDecodingConfig{
- Name: "VersionID",
+ Name: "ValidatedModelVersion",
Style: uri.QueryStyleForm,
Explode: true,
}
@@ -1247,7 +1247,7 @@ func decodeUpdateSubmissionValidatedModelParams(args [1]string, argsEscaped bool
return err
}
- params.VersionID = c
+ params.ValidatedModelVersion = c
return nil
}); err != nil {
return err
@@ -1258,7 +1258,7 @@ func decodeUpdateSubmissionValidatedModelParams(args [1]string, argsEscaped bool
return nil
}(); err != nil {
return params, &ogenerrors.DecodeParamError{
- Name: "VersionID",
+ Name: "ValidatedModelVersion",
In: "query",
Err: err,
}
--
2.47.1
From 188fbd2a6d4474332a072fa87abcb506f1e1fe91 Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Wed, 26 Mar 2025 15:41:46 -0700
Subject: [PATCH 5/5] submissions: rename VersionID to ValidatedModelVersion
---
pkg/service_internal/submissions.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkg/service_internal/submissions.go b/pkg/service_internal/submissions.go
index 3b6edd4..0d3a33a 100644
--- a/pkg/service_internal/submissions.go
+++ b/pkg/service_internal/submissions.go
@@ -17,7 +17,7 @@ func (svc *Service) UpdateSubmissionValidatedModel(ctx context.Context, params i
// check if Status is ChangesRequested|Submitted|UnderConstruction
pmap := datastore.Optional()
pmap.AddNotNil("validated_asset_id", params.ValidatedModelID)
- pmap.AddNotNil("validated_asset_version", params.VersionID)
+ pmap.AddNotNil("validated_asset_version", params.ValidatedModelVersion)
// DO NOT reset completed when validated model is updated
// pmap.Add("completed", false)
return svc.DB.Submissions().IfStatusThenUpdate(ctx, params.SubmissionID, []model.Status{model.StatusValidating}, pmap)
--
2.47.1