diff --git a/validation/api/src/internal.rs b/validation/api/src/internal.rs index ed0e85c..19d3c4e 100644 --- a/validation/api/src/internal.rs +++ b/validation/api/src/internal.rs @@ -22,7 +22,7 @@ macro_rules! query_pairs{ macro_rules! action{ ($system:expr,$fname:ident,$config:ident,$config_type:ident,$action:expr,$config_submission_id:expr,$(($param:expr,$value:expr))*)=>{ pub async fn $fname(&self,$config:$config_type)->Result<(),Error>{ - let url_raw=format!(concat!("{}/",$system,"/{}/status/",$action),self.0.base_url,$config_submission_id); + let url_raw=format!(concat!("{}/",$system,"/{}/",$action),self.0.base_url,$config_submission_id); let url=query_pairs!(reqwest::Url::parse(url_raw.as_str()).map_err(Error::Parse)?,$(($param,$value))*); response_ok( @@ -162,15 +162,15 @@ impl Context{ .json().await.map_err(Error::ReqwestJson) } // simple submission endpoints - action!("submissions",action_submission_validated,config,SubmissionID,"validator-validated",config.0,); + action!("submissions",action_submission_validated,config,SubmissionID,"status/validator-validated",config.0,); action!("submissions",update_submission_validated_model,config,UpdateSubmissionModelRequest,"validated-model",config.SubmissionID, ("ValidatedModelID",config.ModelID.to_string().as_str()) ("ValidatedModelVersion",config.ModelVersion.to_string().as_str()) ); - action!("submissions",action_submission_uploaded,config,ActionSubmissionUploadedRequest,"validator-uploaded",config.SubmissionID, + action!("submissions",action_submission_uploaded,config,ActionSubmissionUploadedRequest,"status/validator-uploaded",config.SubmissionID, ("UploadedAssetID",config.UploadedAssetID.to_string().as_str()) ); - action!("submissions",action_submission_accepted,config,ActionSubmissionAcceptedRequest,"validator-failed",config.SubmissionID, + action!("submissions",action_submission_accepted,config,ActionSubmissionAcceptedRequest,"status/validator-failed",config.SubmissionID, ("StatusMessage",config.StatusMessage.as_str()) ); pub async fn create_mapfix<'a>(&self,config:CreateMapfixRequest<'a>)->Result<MapfixIDResponse,Error>{ @@ -185,17 +185,17 @@ impl Context{ .json().await.map_err(Error::ReqwestJson) } // simple mapfixes endpoints - action!("mapfixes",action_mapfix_validated,config,MapfixID,"validator-validated",config.0,); + action!("mapfixes",action_mapfix_validated,config,MapfixID,"status/validator-validated",config.0,); action!("mapfixes",update_mapfix_validated_model,config,UpdateMapfixModelRequest,"validated-model",config.MapfixID, ("ValidatedModelID",config.ModelID.to_string().as_str()) ("ValidatedModelVersion",config.ModelVersion.to_string().as_str()) ); - action!("mapfixes",action_mapfix_uploaded,config,ActionMapfixUploadedRequest,"validator-uploaded",config.MapfixID,); - action!("mapfixes",action_mapfix_accepted,config,ActionMapfixAcceptedRequest,"validator-failed",config.MapfixID, + 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()) ); // simple operation endpoint - action!("operations",action_operation_failed,config,ActionOperationFailedRequest,"operation-failed",config.OperationID, + action!("operations",action_operation_failed,config,ActionOperationFailedRequest,"status/operation-failed",config.OperationID, ("StatusMessage",config.StatusMessage.as_str()) ); }