refactor: restructure database query code

server/src/api/mod.rs

@@ -1,5 +1,7 @@
 mod pagination;
 
+use sea_orm::{*};
+
 use axum::extract::{Path, Query, State};
 use axum::routing::get;
 use axum::Json;
@@ -7,7 +9,7 @@ use axum::Router;
 
 use pagination::PaginatedResponse;
 
-use crate::db;
+use crate::db::{self, *};
 
 pub fn router() -> Router<crate::Global> {
     Router::new()
@@ -20,26 +22,34 @@ pub fn router() -> Router<crate::Global> {
 async fn get_repos(
     State(global): State<crate::Global>,
     Query(pagination): Query<pagination::Query>,
+    Query(filter): Query<db::query::repo::Filter>,
 ) -> crate::Result<Json<PaginatedResponse<db::repo::Model>>> {
-    let (total_pages, repos) = global
+    let page = pagination.page.unwrap_or(1) - 1;
-        .db
+    let per_page = pagination.per_page.unwrap_or(25);
-        .repo
+
-        .page(
+    let paginator = Repo::find()
-            pagination.per_page.unwrap_or(25),
+        .filter(filter)
-            pagination.page.unwrap_or(1) - 1,
+        .order_by_asc(package::Column::Id)
-        )
+        .paginate(&global.db, pagination.per_page.unwrap_or(25));
+    let items = paginator
+        .fetch_page(pagination.page.unwrap_or(1) - 1)
         .await?;
-    Ok(Json(pagination.res(total_pages, repos)))
+    let total_pages = paginator.num_pages().await?;
+
+    Ok(Json(PaginatedResponse {
+        page,
+        per_page,
+        total_pages,
+        count: items.len(),
+        items,
+    }))
 }
 
 async fn get_single_repo(
     State(global): State<crate::Global>,
     Path(id): Path<i32>,
 ) -> crate::Result<Json<db::repo::Model>> {
-    let repo = global
+    let repo = db::query::repo::by_id(&global.db, id)
-        .db
-        .repo
-        .by_id(id)
         .await?
         .ok_or(axum::http::StatusCode::NOT_FOUND)?;
 
@@ -49,13 +59,13 @@ async fn get_single_repo(
 async fn get_packages(
     State(global): State<crate::Global>,
     Query(pagination): Query<pagination::Query>,
+    Query(filter): Query<db::query::package::Filter>,
 ) -> crate::Result<Json<PaginatedResponse<db::package::Model>>> {
-    let (total_pages, pkgs) = global
+    let (total_pages, pkgs) = db::query::package::page(
-        .db
+        &global.db,
-        .pkg
-        .page(
         pagination.per_page.unwrap_or(25),
         pagination.page.unwrap_or(1) - 1,
+        filter,
     )
     .await?;
 
@@ -66,10 +76,7 @@ async fn get_single_package(
     State(global): State<crate::Global>,
     Path(id): Path<i32>,
 ) -> crate::Result<Json<crate::db::FullPackage>> {
-    let entry = global
+    let entry = db::query::package::full(&global.db, id)
-        .db
-        .pkg
-        .full(id)
         .await?
         .ok_or(axum::http::StatusCode::NOT_FOUND)?;
 

server/src/api/pagination.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-pub const DEFAULT_PAGE: u64 = 0;
+pub const DEFAULT_PAGE: u64 = 1;
 pub const DEFAULT_PER_PAGE: u64 = 25;
 
 #[derive(Deserialize)]

server/src/cli.rs

@@ -10,6 +10,7 @@ use std::sync::{Arc, RwLock};
 use tower_http::trace::TraceLayer;
 use tracing::debug;
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
+use sea_orm_migration::MigratorTrait;
 
 #[derive(Parser)]
 #[command(author, version, about, long_about = None)]
@@ -75,10 +76,8 @@ impl Cli {
 
         debug!("Connecting to database with URL {}", db_url);
 
-        let db = crate::db::RieterDb::connect(db_url).await?;
+        let db = sea_orm::Database::connect(db_url).await?;
-        // let db = crate::db::init("postgres://rieter:rieter@localhost:5432/rieter")
+        crate::db::Migrator::up(&db, None).await?;
-        // .await
-        // .unwrap();
 
         let config = Config {
             data_dir: self.data_dir.clone(),

server/src/db/conn.rs

@@ -1,61 +0,0 @@
-use super::RieterDb;
-use sea_orm::{DbBackend, DbErr, ExecResult, QueryResult, Statement};
-use std::{future::Future, pin::Pin};
-
-// Allows RieterDb objects to be passed to ORM functions
-impl sea_orm::ConnectionTrait for RieterDb {
-    fn get_database_backend(&self) -> DbBackend {
-        self.conn.get_database_backend()
-    }
-    fn execute<'life0, 'async_trait>(
-        &'life0 self,
-        stmt: Statement,
-    ) -> Pin<Box<dyn Future<Output = std::result::Result<ExecResult, DbErr>> + Send + 'async_trait>>
-    where
-        Self: 'async_trait,
-        'life0: 'async_trait,
-    {
-        self.conn.execute(stmt)
-    }
-    fn execute_unprepared<'life0, 'life1, 'async_trait>(
-        &'life0 self,
-        sql: &'life1 str,
-    ) -> Pin<Box<dyn Future<Output = std::result::Result<ExecResult, DbErr>> + Send + 'async_trait>>
-    where
-        Self: 'async_trait,
-        'life0: 'async_trait,
-        'life1: 'async_trait,
-    {
-        self.conn.execute_unprepared(sql)
-    }
-    fn query_one<'life0, 'async_trait>(
-        &'life0 self,
-        stmt: Statement,
-    ) -> Pin<
-        Box<
-            dyn Future<Output = std::result::Result<Option<QueryResult>, DbErr>>
-                + Send
-                + 'async_trait,
-        >,
-    >
-    where
-        Self: 'async_trait,
-        'life0: 'async_trait,
-    {
-        self.conn.query_one(stmt)
-    }
-    fn query_all<'life0, 'async_trait>(
-        &'life0 self,
-        stmt: Statement,
-    ) -> Pin<
-        Box<
-            dyn Future<Output = std::result::Result<Vec<QueryResult>, DbErr>> + Send + 'async_trait,
-        >,
-    >
-    where
-        Self: 'async_trait,
-        'life0: 'async_trait,
-    {
-        self.conn.query_all(stmt)
-    }
-}

server/src/db/mod.rs

@@ -1,19 +1,20 @@
-mod conn;
 pub mod entities;
 mod migrator;
-mod query;
+pub mod query;
+
+use sea_orm::{DeriveActiveEnum, EnumIter};
 
-use sea_orm::{ConnectOptions, Database, DatabaseConnection, DeriveActiveEnum, EnumIter};
-use sea_orm_migration::MigratorTrait;
 use serde::{Deserialize, Serialize};
 
 pub use entities::{prelude::*, *};
-use migrator::Migrator;
+pub use migrator::Migrator;
+
 
 type Result<T> = std::result::Result<T, sea_orm::DbErr>;
 
 #[derive(EnumIter, DeriveActiveEnum, Serialize, Deserialize, PartialEq, Eq, Clone, Debug)]
 #[sea_orm(rs_type = "i32", db_type = "Integer")]
+#[serde(rename_all = "lowercase")]
 pub enum PackageRelatedEnum {
     #[sea_orm(num_value = 0)]
     Conflicts,
@@ -40,24 +41,3 @@ pub struct FullPackage {
     related: Vec<(PackageRelatedEnum, String)>,
     files: Vec<String>,
 }
-
-#[derive(Clone, Debug)]
-pub struct RieterDb {
-    conn: DatabaseConnection,
-    pub pkg: query::PackageQuery,
-    pub repo: query::RepoQuery,
-}
-
-impl RieterDb {
-    pub async fn connect<C: Into<ConnectOptions>>(opt: C) -> Result<Self> {
-        let db = Database::connect(opt).await?;
-
-        Migrator::up(&db, None).await?;
-
-        Ok(Self {
-            conn: db.clone(),
-            pkg: query::PackageQuery::new(db.clone()),
-            repo: query::RepoQuery::new(db.clone()),
-        })
-    }
-}

server/src/db/query/mod.rs

@@ -1,7 +1,4 @@
-mod package;
+pub mod package;
-mod repo;
+pub mod repo;
-
-pub use package::PackageQuery;
-pub use repo::RepoQuery;
 
 type Result<T> = std::result::Result<T, sea_orm::DbErr>;

server/src/db/query/package.rs

@@ -1,37 +1,49 @@
-use sea_orm::*;
+use sea_orm::{sea_query::IntoCondition, *};
+use serde::Deserialize;
 
 use crate::db::*;
 
-#[derive(Clone, Debug)]
+#[derive(Deserialize)]
-pub struct PackageQuery {
+pub struct Filter {
-    conn: DatabaseConnection,
+    repo: Option<i32>,
+    arch: Option<String>,
+    name: Option<String>,
 }
 
-impl PackageQuery {
+impl IntoCondition for Filter {
-    pub fn new(conn: DatabaseConnection) -> Self {
+    fn into_condition(self) -> Condition {
-        Self { conn }
+        Condition::all()
+            .add_option(self.repo.map(|repo| package::Column::RepoId.eq(repo)))
+            .add_option(self.arch.map(|arch| package::Column::Arch.eq(arch)))
+            .add_option(
+                self.name
+                    .map(|name| package::Column::Name.like(format!("%{}%", name))),
+            )
+    }
 }
 
 pub async fn page(
-        &self,
+    conn: &DbConn,
     per_page: u64,
     page: u64,
+    filter: Filter,
 ) -> super::Result<(u64, Vec<package::Model>)> {
     let paginator = Package::find()
+        .filter(filter)
         .order_by_asc(package::Column::Id)
-            .paginate(&self.conn, per_page);
+        .paginate(conn, per_page);
     let packages = paginator.fetch_page(page).await?;
     let total_pages = paginator.num_pages().await?;
 
     Ok((total_pages, packages))
 }
 
-    pub async fn by_id(&self, id: i32) -> Result<Option<package::Model>> {
+pub async fn by_id(conn: &DbConn, id: i32) -> Result<Option<package::Model>> {
-        package::Entity::find_by_id(id).one(&self.conn).await
+    package::Entity::find_by_id(id).one(conn).await
 }
 
 pub async fn by_fields(
-        &self,
+    conn: &DbConn,
     repo_id: i32,
     name: &str,
     version: Option<&str>,
@@ -46,18 +58,18 @@ impl PackageQuery {
         query = query.filter(package::Column::Version.eq(version));
     }
 
-        query.one(&self.conn).await
+    query.one(conn).await
 }
 
-    pub async fn delete_with_arch(&self, repo_id: i32, arch: &str) -> Result<DeleteResult> {
+pub async fn delete_with_arch(conn: &DbConn, repo_id: i32, arch: &str) -> Result<DeleteResult> {
     Package::delete_many()
         .filter(package::Column::RepoId.eq(repo_id))
         .filter(package::Column::Arch.eq(arch))
-            .exec(&self.conn)
+        .exec(conn)
         .await
 }
 
-    pub async fn insert(&self, repo_id: i32, pkg: crate::repo::package::Package) -> Result<()> {
+pub async fn insert(conn: &DbConn, repo_id: i32, pkg: crate::repo::package::Package) -> Result<()> {
     let info = pkg.info;
 
     let model = package::ActiveModel {
@@ -78,7 +90,7 @@ impl PackageQuery {
         sha256_sum: Set(info.sha256sum),
     };
 
-        let pkg_entry = model.insert(&self.conn).await?;
+    let pkg_entry = model.insert(conn).await?;
 
     // Insert all the related tables
     PackageLicense::insert_many(info.licenses.iter().map(|s| package_license::ActiveModel {
@@ -86,7 +98,7 @@ impl PackageQuery {
         name: Set(s.to_string()),
     }))
     .on_empty_do_nothing()
-        .exec(&self.conn)
+    .exec(conn)
     .await?;
 
     PackageGroup::insert_many(info.groups.iter().map(|s| package_group::ActiveModel {
@@ -94,7 +106,7 @@ impl PackageQuery {
         name: Set(s.to_string()),
     }))
     .on_empty_do_nothing()
-        .exec(&self.conn)
+    .exec(conn)
     .await?;
 
     let related = info
@@ -132,45 +144,48 @@ impl PackageQuery {
         package_id: Set(pkg_entry.id),
         r#type: Set(t),
         name: Set(s.to_string()),
-        }));
+    }))
+    .on_empty_do_nothing()
+    .exec(conn)
+    .await?;
 
     PackageFile::insert_many(pkg.files.iter().map(|s| package_file::ActiveModel {
         package_id: Set(pkg_entry.id),
         path: Set(s.display().to_string()),
     }))
     .on_empty_do_nothing()
-        .exec(&self.conn)
+    .exec(conn)
     .await?;
 
     Ok(())
 }
 
-    pub async fn full(&self, id: i32) -> Result<Option<FullPackage>> {
+pub async fn full(conn: &DbConn, id: i32) -> Result<Option<FullPackage>> {
-        if let Some(entry) = self.by_id(id).await? {
+    if let Some(entry) = by_id(conn, id).await? {
         let licenses = entry
             .find_related(PackageLicense)
-                .all(&self.conn)
+            .all(conn)
             .await?
             .into_iter()
             .map(|e| e.name)
             .collect();
         let groups = entry
             .find_related(PackageGroup)
-                .all(&self.conn)
+            .all(conn)
             .await?
             .into_iter()
             .map(|e| e.name)
             .collect();
         let related = entry
             .find_related(PackageRelated)
-                .all(&self.conn)
+            .all(conn)
             .await?
             .into_iter()
             .map(|e| (e.r#type, e.name))
             .collect();
         let files = entry
             .find_related(PackageFile)
-                .all(&self.conn)
+            .all(conn)
             .await?
             .into_iter()
             .map(|e| e.path)
@@ -187,4 +202,3 @@ impl PackageQuery {
         Ok(None)
     }
 }
-}

server/src/db/query/repo.rs

@@ -1,40 +1,41 @@
-use sea_orm::*;
+use sea_orm::{sea_query::IntoCondition, *};
 
 use crate::db::*;
 
-#[derive(Clone, Debug)]
+#[derive(Deserialize)]
-pub struct RepoQuery {
+pub struct Filter {
-    conn: DatabaseConnection,
+    name: Option<String>,
 }
 
-impl RepoQuery {
+impl IntoCondition for Filter {
-    pub fn new(conn: DatabaseConnection) -> Self {
+    fn into_condition(self) -> Condition {
-        Self { conn }
+        Condition::all().add_option(self.name.map(|name| package::Column::Name.like(name)))
+    }
 }
 
-    pub async fn page(&self, per_page: u64, page: u64) -> Result<(u64, Vec<repo::Model>)> {
+pub async fn page(conn: &DbConn, per_page: u64, page: u64) -> Result<(u64, Vec<repo::Model>)> {
     let paginator = Repo::find()
         .order_by_asc(repo::Column::Id)
-            .paginate(&self.conn, per_page);
+        .paginate(conn, per_page);
     let repos = paginator.fetch_page(page).await?;
     let total_pages = paginator.num_pages().await?;
 
     Ok((total_pages, repos))
 }
 
-    pub async fn by_id(&self, id: i32) -> Result<Option<repo::Model>> {
+pub async fn by_id(conn: &DbConn, id: i32) -> Result<Option<repo::Model>> {
-        repo::Entity::find_by_id(id).one(&self.conn).await
+    repo::Entity::find_by_id(id).one(conn).await
 }
 
-    pub async fn by_name(&self, name: &str) -> Result<Option<repo::Model>> {
+pub async fn by_name(conn: &DbConn, name: &str) -> Result<Option<repo::Model>> {
     Repo::find()
         .filter(repo::Column::Name.eq(name))
-            .one(&self.conn)
+        .one(conn)
         .await
 }
 
 pub async fn insert(
-        &self,
+    conn: &DbConn,
     name: &str,
     description: Option<&str>,
 ) -> Result<InsertResult<repo::ActiveModel>> {
@@ -44,6 +45,5 @@ impl RepoQuery {
         description: Set(description.map(String::from)),
     };
 
-        Repo::insert(model).exec(&self.conn).await
+    Repo::insert(model).exec(conn).await
-    }
 }

server/src/main.rs

@@ -22,7 +22,7 @@ pub struct Config {
 pub struct Global {
     config: Config,
     repo_manager: Arc<RwLock<RepoGroupManager>>,
-    db: db::RieterDb,
+    db: sea_orm::DbConn,
 }
 
 #[tokio::main]

server/src/repo/mod.rs

@@ -5,7 +5,7 @@ pub use manager::RepoGroupManager;
 
 use std::path::PathBuf;
 
-use axum::body::{Body, BodyDataStream};
+use axum::body::{Body};
 use axum::extract::{Path, State};
 use axum::http::Request;
 use axum::http::StatusCode;
@@ -21,6 +21,8 @@ use tower_http::services::{ServeDir, ServeFile};
 use tower_http::validate_request::ValidateRequestHeaderLayer;
 use uuid::Uuid;
 
+use crate::db;
+
 const DB_FILE_EXTS: [&str; 4] = [".db", ".files", ".db.tar.gz", ".files.tar.gz"];
 
 pub fn router(api_key: &str) -> Router<crate::Global> {
@@ -128,26 +130,31 @@ async fn post_package_archive(
             tracing::info!("Added '{}' to repository '{}'", pkg.file_name(), repo);
 
             // Query the repo for its ID, or create it if it does not already exist
-            let res = global.db.repo.by_name(&repo).await?;
+            let res = db::query::repo::by_name(&global.db, &repo).await?;
 
             let repo_id = if let Some(repo_entity) = res {
                 repo_entity.id
             } else {
-                global.db.repo.insert(&repo, None).await?.last_insert_id
+                db::query::repo::insert(&global.db, &repo, None)
+                    .await?
+                    .last_insert_id
             };
 
             // If the package already exists in the database, we remove it first
-            let res = global
+            let res = db::query::package::by_fields(
-                .db
+                &global.db,
-                .pkg
+                repo_id,
-                .by_fields(repo_id, &pkg.info.name, None, &pkg.info.arch)
+                &pkg.info.name,
+                None,
+                &pkg.info.arch,
+            )
             .await?;
 
             if let Some(entry) = res {
                 entry.delete(&global.db).await?;
             }
 
-            global.db.pkg.insert(repo_id, pkg).await?;
+            db::query::package::insert(&global.db, repo_id, pkg).await?;
 
             Ok(())
         }
@@ -172,7 +179,7 @@ async fn delete_repo(
             .await??;
 
     if repo_removed {
-        let res = global.db.repo.by_name(&repo).await?;
+        let res = db::query::repo::by_name(&global.db, &repo).await?;
 
         if let Some(repo_entry) = res {
             repo_entry.delete(&global.db).await?;
@@ -203,10 +210,10 @@ async fn delete_arch_repo(
     .await??;
 
     if repo_removed {
-        let res = global.db.repo.by_name(&repo).await?;
+        let res = db::query::repo::by_name(&global.db, &repo).await?;
 
         if let Some(repo_entry) = res {
-            global.db.pkg.delete_with_arch(repo_entry.id, &arch).await?;
+            db::query::package::delete_with_arch(&global.db, repo_entry.id, &arch).await?;
         }
         tracing::info!("Removed architecture '{}' from repository '{}'", arch, repo);
 
@@ -229,13 +236,11 @@ async fn delete_package(
     .await??;
 
     if let Some((name, version, release, arch)) = res {
-        let res = global.db.repo.by_name(&repo).await?;
+        let res = db::query::repo::by_name(&global.db, &repo).await?;
 
         if let Some(repo_entry) = res {
-            let res = global
+            let res = db::query::package::by_fields(
-                .db
+                &global.db,
-                .pkg
-                .by_fields(
                 repo_entry.id,
                 &name,
                 Some(&format!("{}-{}", version, release)),