Merge pull request #1 from enaut/move-to-sqlx

Move diesel to sqlx

Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "pslink"
-version = "0.1.0"
+version = "0.3.0"
 description = "A simple webservice that allows registered users to create short links including qr-codes.\nAnyone can visit the shortened links. This is an ideal setup for small busines or for publishing papers."
 authors = ["Dietrich <dietrich@teilgedanken.de>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"
-keywords = ["url", "link", "webpage", "actix"]
+keywords = ["url", "link", "webpage", "actix", "web"]
-categories = ["os", "os::linux-apis", "parser-implementations", "command-line-utilities"]
+categories = ["web-programming", "network-programming", "web-programming::http-server", "command-line-utilities"]
 readme = "README.md"
 repository = "https://git.teilgedanken.de/dietrich/Pslink"
 build = "build.rs"
@@ -16,15 +16,12 @@ build = "build.rs"
 
 [dependencies]
 actix-web = "3"
-actix-web-static-files = { git = "https://github.com/enaut/actix-web-static-files.git", branch = "enaut-must_use" }
+actix-web-static-files = "3.0"
 actix-slog = "0.2"
 tera = "1.6"
 serde = "1.0"
-diesel = { version = "1.4", features = ["sqlite", "chrono"] }
+sqlx={version="0.4", features = [ "sqlite", "macros", "runtime-actix-rustls", "chrono", "migrate" ]}
-diesel_codegen = { version = "0.16.1", features = ["sqlite"] }
+dotenv = "0.15.0"
-diesel_migrations = "1.4"
-libsqlite3-sys = { version = "0.8", features = ["bundled"] }
-dotenv = "0.10.1"
 actix-identity = "0.3"
 chrono = { version = "0.4", features = ["serde"] }
 argonautica = "0.2"
@@ -38,9 +35,9 @@ rpassword = "5.0"
 clap = "2.33"
 
 [build-dependencies]
-actix-web-static-files = { git = "https://github.com/enaut/actix-web-static-files.git", branch = "enaut-must_use" }
+actix-web-static-files = "3.0"
 
 # optimize for size at cost of compilation speed.
 [profile.release]
-#lto = true
+lto = true
 #codegen-units = 1

diesel.toml

@@ -1,5 +0,0 @@
-# For documentation on how to configure this file,
-# see diesel.rs/guides/configuring-diesel-cli
-
-[print_schema]
-file = "src/schema.rs"

migrations/2021-02-03-113236_initial/down.sql

@@ -1,3 +0,0 @@
--- This file should undo anything in `up.sql`
-DROP TABLE users;
-DROP TABLE links;

migrations/2021-02-03-113236_initial/up.sql

@@ -1,29 +0,0 @@
--- Your SQL goes here
-CREATE TABLE users
-(
-    id INTEGER PRIMARY KEY NOT NULL,
-    username VARCHAR NOT NULL,
-    email VARCHAR NOT NULL,
-    password VARCHAR NOT NULL,
-
-    UNIQUE(username, email)
-);
-
-CREATE TABLE links
-(
-    id INTEGER PRIMARY KEY NOT NULL,
-    title VARCHAR NOT NULL,
-    target VARCHAR NOT NULL,
-    code VARCHAR NOT NULL,
-    author INT NOT NULL,
-    created_at TIMESTAMP NOT NULL,
-
-
-    FOREIGN KEY
-    (author)
-       REFERENCES users
-    (id),
-
-    UNIQUE
-    (code)
-);

migrations/2021-02-09-175834_add_statistics/down.sql

@@ -1,3 +0,0 @@
--- This file should undo anything in `up.sql`
-
-DROP TABLE clicks;

migrations/2021-02-09-175834_add_statistics/up.sql

@@ -1,13 +0,0 @@
--- Your SQL goes here
-
-CREATE TABLE clicks
-(
-    id INTEGER PRIMARY KEY NOT NULL,
-    link INT NOT NULL,
-    created_at TIMESTAMP NOT NULL,
-
-    FOREIGN KEY
-    (link)
-       REFERENCES links
-    (id)
-);

migrations/2021-02-10-072528_add_user_profiles/down.sql

@@ -1,20 +0,0 @@
--- This file should undo anything in `up.sql`
-
-CREATE TABLE usersold
-(
-    id INTEGER PRIMARY KEY NOT NULL,
-    username VARCHAR NOT NULL,
-    email VARCHAR NOT NULL,
-    password VARCHAR NOT NULL,
-
-    UNIQUE(username, email)
-);
-
-INSERT INTO usersold
-SELECT id,username,email,password
-FROM users;
-DROP TABLE users;
-
-ALTER TABLE usersold
-RENAME TO users;
-

migrations/2021-02-10-072528_add_user_profiles/up.sql

@@ -1,6 +0,0 @@
--- Your SQL goes here
-
-ALTER TABLE users ADD COLUMN role INTEGER DEFAULT 1 NOT NULL;
-
-UPDATE users SET role=2 where id is 1;
-

migrations/20210318172317_initialmigration.up.sql

@@ -0,0 +1,31 @@
+-- Add up migration script here
+DROP TABLE IF EXISTS __diesel_schema_migrations;
+
+-- Add migration script here
+CREATE TABLE IF NOT EXISTS users (
+    id INTEGER PRIMARY KEY NOT NULL,
+    username VARCHAR NOT NULL,
+    email VARCHAR NOT NULL,
+    password VARCHAR NOT NULL,
+    role INTEGER DEFAULT 1 NOT NULL,
+    UNIQUE(username),
+    UNIQUE(email)
+);
+
+CREATE TABLE IF NOT EXISTS links (
+    id INTEGER PRIMARY KEY NOT NULL,
+    title VARCHAR NOT NULL,
+    target VARCHAR NOT NULL,
+    code VARCHAR NOT NULL,
+    author INT NOT NULL,
+    created_at TIMESTAMP NOT NULL,
+    FOREIGN KEY (author) REFERENCES users (id),
+    UNIQUE (code)
+);
+
+CREATE TABLE IF NOT EXISTS clicks (
+    id INTEGER PRIMARY KEY NOT NULL,
+    link INT NOT NULL,
+    created_at TIMESTAMP NOT NULL,
+    FOREIGN KEY (link) REFERENCES links (id)
+);

src/cli.rs

@@ -2,18 +2,20 @@ use clap::{
     app_from_crate, crate_authors, crate_description, crate_name, crate_version, App, Arg,
     ArgMatches, SubCommand,
 };
-use diesel::prelude::*;
 use dotenv::dotenv;
+use sqlx::{migrate::Migrator, Pool, Sqlite};
 use std::{
+    fs::File,
     io::{self, BufRead, Write},
     path::PathBuf,
 };
 
-use crate::{models::NewUser, ServerConfig, ServerError};
+use crate::{models::NewUser, models::User, ServerConfig, ServerError};
-use crate::{queries, schema};
 
 use slog::{Drain, Logger};
 
+static MIGRATOR: Migrator = sqlx::migrate!();
+
 #[allow(clippy::clippy::too_many_lines)]
 fn generate_cli() -> App<'static, 'static> {
     app_from_crate!()
@@ -120,7 +122,7 @@ fn generate_cli() -> App<'static, 'static> {
         )
 }
 
-fn parse_args_to_config(config: &ArgMatches, log: &Logger) -> ServerConfig {
+async fn parse_args_to_config(config: ArgMatches<'_>, log: Logger) -> ServerConfig {
     let secret = config
         .value_of("secret")
         .expect("Failed to read the secret")
@@ -163,6 +165,9 @@ fn parse_args_to_config(config: &ArgMatches, log: &Logger) -> ServerConfig {
         ))
         .parse::<PathBuf>()
         .expect("Failed to parse Database path.");
+    let db_pool = Pool::<Sqlite>::connect(&db.display().to_string())
+        .await
+        .expect("Error: Failed to connect to database!");
     let public_url = config
         .value_of("public_url")
         .expect("Failed to read the host value")
@@ -195,6 +200,7 @@ fn parse_args_to_config(config: &ArgMatches, log: &Logger) -> ServerConfig {
     crate::ServerConfig {
         secret,
         db,
+        db_pool,
         public_url,
         internal_ip,
         port,
@@ -205,22 +211,53 @@ fn parse_args_to_config(config: &ArgMatches, log: &Logger) -> ServerConfig {
     }
 }
 
-pub(crate) fn setup() -> Result<Option<crate::ServerConfig>, ServerError> {
+pub(crate) async fn setup() -> Result<Option<crate::ServerConfig>, ServerError> {
     dotenv().ok();
 
+    // initiallize the logger
     let decorator = slog_term::TermDecorator::new().build();
     let drain = slog_term::FullFormat::new(decorator).build().fuse();
     let drain = slog_async::Async::new(drain).build().fuse();
 
     let log = slog::Logger::root(drain, slog_o!("name" => "Pslink"));
 
+    // Print launch info
     slog_info!(log, "Launching Pslink a 'Private short link generator'");
-    slog_info!(log, ".env file setup, logging initialized");
+    slog_info!(log, "logging initialized");
 
     let app = generate_cli();
+
     let config = app.get_matches();
 
-    let server_config: crate::ServerConfig = parse_args_to_config(&config, &log);
+    let db = config
+        .value_of("database")
+        .expect(concat!(
+            "Neither the DATABASE_URL environment variable",
+            " nor the commandline parameters",
+            " contain a valid database location."
+        ))
+        .parse::<PathBuf>()
+        .expect("Failed to parse Database path.");
+    if !db.exists() {
+        if config.subcommand_matches("migrate-database").is_none() {
+            let msg = format!(
+                concat!(
+                    "Database not found at {}!",
+                    " Create a new database with: `pslink migrate-database`",
+                    "or adjust the databasepath."
+                ),
+                db.display()
+            );
+            slog_error!(log, "{}", msg);
+            eprintln!("{}", msg);
+            return Ok(None);
+        }
+
+        // create an empty database file the if above makes sure that this file does not exist.
+        File::create(db)?;
+    };
+
+    let server_config: crate::ServerConfig = parse_args_to_config(config.clone(), log).await;
 
     if let Some(_migrate_config) = config.subcommand_matches("generate-env") {
         return match generate_env_file(&server_config) {
@@ -229,45 +266,26 @@ pub(crate) fn setup() -> Result<Option<crate::ServerConfig>, ServerError> {
         };
     }
     if let Some(_migrate_config) = config.subcommand_matches("migrate-database") {
-        return match apply_migrations(&server_config) {
+        return match apply_migrations(&server_config).await {
             Ok(_) => Ok(None),
             Err(e) => Err(e),
         };
     }
     if let Some(_create_config) = config.subcommand_matches("create-admin") {
-        return match create_admin(&server_config) {
+        return match create_admin(&server_config).await {
             Ok(_) => Ok(None),
             Err(e) => Err(e),
         };
     }
 
     if let Some(_runserver_config) = config.subcommand_matches("runserver") {
-        let connection = if server_config.db.exists() {
+        let num_users = User::count_admins(&server_config).await?;
-            queries::establish_connection(&server_config.db)?
-        } else {
-            let msg = format!(
-                concat!(
-                    "Database not found at {}!",
-                    " Create a new database with: `pslink migrate-database`",
-                    "or adjust the databasepath."
-                ),
-                server_config.db.display()
-            );
-            slog_error!(&server_config.log, "{}", msg);
-            eprintln!("{}", msg);
-            return Ok(None);
-        };
-        let num_users: i64 = schema::users::dsl::users
-            .filter(schema::users::dsl::role.eq(2))
-            .select(diesel::dsl::count_star())
-            .first(&connection)
-            .expect("Failed to count the users");
 
-        if num_users < 1 {
+        if num_users.number < 1 {
             slog_warn!(
                 &server_config.log,
                 concat!(
-                    "No user created you will not be",
+                    "No admin user created you will not be",
                     " able to do anything as the service is invite only.",
                     " Create a user with `pslink create-admin`"
                 )
@@ -285,14 +303,10 @@ pub(crate) fn setup() -> Result<Option<crate::ServerConfig>, ServerError> {
 }
 
 /// Interactively create a new admin user.
-fn create_admin(config: &ServerConfig) -> Result<(), ServerError> {
+async fn create_admin(config: &ServerConfig) -> Result<(), ServerError> {
-    use schema::users;
-    use schema::users::dsl::{email, role, username};
     slog_info!(&config.log, "Creating an admin user.");
     let sin = io::stdin();
 
-    let connection = queries::establish_connection(&config.db)?;
-
     // wait for logging:
     std::thread::sleep(std::time::Duration::from_millis(100));
 
@@ -316,30 +330,22 @@ fn create_admin(config: &ServerConfig) -> Result<(), ServerError> {
 
     let new_admin = NewUser::new(new_username.clone(), new_email.clone(), &password, config)?;
 
-    diesel::insert_into(users::table)
+    new_admin.insert_user(config).await?;
-        .values(&new_admin)
+    let created_user = User::get_user_by_name(&new_username, config).await?;
-        .execute(&connection)?;
+    created_user.toggle_admin(config).await?;
 
-    let created_user = users::table
+    slog_info!(&config.log, "Admin user created: {}", new_username);
-        .filter(username.eq(new_username))
-        .filter(email.eq(new_email));
 
-    // Add admin rights to the user identified by (username, email) this should be unique according to sqlite constraints
-    diesel::update(created_user)
-        .set((role.eq(2),))
-        .execute(&connection)?;
-    slog_info!(&config.log, "Admin user created: {}", &new_admin.username);
     Ok(())
 }
 
-fn apply_migrations(config: &ServerConfig) -> Result<(), ServerError> {
+async fn apply_migrations(config: &ServerConfig) -> Result<(), ServerError> {
     slog_info!(
         config.log,
         "Creating a database file and running the migrations in the file {}:",
         &config.db.display()
     );
-    let connection = queries::establish_connection(&config.db)?;
+    MIGRATOR.run(&config.db_pool).await?;
-    crate::embedded_migrations::run_with_output(&connection, &mut std::io::stdout())?;
     Ok(())
 }
 

src/main.rs

@@ -1,7 +1,4 @@
-#[macro_use]
+extern crate sqlx;
-extern crate diesel;
-#[macro_use]
-extern crate diesel_migrations;
 #[allow(unused_imports)]
 #[macro_use(
     slog_o,
@@ -21,7 +18,6 @@ mod cli;
 mod forms;
 pub mod models;
 mod queries;
-pub mod schema;
 mod views;
 
 use std::{fmt::Display, path::PathBuf, str::FromStr};
@@ -30,13 +26,14 @@ use actix_identity::{CookieIdentityPolicy, IdentityService};
 use actix_web::{web, App, HttpResponse, HttpServer};
 
 use qrcode::types::QrError;
+use sqlx::{Pool, Sqlite};
 use tera::Tera;
 
 #[derive(Debug)]
 pub enum ServerError {
     Argonautic,
-    Diesel(diesel::result::Error),
+    Database(sqlx::Error),
-    Migration(diesel_migrations::RunMigrationsError),
+    DatabaseMigration(sqlx::migrate::MigrateError),
     Environment,
     Template(tera::Error),
     Qr(QrError),
@@ -48,12 +45,14 @@ impl std::fmt::Display for ServerError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             Self::Argonautic => write!(f, "Argonautica Error"),
-            Self::Diesel(e) => write!(f, "Diesel Error: {}", e),
+            Self::Database(e) => write!(f, "Database Error: {}", e),
+            Self::DatabaseMigration(e) => {
+                write!(f, "Migration Error: {}", e)
+            }
             Self::Environment => write!(f, "Environment Error"),
             Self::Template(e) => write!(f, "Template Error: {:?}", e),
             Self::Qr(e) => write!(f, "Qr Code Error: {:?}", e),
             Self::Io(e) => write!(f, "IO Error: {:?}", e),
-            Self::Migration(e) => write!(f, "Migration Error: {:?}", e),
             Self::User(data) => write!(f, "{}", data),
         }
     }
@@ -63,9 +62,12 @@ impl actix_web::error::ResponseError for ServerError {
     fn error_response(&self) -> HttpResponse {
         match self {
             Self::Argonautic => HttpResponse::InternalServerError().json("Argonautica Error"),
-            Self::Diesel(e) => {
+            Self::Database(e) => {
                 HttpResponse::InternalServerError().json(format!("Diesel Error: {:?}", e))
             }
+            Self::DatabaseMigration(_) => {
+                unimplemented!("A migration error should never be rendered")
+            }
             Self::Environment => HttpResponse::InternalServerError().json("Environment Error"),
             Self::Template(e) => {
                 HttpResponse::InternalServerError().json(format!("Template Error: {:?}", e))
@@ -74,9 +76,6 @@ impl actix_web::error::ResponseError for ServerError {
                 HttpResponse::InternalServerError().json(format!("Qr Code Error: {:?}", e))
             }
             Self::Io(e) => HttpResponse::InternalServerError().json(format!("IO Error: {:?}", e)),
-            Self::Migration(e) => {
-                HttpResponse::InternalServerError().json(format!("Migration Error: {:?}", e))
-            }
             Self::User(data) => HttpResponse::InternalServerError().json(data),
         }
     }
@@ -89,16 +88,16 @@ impl From<std::env::VarError> for ServerError {
     }
 }
 
-impl From<diesel_migrations::RunMigrationsError> for ServerError {
+impl From<sqlx::Error> for ServerError {
-    fn from(e: diesel_migrations::RunMigrationsError) -> Self {
+    fn from(err: sqlx::Error) -> Self {
-        Self::Migration(e)
-    }
-}
-
-impl From<diesel::result::Error> for ServerError {
-    fn from(err: diesel::result::Error) -> Self {
         eprintln!("Database error {:?}", err);
-        Self::Diesel(err)
+        Self::Database(err)
+    }
+}
+impl From<sqlx::migrate::MigrateError> for ServerError {
+    fn from(err: sqlx::migrate::MigrateError) -> Self {
+        eprintln!("Database error {:?}", err);
+        Self::DatabaseMigration(err)
     }
 }
 
@@ -158,6 +157,7 @@ impl FromStr for Protocol {
 pub(crate) struct ServerConfig {
     secret: String,
     db: PathBuf,
+    db_pool: Pool<Sqlite>,
     public_url: String,
     internal_ip: String,
     port: u32,
@@ -188,8 +188,6 @@ impl ServerConfig {
 }
 
 include!(concat!(env!("OUT_DIR"), "/generated.rs"));
-embed_migrations!("migrations/");
-
 fn build_tera() -> Tera {
     let mut tera = Tera::default();
 
@@ -339,7 +337,7 @@ async fn webservice(server_config: ServerConfig) -> std::io::Result<()> {
 
 #[actix_web::main]
 async fn main() -> Result<(), std::io::Error> {
-    match cli::setup() {
+    match cli::setup().await {
         Ok(Some(server_config)) => webservice(server_config).await,
         Ok(None) => {
             std::thread::sleep(std::time::Duration::from_millis(100));

src/models.rs

@@ -1,22 +1,87 @@
 use crate::{forms::LinkForm, ServerConfig, ServerError};
 
-use super::schema::{clicks, links, users};
 use argonautica::Hasher;
-use diesel::{Identifiable, Insertable, Queryable};
 use dotenv::dotenv;
 use serde::{Deserialize, Serialize};
 
-#[derive(Identifiable, Queryable, PartialEq, Serialize, Clone, Debug)]
+#[derive(PartialEq, Serialize, Clone, Debug)]
 pub struct User {
-    pub id: i32,
+    pub id: i64,
     pub username: String,
     pub email: String,
     pub password: String,
-    pub role: i32,
+    pub role: i64,
 }
 
-#[derive(Debug, Deserialize, Insertable)]
+impl User {
-#[table_name = "users"]
+    pub(crate) async fn get_user(
+        id: i64,
+        server_config: &ServerConfig,
+    ) -> Result<Self, ServerError> {
+        let user = sqlx::query_as!(Self, "Select * from users where id = ? ", id)
+            .fetch_one(&server_config.db_pool)
+            .await;
+        user.map_err(ServerError::Database)
+    }
+    pub(crate) async fn get_user_by_name(
+        name: &str,
+        server_config: &ServerConfig,
+    ) -> Result<Self, ServerError> {
+        let user = sqlx::query_as!(Self, "Select * from users where username = ? ", name)
+            .fetch_one(&server_config.db_pool)
+            .await;
+        user.map_err(ServerError::Database)
+    }
+
+    pub(crate) async fn get_all_users(
+        server_config: &ServerConfig,
+    ) -> Result<Vec<Self>, ServerError> {
+        let user = sqlx::query_as!(Self, "Select * from users")
+            .fetch_all(&server_config.db_pool)
+            .await;
+        user.map_err(ServerError::Database)
+    }
+
+    pub(crate) async fn update_user(
+        &self,
+        server_config: &ServerConfig,
+    ) -> Result<(), ServerError> {
+        sqlx::query!(
+            "UPDATE users SET
+            username = ?,
+            email = ?,
+            password = ?,
+            role = ? where id = ?",
+            self.username,
+            self.email,
+            self.password,
+            self.role,
+            self.id
+        )
+        .execute(&server_config.db_pool)
+        .await?;
+        Ok(())
+    }
+    pub(crate) async fn toggle_admin(
+        self,
+        server_config: &ServerConfig,
+    ) -> Result<(), ServerError> {
+        let new_role = 2 - (self.role + 1) % 2;
+        sqlx::query!("UPDATE users SET role = ? where id = ?", new_role, self.id)
+            .execute(&server_config.db_pool)
+            .await?;
+        Ok(())
+    }
+
+    pub(crate) async fn count_admins(server_config: &ServerConfig) -> Result<Count, ServerError> {
+        let num = sqlx::query_as!(Count, "select count(*) as number from users where role = 2")
+            .fetch_one(&server_config.db_pool)
+            .await?;
+        Ok(num)
+    }
+}
+
+#[derive(Debug, Deserialize)]
 pub struct NewUser {
     pub username: String,
     pub email: String,
@@ -54,6 +119,24 @@ impl NewUser {
 
         Ok(hash)
     }
+    pub(crate) async fn insert_user(
+        &self,
+        server_config: &ServerConfig,
+    ) -> Result<(), ServerError> {
+        sqlx::query!(
+            "Insert into users (
+            username,
+            email,
+            password,
+            role) VALUES (?,?,?,1)",
+            self.username,
+            self.email,
+            self.password,
+        )
+        .execute(&server_config.db_pool)
+        .await?;
+        Ok(())
+    }
 }
 
 #[derive(Debug, Deserialize)]
@@ -62,28 +145,72 @@ pub struct LoginUser {
     pub password: String,
 }
 
-#[derive(Serialize, Debug, Queryable)]
+#[derive(Serialize, Debug)]
 pub struct Link {
-    pub id: i32,
+    pub id: i64,
     pub title: String,
     pub target: String,
     pub code: String,
-    pub author: i32,
+    pub author: i64,
     pub created_at: chrono::NaiveDateTime,
 }
 
-#[derive(Serialize, Insertable)]
+impl Link {
-#[table_name = "links"]
+    pub(crate) async fn get_link_by_code(
+        code: &str,
+        server_config: &ServerConfig,
+    ) -> Result<Self, ServerError> {
+        let link = sqlx::query_as!(Self, "Select * from links where code = ? ", code)
+            .fetch_one(&server_config.db_pool)
+            .await;
+        slog_info!(server_config.log, "Found link: {:?}", &link);
+        link.map_err(ServerError::Database)
+    }
+
+    pub(crate) async fn delete_link_by_code(
+        code: &str,
+        server_config: &ServerConfig,
+    ) -> Result<(), ServerError> {
+        sqlx::query!("DELETE from links where code = ? ", code)
+            .execute(&server_config.db_pool)
+            .await?;
+        Ok(())
+    }
+    pub(crate) async fn update_link(
+        &self,
+        server_config: &ServerConfig,
+    ) -> Result<(), ServerError> {
+        sqlx::query!(
+            "UPDATE links SET
+            title = ?,
+            target = ?,
+            code = ?,
+            author = ?,
+            created_at = ? where id = ?",
+            self.title,
+            self.target,
+            self.code,
+            self.author,
+            self.created_at,
+            self.id
+        )
+        .execute(&server_config.db_pool)
+        .await?;
+        Ok(())
+    }
+}
+
+#[derive(Serialize, Debug)]
 pub struct NewLink {
     pub title: String,
     pub target: String,
     pub code: String,
-    pub author: i32,
+    pub author: i64,
     pub created_at: chrono::NaiveDateTime,
 }
 
 impl NewLink {
-    pub(crate) fn from_link_form(form: LinkForm, uid: i32) -> Self {
+    pub(crate) fn from_link_form(form: LinkForm, uid: i64) -> Self {
         Self {
             title: form.title,
             target: form.target,
@@ -92,33 +219,67 @@ impl NewLink {
             created_at: chrono::Local::now().naive_utc(),
         }
     }
+
+    pub(crate) async fn insert(self, server_config: &ServerConfig) -> Result<(), ServerError> {
+        sqlx::query!(
+            "Insert into links (
+                title,
+                target,
+                code,
+                author,
+                created_at) VALUES (?,?,?,?,?)",
+            self.title,
+            self.target,
+            self.code,
+            self.author,
+            self.created_at,
+        )
+        .execute(&server_config.db_pool)
+        .await?;
+        Ok(())
+    }
 }
 
-#[derive(Serialize, Debug, Queryable)]
+#[derive(Serialize, Debug)]
 pub struct Click {
-    pub id: i32,
+    pub id: i64,
-    pub link: i32,
+    pub link: i64,
     pub created_at: chrono::NaiveDateTime,
 }
 
-#[derive(Serialize, Insertable)]
+#[derive(Serialize)]
-#[table_name = "clicks"]
 pub struct NewClick {
-    pub link: i32,
+    pub link: i64,
     pub created_at: chrono::NaiveDateTime,
 }
 
 impl NewClick {
     #[must_use]
-    pub fn new(link_id: i32) -> Self {
+    pub fn new(link_id: i64) -> Self {
         Self {
             link: link_id,
             created_at: chrono::Local::now().naive_utc(),
         }
     }
+
+    pub(crate) async fn insert_click(
+        self,
+        server_config: &ServerConfig,
+    ) -> Result<(), ServerError> {
+        sqlx::query!(
+            "Insert into clicks (
+            link,
+            created_at) VALUES (?,?)",
+            self.link,
+            self.created_at,
+        )
+        .execute(&server_config.db_pool)
+        .await?;
+        Ok(())
+    }
 }
 
-#[derive(Serialize, Debug, Queryable)]
+#[derive(Serialize, Debug)]
 pub struct Count {
-    count: i32,
+    pub number: i32,
 }

src/queries.rs

@@ -1,8 +1,5 @@
-use std::path::Path;
-
 use actix_identity::Identity;
 use actix_web::web;
-use diesel::{prelude::*, sqlite::SqliteConnection};
 use serde::Serialize;
 
 use super::models::{Count, Link, NewUser, User};
@@ -12,23 +9,6 @@ use crate::{
     ServerConfig, ServerError,
 };
 
-/// Create a connection to the database
-pub(super) fn establish_connection(database_url: &Path) -> Result<SqliteConnection, ServerError> {
-    match SqliteConnection::establish(&database_url.display().to_string()) {
-        Ok(c) => Ok(c),
-        Err(e) => {
-            eprintln!(
-                "Error connecting to database: {}, {}",
-                database_url.display(),
-                e
-            );
-            Err(ServerError::User(
-                "Error connecting to Database".to_string(),
-            ))
-        }
-    }
-}
-
 /// The possible roles a user could have.
 #[derive(Debug, Clone)]
 pub enum Role {
@@ -40,7 +20,7 @@ pub enum Role {
 
 impl Role {
     /// Determin if the user is admin or the given user id is his own. This is used for things where users can edit or view their own entries, whereas admins can do so for all entries.
-    const fn admin_or_self(&self, id: i32) -> bool {
+    const fn admin_or_self(&self, id: i64) -> bool {
         match self {
             Self::Admin { .. } => true,
             Self::Regular { user } => user.id == id,
@@ -50,17 +30,12 @@ impl Role {
 }
 
 /// queries the user matching the given [`actix_identity::Identity`] and determins its authentication and permission level. Returns a [`Role`] containing the user if it is authenticated.
-pub(crate) fn authenticate(
+pub(crate) async fn authenticate(
     id: &Identity,
     server_config: &ServerConfig,
 ) -> Result<Role, ServerError> {
     if let Some(username) = id.identity() {
-        use super::schema::users::dsl;
+        let user = User::get_user_by_name(&username, server_config).await?;
-        let connection = establish_connection(&server_config.db)?;
-
-        let user = dsl::users
-            .filter(dsl::username.eq(&username))
-            .first::<User>(&connection)?;
 
         return Ok(match user.role {
             0 => Role::Disabled,
@@ -87,52 +62,58 @@ pub struct FullLink {
 }
 
 /// Returns a List of `FullLink` meaning `Links` enriched by their author and statistics. This returns all links if the user is either Admin or Regular user.
-pub(crate) fn list_all_allowed(
+pub(crate) async fn list_all_allowed(
     id: &Identity,
     server_config: &ServerConfig,
 ) -> Result<List<FullLink>, ServerError> {
-    use super::schema::clicks;
+    use crate::sqlx::Row;
-    use super::schema::links;
+    match authenticate(id, server_config).await? {
-    use super::schema::users;
-
-    // query to select all users could be const but typespecification is too complex. A filter can be added in the match below.
-    let query = links::dsl::links
-        .inner_join(users::dsl::users)
-        .left_join(clicks::dsl::clicks)
-        .group_by(links::id)
-        .select((
-            (
-                links::id,
-                links::title,
-                links::target,
-                links::code,
-                links::author,
-                links::created_at,
-            ),
-            (
-                users::id,
-                users::username,
-                users::email,
-                users::password,
-                users::role,
-            ),
-            (diesel::dsl::sql::<diesel::sql_types::Integer>(
-                "COUNT(clicks.id)",
-            ),),
-        ));
-    match authenticate(id, server_config)? {
         Role::Admin { user } | Role::Regular { user } => {
-            // show all links
+            let links = sqlx::query(
-            let connection = establish_connection(&server_config.db)?;
+                "select
-            let all_links: Vec<FullLink> = query
+                        links.id as lid,
-                .load(&connection)?
+                        links.title as ltitle,
+                        links.target as ltarget,
+                        links.code as lcode,
+                        links.author as lauthor,
+                        links.created_at as ldate,
+                        users.id as usid,
+                        users.username as usern,
+                        users.email as uemail,
+                        users.role as urole,
+                        count(clicks.id) as counter
+                    from
+                        links
+                        join users on links.author = users.id
+                        left join clicks on links.id = clicks.link
+                    group by
+                        links.id",
+            )
+            .fetch_all(&server_config.db_pool)
+            .await?
             .into_iter()
-                .map(|l: (Link, User, Count)| FullLink {
+            .map(|v| FullLink {
-                    link: l.0,
+                link: Link {
-                    user: l.1,
+                    id: v.get("lid"),
-                    clicks: l.2,
+                    title: v.get("ltitle"),
-                })
+                    target: v.get("ltarget"),
-                .collect();
+                    code: v.get("lcode"),
+                    author: v.get("lauthor"),
+                    created_at: v.get("ldate"),
+                },
+                user: User {
+                    id: v.get("usid"),
+                    username: v.get("usern"),
+                    email: v.get("uemail"),
+                    password: "invalid".to_owned(),
+                    role: v.get("urole"),
+                },
+                clicks: Count {
+                    number: v.get("counter"), /* count is never None */
+                },
+            });
+            // show all links
+            let all_links: Vec<FullLink> = links.collect();
             Ok(List {
                 user,
                 list: all_links,
@@ -143,15 +124,13 @@ pub(crate) fn list_all_allowed(
 }
 
 /// Only admins can list all users
-pub(crate) fn list_users(
+pub(crate) async fn list_users(
     id: &Identity,
     server_config: &ServerConfig,
 ) -> Result<List<User>, ServerError> {
-    use super::schema::users::dsl::users;
+    match authenticate(id, server_config).await? {
-    match authenticate(id, server_config)? {
         Role::Admin { user } => {
-            let connection = establish_connection(&server_config.db)?;
+            let all_users: Vec<User> = User::get_all_users(server_config).await?;
-            let all_users: Vec<User> = users.load(&connection)?;
             Ok(List {
                 user,
                 list: all_users,
@@ -170,23 +149,19 @@ pub struct Item<T> {
 }
 
 /// Get a user if permissions are accordingly
-pub(crate) fn get_user(
+pub(crate) async fn get_user(
     id: &Identity,
     user_id: &str,
     server_config: &ServerConfig,
 ) -> Result<Item<User>, ServerError> {
-    use super::schema::users;
+    if let Ok(uid) = user_id.parse::<i64>() {
-    if let Ok(uid) = user_id.parse::<i32>() {
         slog_info!(server_config.log, "Getting user {}", uid);
-        let auth = authenticate(id, server_config)?;
+        let auth = authenticate(id, server_config).await?;
         slog_info!(server_config.log, "{:?}", &auth);
         if auth.admin_or_self(uid) {
             match auth {
                 Role::Admin { user } | Role::Regular { user } => {
-                    let connection = establish_connection(&server_config.db)?;
+                    let viewed_user = User::get_user(uid as i64, server_config).await?;
-                    let viewed_user = users::dsl::users
-                        .filter(users::dsl::id.eq(&uid))
-                        .first::<User>(&connection)?;
                     Ok(Item {
                         user,
                         item: viewed_user,
@@ -205,31 +180,23 @@ pub(crate) fn get_user(
 }
 
 /// Get a user **without permission checks** (needed for login)
-pub(crate) fn get_user_by_name(
+pub(crate) async fn get_user_by_name(
     username: &str,
     server_config: &ServerConfig,
 ) -> Result<User, ServerError> {
-    use super::schema::users;
+    let user = User::get_user_by_name(username, server_config).await?;
-
-    let connection = establish_connection(&server_config.db)?;
-    let user = users::dsl::users
-        .filter(users::dsl::username.eq(username))
-        .first::<User>(&connection)?;
     Ok(user)
 }
 
-pub(crate) fn create_user(
+pub(crate) async fn create_user(
     id: &Identity,
     data: &web::Form<NewUser>,
     server_config: &ServerConfig,
 ) -> Result<Item<User>, ServerError> {
     slog_info!(server_config.log, "Creating a User: {:?}", &data);
-    let auth = authenticate(id, server_config)?;
+    let auth = authenticate(id, server_config).await?;
     match auth {
         Role::Admin { user } => {
-            use super::schema::users;
-
-            let connection = establish_connection(&server_config.db)?;
             let new_user = NewUser::new(
                 data.username.clone(),
                 data.email.clone(),
@@ -237,11 +204,10 @@ pub(crate) fn create_user(
                 server_config,
             )?;
 
-            diesel::insert_into(users::table)
+            new_user.insert_user(server_config).await?;
-                .values(&new_user)
-                .execute(&connection)?;
 
-            let new_user = get_user_by_name(&data.username, server_config)?;
+            // querry the new user
+            let new_user = get_user_by_name(&data.username, server_config).await?;
             Ok(Item {
                 user,
                 item: new_user,
@@ -255,37 +221,33 @@ pub(crate) fn create_user(
 /// Take a [`actix_web::web::Form<NewUser>`] and update the corresponding entry in the database.
 /// The password is only updated if a new password of at least 4 characters is provided.
 /// The `user_id` is never changed.
-pub(crate) fn update_user(
+pub(crate) async fn update_user(
     id: &Identity,
     user_id: &str,
     server_config: &ServerConfig,
     data: &web::Form<NewUser>,
 ) -> Result<Item<User>, ServerError> {
-    if let Ok(uid) = user_id.parse::<i32>() {
+    if let Ok(uid) = user_id.parse::<i64>() {
-        let auth = authenticate(id, server_config)?;
+        let auth = authenticate(id, server_config).await?;
+        let unmodified_user = User::get_user(uid, server_config).await?;
         if auth.admin_or_self(uid) {
             match auth {
                 Role::Admin { .. } | Role::Regular { .. } => {
-                    use super::schema::users::dsl::{email, id, password, username, users};
-
                     slog_info!(server_config.log, "Updating userinfo: ");
-                    let connection = establish_connection(&server_config.db)?;
+                    let password = if data.password.len() > 3 {
-
+                        NewUser::hash_password(&data.password, server_config)?
-                    // Update username and email - if they have not been changed their values will be replaced by the old ones.
+                    } else {
-                    diesel::update(users.filter(id.eq(&uid)))
+                        unmodified_user.password
-                        .set((
+                    };
-                            username.eq(data.username.clone()),
+                    let new_user = User {
-                            email.eq(data.email.clone()),
+                        id: uid,
-                        ))
+                        username: data.username.clone(),
-                        .execute(&connection)?;
+                        email: data.email.clone(),
-                    // Update the password only if the user entered something.
+                        password,
-                    if data.password.len() > 3 {
+                        role: unmodified_user.role,
-                        let hash = NewUser::hash_password(&data.password, server_config)?;
+                    };
-                        diesel::update(users.filter(id.eq(&uid)))
+                    new_user.update_user(server_config).await?;
-                            .set((password.eq(hash),))
+                    let changed_user = User::get_user(uid, server_config).await?;
-                            .execute(&connection)?;
-                    }
-                    let changed_user = users.filter(id.eq(&uid)).first::<User>(&connection)?;
                     Ok(Item {
                         user: changed_user.clone(),
                         item: changed_user,
@@ -303,36 +265,30 @@ pub(crate) fn update_user(
     }
 }
 
-pub(crate) fn toggle_admin(
+pub(crate) async fn toggle_admin(
     id: &Identity,
     user_id: &str,
     server_config: &ServerConfig,
 ) -> Result<Item<User>, ServerError> {
-    if let Ok(uid) = user_id.parse::<i32>() {
+    if let Ok(uid) = user_id.parse::<i64>() {
-        let auth = authenticate(id, server_config)?;
+        let auth = authenticate(id, server_config).await?;
         match auth {
             Role::Admin { .. } => {
-                use super::schema::users::dsl::{id, role, users};
-
                 slog_info!(server_config.log, "Changing administrator priviledges: ");
-                let connection = establish_connection(&server_config.db)?;
 
-                let unchanged_user = users.filter(id.eq(&uid)).first::<User>(&connection)?;
+                let unchanged_user = User::get_user(uid, server_config).await?;
 
-                let new_role = 2 - (unchanged_user.role + 1) % 2;
+                let old = unchanged_user.role;
+                unchanged_user.toggle_admin(server_config).await?;
+
+                slog_info!(server_config.log, "Toggling role: old was {}", old);
+
+                let changed_user = User::get_user(uid, server_config).await?;
                 slog_info!(
                     server_config.log,
-                    "Assigning new role: {} - old was {}",
+                    "Toggled role: new is {}",
-                    new_role,
+                    changed_user.role
-                    unchanged_user.role
                 );
-
-                // Update the role eg. admin vs. normal vs. disabled
-                diesel::update(users.filter(id.eq(&uid)))
-                    .set((role.eq(new_role),))
-                    .execute(&connection)?;
-
-                let changed_user = users.filter(id.eq(&uid)).first::<User>(&connection)?;
                 Ok(Item {
                     user: changed_user.clone(),
                     item: changed_user,
@@ -348,18 +304,14 @@ pub(crate) fn toggle_admin(
 }
 
 /// Get one link if permissions are accordingly.
-pub(crate) fn get_link(
+pub(crate) async fn get_link(
     id: &Identity,
     link_code: &str,
     server_config: &ServerConfig,
 ) -> Result<Item<Link>, ServerError> {
-    use super::schema::links::dsl::{code, links};
+    match authenticate(id, server_config).await? {
-    match authenticate(id, server_config)? {
         Role::Admin { user } | Role::Regular { user } => {
-            let connection = establish_connection(&server_config.db)?;
+            let link = Link::get_link_by_code(link_code, server_config).await?;
-            let link: Link = links
-                .filter(code.eq(&link_code))
-                .first::<Link>(&connection)?;
             Ok(Item { user, item: link })
         }
         Role::Disabled | Role::NotAuthenticated => Err(ServerError::User("Not Allowed".to_owned())),
@@ -367,75 +319,72 @@ pub(crate) fn get_link(
 }
 
 /// Get link **without authentication**
-pub(crate) fn get_link_simple(
+pub(crate) async fn get_link_simple(
     link_code: &str,
     server_config: &ServerConfig,
 ) -> Result<Link, ServerError> {
-    use super::schema::links::dsl::{code, links};
     slog_info!(server_config.log, "Getting link for {:?}", link_code);
-    let connection = establish_connection(&server_config.db)?;
+
-    let link: Link = links
+    let link = Link::get_link_by_code(link_code, server_config).await?;
-        .filter(code.eq(&link_code))
+    slog_info!(server_config.log, "Foun d link for {:?}", link);
-        .first::<Link>(&connection)?;
     Ok(link)
 }
 /// Click on a link
-pub(crate) fn click_link(link_id: i32, server_config: &ServerConfig) -> Result<(), ServerError> {
+pub(crate) async fn click_link(
-    use super::schema::clicks;
+    link_id: i64,
+    server_config: &ServerConfig,
+) -> Result<(), ServerError> {
+    slog_info!(server_config.log, "Clicking on {:?}", link_id);
     let new_click = NewClick::new(link_id);
-    let connection = establish_connection(&server_config.db)?;
+    new_click.insert_click(server_config).await?;
-
-    diesel::insert_into(clicks::table)
-        .values(&new_click)
-        .execute(&connection)?;
     Ok(())
 }
 
 /// Click on a link
-pub(crate) fn delete_link(
+pub(crate) async fn delete_link(
     id: &Identity,
     link_code: &str,
     server_config: &ServerConfig,
 ) -> Result<(), ServerError> {
-    use super::schema::links::dsl::{code, links};
+    let auth = authenticate(id, server_config).await?;
-    let connection = establish_connection(&server_config.db)?;
+    let link = get_link_simple(link_code, server_config).await?;
-    let auth = authenticate(id, server_config)?;
-    let link = get_link_simple(link_code, server_config)?;
     if auth.admin_or_self(link.author) {
-        diesel::delete(links.filter(code.eq(&link_code))).execute(&connection)?;
+        Link::delete_link_by_code(link_code, server_config).await?;
         Ok(())
     } else {
         Err(ServerError::User("Permission denied!".to_owned()))
     }
 }
+
 /// Update a link if the user is admin or it is its own link.
-pub(crate) fn update_link(
+pub(crate) async fn update_link(
     id: &Identity,
     link_code: &str,
-    data: &web::Form<LinkForm>,
+    data: web::Form<LinkForm>,
     server_config: &ServerConfig,
 ) -> Result<Item<Link>, ServerError> {
-    use super::schema::links::dsl::{code, links, target, title};
     slog_info!(
         server_config.log,
         "Changing link to: {:?} {:?}",
         &data,
         &link_code
     );
-    let auth = authenticate(id, server_config)?;
+    let auth = authenticate(id, server_config).await?;
     match auth {
         Role::Admin { .. } | Role::Regular { .. } => {
-            let query = get_link(id, link_code, server_config)?;
+            let query = get_link(id, link_code, server_config).await?;
             if auth.admin_or_self(query.item.author) {
-                let connection = establish_connection(&server_config.db)?;
+                let mut link = query.item;
-                diesel::update(links.filter(code.eq(&query.item.code)))
+                let LinkForm {
-                    .set((
+                    title,
-                        code.eq(&data.code),
+                    target,
-                        target.eq(&data.target),
+                    code,
-                        title.eq(&data.title),
+                } = data.into_inner();
-                    ))
+                link.code = code.clone();
-                    .execute(&connection)?;
+                link.target = target;
-                get_link(id, &data.code, server_config)
+                link.title = title;
+                link.update_link(server_config).await?;
+                get_link(id, &code, server_config).await
             } else {
                 Err(ServerError::User("Not Allowed".to_owned()))
             }
@@ -444,23 +393,21 @@ pub(crate) fn update_link(
     }
 }
 
-pub(crate) fn create_link(
+pub(crate) async fn create_link(
     id: &Identity,
     data: web::Form<LinkForm>,
     server_config: &ServerConfig,
 ) -> Result<Item<Link>, ServerError> {
-    let auth = authenticate(id, server_config)?;
+    let auth = authenticate(id, server_config).await?;
     match auth {
         Role::Admin { user } | Role::Regular { user } => {
-            use super::schema::links;
+            let code = data.code.clone();
-
+            slog_info!(server_config.log, "Creating link for: {}", &code);
-            let connection = establish_connection(&server_config.db)?;
             let new_link = NewLink::from_link_form(data.into_inner(), user.id);
+            slog_info!(server_config.log, "Creating link for: {:?}", &new_link);
 
-            diesel::insert_into(links::table)
+            new_link.insert(server_config).await?;
-                .values(&new_link)
+            let new_link = get_link_simple(&code, server_config).await?;
-                .execute(&connection)?;
-            let new_link = get_link_simple(&new_link.code, server_config)?;
             Ok(Item {
                 user,
                 item: new_link,

src/schema.rs

@@ -1,37 +0,0 @@
-table! {
-    clicks (id) {
-        id -> Integer,
-        link -> Integer,
-        created_at -> Timestamp,
-    }
-}
-
-table! {
-    links (id) {
-        id -> Integer,
-        title -> Text,
-        target -> Text,
-        code -> Text,
-        author -> Integer,
-        created_at -> Timestamp,
-    }
-}
-
-table! {
-    users (id) {
-        id -> Integer,
-        username -> Text,
-        email -> Text,
-        password -> Text,
-        role -> Integer,
-    }
-}
-
-joinable!(clicks -> links (link));
-joinable!(links -> users (author));
-
-allow_tables_to_appear_in_same_query!(
-    clicks,
-    links,
-    users,
-);

src/views.rs

@@ -33,7 +33,7 @@ pub(crate) async fn index(
     config: web::Data<crate::ServerConfig>,
     id: Identity,
 ) -> Result<HttpResponse, ServerError> {
-    if let Ok(links) = queries::list_all_allowed(&id, &config) {
+    if let Ok(links) = queries::list_all_allowed(&id, &config).await {
         let mut data = Context::new();
         data.insert("user", &links.user);
         data.insert("title", &format!("Links der {}", &config.brand_name,));
@@ -51,7 +51,7 @@ pub(crate) async fn index_users(
     config: web::Data<crate::ServerConfig>,
     id: Identity,
 ) -> Result<HttpResponse, ServerError> {
-    if let Ok(users) = queries::list_users(&id, &config) {
+    if let Ok(users) = queries::list_users(&id, &config).await {
         let mut data = Context::new();
         data.insert("user", &users.user);
         data.insert("title", &format!("Benutzer der {}", &config.brand_name,));
@@ -77,7 +77,7 @@ pub(crate) async fn view_link(
     id: Identity,
     link_id: web::Path<String>,
 ) -> Result<HttpResponse, ServerError> {
-    if let Ok(link) = queries::get_link(&id, &link_id.0, &config) {
+    if let Ok(link) = queries::get_link(&id, &link_id.0, &config).await {
         let host = config.public_url.to_string();
         let protocol = config.protocol.to_string();
         let qr = QrCode::with_error_correction_level(
@@ -117,7 +117,7 @@ pub(crate) async fn view_profile(
     user_id: web::Path<String>,
 ) -> Result<HttpResponse, ServerError> {
     slog_info!(config.log, "Viewing Profile!");
-    if let Ok(query) = queries::get_user(&id, &user_id.0, &config) {
+    if let Ok(query) = queries::get_user(&id, &user_id.0, &config).await {
         let mut data = Context::new();
         data.insert("user", &query.user);
         data.insert(
@@ -144,7 +144,7 @@ pub(crate) async fn edit_profile(
     user_id: web::Path<String>,
 ) -> Result<HttpResponse, ServerError> {
     slog_info!(config.log, "Editing Profile!");
-    if let Ok(query) = queries::get_user(&id, &user_id.0, &config) {
+    if let Ok(query) = queries::get_user(&id, &user_id.0, &config).await {
         let mut data = Context::new();
         data.insert("user", &query.user);
         data.insert(
@@ -169,7 +169,7 @@ pub(crate) async fn process_edit_profile(
     id: Identity,
     user_id: web::Path<String>,
 ) -> Result<HttpResponse, ServerError> {
-    if let Ok(query) = queries::update_user(&id, &user_id.0, &config, &data) {
+    if let Ok(query) = queries::update_user(&id, &user_id.0, &config, &data).await {
         Ok(redirect_builder(&format!(
             "admin/view/profile/{}",
             query.user.username
@@ -184,7 +184,7 @@ pub(crate) async fn download_png(
     config: web::Data<crate::ServerConfig>,
     link_code: web::Path<String>,
 ) -> Result<HttpResponse, ServerError> {
-    match queries::get_link(&id, &link_code.0, &config) {
+    match queries::get_link(&id, &link_code.0, &config).await {
         Ok(query) => {
             let qr = QrCode::with_error_correction_level(
                 &format!("http://{}/{}", config.public_url, &query.item.code),
@@ -208,7 +208,7 @@ pub(crate) async fn signup(
     config: web::Data<crate::ServerConfig>,
     id: Identity,
 ) -> Result<HttpResponse, ServerError> {
-    match queries::authenticate(&id, &config)? {
+    match queries::authenticate(&id, &config).await? {
         queries::Role::Admin { user } => {
             let mut data = Context::new();
             data.insert("title", "Ein Benutzerkonto erstellen");
@@ -229,7 +229,7 @@ pub(crate) async fn process_signup(
     id: Identity,
 ) -> Result<HttpResponse, ServerError> {
     slog_info!(config.log, "Creating a User: {:?}", &data);
-    if let Ok(item) = queries::create_user(&id, &data, &config) {
+    if let Ok(item) = queries::create_user(&id, &data, &config).await {
         Ok(HttpResponse::Ok().body(format!("Successfully saved user: {}", item.item.username)))
     } else {
         Ok(redirect_builder("/admin/login/"))
@@ -241,7 +241,7 @@ pub(crate) async fn toggle_admin(
     config: web::Data<crate::ServerConfig>,
     id: Identity,
 ) -> Result<HttpResponse, ServerError> {
-    let update = queries::toggle_admin(&id, &data.0, &config)?;
+    let update = queries::toggle_admin(&id, &data.0, &config).await?;
     Ok(redirect_builder(&format!(
         "/admin/view/profile/{}",
         update.item.id
@@ -268,7 +268,7 @@ pub(crate) async fn process_login(
     config: web::Data<crate::ServerConfig>,
     id: Identity,
 ) -> Result<HttpResponse, ServerError> {
-    let user = queries::get_user_by_name(&data.username, &config);
+    let user = queries::get_user_by_name(&data.username, &config).await;
 
     match user {
         Ok(u) => {
@@ -306,14 +306,14 @@ pub(crate) async fn redirect(
     data: web::Path<String>,
 ) -> Result<HttpResponse, ServerError> {
     slog_info!(config.log, "Redirecting to {:?}", data);
-    let link = queries::get_link_simple(&data.0, &config);
+    let link = queries::get_link_simple(&data.0, &config).await;
     slog_info!(config.log, "link: {:?}", link);
     match link {
         Ok(link) => {
-            queries::click_link(link.id, &config)?;
+            queries::click_link(link.id, &config).await?;
             Ok(redirect_builder(&link.target))
         }
-        Err(ServerError::Diesel(e)) => {
+        Err(ServerError::Database(e)) => {
             slog_info!(
                 config.log,
                 "Link was not found: http://{}/{} \n {}",
@@ -341,7 +341,7 @@ pub(crate) async fn create_link(
     config: web::Data<crate::ServerConfig>,
     id: Identity,
 ) -> Result<HttpResponse, ServerError> {
-    match queries::authenticate(&id, &config)? {
+    match queries::authenticate(&id, &config).await? {
         queries::Role::Admin { user } | queries::Role::Regular { user } => {
             let mut data = Context::new();
             data.insert("title", "Einen Kurzlink erstellen");
@@ -361,7 +361,7 @@ pub(crate) async fn process_link_creation(
     config: web::Data<crate::ServerConfig>,
     id: Identity,
 ) -> Result<HttpResponse, ServerError> {
-    let new_link = queries::create_link(&id, data, &config)?;
+    let new_link = queries::create_link(&id, data, &config).await?;
     Ok(redirect_builder(&format!(
         "/admin/view/link/{}",
         new_link.item.code
@@ -374,7 +374,7 @@ pub(crate) async fn edit_link(
     id: Identity,
     link_id: web::Path<String>,
 ) -> Result<HttpResponse, ServerError> {
-    if let Ok(query) = queries::get_link(&id, &link_id.0, &config) {
+    if let Ok(query) = queries::get_link(&id, &link_id.0, &config).await {
         let mut data = Context::new();
         data.insert("title", "Submit a Post");
         data.insert("link", &query.item);
@@ -391,7 +391,7 @@ pub(crate) async fn process_link_edit(
     id: Identity,
     link_code: web::Path<String>,
 ) -> Result<HttpResponse, ServerError> {
-    match queries::update_link(&id, &link_code.0, &data, &config) {
+    match queries::update_link(&id, &link_code.0, data, &config).await {
         Ok(query) => Ok(redirect_builder(&format!(
             "/admin/view/link/{}",
             &query.item.code
@@ -405,6 +405,6 @@ pub(crate) async fn process_link_delete(
     config: web::Data<crate::ServerConfig>,
     link_code: web::Path<String>,
 ) -> Result<HttpResponse, ServerError> {
-    queries::delete_link(&id, &link_code.0, &config)?;
+    queries::delete_link(&id, &link_code.0, &config).await?;
     Ok(redirect_builder("/admin/login/"))
 }

templates/index.html

@@ -45,7 +45,7 @@
                 {% endif %}
             </td>
             <td>
-                {{ c.count }}
+                {{ c.number }}
             </td>
         </tr>
         {% endfor %}