emgauwa/core
2
0
Fork 0
Code Issues Pull requests Projects Releases1 Packages Wiki Activity Actions

Refactor models names

Browse source
This commit is contained in:
Tobias Reisinger 2023-11-27 12:49:40 +01:00
parent 76b14ce75b
commit be7f31906c
Signed by: serguzim
GPG key ID: 13AD60C237A28DFE
24 changed files with 461 additions and 340 deletions
emgauwa-lib/src/db
relays.rs

81
emgauwa-lib/src/db/relays.rs
View file

@ -1,16 +1,15 @@
use serde_derive::Serialize;
use std::ops::DerefMut;
use crate::db::DbController;
use sqlx::pool::PoolConnection;
use sqlx::Sqlite;
use crate::db::Controller;
use crate::db::errors::DatabaseError;
use crate::db::Tag;
use crate::db::DbTag;
#[derive(Debug, Serialize, Clone)]
#[derive(sqlx::FromRow)]
pub struct Relay {
#[derive(Debug, Serialize, Clone, sqlx::FromRow)]
pub struct DbRelay {
#[serde(skip)]
pub id: i64,
pub name: String,
@ -19,34 +18,41 @@ pub struct Relay {
pub controller_id: i64,
}
impl Relay {
pub async fn get_all(
conn: &mut PoolConnection<Sqlite>,
) -> Result<Vec<Relay>, DatabaseError> {
Ok(sqlx::query_as!(Relay, "SELECT * FROM relays")
impl DbRelay {
pub async fn get_all(conn: &mut PoolConnection<Sqlite>) -> Result<Vec<DbRelay>, DatabaseError> {
Ok(sqlx::query_as!(DbRelay, "SELECT * FROM relays")
.fetch_all(conn.deref_mut())
.await?)
}
pub async fn get(
conn: &mut PoolConnection<Sqlite>,
id: i64,
) -> Result<Relay, DatabaseError> {
sqlx::query_as!(
Relay,
"SELECT * FROM relays WHERE id = ?",
id
)
pub async fn get(conn: &mut PoolConnection<Sqlite>, id: i64) -> Result<DbRelay, DatabaseError> {
sqlx::query_as!(DbRelay, "SELECT * FROM relays WHERE id = ?", id)
.fetch_optional(conn.deref_mut())
.await
.map(|s| s.ok_or(DatabaseError::NotFound))?
}
pub async fn get_by_controller_and_num(
conn: &mut PoolConnection<Sqlite>,
controller: &DbController,
number: i64,
) -> Result<DbRelay, DatabaseError> {
sqlx::query_as!(
DbRelay,
"SELECT * FROM relays WHERE controller_id = ? AND number = ?",
controller.id,
number
)
.fetch_optional(conn.deref_mut())
.await
.map(|s| s.ok_or(DatabaseError::NotFound))?
}
pub async fn get_by_tag(
conn: &mut PoolConnection<Sqlite>,
tag: &Tag,
) -> Result<Vec<Relay>, DatabaseError> {
Ok(sqlx::query_as!(Relay, "SELECT schedule.* FROM relays AS schedule INNER JOIN junction_tag ON junction_tag.schedule_id = schedule.id WHERE junction_tag.tag_id = ?", tag.id)
tag: &DbTag,
) -> Result<Vec<DbRelay>, DatabaseError> {
Ok(sqlx::query_as!(DbRelay, "SELECT schedule.* FROM relays AS schedule INNER JOIN junction_tag ON junction_tag.schedule_id = schedule.id WHERE junction_tag.tag_id = ?", tag.id)
.fetch_all(conn.deref_mut())
.await?)
}
@ -55,10 +61,10 @@ impl Relay {
conn: &mut PoolConnection<Sqlite>,
new_name: &str,
new_number: i64,
new_controller: &Controller,
) -> Result<Relay, DatabaseError> {
new_controller: &DbController,
) -> Result<DbRelay, DatabaseError> {
sqlx::query_as!(
Relay,
DbRelay,
"INSERT INTO relays (name, number, controller_id) VALUES (?, ?, ?) RETURNING *",
new_name,
new_number,
@ -69,10 +75,7 @@ impl Relay {
.ok_or(DatabaseError::InsertGetError)
}
pub async fn delete(
&self,
conn: &mut PoolConnection<Sqlite>,
) -> Result<(), DatabaseError> {
pub async fn delete(&self, conn: &mut PoolConnection<Sqlite>) -> Result<(), DatabaseError> {
sqlx::query!("DELETE FROM relays WHERE id = ?", self.id)
.execute(conn.deref_mut())
.await
@ -87,8 +90,8 @@ impl Relay {
conn: &mut PoolConnection<Sqlite>,
new_name: &str,
new_number: i64,
new_controller: &Controller,
) -> Result<Relay, DatabaseError> {
new_controller: &DbController,
) -> Result<DbRelay, DatabaseError> {
sqlx::query!(
"UPDATE relays SET name = ?, number = ?, controller_id = ? WHERE id = ?",
new_name,
@ -99,14 +102,20 @@ impl Relay {
.execute(conn.deref_mut())
.await?;
Relay::get(conn, self.id).await
DbRelay::get(conn, self.id).await
}
pub async fn get_controller(&self, conn: &mut PoolConnection<Sqlite>) -> Result<Controller, DatabaseError> {
Controller::get(conn, self.controller_id).await
pub async fn get_controller(
&self,
conn: &mut PoolConnection<Sqlite>,
) -> Result<DbController, DatabaseError> {
DbController::get(conn, self.controller_id).await
}
pub async fn get_tags(&self, conn: &mut PoolConnection<Sqlite>) -> Result<Vec<String>, DatabaseError> {
pub async fn get_tags(
&self,
conn: &mut PoolConnection<Sqlite>,
) -> Result<Vec<String>, DatabaseError> {
Ok(sqlx::query_scalar!("SELECT tag FROM tags INNER JOIN junction_tag ON junction_tag.tag_id = tags.id WHERE junction_tag.relay_id = ?", self.id)
.fetch_all(conn.deref_mut())
.await?)
@ -122,7 +131,7 @@ impl Relay {
.await?;
for new_tag in new_tags {
let tag: Tag = Tag::get_by_tag_or_create(conn, new_tag).await?;
let tag: DbTag = DbTag::get_by_tag_or_create(conn, new_tag).await?;
tag.link_relay(conn, self).await?;
}
Ok(())