✨ Adds delete method
This commit is contained in:
@@ -1,7 +1,8 @@
|
||||
use crate::dtos::tracker::TrackerDTO;
|
||||
use crate::models::AppState;
|
||||
use crate::models::tracker::{NewTracker, Tracker};
|
||||
use crate::models::tracker::Tracker;
|
||||
use crate::schema::trackers;
|
||||
use crate::schema::trackers::dsl;
|
||||
use chrono::Utc;
|
||||
use diesel::{ExpressionMethods, QueryDsl, RunQueryDsl, SelectableHelper};
|
||||
use rocket::State;
|
||||
@@ -20,7 +21,7 @@ pub fn index(
|
||||
let offset = offset.unwrap_or(0);
|
||||
let limit = limit.unwrap_or(10);
|
||||
|
||||
let results = trackers::dsl::trackers
|
||||
let results = dsl::trackers
|
||||
.offset(offset)
|
||||
.limit(limit)
|
||||
.select(Tracker::as_select())
|
||||
@@ -39,10 +40,10 @@ pub fn get(id: String, state: &State<AppState>) -> Result<Json<TrackerDTO>, Stat
|
||||
|
||||
let id = match Uuid::parse_str(id.as_str()).ok() {
|
||||
Some(id) => id,
|
||||
None => return Err(Status::NotFound),
|
||||
None => return Err(Status::BadRequest),
|
||||
};
|
||||
|
||||
let result = trackers::dsl::trackers
|
||||
let result = dsl::trackers
|
||||
.filter(trackers::id.eq(id))
|
||||
.first::<Tracker>(&mut *db)
|
||||
.ok();
|
||||
@@ -57,7 +58,8 @@ pub fn get(id: String, state: &State<AppState>) -> Result<Json<TrackerDTO>, Stat
|
||||
pub fn create(state: &State<AppState>) -> Result<Json<TrackerDTO>, Status> {
|
||||
let mut db = state.db.lock().unwrap();
|
||||
|
||||
let new = NewTracker {
|
||||
let new = Tracker {
|
||||
id: Uuid::new_v4(),
|
||||
created_at: Utc::now().naive_utc(),
|
||||
};
|
||||
let result = diesel::insert_into(trackers::table)
|
||||
@@ -71,3 +73,23 @@ pub fn create(state: &State<AppState>) -> Result<Json<TrackerDTO>, Status> {
|
||||
None => Err(Status::InternalServerError),
|
||||
}
|
||||
}
|
||||
|
||||
#[delete("/<id>")]
|
||||
pub fn delete(id: String, state: &State<AppState>) -> Result<Status, Status> {
|
||||
let mut db = state.db.lock().unwrap();
|
||||
|
||||
let id = match Uuid::parse_str(id.as_str()).ok() {
|
||||
Some(id) => id,
|
||||
None => return Err(Status::BadRequest),
|
||||
};
|
||||
|
||||
let count = diesel::delete(dsl::trackers.filter(dsl::id.eq(id)))
|
||||
.execute(&mut *db)
|
||||
.ok();
|
||||
|
||||
match count {
|
||||
Some(count) if count > 0 => Ok(Status::Ok),
|
||||
Some(_) => Ok(Status::NotFound),
|
||||
None => Err(Status::InternalServerError),
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user