eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Commonize and distinguish a lot of struct names in labrinth::database::models (#3691)

Browse Source
This commit is contained in:
Josiah Glosson
2025-05-24 04:38:43 -05:00
committed by GitHub
parent 9c1bdf16e4
commit 4e4a7be7ef
78 changed files with 1075 additions and 1009 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apps/labrinth/src/routes/maven.rs
View File

@@ -1,8 +1,10 @@
use crate::auth::checks::{is_visible_project, is_visible_version};
use crate::database::models::legacy_loader_fields::MinecraftGameVersion;
use crate::database::models::loader_fields::Loader;
use crate::database::models::project_item::QueryProject;
use crate::database::models::version_item::{QueryFile, QueryVersion};
use crate::database::models::project_item::ProjectQueryResult;
use crate::database::models::version_item::{
FileQueryResult, VersionQueryResult,
};
use crate::database::redis::RedisPool;
use crate::models::ids::{ProjectId, VersionId};
use crate::models::pats::Scopes;
@@ -76,7 +78,7 @@ pub async fn maven_metadata(
) -> Result<HttpResponse, ApiError> {
let project_id = params.into_inner().0;
let Some(project) =
database::models::Project::get(&project_id, &**pool, &redis).await?
database::models::DBProject::get(&project_id, &**pool, &redis).await?
else {
return Err(ApiError::NotFound);
};
@@ -159,17 +161,17 @@ pub async fn maven_metadata(
}
async fn find_version(
project: &QueryProject,
project: &ProjectQueryResult,
vcoords: &String,
pool: &PgPool,
redis: &RedisPool,
) -> Result<Option<QueryVersion>, ApiError> {
) -> Result<Option<VersionQueryResult>, ApiError> {
let id_option = ariadne::ids::base62_impl::parse_base62(vcoords)
.ok()
.map(|x| x as i64);
let all_versions =
database::models::Version::get_many(&project.versions, pool, redis)
database::models::DBVersion::get_many(&project.versions, pool, redis)
.await?;
let exact_matches = all_versions
@@ -236,9 +238,9 @@ async fn find_version(
fn find_file<'a>(
project_id: &str,
vcoords: &str,
version: &'a QueryVersion,
version: &'a VersionQueryResult,
file: &str,
) -> Option<&'a QueryFile> {
) -> Option<&'a FileQueryResult> {
if let Some(selected_file) =
version.files.iter().find(|x| x.filename == file)
{
@@ -282,7 +284,7 @@ pub async fn version_file(
) -> Result<HttpResponse, ApiError> {
let (project_id, vnum, file) = params.into_inner();
let Some(project) =
database::models::Project::get(&project_id, &**pool, &redis).await?
database::models::DBProject::get(&project_id, &**pool, &redis).await?
else {
return Err(ApiError::NotFound);
};
@@ -348,7 +350,7 @@ pub async fn version_file_sha1(
) -> Result<HttpResponse, ApiError> {
let (project_id, vnum, file) = params.into_inner();
let Some(project) =
database::models::Project::get(&project_id, &**pool, &redis).await?
database::models::DBProject::get(&project_id, &**pool, &redis).await?
else {
return Err(ApiError::NotFound);
};
@@ -393,7 +395,7 @@ pub async fn version_file_sha512(
) -> Result<HttpResponse, ApiError> {
let (project_id, vnum, file) = params.into_inner();
let Some(project) =
database::models::Project::get(&project_id, &**pool, &redis).await?
database::models::DBProject::get(&project_id, &**pool, &redis).await?
else {
return Err(ApiError::NotFound);
};