tweak(labrinth): expose base62 file IDs more consistently for Delphi

Author: AlexTMjugador

apps/labrinth/src/database/models/version_item.rs

@@ -167,7 +167,9 @@ impl VersionFileBuilder {
 
         if let Err(err) = crate::routes::internal::delphi::run(
             &mut **transaction,
-            DelphiRunParameters { file_id },
+            DelphiRunParameters {
+                file_id: file_id.into(),
+            },
         )
         .await
         {

apps/labrinth/src/models/v3/projects.rs

@@ -5,7 +5,7 @@ use crate::database::models::loader_fields::VersionField;
 use crate::database::models::project_item::{LinkUrl, ProjectQueryResult};
 use crate::database::models::version_item::VersionQueryResult;
 use crate::models::ids::{
-    OrganizationId, ProjectId, TeamId, ThreadId, VersionId,
+    FileId, OrganizationId, ProjectId, TeamId, ThreadId, VersionId,
 };
 use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
@@ -712,7 +712,7 @@ impl From<VersionQueryResult> for Version {
                 .files
                 .into_iter()
                 .map(|f| VersionFile {
-                    id: Some(f.id.0),
+                    id: Some(FileId(f.id.0 as u64)),
                     url: f.url,
                     filename: f.filename,
                     hashes: f.hashes,
@@ -840,7 +840,7 @@ pub struct VersionFile {
     /// The ID of the file. Every file has an ID once created, but it
     /// is not known until it indeed has been created.
     #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub id: Option<i64>,
+    pub id: Option<FileId>,
     /// A map of hashes of the file.  The key is the hashing algorithm
     /// and the value is the string version of the hash.
     pub hashes: std::collections::HashMap<String, String>,

apps/labrinth/src/routes/internal/delphi.rs

@@ -21,7 +21,10 @@ use crate::{
         },
         redis::RedisPool,
     },
-    models::pats::Scopes,
+    models::{
+        ids::{ProjectId, VersionId},
+        pats::Scopes,
+    },
     queue::session::AuthQueue,
     routes::ApiError,
     util::guards::admin_key_guard,
@@ -90,7 +93,7 @@ impl DelphiReport {
 
 #[derive(Deserialize)]
 pub struct DelphiRunParameters {
-    pub file_id: crate::database::models::ids::DBFileId,
+    pub file_id: crate::models::ids::FileId,
 }
 
 #[post("ingest", guard = "admin_key_guard")]
@@ -158,7 +161,7 @@ pub async fn run(
         FROM files INNER JOIN versions ON files.version_id = versions.id
         WHERE files.id = $1
         "#,
-        run_parameters.file_id.0
+        run_parameters.file_id.0 as i64
     )
     .fetch_one(exec)
     .await?;
@@ -177,8 +180,8 @@ pub async fn run(
         .post(dotenvy::var("DELPHI_URL")?)
         .json(&serde_json::json!({
             "url": file_data.url,
-            "project_id": file_data.project_id,
-            "version_id": file_data.version_id,
+            "project_id": ProjectId(file_data.project_id.0 as u64),
+            "version_id": VersionId(file_data.version_id.0 as u64),
             "file_id": run_parameters.file_id,
         }))
         .send()