AntennaNew was not really needed.

This commit is contained in:
2023-07-22 00:43:00 +02:00
parent cb7b62a092
commit ab5ac2fcbe
3 changed files with 17 additions and 19 deletions

View File

@@ -1,7 +1,7 @@
use diesel::prelude::*;
use rocket::{http::Status, serde::json::Json, State};
use kairo_common::{postgres, schema::antennas, Antenna, NewAntenna};
use kairo_common::{postgres, schema::antennas, Antenna};
#[rocket::get("/id/<id>")]
pub fn get_by_id(db_pool: &State<postgres::DbPool>, id: String) -> Option<Json<Antenna>> {
@@ -33,11 +33,11 @@ pub fn get_list(db_pool: &State<postgres::DbPool>) -> Json<Vec<Antenna>> {
}
#[rocket::post("/new", format = "json", data = "<antenna>")]
pub fn new(db_pool: &State<postgres::DbPool>, antenna: Json<NewAntenna<'_>>) -> Status {
pub fn new(db_pool: &State<postgres::DbPool>, antenna: Json<Antenna>) -> Status {
let mut db = db_pool.get().unwrap();
let res = diesel::insert_into(antennas::table)
.values(*antenna)
.values(antenna.0)
.execute(&mut db);
match res {
@@ -47,12 +47,12 @@ pub fn new(db_pool: &State<postgres::DbPool>, antenna: Json<NewAntenna<'_>>) ->
}
#[rocket::patch("/update", format = "json", data = "<antenna>")]
pub fn update(db_pool: &State<postgres::DbPool>, antenna: Json<NewAntenna<'_>>) -> Status {
pub fn update(db_pool: &State<postgres::DbPool>, antenna: Json<Antenna>) -> Status {
let mut db = db_pool.get().unwrap();
let res = diesel::update(antennas::table)
.filter(antennas::id.eq(antenna.id))
.set(*antenna)
.filter(antennas::id.eq(antenna.id.clone()))
.set(antenna.0)
.execute(&mut db);
match res {