From ffcba574082a8b0952fae12b05e9d4bb731c4bc2 Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Mon, 31 Mar 2025 15:45:06 -0700
Subject: [PATCH] validation: tweak validator-uploaded endpoint
---
validation/api/src/internal.rs | 4 ++--
validation/api/src/types.rs | 2 +-
validation/src/upload_fix.rs | 6 +++++-
validation/src/upload_new.rs | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/validation/api/src/internal.rs b/validation/api/src/internal.rs
index b4bf484..54429e6 100644
--- a/validation/api/src/internal.rs
+++ b/validation/api/src/internal.rs
@@ -151,9 +151,9 @@ impl Context{
let url_raw=format!("{}/submissions/{}/status/validator-uploaded",self.0.base_url,config.SubmissionID);
let mut url=reqwest::Url::parse(url_raw.as_str()).map_err(Error::Parse)?;
- if let Some(target_asset_id)=config.TargetAssetID{
+ {
url.query_pairs_mut()
- .append_pair("TargetAssetID",target_asset_id.to_string().as_str());
+ .append_pair("UploadedAssetID",config.UploadedAssetID.to_string().as_str());
}
response_ok(
self.0.post_empty_body(url).await.map_err(Error::Reqwest)?
diff --git a/validation/api/src/types.rs b/validation/api/src/types.rs
index 41e282e..21da6aa 100644
--- a/validation/api/src/types.rs
+++ b/validation/api/src/types.rs
@@ -177,7 +177,7 @@ pub struct UpdateSubmissionModelRequest{
#[derive(Clone,Debug)]
pub struct ActionSubmissionUploadedRequest{
pub SubmissionID:i64,
- pub TargetAssetID:Option<u64>,
+ pub UploadedAssetID:u64,
}
#[allow(nonstandard_style)]
diff --git a/validation/src/upload_fix.rs b/validation/src/upload_fix.rs
index 8aa3bac..23b375c 100644
--- a/validation/src/upload_fix.rs
+++ b/validation/src/upload_fix.rs
@@ -7,6 +7,7 @@ pub enum UploadError{
Json(serde_json::Error),
Upload(rbx_asset::cookie::UploadError),
ApiActionSubmissionUploaded(submissions_api::Error),
+ Unimplemented,
}
impl std::fmt::Display for UploadError{
fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
@@ -51,10 +52,13 @@ impl Uploader{
// that's it, the database entry does not need to be changed.
+ //TEMP
+ return Err(UploadError::Unimplemented);
+
// mark submission as uploaded, TargetAssetID is unchanged
self.api_internal.action_submission_uploaded(submissions_api::types::ActionSubmissionUploadedRequest{
SubmissionID:upload_info.SubmissionID,
- TargetAssetID:None,
+ UploadedAssetID:0, //TEMP
}).await.map_err(UploadError::ApiActionSubmissionUploaded)?;
Ok(())
diff --git a/validation/src/upload_new.rs b/validation/src/upload_new.rs
index 6e4f074..2a0a6be 100644
--- a/validation/src/upload_new.rs
+++ b/validation/src/upload_new.rs
@@ -52,7 +52,7 @@ impl Uploader{
// note the asset id of the created model for later release, and mark the submission as uploaded
self.api.action_submission_uploaded(submissions_api::types::ActionSubmissionUploadedRequest{
SubmissionID:upload_info.SubmissionID,
- TargetAssetID:Some(upload_response.AssetId),
+ UploadedAssetID:upload_response.AssetId,
}).await.map_err(UploadError::ApiActionSubmissionUploaded)?;
Ok(())