Move API Task type to shared crate contextswitch-types

src/lib.rs

@@ -1,11 +1,11 @@
-use actix_web::{dev::Server, middleware::Logger, web, App, HttpResponse, HttpServer};
-use chrono::{DateTime, Utc};
+use actix_web::{dev::Server, middleware, web, App, HttpResponse, HttpServer};
 use listenfd::ListenFd;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
+use std::env;
 use std::io::Error;
 use std::net::TcpListener;
-use uuid::Uuid;
 
+pub mod contextswitch;
 pub mod taskwarrior;
 
 #[derive(Deserialize)]
@@ -13,43 +13,8 @@ struct TaskQuery {
     filter: String,
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
-pub struct Task {
-    pub uuid: Uuid,
-    pub id: u32,
-    #[serde(with = "taskwarrior::tw_date_format")]
-    pub entry: DateTime<Utc>,
-    #[serde(with = "taskwarrior::tw_date_format")]
-    pub modified: DateTime<Utc>,
-    pub status: taskwarrior::Status,
-    pub description: String,
-    pub urgency: f64,
-    #[serde(
-        default,
-        skip_serializing_if = "Option::is_none",
-        with = "taskwarrior::opt_tw_date_format"
-    )]
-    pub due: Option<DateTime<Utc>>,
-    #[serde(
-        default,
-        skip_serializing_if = "Option::is_none",
-        with = "taskwarrior::opt_tw_date_format"
-    )]
-    pub end: Option<DateTime<Utc>>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub parent: Option<Uuid>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub project: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub recur: Option<taskwarrior::Recurrence>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub tags: Option<Vec<String>>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub contextswitch: Option<taskwarrior::ContextSwitchMetadata>,
-}
-
 async fn list_tasks(task_query: web::Query<TaskQuery>) -> Result<HttpResponse, Error> {
-    let tasks = taskwarrior::export(task_query.filter.split(' ').collect())?;
+    let tasks = contextswitch::export(task_query.filter.split(' ').collect())?;
 
     Ok(HttpResponse::Ok()
         .content_type("application/json")
@@ -61,9 +26,16 @@ async fn health_check() -> HttpResponse {
 }
 
 pub fn run(listener: TcpListener) -> Result<Server, std::io::Error> {
-    let mut server = HttpServer::new(|| {
+    let cs_front_base_url =
+        env::var("CS_FRONT_BASE_URL").unwrap_or("http://localhost:8080".to_string());
+    let mut server = HttpServer::new(move || {
         App::new()
-            .wrap(Logger::default())
+            .wrap(middleware::Logger::default())
+            .wrap(middleware::Compress::default())
+            .wrap(
+                middleware::DefaultHeaders::new()
+                    .add(("Access-Control-Allow-Origin", cs_front_base_url.as_bytes())),
+            )
             .route("/ping", web::get().to(health_check))
             .route("/tasks", web::get().to(list_tasks))
     })