StrafesNET/maps-service
5
Fork 0
Code Issues15 Pull Requests1 Packages Projects Releases Wiki Activity

Fixups #57

Merged
Quaternions merged 2 commits from web-fixup into staging 2025-04-01 20:34:17 +00:00
Conversation 0 Commits 2 Files Changed 3 +8 -8
3 changed files with 8 additions and 8 deletions
pkg
model
nats.go
service
submissions.go
web/src/app/ts
Submission.ts

8
pkg/model/nats.go

@ -5,7 +5,7 @@ package model
// Requests are sent from maps-service to validator // Requests are sent from maps-service to validator
type ValidateRequest struct { type ValidateSubmissionRequest struct {
// submission_id is passed back in the response message // submission_id is passed back in the response message
SubmissionID int64 SubmissionID int64
ModelID int64 ModelID int64
@ -14,15 +14,15 @@ type ValidateRequest struct {
} }
// Create a new map // Create a new map
type UploadNewRequest struct { type UploadSubmissionRequest struct {
SubmissionID int64 SubmissionID int64
ModelID int64 ModelID int64
ModelVersion int64 ModelVersion int64
ModelName string ModelName string
} }
type UploadFixRequest struct { type UploadMapfixRequest struct {
SubmissionID int64 MapfixID int64
ModelID int64 ModelID int64
ModelVersion int64 ModelVersion int64
TargetAssetID int64 TargetAssetID int64

6
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 // sentinel value because we are not using rust
if submission.UploadedAssetID == 0 { if submission.UploadedAssetID == 0 {
// this is a new map // this is a new map
upload_new_request := model.UploadNewRequest{ upload_new_request := model.UploadSubmissionRequest{
SubmissionID: submission.ID, SubmissionID: submission.ID,
ModelID: submission.ValidatedAssetID, ModelID: submission.ValidatedAssetID,
ModelVersion: submission.ValidatedAssetVersion, ModelVersion: submission.ValidatedAssetVersion,
@ -499,7 +499,7 @@ func (svc *Service) ActionSubmissionTriggerValidate(ctx context.Context, params
return err return err
} }
validate_request := model.ValidateRequest{ validate_request := model.ValidateSubmissionRequest{
SubmissionID: submission.ID, SubmissionID: submission.ID,
ModelID: submission.AssetID, ModelID: submission.AssetID,
ModelVersion: submission.AssetVersion, ModelVersion: submission.AssetVersion,
@ -549,7 +549,7 @@ func (svc *Service) ActionSubmissionRetryValidate(ctx context.Context, params ap
return err return err
} }
validate_request := model.ValidateRequest{ validate_request := model.ValidateSubmissionRequest{
SubmissionID: submission.ID, SubmissionID: submission.ID,
ModelID: submission.AssetID, ModelID: submission.AssetID,
ModelVersion: submission.AssetVersion, ModelVersion: submission.AssetVersion,

2
web/src/app/ts/Submission.ts

@ -23,7 +23,7 @@ interface SubmissionInfo {
readonly ValidatedAssetID: number, readonly ValidatedAssetID: number,
readonly ValidatedAssetVersion: number, readonly ValidatedAssetVersion: number,
readonly Completed: boolean, readonly Completed: boolean,
readonly TargetAssetID: number, readonly UploadedAssetID: number,
readonly StatusID: SubmissionStatus readonly StatusID: SubmissionStatus
readonly StatusMessage: string, readonly StatusMessage: string,
} }