validator: refactor + remove mapfix capability

validation/api/src/external.rs

@@ -14,7 +14,7 @@ impl Context{
 		response_ok(
 			self.0.get(url).await.map_err(Error::Reqwest)?
 		).await.map_err(Error::Response)?
-		.json().await.map_err(Error::ReqwestJson)
+		.json().await.map_err(Error::Reqwest)
 	}
 	pub async fn get_scripts<'a>(&self,config:GetScriptsRequest<'a>)->Result<Vec<ScriptResponse>,Error>{
 		let url_raw=format!("{}/scripts",self.0.base_url);
@@ -33,18 +33,15 @@ impl Context{
 			if let Some(source)=config.Source{
 				query_pairs.append_pair("Source",source);
 			}
-			if let Some(resource_type)=config.ResourceType{
-				query_pairs.append_pair("ResourceType",(resource_type as i32).to_string().as_str());
-			}
-			if let Some(resource_id)=config.ResourceID{
-				query_pairs.append_pair("ResourceID",resource_id.to_string().as_str());
+			if let Some(submission_id)=config.SubmissionID{
+				query_pairs.append_pair("SubmissionID",submission_id.to_string().as_str());
 			}
 		}
 
 		response_ok(
 			self.0.get(url).await.map_err(Error::Reqwest)?
 		).await.map_err(Error::Response)?
-		.json().await.map_err(Error::ReqwestJson)
+		.json().await.map_err(Error::Reqwest)
 	}
 	pub async fn get_script_from_hash<'a>(&self,config:HashRequest<'a>)->Result<Option<ScriptResponse>,SingleItemError>{
 		let scripts=self.get_scripts(GetScriptsRequest{
@@ -53,8 +50,7 @@ impl Context{
 			Hash:Some(config.hash),
 			Name:None,
 			Source:None,
-			ResourceType:None,
-			ResourceID:None,
+			SubmissionID:None,
 		}).await.map_err(SingleItemError::Other)?;
 		if 1<scripts.len(){
 			return Err(SingleItemError::DuplicateItems);
@@ -70,7 +66,7 @@ impl Context{
 		response_ok(
 			self.0.post(url,body).await.map_err(Error::Reqwest)?
 		).await.map_err(Error::Response)?
-		.json().await.map_err(Error::ReqwestJson)
+		.json().await.map_err(Error::Reqwest)
 	}
 	pub async fn get_script_policies<'a>(&self,config:GetScriptPoliciesRequest<'a>)->Result<Vec<ScriptPolicyResponse>,Error>{
 		let url_raw=format!("{}/script-policy",self.0.base_url);
@@ -94,7 +90,7 @@ impl Context{
 		response_ok(
 			self.0.get(url).await.map_err(Error::Reqwest)?
 		).await.map_err(Error::Response)?
-		.json().await.map_err(Error::ReqwestJson)
+		.json().await.map_err(Error::Reqwest)
 	}
 	pub async fn get_script_policy_from_hash<'a>(&self,config:HashRequest<'a>)->Result<Option<ScriptPolicyResponse>,SingleItemError>{
 		let policies=self.get_script_policies(GetScriptPoliciesRequest{
@@ -118,7 +114,7 @@ impl Context{
 		response_ok(
 			self.0.post(url,body).await.map_err(Error::Reqwest)?
 		).await.map_err(Error::Response)?
-		.json().await.map_err(Error::ReqwestJson)
+		.json().await.map_err(Error::Reqwest)
 	}
 	pub async fn update_script_policy(&self,config:UpdateScriptPolicyRequest)->Result<(),Error>{
 		let url_raw=format!("{}/script-policy/{}",self.0.base_url,config.ID.0);

validation/api/src/internal.rs

@@ -29,7 +29,7 @@ impl Context{
 		response_ok(
 			self.0.get(url).await.map_err(Error::Reqwest)?
 		).await.map_err(Error::Response)?
-		.json().await.map_err(Error::ReqwestJson)
+		.json().await.map_err(Error::Reqwest)
 	}
 	pub async fn get_scripts<'a>(&self,config:GetScriptsRequest<'a>)->Result<Vec<ScriptResponse>,Error>{
 		let url_raw=format!("{}/scripts",self.0.base_url);
@@ -48,18 +48,15 @@ impl Context{
 			if let Some(source)=config.Source{
 				query_pairs.append_pair("Source",source);
 			}
-			if let Some(resource_type)=config.ResourceType{
-				query_pairs.append_pair("ResourceType",(resource_type as i32).to_string().as_str());
-			}
-			if let Some(resource_id)=config.ResourceID{
-				query_pairs.append_pair("ResourceID",resource_id.to_string().as_str());
+			if let Some(submission_id)=config.SubmissionID{
+				query_pairs.append_pair("SubmissionID",submission_id.to_string().as_str());
 			}
 		}
 
 		response_ok(
 			self.0.get(url).await.map_err(Error::Reqwest)?
 		).await.map_err(Error::Response)?
-		.json().await.map_err(Error::ReqwestJson)
+		.json().await.map_err(Error::Reqwest)
 	}
 	pub async fn get_script_from_hash<'a>(&self,config:HashRequest<'a>)->Result<Option<ScriptResponse>,SingleItemError>{
 		let scripts=self.get_scripts(GetScriptsRequest{
@@ -68,8 +65,7 @@ impl Context{
 			Hash:Some(config.hash),
 			Name:None,
 			Source:None,
-			ResourceType:None,
-			ResourceID:None,
+			SubmissionID:None,
 		}).await.map_err(SingleItemError::Other)?;
 		if 1<scripts.len(){
 			return Err(SingleItemError::DuplicateItems);
@@ -85,7 +81,7 @@ impl Context{
 		response_ok(
 			self.0.post(url,body).await.map_err(Error::Reqwest)?
 		).await.map_err(Error::Response)?
-		.json().await.map_err(Error::ReqwestJson)
+		.json().await.map_err(Error::Reqwest)
 	}
 	pub async fn get_script_policies<'a>(&self,config:GetScriptPoliciesRequest<'a>)->Result<Vec<ScriptPolicyResponse>,Error>{
 		let url_raw=format!("{}/script-policy",self.0.base_url);
@@ -109,7 +105,7 @@ impl Context{
 		response_ok(
 			self.0.get(url).await.map_err(Error::Reqwest)?
 		).await.map_err(Error::Response)?
-		.json().await.map_err(Error::ReqwestJson)
+		.json().await.map_err(Error::Reqwest)
 	}
 	pub async fn get_script_policy_from_hash<'a>(&self,config:HashRequest<'a>)->Result<Option<ScriptPolicyResponse>,SingleItemError>{
 		let policies=self.get_script_policies(GetScriptPoliciesRequest{
@@ -133,7 +129,7 @@ impl Context{
 		response_ok(
 			self.0.post(url,body).await.map_err(Error::Reqwest)?
 		).await.map_err(Error::Response)?
-		.json().await.map_err(Error::ReqwestJson)
+		.json().await.map_err(Error::Reqwest)
 	}
 	pub async fn update_submission_validated_model(&self,config:UpdateSubmissionModelRequest)->Result<(),Error>{
 		let url_raw=format!("{}/submissions/{}/validated-model",self.0.base_url,config.SubmissionID);

validation/api/src/types.rs

@@ -2,7 +2,6 @@
 pub enum Error{
 	Parse(url::ParseError),
 	Reqwest(reqwest::Error),
-	ReqwestJson(reqwest::Error),
 	Response(ResponseError),
 	JSON(serde_json::Error),
 }
@@ -66,14 +65,6 @@ pub struct ScriptID(pub(crate)i64);
 #[derive(Clone,Copy,Debug,serde::Serialize,serde::Deserialize)]
 pub struct ScriptPolicyID(pub(crate)i64);
 
-#[derive(Clone,Copy,Debug,PartialEq,Eq,serde_repr::Serialize_repr,serde_repr::Deserialize_repr)]
-#[repr(i32)]
-pub enum ResourceType{
-	Unknown=0,
-	Mapfix=1,
-	Submission=2,
-}
-
 #[allow(nonstandard_style)]
 pub struct GetScriptRequest{
 	pub ScriptID:ScriptID,
@@ -90,9 +81,7 @@ pub struct GetScriptsRequest<'a>{
 	#[serde(skip_serializing_if="Option::is_none")]
 	pub Source:Option<&'a str>,
 	#[serde(skip_serializing_if="Option::is_none")]
-	pub ResourceType:Option<ResourceType>,
-	#[serde(skip_serializing_if="Option::is_none")]
-	pub ResourceID:Option<i64>,
+	pub SubmissionID:Option<i64>,
 }
 #[derive(Clone,Copy,Debug)]
 pub struct HashRequest<'a>{
@@ -105,8 +94,13 @@ pub struct ScriptResponse{
 	pub Name:String,
 	pub Hash:String,
 	pub Source:String,
-	pub ResourceType:ResourceType,
-	pub ResourceID:i64,
+	pub SubmissionID:i64,
+}
+#[derive(Clone,Debug,serde::Serialize)]
+pub enum ResourceType{
+	Unknown=0,
+	Mapfix=1,
+	Submission=2,
 }
 #[allow(nonstandard_style)]
 #[derive(Clone,Debug,serde::Serialize)]