Merge pull request #28 from FxQnLr/0.3.4

0.3.4

1 files changed, 21 insertions, 28 deletions

diff --git a/src/routes/device.rs b/src/routes/device.rs
index d01d9f0..40b5cd8 100644
--- a/src/routes/device.rs
+++ b/src/routes/device.rs
@@ -20,7 +20,7 @@ use utoipa::ToSchema;
     security(("api_key" = []))
 )]
 #[deprecated]
-pub async fn get(
+pub async fn get_payload(
     State(state): State<Arc<crate::AppState>>,
     Json(payload): Json<GetDevicePayload>,
 ) -> Result<Json<Value>, Error> {
@@ -49,11 +49,11 @@ pub async fn get(
         (status = 200, description = "Get `Device` information", body = [Device])
     ),
     params(
-        ("id" = String, Path, description = "Device id")
+        ("id" = String, Path, description = "device id")
     ),
-    security(("api_key" = []))
+    security((), ("api_key" = []))
 )]
-pub async fn get_path(
+pub async fn get(
     State(state): State<Arc<crate::AppState>>,
     Path(path): Path<String>,
 ) -> Result<Json<Value>, Error> {
@@ -76,22 +76,31 @@ pub async fn get_path(
 }
 
 #[derive(Deserialize, ToSchema)]
+#[deprecated]
 pub struct GetDevicePayload {
     id: String,
 }
 
+#[derive(Deserialize, ToSchema)]
+pub struct DevicePayload {
+    id: String,
+    mac: String,
+    broadcast_addr: String,
+    ip: String,
+}
+
 #[utoipa::path(
     put,
     path = "/device",
-    request_body = PutDevicePayload,
+    request_body = DevicePayload,
     responses(
-        (status = 200, description = "List matching todos by query", body = [DeviceSchema])
+        (status = 200, description = "add device to storage", body = [DeviceSchema])
     ),
-    security(("api_key" = []))
+    security((), ("api_key" = []))
 )]
 pub async fn put(
     State(state): State<Arc<crate::AppState>>,
-    Json(payload): Json<PutDevicePayload>,
+    Json(payload): Json<DevicePayload>,
 ) -> Result<Json<Value>, Error> {
     info!(
         "add device {} ({}, {}, {})",
@@ -118,26 +127,18 @@ pub async fn put(
     Ok(Json(json!(device)))
 }
 
-#[derive(Deserialize, ToSchema)]
-pub struct PutDevicePayload {
-    id: String,
-    mac: String,
-    broadcast_addr: String,
-    ip: String,
-}
-
 #[utoipa::path(
     post,
     path = "/device",
-    request_body = PostDevicePayload,
+    request_body = DevicePayload,
     responses(
-        (status = 200, description = "List matching todos by query", body = [DeviceSchema])
+        (status = 200, description = "update device in storage", body = [DeviceSchema])
     ),
-    security(("api_key" = []))
+    security((), ("api_key" = []))
 )]
 pub async fn post(
     State(state): State<Arc<crate::AppState>>,
-    Json(payload): Json<PostDevicePayload>,
+    Json(payload): Json<DevicePayload>,
 ) -> Result<Json<Value>, Error> {
     info!(
         "edit device {} ({}, {}, {})",
@@ -162,11 +163,3 @@ pub async fn post(
 
     Ok(Json(json!(device)))
 }
-
-#[derive(Deserialize, ToSchema)]
-pub struct PostDevicePayload {
-    id: String,
-    mac: String,
-    broadcast_addr: String,
-    ip: String,
-}