Skip to content

Commit

Permalink
made shure that filtering of bogus entrys takes place in our backend
Browse files Browse the repository at this point in the history
  • Loading branch information
CommanderStorm committed Dec 30, 2022
1 parent 6e20738 commit ece6483
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 6 additions & 2 deletions server/src/calendar/continous_scraping.rs
Expand Up @@ -102,12 +102,16 @@ fn promote_scraped_results_to_prod() {
let start_time = Instant::now();
let conn = &mut utils::establish_connection();
use crate::schema::calendar::dsl::calendar;
use crate::schema::calendar_scrape::dsl::calendar_scrape;
use crate::schema::calendar_scrape::dsl::{calendar_scrape, status};
diesel::delete(calendar)
.execute(conn)
.expect("Failed to delete calendar");
diesel::insert_into(calendar)
.values(calendar_scrape)
.values(
calendar_scrape
.filter(status.eq("fix"))
.or_filter(status.eq("geplant")),
)
.execute(conn)
.expect("Failed to insert newly scraped values into db");

Expand Down
8 changes: 2 additions & 6 deletions server/src/calendar/mod.rs
Expand Up @@ -38,15 +38,11 @@ pub async fn calendar_handler(
let id = params.into_inner();
let conn = &mut utils::establish_connection();
use crate::schema::calendar::dsl::*;
let query = calendar
let results = calendar
.filter(key.eq(&id))
.filter(dtstart.ge(&args.start))
.filter(dtend.ge(&args.end))
.filter(status.eq("fix"))
.or_filter(status.eq("geplant"));
let dbg = diesel::debug_query::<diesel::sqlite::Sqlite, _>(&query);
log::info!("sql: {}", dbg);
let results = query.load::<XMLEvent>(conn);
.load::<XMLEvent>(conn);
match results {
Ok(result) => {
let events = result.into_iter().map(Event::from).collect();
Expand Down

0 comments on commit ece6483

Please sign in to comment.