From e6278176e483124f48752b21b9fb07c3658cd824 Mon Sep 17 00:00:00 2001
From: Tobias Reisinger <tobias@msrg.cc>
Date: Sat, 6 Nov 2021 14:54:45 +0100
Subject: [PATCH] Add middleware

---
 Cargo.lock                               | Bin 48272 -> 49456 bytes
 Cargo.toml                               |   1 +
 migrations/2021-10-13-000000_init/up.sql |   4 +---
 src/db/models.rs                         |   2 +-
 src/handlers/v1/schedules.rs             |   9 +--------
 src/main.rs                              |  13 ++++++++++++-
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 37f426231aaf9ca4591d40c47ac8ba520b71c1c5..e8a9666960442d71b86275dbd96a5fb019a51d88 100644
GIT binary patch
delta 544
zcmX|;KWmgh5XRvS)Lbj(geaZ|f{4h@&i+l*oB_eYMzNQj-P!XX_a3}CgOW<I(?VQ}
zU?KPo0&gXx@grFJEyPMIUC%$&%)kuK^Ze%ZkKWPq{?YYef4O{GN}@^fgq|3jwITs1
z2{93n_sRyPQ^JgvJqj-))z%tNPP%~Llg`Ypd_H-mT*>RDe|Wju8ot~ZaI^n#cQKuE
z+kKKZd#C=*<=wNmEl9>JP$_SL*+iov0<lOMh4q-JirR!yrp!?~5K(DNg0qw^`&i)i
zI)v(de04AyKYBb5&2l#9)l@ZCwdE;4S#?Wp=W(&SC}C%#`>A$@YyU4wn1zWC7&K)9
zuRT^fglI?xODffzDR6YEqOiHbNT|>&Bfz4q8x%CFa`C~iyLET#&e^|0?Rc=y?cQwB
zjBbp^a1F}WbN42{vn1zz7EGe@loeYvL4-hwT(DkwqdlWCMjOacgp{>nX_9kMXSG7y
z9G@s3HZODsZ(m$0-?mSeFK_Notl(%OJ52=Ifrc1ZvyQG>*1@s2Nydthga9e4GzLV)
X7+EI<`{#Mh@mhKH{(SfS<6-X?oUN+u

delta 51
zcmV-30L=fef&-BG0<b(6vo#os8<S=l5R)I2472Jp9RjlxH$oS)7Ee1!lO34|vptx5
JC9|Ktkpkw^650R&

diff --git a/Cargo.toml b/Cargo.toml
index bb6f53a..21bb0d3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,6 +15,7 @@ chrono = { version = "0.4", features = ["serde"] }
 diesel = { version = "1.4", features = ["sqlite", "uuid"] }
 diesel_migrations = "1.4"
 dotenv = "0.15"
+env_logger = "0.9.0"
 serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
diff --git a/migrations/2021-10-13-000000_init/up.sql b/migrations/2021-10-13-000000_init/up.sql
index 6ac0492..acee951 100644
--- a/migrations/2021-10-13-000000_init/up.sql
+++ b/migrations/2021-10-13-000000_init/up.sql
@@ -44,10 +44,8 @@ CREATE TABLE schedules
     periods BLOB
             NOT NULL
 );
---INSERT INTO schedules (uid, name, periods) VALUES (x'6f666600000000000000000000000000', 'off', x'00');
---INSERT INTO schedules (uid, name, periods) VALUES (x'6f6e0000000000000000000000000000',  'on', x'010000009F05');
 INSERT INTO schedules (uid, name, periods) VALUES (x'00', 'off', x'');
-INSERT INTO schedules (uid, name, periods) VALUES (x'01',  'on', x'0000173B');
+INSERT INTO schedules (uid, name, periods) VALUES (x'01',  'on', x'00000000');
 
 CREATE TABLE tags
 (
diff --git a/src/db/models.rs b/src/db/models.rs
index 71d6afa..9374553 100644
--- a/src/db/models.rs
+++ b/src/db/models.rs
@@ -15,7 +15,7 @@ use crate::types::EmgauwaUid;
 pub struct Schedule {
     #[serde(skip)]
     pub id: i32,
-    #[serde(alias = "id")]
+    #[serde(rename(serialize = "id"))]
     pub uid: EmgauwaUid,
     pub name: String,
     pub periods: Periods,
diff --git a/src/handlers/v1/schedules.rs b/src/handlers/v1/schedules.rs
index 06fcb9f..9a3289d 100644
--- a/src/handlers/v1/schedules.rs
+++ b/src/handlers/v1/schedules.rs
@@ -45,17 +45,10 @@ pub async fn show(web::Path((schedule_uid,)): web::Path<(String,)>) -> impl Resp
 }
 
 pub async fn add(post: web::Json<RequestSchedule>) -> impl Responder {
-
-    println!("model: {:?}", post);
-
-    for period in post.periods.0.iter() {
-        println!("start: {:?}; end: {:?}", period.start, period.end);
-    }
-
     let new_schedule = db::create_schedule(&post.name, &post.periods);
 
     match new_schedule {
-        Ok(ok) => HttpResponse::Ok().json(ok),
+        Ok(ok) => HttpResponse::Created().json(ok),
         Err(err) => HttpResponse::InternalServerError().json(err),
     }
 }
diff --git a/src/main.rs b/src/main.rs
index 65f8cb0..d5e5575 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,7 +4,9 @@ extern crate diesel;
 extern crate diesel_migrations;
 extern crate dotenv;
 
-use actix_web::{App, HttpServer, web};
+use actix_web::{middleware, web, App, HttpServer};
+use actix_web::middleware::normalize::TrailingSlash;
+use env_logger::{Builder, Env};
 
 mod db;
 mod handlers;
@@ -14,8 +16,17 @@ mod types;
 async fn main() -> std::io::Result<()> {
     db::run_migrations();
 
+    Builder::from_env(Env::default().default_filter_or("info")).init();
+
     HttpServer::new(|| {
         App::new()
+            .wrap(middleware::DefaultHeaders::new()
+                .header("Access-Control-Allow-Origin", "*")
+                .header("Access-Control-Allow-Headers", "*")
+                .header("Access-Control-Allow-Methods", "*")
+            )
+            .wrap(middleware::Logger::default())
+            .wrap(middleware::NormalizePath::new(TrailingSlash::Trim))
             .route(
                 "/api/v1/schedules",
                 web::get().to(handlers::v1::schedules::index),