bugfixes

TUM-Dev · Dec 26, 2022 · f8a93f4 · f8a93f4
1 parent 958db35
commit f8a93f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/server/src/calendar/mod.rs b/server/src/calendar/mod.rs
@@ -1,7 +1,6 @@
 use crate::utils;
 use actix_web::{get, web, HttpResponse};
 use diesel::prelude::*;
-use log::error;
 use serde::{Deserialize, Serialize};
 use std::fmt::Debug;
 use tumonline_calendar::XMLEvent;
@@ -30,7 +29,7 @@ pub async fn calendar_handler(
     let results = calendar
         .filter(key.eq(&id))
         .filter(dtstart.ge(&args.start))
-        .filter(dtend.ge(&args.start))
+        .filter(dtend.ge(&args.end))
         .load::<XMLEvent>(conn);
 
     match results {

diff --git a/server/src/calendar/tumonline_calendar.rs b/server/src/calendar/tumonline_calendar.rs
@@ -4,7 +4,7 @@ use awc::Client;
 use chrono::NaiveDate;
 use diesel::prelude::*;
 use diesel::Insertable;
-use log::{debug, error, info, warn};
+use log::{error, info, warn};
 use minidom::Element;
 use rand::Rng;
 use serde::Deserialize;
@@ -147,8 +147,8 @@ impl XMLEvent {
         }
         XMLEvent {
             key,
-            dtstart: extract_i32(&hm, "dtstart"),
-            dtend: extract_i32(&hm, "dtend"),
+            dtstart: extract_i32(&hm, "dtstart").unwrap(),
+            dtend: extract_i32(&hm, "dtend").unwrap(),
             dtstamp: extract_i32(&hm, "dtstamp"),
             duration: extract_i32(&hm, "duration"),
             event_id: extract_str(&hm, "eventID"),