tomasalias/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

59
apps/labrinth/src/routes/v3/versions.rs
View File

@@ -9,8 +9,10 @@ use crate::database;
use crate::database::models::loader_fields::{
self, LoaderField, LoaderFieldEnumValue, VersionField,
};
use crate::database::models::version_item::{DependencyBuilder, LoaderVersion};
use crate::database::models::{Organization, image_item};
use crate::database::models::version_item::{
DBLoaderVersion, DependencyBuilder,
};
use crate::database::models::{DBOrganization, image_item};
use crate::database::redis::RedisPool;
use crate::models;
use crate::models::ids::VersionId;
@@ -70,7 +72,8 @@ pub async fn version_project_get_helper(
redis: web::Data<RedisPool>,
session_queue: web::Data<AuthQueue>,
) -> Result<HttpResponse, ApiError> {
let result = database::models::Project::get(&id.0, &**pool, &redis).await?;
let result =
database::models::DBProject::get(&id.0, &**pool, &redis).await?;
let user_option = get_user_from_headers(
&req,
@@ -90,7 +93,7 @@ pub async fn version_project_get_helper(
return Err(ApiError::NotFound);
}
let versions = database::models::Version::get_many(
let versions = database::models::DBVersion::get_many(
&project.versions,
&**pool,
&redis,
@@ -134,7 +137,7 @@ pub async fn versions_get(
.map(|x| x.into())
.collect::<Vec<database::models::DBVersionId>>();
let versions_data =
database::models::Version::get_many(&version_ids, &**pool, &redis)
database::models::DBVersion::get_many(&version_ids, &**pool, &redis)
.await?;
let user_option = get_user_from_headers(
@@ -174,7 +177,7 @@ pub async fn version_get_helper(
session_queue: web::Data<AuthQueue>,
) -> Result<HttpResponse, ApiError> {
let version_data =
database::models::Version::get(id.into(), &**pool, &redis).await?;
database::models::DBVersion::get(id.into(), &**pool, &redis).await?;
let user_option = get_user_from_headers(
&req,
@@ -290,11 +293,11 @@ pub async fn version_edit_helper(
let version_id = info.0.into();
let result =
database::models::Version::get(version_id, &**pool, &redis).await?;
database::models::DBVersion::get(version_id, &**pool, &redis).await?;
if let Some(version_item) = result {
let team_member =
database::models::TeamMember::get_from_user_id_project(
database::models::DBTeamMember::get_from_user_id_project(
version_item.inner.project_id,
user.id.into(),
false,
@@ -303,7 +306,7 @@ pub async fn version_edit_helper(
.await?;
let organization =
Organization::get_associated_organization_project_id(
DBOrganization::get_associated_organization_project_id(
version_item.inner.project_id,
&**pool,
)
@@ -311,7 +314,7 @@ pub async fn version_edit_helper(
let organization_team_member = if let Some(organization) = &organization
{
database::models::TeamMember::get_from_user_id(
database::models::DBTeamMember::get_from_user_id(
organization.team_id,
user.id.into(),
&**pool,
@@ -513,15 +516,15 @@ pub async fn version_edit_helper(
.to_string(),
)
})?;
loader_versions.push(LoaderVersion {
loader_versions.push(DBLoaderVersion {
loader_id,
version_id,
});
}
LoaderVersion::insert_many(loader_versions, &mut transaction)
DBLoaderVersion::insert_many(loader_versions, &mut transaction)
.await?;
crate::database::models::Project::clear_cache(
crate::database::models::DBProject::clear_cache(
version_item.inner.project_id,
None,
None,
@@ -679,9 +682,9 @@ pub async fn version_edit_helper(
.await?;
transaction.commit().await?;
database::models::Version::clear_cache(&version_item, &redis)
database::models::DBVersion::clear_cache(&version_item, &redis)
.await?;
database::models::Project::clear_cache(
database::models::DBProject::clear_cache(
version_item.inner.project_id,
None,
Some(true),
@@ -726,7 +729,7 @@ pub async fn version_list(
let string = info.into_inner().0;
let result =
database::models::Project::get(&string, &**pool, &redis).await?;
database::models::DBProject::get(&string, &**pool, &redis).await?;
let user_option = get_user_from_headers(
&req,
@@ -753,7 +756,7 @@ pub async fn version_list(
let loader_filters = filters.loaders.as_ref().map(|x| {
serde_json::from_str::<Vec<String>>(x).unwrap_or_default()
});
let mut versions = database::models::Version::get_many(
let mut versions = database::models::DBVersion::get_many(
&project.versions,
&**pool,
&redis,
@@ -886,7 +889,7 @@ pub async fn version_delete(
.1;
let id = info.into_inner().0;
let version = database::models::Version::get(id.into(), &**pool, &redis)
let version = database::models::DBVersion::get(id.into(), &**pool, &redis)
.await?
.ok_or_else(|| {
ApiError::InvalidInput(
@@ -896,7 +899,7 @@ pub async fn version_delete(
if !user.role.is_admin() {
let team_member =
database::models::TeamMember::get_from_user_id_project(
database::models::DBTeamMember::get_from_user_id_project(
version.inner.project_id,
user.id.into(),
false,
@@ -906,7 +909,7 @@ pub async fn version_delete(
.map_err(ApiError::Database)?;
let organization =
Organization::get_associated_organization_project_id(
DBOrganization::get_associated_organization_project_id(
version.inner.project_id,
&**pool,
)
@@ -914,7 +917,7 @@ pub async fn version_delete(
let organization_team_member = if let Some(organization) = &organization
{
database::models::TeamMember::get_from_user_id(
database::models::DBTeamMember::get_from_user_id(
organization.team_id,
user.id.into(),
&**pool,
@@ -942,14 +945,16 @@ pub async fn version_delete(
let context = ImageContext::Version {
version_id: Some(version.inner.id.into()),
};
let uploaded_images =
database::models::Image::get_many_contexted(context, &mut transaction)
.await?;
let uploaded_images = database::models::DBImage::get_many_contexted(
context,
&mut transaction,
)
.await?;
for image in uploaded_images {
image_item::Image::remove(image.id, &mut transaction, &redis).await?;
image_item::DBImage::remove(image.id, &mut transaction, &redis).await?;
}
let result = database::models::Version::remove_full(
let result = database::models::DBVersion::remove_full(
version.inner.id,
&redis,
&mut transaction,
@@ -957,7 +962,7 @@ pub async fn version_delete(
.await?;
transaction.commit().await?;
remove_documents(&[version.inner.id.into()], &search_config).await?;
database::models::Project::clear_cache(
database::models::DBProject::clear_cache(
version.inner.project_id,
None,
Some(true),