Pernoise/Rocketmc
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

126
apps/labrinth/src/routes/v3/organizations.rs
View File

@@ -3,9 +3,9 @@ use std::sync::Arc;
use super::ApiError;
use crate::auth::{filter_visible_projects, get_user_from_headers};
use crate::database::models::team_item::TeamMember;
use crate::database::models::team_item::DBTeamMember;
use crate::database::models::{
Organization, generate_organization_id, team_item,
DBOrganization, generate_organization_id, team_item,
};
use crate::database::redis::RedisPool;
use crate::file_hosting::FileHost;
@@ -69,7 +69,7 @@ pub async fn organization_projects_get(
.map(|x| x.1)
.ok();
let organization_data = Organization::get(&id, &**pool, &redis).await?;
let organization_data = DBOrganization::get(&id, &**pool, &redis).await?;
if let Some(organization) = organization_data {
let project_ids = sqlx::query!(
"
@@ -84,7 +84,7 @@ pub async fn organization_projects_get(
.try_collect::<Vec<_>>()
.await?;
let projects_data = crate::database::models::Project::get_many_ids(
let projects_data = crate::database::models::DBProject::get_many_ids(
&project_ids,
&**pool,
&redis,
@@ -146,7 +146,7 @@ pub async fn organization_create(
organization_strings.push(name_organization_id.to_string());
}
organization_strings.push(new_organization.slug.clone());
let results = Organization::get_many(
let results = DBOrganization::get_many(
&organization_strings,
&mut *transaction,
&redis,
@@ -174,7 +174,7 @@ pub async fn organization_create(
let team_id = team.insert(&mut transaction).await?;
// Create organization
let organization = Organization {
let organization = DBOrganization {
id: organization_id,
slug: new_organization.slug.clone(),
name: new_organization.name.clone(),
@@ -188,10 +188,11 @@ pub async fn organization_create(
transaction.commit().await?;
// Only member is the owner, the logged in one
let member_data = TeamMember::get_from_team_full(team_id, &**pool, &redis)
.await?
.into_iter()
.next();
let member_data =
DBTeamMember::get_from_team_full(team_id, &**pool, &redis)
.await?
.into_iter()
.next();
let members_data = if let Some(member_data) = member_data {
vec![crate::models::teams::TeamMember::from_model(
member_data,
@@ -230,13 +231,13 @@ pub async fn organization_get(
.ok();
let user_id = current_user.as_ref().map(|x| x.id.into());
let organization_data = Organization::get(&id, &**pool, &redis).await?;
let organization_data = DBOrganization::get(&id, &**pool, &redis).await?;
if let Some(data) = organization_data {
let members_data =
TeamMember::get_from_team_full(data.team_id, &**pool, &redis)
DBTeamMember::get_from_team_full(data.team_id, &**pool, &redis)
.await?;
let users = crate::database::models::User::get_many_ids(
let users = crate::database::models::DBUser::get_many_ids(
&members_data.iter().map(|x| x.user_id).collect::<Vec<_>>(),
&**pool,
&redis,
@@ -293,15 +294,16 @@ pub async fn organizations_get(
) -> Result<HttpResponse, ApiError> {
let ids = serde_json::from_str::<Vec<&str>>(&ids.ids)?;
let organizations_data =
Organization::get_many(&ids, &**pool, &redis).await?;
DBOrganization::get_many(&ids, &**pool, &redis).await?;
let team_ids = organizations_data
.iter()
.map(|x| x.team_id)
.collect::<Vec<_>>();
let teams_data =
TeamMember::get_from_team_full_many(&team_ids, &**pool, &redis).await?;
let users = crate::database::models::User::get_many_ids(
DBTeamMember::get_from_team_full_many(&team_ids, &**pool, &redis)
.await?;
let users = crate::database::models::DBUser::get_many_ids(
&teams_data.iter().map(|x| x.user_id).collect::<Vec<_>>(),
&**pool,
&redis,
@@ -405,11 +407,11 @@ pub async fn organizations_edit(
let string = info.into_inner().0;
let result =
database::models::Organization::get(&string, &**pool, &redis).await?;
database::models::DBOrganization::get(&string, &**pool, &redis).await?;
if let Some(organization_item) = result {
let id = organization_item.id;
let team_member = database::models::TeamMember::get_from_user_id(
let team_member = database::models::DBTeamMember::get_from_user_id(
organization_item.team_id,
user.id.into(),
&**pool,
@@ -526,7 +528,7 @@ pub async fn organizations_edit(
}
transaction.commit().await?;
database::models::Organization::clear_cache(
database::models::DBOrganization::clear_cache(
organization_item.id,
Some(organization_item.slug),
&redis,
@@ -564,7 +566,7 @@ pub async fn organization_delete(
let string = info.into_inner().0;
let organization =
database::models::Organization::get(&string, &**pool, &redis)
database::models::DBOrganization::get(&string, &**pool, &redis)
.await?
.ok_or_else(|| {
ApiError::InvalidInput(
@@ -574,7 +576,7 @@ pub async fn organization_delete(
if !user.role.is_admin() {
let team_member =
database::models::TeamMember::get_from_user_id_organization(
database::models::DBTeamMember::get_from_user_id_organization(
organization.id,
user.id.into(),
false,
@@ -638,7 +640,7 @@ pub async fn organization_delete(
&mut transaction,
)
.await?;
let member = TeamMember {
let member = DBTeamMember {
id: new_id,
team_id: *organization_project_team,
user_id: owner_id,
@@ -653,7 +655,7 @@ pub async fn organization_delete(
member.insert(&mut transaction).await?;
}
// Safely remove the organization
let result = database::models::Organization::remove(
let result = database::models::DBOrganization::remove(
organization.id,
&mut transaction,
&redis,
@@ -662,7 +664,7 @@ pub async fn organization_delete(
transaction.commit().await?;
database::models::Organization::clear_cache(
database::models::DBOrganization::clear_cache(
organization.id,
Some(organization.slug),
&redis,
@@ -670,7 +672,7 @@ pub async fn organization_delete(
.await?;
for team_id in organization_project_teams {
database::models::TeamMember::clear_cache(team_id, &redis).await?;
database::models::DBTeamMember::clear_cache(team_id, &redis).await?;
}
if result.is_some() {
@@ -704,7 +706,7 @@ pub async fn organization_projects_add(
.1;
let organization =
database::models::Organization::get(&info, &**pool, &redis)
database::models::DBOrganization::get(&info, &**pool, &redis)
.await?
.ok_or_else(|| {
ApiError::InvalidInput(
@@ -712,7 +714,7 @@ pub async fn organization_projects_add(
)
})?;
let project_item = database::models::Project::get(
let project_item = database::models::DBProject::get(
&project_info.project_id,
&**pool,
&redis,
@@ -731,7 +733,7 @@ pub async fn organization_projects_add(
}
let project_team_member =
database::models::TeamMember::get_from_user_id_project(
database::models::DBTeamMember::get_from_user_id_project(
project_item.inner.id,
current_user.id.into(),
false,
@@ -744,7 +746,7 @@ pub async fn organization_projects_add(
)
})?;
let organization_team_member =
database::models::TeamMember::get_from_user_id_organization(
database::models::DBTeamMember::get_from_user_id_organization(
organization.id,
current_user.id.into(),
false,
@@ -814,17 +816,17 @@ pub async fn organization_projects_add(
transaction.commit().await?;
database::models::User::clear_project_cache(
database::models::DBUser::clear_project_cache(
&[current_user.id.into()],
&redis,
)
.await?;
database::models::TeamMember::clear_cache(
database::models::DBTeamMember::clear_cache(
project_item.inner.team_id,
&redis,
)
.await?;
database::models::Project::clear_cache(
database::models::DBProject::clear_cache(
project_item.inner.id,
project_item.inner.slug,
None,
@@ -866,17 +868,20 @@ pub async fn organization_projects_remove(
.await?
.1;
let organization =
database::models::Organization::get(&organization_id, &**pool, &redis)
.await?
.ok_or_else(|| {
ApiError::InvalidInput(
"The specified organization does not exist!".to_string(),
)
})?;
let organization = database::models::DBOrganization::get(
&organization_id,
&**pool,
&redis,
)
.await?
.ok_or_else(|| {
ApiError::InvalidInput(
"The specified organization does not exist!".to_string(),
)
})?;
let project_item =
database::models::Project::get(&project_id, &**pool, &redis)
database::models::DBProject::get(&project_id, &**pool, &redis)
.await?
.ok_or_else(|| {
ApiError::InvalidInput(
@@ -896,7 +901,7 @@ pub async fn organization_projects_remove(
}
let organization_team_member =
database::models::TeamMember::get_from_user_id_organization(
database::models::DBTeamMember::get_from_user_id_organization(
organization.id,
current_user.id.into(),
false,
@@ -916,7 +921,7 @@ pub async fn organization_projects_remove(
.unwrap_or_default();
if permissions.contains(OrganizationPermissions::REMOVE_PROJECT) {
// Now that permissions are confirmed, we confirm the veracity of the new user as an org member
database::models::TeamMember::get_from_user_id_organization(
database::models::DBTeamMember::get_from_user_id_organization(
organization.id,
data.new_owner.into(),
false,
@@ -932,13 +937,14 @@ pub async fn organization_projects_remove(
// Then, we get the team member of the project and that user (if it exists)
// We use the team member get directly
let new_owner = database::models::TeamMember::get_from_user_id_project(
project_item.inner.id,
data.new_owner.into(),
true,
&**pool,
)
.await?;
let new_owner =
database::models::DBTeamMember::get_from_user_id_project(
project_item.inner.id,
data.new_owner.into(),
true,
&**pool,
)
.await?;
let mut transaction = pool.begin().await?;
@@ -951,7 +957,7 @@ pub async fn organization_projects_remove(
&mut transaction,
)
.await?;
let member = TeamMember {
let member = DBTeamMember {
id: new_id,
team_id: project_item.inner.team_id,
user_id: data.new_owner.into(),
@@ -998,17 +1004,17 @@ pub async fn organization_projects_remove(
.await?;
transaction.commit().await?;
database::models::User::clear_project_cache(
database::models::DBUser::clear_project_cache(
&[current_user.id.into()],
&redis,
)
.await?;
database::models::TeamMember::clear_cache(
database::models::DBTeamMember::clear_cache(
project_item.inner.team_id,
&redis,
)
.await?;
database::models::Project::clear_cache(
database::models::DBProject::clear_cache(
project_item.inner.id,
project_item.inner.slug,
None,
@@ -1052,7 +1058,7 @@ pub async fn organization_icon_edit(
let string = info.into_inner().0;
let organization_item =
database::models::Organization::get(&string, &**pool, &redis)
database::models::DBOrganization::get(&string, &**pool, &redis)
.await?
.ok_or_else(|| {
ApiError::InvalidInput(
@@ -1061,7 +1067,7 @@ pub async fn organization_icon_edit(
})?;
if !user.role.is_mod() {
let team_member = database::models::TeamMember::get_from_user_id(
let team_member = database::models::DBTeamMember::get_from_user_id(
organization_item.team_id,
user.id.into(),
&**pool,
@@ -1125,7 +1131,7 @@ pub async fn organization_icon_edit(
.await?;
transaction.commit().await?;
database::models::Organization::clear_cache(
database::models::DBOrganization::clear_cache(
organization_item.id,
Some(organization_item.slug),
&redis,
@@ -1155,7 +1161,7 @@ pub async fn delete_organization_icon(
let string = info.into_inner().0;
let organization_item =
database::models::Organization::get(&string, &**pool, &redis)
database::models::DBOrganization::get(&string, &**pool, &redis)
.await?
.ok_or_else(|| {
ApiError::InvalidInput(
@@ -1164,7 +1170,7 @@ pub async fn delete_organization_icon(
})?;
if !user.role.is_mod() {
let team_member = database::models::TeamMember::get_from_user_id(
let team_member = database::models::DBTeamMember::get_from_user_id(
organization_item.team_id,
user.id.into(),
&**pool,
@@ -1208,7 +1214,7 @@ pub async fn delete_organization_icon(
transaction.commit().await?;
database::models::Organization::clear_cache(
database::models::DBOrganization::clear_cache(
organization_item.id,
Some(organization_item.slug),
&redis,