Compare commits
12 Commits
master
...
feat/smart
| Author | SHA1 | Date | |
|---|---|---|---|
| 8bebf0d526 | |||
| 3358f96cbb | |||
| 1a09272b57 | |||
| f691d2250f | |||
| 360fc6b6bb | |||
| 50c8e1e9d6 | |||
| 5a27637bed | |||
| 66aa05c954 | |||
| 5a87aaecad | |||
| 76266f17cf | |||
| 162b5ffefc | |||
| 967698b0bc |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,2 +1,3 @@
|
|||||||
/.idea/
|
/.idea/
|
||||||
/**/.DS_Store
|
/**/.DS_Store
|
||||||
|
/tmp/
|
||||||
|
|||||||
2
smart-house-web/.gitignore
vendored
Normal file
2
smart-house-web/.gitignore
vendored
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
/target/
|
||||||
|
/Cargo.lock
|
||||||
15
smart-house-web/Cargo.toml
Normal file
15
smart-house-web/Cargo.toml
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
[workspace]
|
||||||
|
resolver = "3"
|
||||||
|
members = ["backend"]
|
||||||
|
|
||||||
|
[profile.release]
|
||||||
|
opt-level = "z"
|
||||||
|
strip = "symbols"
|
||||||
|
lto = "fat"
|
||||||
|
panic = "abort"
|
||||||
|
codegen-units = 1
|
||||||
|
overflow-checks = false
|
||||||
|
debug-assertions = false
|
||||||
|
incremental = false
|
||||||
|
|
||||||
|
[workspace.dependencies]
|
||||||
40
smart-house-web/README.md
Normal file
40
smart-house-web/README.md
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
# ДЗ 2026-04-28 - Веб-сервис умного дома
|
||||||
|
|
||||||
|
## Цель:
|
||||||
|
|
||||||
|
Превращаем умный дом в веб-сервис.
|
||||||
|
|
||||||
|
## Срок:
|
||||||
|
|
||||||
|
Сдать до: **2026-05-25**
|
||||||
|
|
||||||
|
## Описание/Пошаговая инструкция выполнения домашнего задания:
|
||||||
|
|
||||||
|
Реализовать backend сервис для управления умным домом и frontend приложение для взаимодействия с ним.
|
||||||
|
|
||||||
|
- Технология взаимодействия с backend сервисом (gRPC, REST, GraphQL, ...) выбирается произвольно.
|
||||||
|
|
||||||
|
API backend сервиса предоставляет доступ ко всему базовому функционалу библиотеки умного дома:
|
||||||
|
|
||||||
|
- [ ] Добавление/удаление/перечисление комнат в доме и получение информации о конкретной комнате.
|
||||||
|
- [ ] Добавление/удаление/перечисление устройств в комнате и получение информации о конкретном устройстве.
|
||||||
|
- [ ] Получение отчёта о доме.
|
||||||
|
- [ ] Присутствуют функциональные тесты, которые общаются с backend-ом и проверяют его ответы.
|
||||||
|
|
||||||
|
Frontend приложение:
|
||||||
|
|
||||||
|
- [ ] Отображает список комнат в доме.
|
||||||
|
- [ ] Позволяет перейти к конкретной комнате или добавить новую комнату.
|
||||||
|
- [ ] Отображает список устройств в комнате.
|
||||||
|
- [ ] Позволяет перейти к конкретному устройству или добавить новое устройство.
|
||||||
|
- [ ] Позволяет запросить отчёт о состоянии дома.
|
||||||
|
|
||||||
|
**Критерии оценки:**
|
||||||
|
|
||||||
|
- Workspace успешно собирается.
|
||||||
|
- Приложения-примеры успешно выполняются.
|
||||||
|
- Команды cargo clippy, и cargo fmt --check не выводят ошибок и предупреждений.
|
||||||
|
|
||||||
|
## Демо
|
||||||
|
|
||||||
|
**TBD**
|
||||||
15
smart-house-web/backend/Cargo.toml
Normal file
15
smart-house-web/backend/Cargo.toml
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
[package]
|
||||||
|
name = "backend"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2024"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
tracing = "0.1"
|
||||||
|
tracing-subscriber = "0.3"
|
||||||
|
tokio = { version = "1.52", features = ["rt", "rt-multi-thread", "signal", "time"] }
|
||||||
|
axum = "0.8"
|
||||||
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
|
serde_json = "1.0"
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
|
hyper = "1.9.0"
|
||||||
126
smart-house-web/backend/src/house.rs
Normal file
126
smart-house-web/backend/src/house.rs
Normal file
@@ -0,0 +1,126 @@
|
|||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use std::collections::HashMap;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
pub struct PowerSocket {
|
||||||
|
power_rate: f32,
|
||||||
|
on: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PowerSocket {
|
||||||
|
pub fn new(power_rate: f32, on: bool) -> Self {
|
||||||
|
Self { power_rate, on }
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_on(&self) -> bool {
|
||||||
|
self.on
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn set_on(&mut self, on: bool) {
|
||||||
|
self.on = on
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_power(&self) -> f32 {
|
||||||
|
if self.is_on() { self.power_rate } else { 0.0 }
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn report(&self) -> String {
|
||||||
|
let state = if self.is_on() { "ON" } else { "OFF" };
|
||||||
|
let power = self.get_power();
|
||||||
|
format!("PowerSocket[ {} : {:02.1} ]", state, power)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
pub struct Thermometer {
|
||||||
|
temperature: f32,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Thermometer {
|
||||||
|
pub fn new(temperature: f32) -> Self {
|
||||||
|
Self { temperature }
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_temperature(&self) -> f32 {
|
||||||
|
self.temperature
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn report(&self) -> String {
|
||||||
|
let temperature = self.get_temperature();
|
||||||
|
format!("Thermometer[ {:02.1} ]", temperature)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
#[serde(tag = "type")]
|
||||||
|
pub enum Device {
|
||||||
|
PowerSocket(PowerSocket),
|
||||||
|
Thermometer(Thermometer),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Device {
|
||||||
|
pub fn report(&self) -> String {
|
||||||
|
match self {
|
||||||
|
Device::PowerSocket(v) => v.report().to_string(),
|
||||||
|
Device::Thermometer(v) => v.report().to_string(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<PowerSocket> for Device {
|
||||||
|
fn from(value: PowerSocket) -> Self {
|
||||||
|
Device::PowerSocket(value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<Thermometer> for Device {
|
||||||
|
fn from(value: Thermometer) -> Self {
|
||||||
|
Device::Thermometer(value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Default, Clone, Serialize, Deserialize)]
|
||||||
|
pub struct Room {
|
||||||
|
devices: HashMap<String, Device>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Room {
|
||||||
|
pub fn new(devices: HashMap<String, Device>) -> Self {
|
||||||
|
Self { devices }
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_devices(&self) -> &HashMap<String, Device> {
|
||||||
|
&self.devices
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_devices_mut(&mut self) -> &mut HashMap<String, Device> {
|
||||||
|
&mut self.devices
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Default, Clone, Serialize, Deserialize)]
|
||||||
|
pub struct House {
|
||||||
|
rooms: HashMap<String, Room>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl House {
|
||||||
|
pub fn new(rooms: HashMap<String, Room>) -> Self {
|
||||||
|
Self { rooms }
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_rooms(&self) -> &HashMap<String, Room> {
|
||||||
|
&self.rooms
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_rooms_mut(&mut self) -> &mut HashMap<String, Room> {
|
||||||
|
&mut self.rooms
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn add_room(&mut self, name: String, room: Room) {
|
||||||
|
self.rooms.insert(name, room);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn del_room(&mut self, name: &str) {
|
||||||
|
self.rooms.remove(name);
|
||||||
|
}
|
||||||
|
}
|
||||||
47
smart-house-web/backend/src/lib.rs
Normal file
47
smart-house-web/backend/src/lib.rs
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
/// Ошибка инициализации логгера
|
||||||
|
const CODE_LOGGER_INITIALIZATION_ERROR: i32 = 1;
|
||||||
|
|
||||||
|
/// Ошибка инициализации рантайма Tokio
|
||||||
|
const CODE_TOKIO_RUNTIME_CREATION_ERROR: i32 = 2;
|
||||||
|
|
||||||
|
/// Ошибка привязки слушателя
|
||||||
|
const CODE_LISTENER_BINDING_ERROR: i32 = 3;
|
||||||
|
|
||||||
|
/// Ошибка запуска сервера
|
||||||
|
const CODE_STARTIG_SERVER_ERROR: i32 = 4;
|
||||||
|
|
||||||
|
/// Ошибка установки обработчика сигнала завершения
|
||||||
|
const CODE_CTRL_C_SIGNAL_INSTALL_ERROR: i32 = 5;
|
||||||
|
|
||||||
|
/// Инициализация логирования
|
||||||
|
pub fn init_logger() {
|
||||||
|
use std::process::exit;
|
||||||
|
use tracing::{Level, trace};
|
||||||
|
use tracing_subscriber::{
|
||||||
|
Layer, filter::Targets, fmt::layer, layer::SubscriberExt, registry, util::SubscriberInitExt,
|
||||||
|
};
|
||||||
|
|
||||||
|
let layer = layer()
|
||||||
|
.compact()
|
||||||
|
.with_thread_names(true)
|
||||||
|
.with_file(false)
|
||||||
|
.with_line_number(false)
|
||||||
|
.with_filter(
|
||||||
|
Targets::new()
|
||||||
|
.with_target("axum::serve", Level::INFO)
|
||||||
|
.with_default(Level::TRACE),
|
||||||
|
)
|
||||||
|
.boxed();
|
||||||
|
if let Err(e) = registry().with(vec![layer]).try_init() {
|
||||||
|
eprintln!("Logger initialization failed: {:?}", e);
|
||||||
|
exit(CODE_LOGGER_INITIALIZATION_ERROR);
|
||||||
|
} else {
|
||||||
|
trace!("Logger succesfully initialized");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mod server;
|
||||||
|
pub use server::run_server;
|
||||||
|
|
||||||
|
mod house;
|
||||||
|
pub use house::{Device, House, PowerSocket, Room, Thermometer};
|
||||||
6
smart-house-web/backend/src/main.rs
Normal file
6
smart-house-web/backend/src/main.rs
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
use backend::{init_logger, run_server};
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
init_logger();
|
||||||
|
run_server();
|
||||||
|
}
|
||||||
111
smart-house-web/backend/src/server.rs
Normal file
111
smart-house-web/backend/src/server.rs
Normal file
@@ -0,0 +1,111 @@
|
|||||||
|
use axum::routing::{delete, get, post, put};
|
||||||
|
use std::{
|
||||||
|
process::exit,
|
||||||
|
sync::{
|
||||||
|
Arc,
|
||||||
|
atomic::{AtomicUsize, Ordering},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
use tokio::sync::RwLock;
|
||||||
|
use tracing::{error, info};
|
||||||
|
|
||||||
|
use crate::House;
|
||||||
|
|
||||||
|
/// Запуск сервера
|
||||||
|
pub fn run_server() {
|
||||||
|
let runtime = match tokio::runtime::Builder::new_multi_thread()
|
||||||
|
.name("tokio")
|
||||||
|
.thread_name_fn(|| {
|
||||||
|
static LAST_ID: AtomicUsize = AtomicUsize::new(0);
|
||||||
|
let id = LAST_ID.fetch_add(1, Ordering::SeqCst);
|
||||||
|
format!("tkwr-{id}")
|
||||||
|
})
|
||||||
|
.worker_threads(2)
|
||||||
|
.thread_stack_size(256 * 1024)
|
||||||
|
.enable_all()
|
||||||
|
.build()
|
||||||
|
{
|
||||||
|
Ok(runtime) => runtime,
|
||||||
|
Err(e) => {
|
||||||
|
error!("Failed to create Tokio runtime: {:?}", e);
|
||||||
|
exit(crate::CODE_TOKIO_RUNTIME_CREATION_ERROR);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
runtime.block_on(server_main());
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Тип состояния
|
||||||
|
type ServerState = Arc<RwLock<House>>;
|
||||||
|
|
||||||
|
/// Основная функция сервера
|
||||||
|
async fn server_main() {
|
||||||
|
let state: ServerState = Arc::new(RwLock::new(House::default()));
|
||||||
|
|
||||||
|
let app = axum::Router::new()
|
||||||
|
// Тестовый эндпоинт для экспериментов
|
||||||
|
.route("/debug", get(debug::debug))
|
||||||
|
// API дома
|
||||||
|
.route("/rooms", get(house::get_rooms))
|
||||||
|
.route("/rooms", post(house::post_rooms))
|
||||||
|
// API комнат
|
||||||
|
.route("/room/{name}", get(room::get_room))
|
||||||
|
.route("/room/{name}", put(room::put_room))
|
||||||
|
.route("/room/{name}", delete(room::delete_room))
|
||||||
|
.route("/room/{name}/devices", get(room::get_devices))
|
||||||
|
// API устройств
|
||||||
|
.route("/room/{name}/device/{name}", get(device::get_device))
|
||||||
|
.route("/room/{name}/device/{name}", put(device::put_device))
|
||||||
|
.route("/room/{name}/device/{name}", delete(device::delete_device))
|
||||||
|
// Состояние и роут по-умолчанию
|
||||||
|
.with_state(state)
|
||||||
|
.fallback(fallback);
|
||||||
|
let addr = "127.0.0.1:8080";
|
||||||
|
let listener = match tokio::net::TcpListener::bind(addr).await {
|
||||||
|
Ok(listener) => listener,
|
||||||
|
Err(e) => {
|
||||||
|
error!("Failed to bind listener to {}: {:?}", addr, e);
|
||||||
|
exit(crate::CODE_LISTENER_BINDING_ERROR);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
info!("Starting server at {}...", addr);
|
||||||
|
if let Err(e) = axum::serve(listener, app)
|
||||||
|
.with_graceful_shutdown(shutdown_signal())
|
||||||
|
.await
|
||||||
|
{
|
||||||
|
error!("Failed to start server: {:?}", e);
|
||||||
|
exit(crate::CODE_STARTIG_SERVER_ERROR);
|
||||||
|
};
|
||||||
|
info!("Shutdown server");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Эндпоинт по-умолчанию
|
||||||
|
async fn fallback() -> axum::response::Response {
|
||||||
|
use axum::response::IntoResponse;
|
||||||
|
(axum::http::StatusCode::NOT_FOUND, "404 NOT FOUND").into_response()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Аккуратное завершение работы сервера
|
||||||
|
async fn shutdown_signal() {
|
||||||
|
// let timeout = async {
|
||||||
|
// tokio::time::sleep(std::time::Duration::from_secs(10)).await;
|
||||||
|
// info!("10 seconds timeout expired");
|
||||||
|
// };
|
||||||
|
let ctrl_c = async {
|
||||||
|
tokio::signal::ctrl_c().await.map_err(|e| {
|
||||||
|
error!("Can't install Ctrl+C signal handler: {:?}", e);
|
||||||
|
exit(crate::CODE_CTRL_C_SIGNAL_INSTALL_ERROR);
|
||||||
|
});
|
||||||
|
info!("Ctrl+C pressed");
|
||||||
|
};
|
||||||
|
let pending = std::future::pending::<()>();
|
||||||
|
tokio::select! {
|
||||||
|
// _ = timeout => {},
|
||||||
|
_ = ctrl_c => {},
|
||||||
|
_ = pending => {},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mod debug;
|
||||||
|
mod device;
|
||||||
|
mod house;
|
||||||
|
mod room;
|
||||||
13
smart-house-web/backend/src/server/debug.rs
Normal file
13
smart-house-web/backend/src/server/debug.rs
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
use std::collections::HashMap;
|
||||||
|
|
||||||
|
use axum::{Json, extract::State};
|
||||||
|
|
||||||
|
use crate::{Device, PowerSocket, Room, Thermometer};
|
||||||
|
|
||||||
|
pub async fn debug(State(_server_state): State<super::ServerState>) -> Json<Room> {
|
||||||
|
let map = HashMap::<String, Device>::from([
|
||||||
|
("thermo".into(), Thermometer::new(20.0).into()),
|
||||||
|
("psock".into(), PowerSocket::new(10.0, false).into()),
|
||||||
|
]);
|
||||||
|
Room::new(map).into()
|
||||||
|
}
|
||||||
44
smart-house-web/backend/src/server/device.rs
Normal file
44
smart-house-web/backend/src/server/device.rs
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
use axum::{
|
||||||
|
Json,
|
||||||
|
extract::{Path, State},
|
||||||
|
http::StatusCode,
|
||||||
|
};
|
||||||
|
|
||||||
|
use crate::{Device, Room};
|
||||||
|
|
||||||
|
pub async fn get_device(
|
||||||
|
State(server_state): State<super::ServerState>,
|
||||||
|
Path((room, device)): Path<(String, String)>,
|
||||||
|
) -> Result<Json<Device>, StatusCode> {
|
||||||
|
let house = server_state.read().await;
|
||||||
|
let Some(room) = house.get_rooms().get(&room) else {
|
||||||
|
return Err(StatusCode::NOT_FOUND);
|
||||||
|
};
|
||||||
|
let Some(device) = room.get_devices().get(&device) else {
|
||||||
|
return Err(StatusCode::NOT_FOUND);
|
||||||
|
};
|
||||||
|
Ok(device.clone().into())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn put_device(
|
||||||
|
State(server_state): State<super::ServerState>,
|
||||||
|
Path((room, name)): Path<(String, String)>,
|
||||||
|
Json(device): Json<Device>,
|
||||||
|
) -> StatusCode {
|
||||||
|
let mut house = server_state.write().await;
|
||||||
|
let room = house.get_rooms_mut().entry(room).or_insert(Room::default());
|
||||||
|
room.get_devices_mut().insert(name, device);
|
||||||
|
StatusCode::CREATED
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn delete_device(
|
||||||
|
State(server_state): State<super::ServerState>,
|
||||||
|
Path((room, device)): Path<(String, String)>,
|
||||||
|
) -> StatusCode {
|
||||||
|
let mut house = server_state.write().await;
|
||||||
|
let Some(room) = house.get_rooms_mut().get_mut(&room) else {
|
||||||
|
return StatusCode::ACCEPTED;
|
||||||
|
};
|
||||||
|
room.get_devices_mut().remove(&device);
|
||||||
|
StatusCode::ACCEPTED
|
||||||
|
}
|
||||||
21
smart-house-web/backend/src/server/house.rs
Normal file
21
smart-house-web/backend/src/server/house.rs
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
use std::collections::HashMap;
|
||||||
|
|
||||||
|
use axum::{Json, extract::State, http::StatusCode};
|
||||||
|
|
||||||
|
use crate::Room;
|
||||||
|
|
||||||
|
pub async fn get_rooms(
|
||||||
|
State(server_state): State<super::ServerState>,
|
||||||
|
) -> Json<HashMap<String, Room>> {
|
||||||
|
server_state.read().await.get_rooms().clone().into()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn post_rooms(
|
||||||
|
State(server_state): State<super::ServerState>,
|
||||||
|
Json(map): Json<HashMap<String, Room>>,
|
||||||
|
) -> StatusCode {
|
||||||
|
for (name, room) in map.into_iter() {
|
||||||
|
server_state.write().await.add_room(name, room);
|
||||||
|
}
|
||||||
|
StatusCode::CREATED
|
||||||
|
}
|
||||||
49
smart-house-web/backend/src/server/room.rs
Normal file
49
smart-house-web/backend/src/server/room.rs
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
use std::collections::HashMap;
|
||||||
|
|
||||||
|
use axum::{
|
||||||
|
Json,
|
||||||
|
extract::{Path, State},
|
||||||
|
http::StatusCode,
|
||||||
|
};
|
||||||
|
|
||||||
|
use crate::{Device, Room};
|
||||||
|
|
||||||
|
pub async fn get_room(
|
||||||
|
State(server_state): State<super::ServerState>,
|
||||||
|
Path(name): Path<String>,
|
||||||
|
) -> Result<Json<Room>, StatusCode> {
|
||||||
|
let house = server_state.read().await;
|
||||||
|
let Some(room) = house.get_rooms().get(&name) else {
|
||||||
|
return Err(StatusCode::NOT_FOUND);
|
||||||
|
};
|
||||||
|
Ok(room.clone().into())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn put_room(
|
||||||
|
State(server_state): State<super::ServerState>,
|
||||||
|
Path(name): Path<String>,
|
||||||
|
Json(room): Json<Room>,
|
||||||
|
) -> StatusCode {
|
||||||
|
let mut house = server_state.write().await;
|
||||||
|
house.add_room(name, room);
|
||||||
|
StatusCode::CREATED
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn delete_room(
|
||||||
|
State(server_state): State<super::ServerState>,
|
||||||
|
Path(name): Path<String>,
|
||||||
|
) -> StatusCode {
|
||||||
|
server_state.write().await.del_room(&name);
|
||||||
|
StatusCode::ACCEPTED
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_devices(
|
||||||
|
State(server_state): State<super::ServerState>,
|
||||||
|
Path(name): Path<String>,
|
||||||
|
) -> Result<Json<HashMap<String, Device>>, StatusCode> {
|
||||||
|
let house = server_state.read().await;
|
||||||
|
let Some(room) = house.get_rooms().get(&name) else {
|
||||||
|
return Err(StatusCode::NOT_FOUND);
|
||||||
|
};
|
||||||
|
Ok(room.get_devices().clone().into())
|
||||||
|
}
|
||||||
71
smart-house-web/backend/test.http
Normal file
71
smart-house-web/backend/test.http
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
### DEBUG
|
||||||
|
GET http://localhost:8080/debug
|
||||||
|
|
||||||
|
### list rooms
|
||||||
|
GET http://localhost:8080/rooms
|
||||||
|
|
||||||
|
### post all rooms
|
||||||
|
POST http://localhost:8080/rooms
|
||||||
|
Content-Type: application/json
|
||||||
|
|
||||||
|
{
|
||||||
|
"ROOM0": {
|
||||||
|
"devices": {}
|
||||||
|
},
|
||||||
|
"ROOM1": {
|
||||||
|
"devices": {
|
||||||
|
"therm": {
|
||||||
|
"type": "Thermometer",
|
||||||
|
"temperature": 22
|
||||||
|
},
|
||||||
|
"psock": {
|
||||||
|
"type": "PowerSocket",
|
||||||
|
"power_rate": 11,
|
||||||
|
"on": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
### drop room
|
||||||
|
DELETE http://localhost:8080/room/ROOM
|
||||||
|
|
||||||
|
### add room
|
||||||
|
PUT http://localhost:8080/room/ROOM
|
||||||
|
Content-Type: application/json
|
||||||
|
|
||||||
|
{
|
||||||
|
"devices": {
|
||||||
|
"therm": {
|
||||||
|
"type": "Thermometer",
|
||||||
|
"temperature": 20
|
||||||
|
},
|
||||||
|
"psock": {
|
||||||
|
"type": "PowerSocket",
|
||||||
|
"power_rate": 10,
|
||||||
|
"on": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
### get room
|
||||||
|
GET http://localhost:8080/room/ROOM1
|
||||||
|
|
||||||
|
### get room devices
|
||||||
|
GET http://localhost:8080/room/ROOM1/devices
|
||||||
|
|
||||||
|
### get room device
|
||||||
|
GET http://localhost:8080/room/ROOM/device/TEST
|
||||||
|
|
||||||
|
### get room device
|
||||||
|
PUT http://localhost:8080/room/ROOM/device/TEST
|
||||||
|
Content-Type: application/json
|
||||||
|
|
||||||
|
{
|
||||||
|
"type": "PowerSocket",
|
||||||
|
"power_rate": 5,
|
||||||
|
"on": true
|
||||||
|
}
|
||||||
|
|
||||||
|
### get room device
|
||||||
|
DELETE http://localhost:8080/room/ROOM/device/TEST
|
||||||
4
smart-house-web/backend/tests/api_tests.rs
Normal file
4
smart-house-web/backend/tests/api_tests.rs
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
#[tokio::test(flavor = "current_thread")]
|
||||||
|
async fn smoke() {
|
||||||
|
println!("Hello test!")
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user