denyskon/meincantor-api
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

multiple fixes

Browse Source
This commit is contained in:
Denys Konovalov 2021-12-18 17:02:15 +01:00
parent 4df7ff8413
commit 2384fd8c4f
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "api" name = "api"
version = "0.9.5-dev" version = "1.0.0"
edition = "2018" edition = "2018"
license = "AGPL-3.0-or-later" license = "AGPL-3.0-or-later"
authors = ["Denys Konovalov <denys.konovalov@protonmail.com>"] authors = ["Denys Konovalov <denys.konovalov@protonmail.com>"]

4
docker-compose.yml
View File

@ -20,4 +20,6 @@ services:
KC_OPENID_TOKEN_ENDPOINT: https://example.keycloak.com/auth/realms/EXAMPLE_REALM/protocol/openid-connect/token 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_OPENID_USERINFO_ENDPOINT: https://example.keycloak.com/auth/realms/EXAMPLE_REALM/protocol/openid-connect/userinfo
KC_CLIENT_ID: EXAMPLE_CLIENT 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

16
src/indiware_connector.rs
View File

@ -422,14 +422,8 @@ pub async fn get_class_timetable(_conn: DbConn, class: String, url: String) -> T
} }
response.courses.sort_by(|a, b| { response.courses.sort_by(|a, b| {
let n1 = a.as_object().unwrap().get("St").unwrap().as_i64().unwrap(); 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 n2 = b.as_object().unwrap().get("St").unwrap().as_i64().unwrap();
let sb2 = b.as_object().unwrap().get("Fa").unwrap().as_str().unwrap(); n1.cmp(&n2)
if n1 == n2 {
sb1.cmp(&sb2)
} else {
n1.cmp(&n2)
}
}); });
response.count = response.courses.len(); response.count = response.courses.len();
} else if class == String::from("12") } 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| { response.courses.sort_by(|a, b| {
let n1 = a.as_object().unwrap().get("St").unwrap().as_i64().unwrap(); 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 n2 = b.as_object().unwrap().get("St").unwrap().as_i64().unwrap();
let sb2 = b.as_object().unwrap().get("Fa").unwrap().as_str().unwrap(); n1.cmp(&n2)
if n1 == n2 {
sb1.cmp(&sb2)
} else {
n1.cmp(&n2)
}
}); });
response.count = response.courses.len(); response.count = response.courses.len();
} }