diff --git a/validation/api/src/internal.rs b/validation/api/src/internal.rs index a281dcc..d689981 100644 --- a/validation/api/src/internal.rs +++ b/validation/api/src/internal.rs @@ -163,7 +163,7 @@ impl Context{ } // simple submission endpoints action!("submissions",action_submission_request_changes,config,ActionSubmissionRequestChangesRequest,"status/validator-request-changes",config.SubmissionID, - ("StatusMessage",config.StatusMessage.as_str()) + ("ErrorMessage",config.ErrorMessage.as_str()) ); action!("submissions",action_submission_submitted,config,ActionSubmissionSubmittedRequest,"status/validator-submitted",config.SubmissionID, ("ModelVersion",config.ModelVersion.to_string().as_str()) @@ -177,7 +177,7 @@ impl Context{ ("UploadedAssetID",config.UploadedAssetID.to_string().as_str()) ); action!("submissions",action_submission_accepted,config,ActionSubmissionAcceptedRequest,"status/validator-failed",config.SubmissionID, - ("StatusMessage",config.StatusMessage.as_str()) + ("ErrorMessage",config.ErrorMessage.as_str()) ); pub async fn create_mapfix<'a>(&self,config:CreateMapfixRequest<'a>)->Result<MapfixIDResponse,Error>{ let url_raw=format!("{}/mapfixes",self.0.base_url); @@ -192,7 +192,7 @@ impl Context{ } // simple mapfixes endpoints action!("mapfixes",action_mapfix_request_changes,config,ActionMapfixRequestChangesRequest,"status/validator-request-changes",config.MapfixID, - ("StatusMessage",config.StatusMessage.as_str()) + ("ErrorMessage",config.ErrorMessage.as_str()) ); action!("mapfixes",action_mapfix_submitted,config,ActionMapfixSubmittedRequest,"status/validator-submitted",config.MapfixID, ("ModelVersion",config.ModelVersion.to_string().as_str()) @@ -204,7 +204,7 @@ impl Context{ ); action!("mapfixes",action_mapfix_uploaded,config,ActionMapfixUploadedRequest,"status/validator-uploaded",config.MapfixID,); action!("mapfixes",action_mapfix_accepted,config,ActionMapfixAcceptedRequest,"status/validator-failed",config.MapfixID, - ("StatusMessage",config.StatusMessage.as_str()) + ("ErrorMessage",config.ErrorMessage.as_str()) ); // simple operation endpoint action!("operations",action_operation_failed,config,ActionOperationFailedRequest,"status/operation-failed",config.OperationID, diff --git a/validation/api/src/types.rs b/validation/api/src/types.rs index 9ff38bf..671b6d1 100644 --- a/validation/api/src/types.rs +++ b/validation/api/src/types.rs @@ -233,7 +233,7 @@ pub struct ActionSubmissionSubmittedRequest{ #[derive(Clone,Debug)] pub struct ActionSubmissionRequestChangesRequest{ pub SubmissionID:i64, - pub StatusMessage:String, + pub ErrorMessage:String, } #[allow(nonstandard_style)] @@ -247,7 +247,7 @@ pub struct ActionSubmissionUploadedRequest{ #[derive(Clone,Debug)] pub struct ActionSubmissionAcceptedRequest{ pub SubmissionID:i64, - pub StatusMessage:String, + pub ErrorMessage:String, } #[derive(Clone,Copy,Debug,serde::Deserialize)] @@ -272,7 +272,7 @@ pub struct ActionMapfixSubmittedRequest{ #[derive(Clone,Debug)] pub struct ActionMapfixRequestChangesRequest{ pub MapfixID:i64, - pub StatusMessage:String, + pub ErrorMessage:String, } #[allow(nonstandard_style)] @@ -285,7 +285,7 @@ pub struct ActionMapfixUploadedRequest{ #[derive(Clone,Debug)] pub struct ActionMapfixAcceptedRequest{ pub MapfixID:i64, - pub StatusMessage:String, + pub ErrorMessage:String, } #[derive(Clone,Copy,Debug,serde::Deserialize)] diff --git a/validation/src/check_mapfix.rs b/validation/src/check_mapfix.rs index b261f4e..a562ed0 100644 --- a/validation/src/check_mapfix.rs +++ b/validation/src/check_mapfix.rs @@ -35,7 +35,7 @@ impl crate::message_handler::MessageHandler{ self.api.action_mapfix_request_changes( submissions_api::types::ActionMapfixRequestChangesRequest{ MapfixID:mapfix_id, - StatusMessage:report.to_string(), + ErrorMessage:report.to_string(), } ).await.map_err(Error::ApiActionMapfixCheck)?; } @@ -46,7 +46,7 @@ impl crate::message_handler::MessageHandler{ self.api.action_mapfix_request_changes( submissions_api::types::ActionMapfixRequestChangesRequest{ MapfixID:mapfix_id, - StatusMessage:e.to_string(), + ErrorMessage:e.to_string(), } ).await.map_err(Error::ApiActionMapfixCheck)?; }, diff --git a/validation/src/check_submission.rs b/validation/src/check_submission.rs index 12f18e1..05d0f18 100644 --- a/validation/src/check_submission.rs +++ b/validation/src/check_submission.rs @@ -35,7 +35,7 @@ impl crate::message_handler::MessageHandler{ self.api.action_submission_request_changes( submissions_api::types::ActionSubmissionRequestChangesRequest{ SubmissionID:submission_id, - StatusMessage:report.to_string(), + ErrorMessage:report.to_string(), } ).await.map_err(Error::ApiActionSubmissionCheck)?; } @@ -46,7 +46,7 @@ impl crate::message_handler::MessageHandler{ self.api.action_submission_request_changes( submissions_api::types::ActionSubmissionRequestChangesRequest{ SubmissionID:submission_id, - StatusMessage:e.to_string(), + ErrorMessage:e.to_string(), } ).await.map_err(Error::ApiActionSubmissionCheck)?; }, diff --git a/validation/src/validate_mapfix.rs b/validation/src/validate_mapfix.rs index c1607f6..287f4ac 100644 --- a/validation/src/validate_mapfix.rs +++ b/validation/src/validate_mapfix.rs @@ -29,7 +29,7 @@ impl crate::message_handler::MessageHandler{ // update the mapfix model status to accepted self.api.action_mapfix_accepted(submissions_api::types::ActionMapfixAcceptedRequest{ MapfixID:mapfix_id, - StatusMessage:format!("{e}"), + ErrorMessage:format!("{e}"), }).await.map_err(Error::ApiActionMapfixValidate)?; }, } diff --git a/validation/src/validate_submission.rs b/validation/src/validate_submission.rs index 5859bd6..7072b4b 100644 --- a/validation/src/validate_submission.rs +++ b/validation/src/validate_submission.rs @@ -29,7 +29,7 @@ impl crate::message_handler::MessageHandler{ // update the submission model status to accepted self.api.action_submission_accepted(submissions_api::types::ActionSubmissionAcceptedRequest{ SubmissionID:submission_id, - StatusMessage:format!("{e}"), + ErrorMessage:format!("{e}"), }).await.map_err(Error::ApiActionSubmissionValidate)?; }, }