From b0f1e42a06efe345a218843937577477ee0c8917 Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Mon, 31 Mar 2025 19:57:48 -0700
Subject: [PATCH 1/2] web: fix SubmissionInfo type
---
web/src/app/ts/Submission.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web/src/app/ts/Submission.ts b/web/src/app/ts/Submission.ts
index e8624da..6e2aa51 100644
--- a/web/src/app/ts/Submission.ts
+++ b/web/src/app/ts/Submission.ts
@@ -23,7 +23,7 @@ interface SubmissionInfo {
readonly ValidatedAssetID: number,
readonly ValidatedAssetVersion: number,
readonly Completed: boolean,
- readonly TargetAssetID: number,
+ readonly UploadedAssetID: number,
readonly StatusID: SubmissionStatus
readonly StatusMessage: string,
}
--
2.47.1
From 1d7f6ea79a7a882de22c912d3d6bb85c15d3ea6d Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Tue, 1 Apr 2025 13:32:30 -0700
Subject: [PATCH 2/2] nats: rename types
---
pkg/model/nats.go | 8 ++++----
pkg/service/submissions.go | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pkg/model/nats.go b/pkg/model/nats.go
index 1da2918..60114b0 100644
--- a/pkg/model/nats.go
+++ b/pkg/model/nats.go
@@ -5,7 +5,7 @@ package model
// Requests are sent from maps-service to validator
-type ValidateRequest struct {
+type ValidateSubmissionRequest struct {
// submission_id is passed back in the response message
SubmissionID int64
ModelID int64
@@ -14,15 +14,15 @@ type ValidateRequest struct {
}
// Create a new map
-type UploadNewRequest struct {
+type UploadSubmissionRequest struct {
SubmissionID int64
ModelID int64
ModelVersion int64
ModelName string
}
-type UploadFixRequest struct {
- SubmissionID int64
+type UploadMapfixRequest struct {
+ MapfixID int64
ModelID int64
ModelVersion int64
TargetAssetID int64
diff --git a/pkg/service/submissions.go b/pkg/service/submissions.go
index 430e6d0..5944eff 100644
--- a/pkg/service/submissions.go
+++ b/pkg/service/submissions.go
@@ -398,7 +398,7 @@ func (svc *Service) ActionSubmissionTriggerUpload(ctx context.Context, params ap
// sentinel value because we are not using rust
if submission.UploadedAssetID == 0 {
// this is a new map
- upload_new_request := model.UploadNewRequest{
+ upload_new_request := model.UploadSubmissionRequest{
SubmissionID: submission.ID,
ModelID: submission.ValidatedAssetID,
ModelVersion: submission.ValidatedAssetVersion,
@@ -499,7 +499,7 @@ func (svc *Service) ActionSubmissionTriggerValidate(ctx context.Context, params
return err
}
- validate_request := model.ValidateRequest{
+ validate_request := model.ValidateSubmissionRequest{
SubmissionID: submission.ID,
ModelID: submission.AssetID,
ModelVersion: submission.AssetVersion,
@@ -549,7 +549,7 @@ func (svc *Service) ActionSubmissionRetryValidate(ctx context.Context, params ap
return err
}
- validate_request := model.ValidateRequest{
+ validate_request := model.ValidateSubmissionRequest{
SubmissionID: submission.ID,
ModelID: submission.AssetID,
ModelVersion: submission.AssetVersion,
--
2.47.1