Labrinth ID cleanup (#3681)

* Put all ID types in the labrinth::models::ids, and reduce code duplication with them

* Rewrite labrinth::database::models::ids and rename most DB interface ID structs to be prefixed with DB

* Run sqlx prepare

---------

Co-authored-by: Alejandro González <7822554+AlexTMjugador@users.noreply.github.com>
This commit is contained in:
Josiah Glosson
2025-05-22 03:34:36 -05:00
committed by GitHub
parent c6022ad977
commit 9e527ff141
111 changed files with 1477 additions and 1965 deletions

View File

@@ -1,19 +1,17 @@
use crate::{
assert_status,
common::api_common::{Api, AppendsOptionalPat, request_data::ImageData},
};
use actix_http::StatusCode;
use actix_web::{
dev::ServiceResponse,
test::{self, TestRequest},
};
use ariadne::ids::UserId;
use bytes::Bytes;
use labrinth::models::{
organizations::Organization, users::UserId, v3::projects::Project,
};
use labrinth::models::{organizations::Organization, v3::projects::Project};
use serde_json::json;
use crate::{
assert_status,
common::api_common::{Api, AppendsOptionalPat, request_data::ImageData},
};
use super::ApiV3;
impl ApiV3 {

View File

@@ -7,10 +7,8 @@ use crate::common::{
},
dummy_data::TestFile,
};
use labrinth::{
models::projects::ProjectId,
util::actix::{MultipartSegment, MultipartSegmentData},
};
use labrinth::models::ids::ProjectId;
use labrinth::util::actix::{MultipartSegment, MultipartSegmentData};
pub fn get_public_project_creation_data(
slug: &str,

View File

@@ -19,11 +19,9 @@ use actix_web::{
test::{self, TestRequest},
};
use async_trait::async_trait;
use labrinth::models::ids::ProjectId;
use labrinth::{
models::{
projects::{ProjectId, VersionType},
v3::projects::Version,
},
models::{projects::VersionType, v3::projects::Version},
routes::v3::version_file::FileUpdateData,
util::actix::AppendsMultipart,
};