From 2384fd8c4fea75a786f4435ec1425b442256f2b2 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sat, 18 Dec 2021 17:02:15 +0100 Subject: [PATCH] multiple fixes --- Cargo.toml | 2 +- docker-compose.yml | 4 +++- src/indiware_connector.rs | 16 ++-------------- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a767cf3..5ff87af 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "api" -version = "0.9.5-dev" +version = "1.0.0" edition = "2018" license = "AGPL-3.0-or-later" authors = ["Denys Konovalov "] diff --git a/docker-compose.yml b/docker-compose.yml index bea8dd5..e65bfb9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,4 +20,6 @@ services: KC_OPENID_TOKEN_ENDPOINT: https://example.keycloak.com/auth/realms/EXAMPLE_REALM/protocol/openid-connect/token KC_OPENID_USERINFO_ENDPOINT: https://example.keycloak.com/auth/realms/EXAMPLE_REALM/protocol/openid-connect/userinfo KC_CLIENT_ID: EXAMPLE_CLIENT - ROCKET_DATABASES: '{timetable={url="postgres://meincantor:meincantor_password@postgres/meincantor_db"}}'' + ROCKET_DATABASES: '{timetable={url="postgres://meincantor:meincantor_password@postgres/meincantor_db"}}' + volumes: + - ./static:/app/static diff --git a/src/indiware_connector.rs b/src/indiware_connector.rs index b2d2b93..f0dfea2 100644 --- a/src/indiware_connector.rs +++ b/src/indiware_connector.rs @@ -422,14 +422,8 @@ pub async fn get_class_timetable(_conn: DbConn, class: String, url: String) -> T } response.courses.sort_by(|a, b| { let n1 = a.as_object().unwrap().get("St").unwrap().as_i64().unwrap(); - let sb1 = a.as_object().unwrap().get("Fa").unwrap().as_str().unwrap(); let n2 = b.as_object().unwrap().get("St").unwrap().as_i64().unwrap(); - let sb2 = b.as_object().unwrap().get("Fa").unwrap().as_str().unwrap(); - if n1 == n2 { - sb1.cmp(&sb2) - } else { - n1.cmp(&n2) - } + n1.cmp(&n2) }); response.count = response.courses.len(); } else if class == String::from("12") @@ -467,14 +461,8 @@ pub async fn get_class_timetable(_conn: DbConn, class: String, url: String) -> T } response.courses.sort_by(|a, b| { let n1 = a.as_object().unwrap().get("St").unwrap().as_i64().unwrap(); - let sb1 = a.as_object().unwrap().get("Fa").unwrap().as_str().unwrap(); let n2 = b.as_object().unwrap().get("St").unwrap().as_i64().unwrap(); - let sb2 = b.as_object().unwrap().get("Fa").unwrap().as_str().unwrap(); - if n1 == n2 { - sb1.cmp(&sb2) - } else { - n1.cmp(&n2) - } + n1.cmp(&n2) }); response.count = response.courses.len(); }