Refactor models names
This commit is contained in:
parent
76b14ce75b
commit
be7f31906c
24 changed files with 461 additions and 340 deletions
emgauwa-lib/src/handlers/v1
|
@ -1,13 +1,12 @@
|
|||
use actix_web::{delete, get, post, put, web, HttpResponse};
|
||||
use actix_web::{get, web, HttpResponse};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use sqlx::pool::PoolConnection;
|
||||
|
||||
use sqlx::{Pool, Sqlite};
|
||||
|
||||
use crate::db::errors::DatabaseError;
|
||||
use crate::db::Relay;
|
||||
use crate::db::Tag;
|
||||
use crate::db::DbRelay;
|
||||
|
||||
use crate::handlers::errors::ApiError;
|
||||
use crate::return_models::ReturnRelay;
|
||||
use crate::models::Relay;
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
pub struct RequestRelay {
|
||||
|
@ -19,10 +18,12 @@ pub struct RequestRelay {
|
|||
pub async fn index(pool: web::Data<Pool<Sqlite>>) -> Result<HttpResponse, ApiError> {
|
||||
let mut pool_conn = pool.acquire().await?;
|
||||
|
||||
let relays = Relay::get_all(&mut pool_conn).await?;
|
||||
let relays = DbRelay::get_all(&mut pool_conn).await?;
|
||||
|
||||
let return_relays: Vec<ReturnRelay> =
|
||||
relays.into_iter().map(|s| ReturnRelay::from_relay(s, &mut pool_conn)).collect();
|
||||
let return_relays: Vec<Relay> = relays
|
||||
.into_iter()
|
||||
.map(|s| Relay::from_db_relay(s, &mut pool_conn))
|
||||
.collect();
|
||||
|
||||
Ok(HttpResponse::Ok().json(return_relays))
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue