server/src/api/mod.rs

@@ -1,16 +1,20 @@
 // SPDX-License-Identifier: GPL-3.0-Only
 // Copyright (C) 2024 Luke Harding
 
-use actix_web::web;
+use actix_web::{get, HttpResponse, Responder, web};
 
-pub mod v1;
+use crate::db;
 
 pub struct AppState {
     pub database_url: String,
 }
 
-pub fn configure(cfg: &mut web::ServiceConfig) {
+#[get("/get_tasks")]
-    let scope = web::scope("/api").configure(v1::configure);
+pub async fn get_tasks(data: web::Data<AppState>) -> impl Responder {
+    let tasks = match db::get_tasks(data.database_url.clone()).await {
+        Ok(tasks) => tasks,
+        Err(e) => return HttpResponse::InternalServerError().body(e.to_string()),
+    };
 
-    cfg.service(scope);
+    HttpResponse::Ok().json(tasks)
 }

server/src/api/v1.rs

@@ -1,65 +0,0 @@
-use actix_web::{get, HttpResponse, post, Responder, web};
-use chrono::NaiveDateTime;
-use serde::Deserialize;
-use uuid::Uuid;
-
-use crate::api::AppState;
-use crate::db;
-
-pub fn configure(cfg: &mut web::ServiceConfig) {
-    let scope = web::scope("/v1")
-        .service(get_task)
-        .service(get_tasks)
-        .service(create_task);
-
-    cfg.service(scope);
-}
-
-#[get("/get_tasks")]
-pub async fn get_tasks(data: web::Data<AppState>) -> impl Responder {
-    let tasks = match db::get_tasks(data.database_url.clone()).await {
-        Ok(tasks) => tasks,
-        Err(e) => return HttpResponse::InternalServerError().body(e.to_string()),
-    };
-
-    HttpResponse::Ok().json(tasks)
-}
-
-#[get("/get_task/{uuid}")]
-pub async fn get_task(data: web::Data<AppState>, path: web::Path<Uuid>) -> impl Responder {
-    let uuid = path.into_inner();
-
-    let task = match db::get_task(data.database_url.clone(), uuid).await {
-        Ok(task) => task,
-        Err(e) => return HttpResponse::InternalServerError().body(e.to_string()),
-    };
-
-    HttpResponse::Ok().json(task)
-}
-
-#[derive(Deserialize)]
-struct JsonTask {
-    pub title: String,
-    pub description: String,
-    pub due_date: NaiveDateTime,
-}
-
-#[post("/create_task")]
-pub async fn create_task(data: web::Data<AppState>, task: web::Json<JsonTask>) -> impl Responder {
-    let uuid = Uuid::new_v4();
-
-    let new_task = match db::create_task(
-        data.database_url.clone(),
-        uuid,
-        &task.title,
-        &task.description,
-        task.due_date,
-    )
-    .await
-    {
-        Ok(task) => task,
-        Err(e) => return HttpResponse::InternalServerError().body(e.to_string()),
-    };
-
-    HttpResponse::Ok().json(new_task)
-}

server/src/db/mod.rs

@@ -3,19 +3,12 @@
 
 use std::error;
 
-use chrono::NaiveDateTime;
+use diesel::{Connection, PgConnection, QueryDsl, RunQueryDsl, SelectableHelper};
-use diesel::{
-    Connection, ExpressionMethods, PgConnection, QueryDsl, RunQueryDsl, SelectableHelper,
-};
 use diesel::pg::Pg;
 use diesel_migrations::{embed_migrations, EmbeddedMigrations, MigrationHarness};
-use uuid::Uuid;
 
 use models::Task;
 
-use crate::db::models::NewTask;
-use crate::schema::tasks;
-
 pub mod models;
 
 pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!("./migrations");
@@ -39,33 +32,3 @@ pub async fn get_tasks(database_url: String) -> Result<Vec<Task>, Box<dyn error:
 
     Ok(tasks.select(Task::as_select()).load(conn)?)
 }
-
-pub async fn get_task(database_url: String, uuid: Uuid) -> Result<Task, Box<dyn error::Error>> {
-    use crate::schema::tasks::dsl::*;
-
-    let conn = &mut establish_connection(&database_url)?;
-
-    Ok(tasks.filter(id.eq(uuid)).first(conn)?)
-}
-
-pub async fn create_task(
-    database_url: String,
-    uuid: Uuid,
-    title: &str,
-    description: &str,
-    due_date: NaiveDateTime,
-) -> Result<Task, Box<dyn error::Error>> {
-    let conn = &mut establish_connection(&database_url)?;
-
-    let new_task = NewTask {
-        id: uuid,
-        title,
-        description,
-        due_date,
-    };
-
-    Ok(diesel::insert_into(tasks::table)
-        .values(&new_task)
-        .returning(Task::as_returning())
-        .get_result(conn)?)
-}

server/src/db/models.rs

@@ -6,8 +6,6 @@ use diesel::prelude::*;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
-use crate::schema::tasks;
-
 #[derive(Queryable, Selectable, Serialize, Deserialize)]
 #[diesel(table_name = crate::schema::tasks)]
 #[diesel(check_for_backend(diesel::pg::Pg))]
@@ -18,12 +16,3 @@ pub struct Task {
     pub complete: bool,
     pub due_date: NaiveDateTime,
 }
-
-#[derive(Insertable, Deserialize, Serialize)]
-#[diesel(table_name = tasks)]
-pub struct NewTask<'a> {
-    pub id: Uuid,
-    pub title: &'a str,
-    pub description: &'a str,
-    pub due_date: NaiveDateTime,
-}

server/src/main.rs

@@ -76,7 +76,7 @@ async fn main() -> io::Result<()> {
             .app_data(web::Data::new(AppState {
                 database_url: database_url.clone(),
             }))
-            .configure(api::configure)
+            .service(api::get_tasks)
     })
     .bind((bind_addr, port))?
     .run()