Chewing_Bever/rieter
1
0
Fork 0
Code Issues 11 Releases Packages 3 Activity

refactor: remove old manager; some refactoring

Browse source
This commit is contained in:
Jef Roosens 2024-05-29 13:26:02 +02:00
parent fc844c685f
commit 0b1c8b640f
Signed by: Jef Roosens
GPG key ID: B75D4F293C7052DB
5 changed files with 270 additions and 588 deletions
Download patch file Download diff file Expand all files Collapse all files

62
server/src/db/query/package.rs
View file

@ -1,4 +1,4 @@
use crate::db::*;
use crate::db::{self, *};
use sea_orm::{sea_query::IntoCondition, *};
use serde::Deserialize;
@ -50,20 +50,14 @@ pub async fn by_fields(
version: Option<&str>,
compression: Option<&str>,
) -> Result<Option<package::Model>> {
let mut query = Package::find()
.filter(package::Column::RepoId.eq(repo_id))
.filter(package::Column::Name.eq(name))
.filter(package::Column::Arch.eq(arch));
let cond = Condition::all()
.add(package::Column::RepoId.eq(repo_id))
.add(package::Column::Name.eq(name))
.add(package::Column::Arch.eq(arch))
.add_option(version.map(|version| package::Column::Version.eq(version)))
.add_option(compression.map(|compression| package::Column::Compression.eq(compression)));
if let Some(version) = version {
query = query.filter(package::Column::Version.eq(version));
}
if let Some(compression) = compression {
query = query.filter(package::Column::Compression.eq(compression));
}
query.one(conn).await
Package::find().filter(cond).one(conn).await
}
pub async fn delete_with_arch(conn: &DbConn, repo_id: i32, arch: &str) -> Result<DeleteResult> {
@ -168,34 +162,34 @@ pub async fn insert(conn: &DbConn, repo_id: i32, pkg: crate::repo::package::Pack
pub async fn full(conn: &DbConn, id: i32) -> Result<Option<FullPackage>> {
if let Some(entry) = by_id(conn, id).await? {
let licenses = entry
let licenses: Vec<String> = entry
.find_related(PackageLicense)
.select_only()
.column(package_license::Column::Name)
.into_tuple()
.all(conn)
.await?
.into_iter()
.map(|e| e.name)
.collect();
let groups = entry
.await?;
let groups: Vec<String> = entry
.find_related(PackageGroup)
.select_only()
.column(package_group::Column::Name)
.into_tuple()
.all(conn)
.await?
.into_iter()
.map(|e| e.name)
.collect();
let related = entry
.await?;
let related: Vec<(db::PackageRelatedEnum, String)> = entry
.find_related(PackageRelated)
.select_only()
.columns([package_related::Column::Type, package_related::Column::Name])
.into_tuple()
.all(conn)
.await?
.into_iter()
.map(|e| (e.r#type, e.name))
.collect();
let files = entry
.await?;
let files: Vec<String> = entry
.find_related(PackageFile)
.select_only()
.column(package_file::Column::Path)
.into_tuple()
.all(conn)
.await?
.into_iter()
.map(|e| e.path)
.collect();
.await?;
Ok(Some(FullPackage {
entry,

8
server/src/db/query/repo.rs
View file

@ -43,16 +43,12 @@ pub async fn by_name(conn: &DbConn, name: &str) -> Result<Option<repo::Model>> {
.await
}
pub async fn insert(
conn: &DbConn,
name: &str,
description: Option<&str>,
) -> Result<InsertResult<repo::ActiveModel>> {
pub async fn insert(conn: &DbConn, name: &str, description: Option<&str>) -> Result<repo::Model> {
let model = repo::ActiveModel {
id: NotSet,
name: Set(String::from(name)),
description: Set(description.map(String::from)),
};
Repo::insert(model).exec(conn).await
model.insert(conn).await
}