fix: return null for missing settings without 404

ErikBjare · ErikBjare · commit d39f258d69f6 · 2023-10-19T12:47:14.000+02:00
diff --git a/aw-server/src/endpoints/settings.rs b/aw-server/src/endpoints/settings.rs
@@ -5,7 +5,7 @@ use rocket::State;
 use std::collections::HashMap;
 use std::sync::MutexGuard;
 
-use aw_datastore::Datastore;
+use aw_datastore::{Datastore, DatastoreError};
 
 use crate::endpoints::HttpErrorJson;
 
@@ -57,6 +57,7 @@ pub fn setting_get(
 
     match datastore.get_key_value(&setting_key) {
         Ok(value) => Ok(Json(serde_json::from_str(&value).unwrap())),
+        Err(DatastoreError::NoSuchKey(_)) => Ok(Json(serde_json::from_str("null").unwrap())),
         Err(err) => Err(err.into()),
     }
 }
diff --git a/aw-server/tests/api.rs b/aw-server/tests/api.rs
@@ -513,7 +513,7 @@ mod api_tests {
     }
 
     #[test]
-    fn test_getting_not_found_value() {
+    fn test_get_unset_setting() {
         let server = setup_testserver();
         let client = Client::untracked(server).expect("valid instance");
 
@@ -523,7 +523,8 @@ mod api_tests {
             .get(format!("/api/0/settings/{}", key))
             .header(Header::new("Host", "127.0.0.1:5600"))
             .dispatch();
-        assert_eq!(res.status(), rocket::http::Status::NotFound);
+        assert_eq!(res.status(), rocket::http::Status::Ok);
+        assert_eq!(res.into_string().unwrap(), "null")
     }
 
     #[test]
@@ -664,7 +665,8 @@ mod api_tests {
             .get("/api/0/settings/test_key")
             .header(Header::new("Host", "127.0.0.1:5600"))
             .dispatch();
-        assert_eq!(res.status(), rocket::http::Status::NotFound);
+        assert_eq!(res.status(), rocket::http::Status::Ok);
+        assert_eq!(res.into_string().unwrap(), "null");
     }
 
     #[test]

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ use rocket::State;`
`5`	`5`	`use std::collections::HashMap;`
`6`	`6`	`use std::sync::MutexGuard;`
`7`	`7`
`8`		`-use aw_datastore::Datastore;`
	`8`	`+use aw_datastore::{Datastore, DatastoreError};`
`9`	`9`
`10`	`10`	`use crate::endpoints::HttpErrorJson;`
`11`	`11`
`@@ -57,6 +57,7 @@ pub fn setting_get(`
`57`	`57`
`58`	`58`	`match datastore.get_key_value(&setting_key) {`
`59`	`59`	`Ok(value) => Ok(Json(serde_json::from_str(&value).unwrap())),`
	`60`	`+ Err(DatastoreError::NoSuchKey(_)) => Ok(Json(serde_json::from_str("null").unwrap())),`
`60`	`61`	`Err(err) => Err(err.into()),`
`61`	`62`	`}`
`62`	`63`	`}`