validation: use to_string instead of format

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,

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)]

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)?;
 			},

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)?;
 			},

validation/src/create_mapfix.rs

@@ -43,7 +43,7 @@ impl crate::message_handler::MessageHandler{
 		if let Err(e)=create_result{
 			self.api.action_operation_failed(submissions_api::types::ActionOperationFailedRequest{
 				OperationID:operation_id,
-				StatusMessage:format!("{e}"),
+				StatusMessage:e.to_string(),
 			}).await?;
 		}
 

validation/src/create_submission.rs

@@ -40,7 +40,7 @@ impl crate::message_handler::MessageHandler{
 		if let Err(e)=create_result{
 			self.api.action_operation_failed(submissions_api::types::ActionOperationFailedRequest{
 				OperationID:operation_id,
-				StatusMessage:format!("{e}"),
+				StatusMessage:e.to_string(),
 			}).await?;
 		}
 

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:e.to_string(),
 				}).await.map_err(Error::ApiActionMapfixValidate)?;
 			},
 		}

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:e.to_string(),
 				}).await.map_err(Error::ApiActionSubmissionValidate)?;
 			},
 		}

web/src/app/mapfixes/[mapfixId]/_comments.tsx

@@ -12,7 +12,6 @@ interface CreatorAndReviewStatus {
     asset_id: MapfixInfo["AssetID"],
     creator: MapfixInfo["DisplayName"],
     review: MapfixInfo["StatusID"],
-    status_message: MapfixInfo["StatusMessage"],
     submitter: MapfixInfo["Submitter"],
     target_asset_id: MapfixInfo["TargetAssetID"],
     comments: Comment[],

web/src/app/mapfixes/[mapfixId]/page.tsx

@@ -54,7 +54,6 @@ function TitleAndComments(stats: CreatorAndReviewStatus) {
             <p className="submitter">Submitter {stats.submitter}</p>
             <p className="asset-id">Model Asset ID {stats.asset_id}</p>
             <p className="target-asset-id">Target Asset ID {stats.target_asset_id}</p>
-            <p className="status-message">Validation Error: {stats.status_message}</p>
             <span className="spacer"></span>
             <Comments comments_data={stats}/>
         </main>
@@ -86,7 +85,7 @@ export default function MapfixInfoPage() {
             <main className="map-page-main">
                 <section className="review-section">
 						<RatingArea mapfixId={dynamicId.mapfixId} mapfixStatus={mapfix.StatusID} mapfixSubmitter={mapfix.Submitter} mapfixAssetId={mapfix.AssetID} mapfixTargetAssetId={mapfix.TargetAssetID} />
-                    <TitleAndComments name={mapfix.DisplayName} creator={mapfix.Creator} review={mapfix.StatusID} status_message={mapfix.StatusMessage} asset_id={mapfix.AssetID} submitter={mapfix.Submitter} target_asset_id={mapfix.TargetAssetID} comments={[]}/>
+                    <TitleAndComments name={mapfix.DisplayName} creator={mapfix.Creator} review={mapfix.StatusID} asset_id={mapfix.AssetID} submitter={mapfix.Submitter} target_asset_id={mapfix.TargetAssetID} comments={[]}/>
                 </section>
             </main>
         </Webpage>

web/src/app/submissions/[submissionId]/_comments.tsx

@@ -12,7 +12,6 @@ interface CreatorAndReviewStatus {
     asset_id: SubmissionInfo["AssetID"],
     creator: SubmissionInfo["DisplayName"],
     review: SubmissionInfo["StatusID"],
-    status_message: SubmissionInfo["StatusMessage"],
     submitter: SubmissionInfo["Submitter"],
     uploaded_asset_id: SubmissionInfo["UploadedAssetID"],
     comments: Comment[],

web/src/app/submissions/[submissionId]/page.tsx

@@ -46,7 +46,6 @@ function TitleAndComments(stats: CreatorAndReviewStatus) {
             <p className="submitter">Submitter {stats.submitter}</p>
             <p className="asset-id">Model Asset ID {stats.asset_id}</p>
             <p className="uploaded-asset-id">Uploaded Asset ID {stats.uploaded_asset_id}</p>
-            <p className="status-message">Validation Error: {stats.status_message}</p>
             <span className="spacer"></span>
             <Comments comments_data={stats}/>
         </main>
@@ -78,7 +77,7 @@ export default function SubmissionInfoPage() {
             <main className="map-page-main">
                 <section className="review-section">
 					<RatingArea assetId={submission.AssetID} submissionId={dynamicId.submissionId} submissionStatus={submission.StatusID} submissionSubmitter={submission.Submitter}/>
-                    <TitleAndComments name={submission.DisplayName} creator={submission.Creator} review={submission.StatusID} status_message={submission.StatusMessage} asset_id={submission.AssetID} submitter={submission.Submitter} uploaded_asset_id={submission.UploadedAssetID} comments={[]}/>
+                    <TitleAndComments name={submission.DisplayName} creator={submission.Creator} review={submission.StatusID} asset_id={submission.AssetID} submitter={submission.Submitter} uploaded_asset_id={submission.UploadedAssetID} comments={[]}/>
                 </section>
             </main>
         </Webpage>

web/src/app/ts/Mapfix.ts

@@ -25,8 +25,7 @@ interface MapfixInfo {
     readonly ValidatedAssetVersion:  number,
     readonly Completed:     boolean,
     readonly TargetAssetID: number,
-    readonly StatusID:      MapfixStatus
-    readonly StatusMessage: string,
+    readonly StatusID:      MapfixStatus,
 }
 
 interface MapfixList {

web/src/app/ts/Submission.ts

@@ -25,8 +25,7 @@ interface SubmissionInfo {
     readonly ValidatedAssetVersion:  number,
     readonly Completed:     boolean,
     readonly UploadedAssetID: number,
-    readonly StatusID:      SubmissionStatus
-    readonly StatusMessage: string,
+    readonly StatusID:      SubmissionStatus,
 }
 
 interface SubmissionList {