allow to migrate tables

.drone.yml

@@ -7,9 +7,12 @@ platform:
   os: linux
   arch: arm
 
+clone:
+  skip_verify: true
+
 steps:
 - name: validate
-  image: rust:1.52
+  image: rust:1.49
   commands:
   - cargo test --release --target=armv7-unknown-linux-gnueabihf
   environment:

.gitignore

@@ -1,4 +1,3 @@
 /target
-Cargo.lock
 .testdata
 .vscode

Cargo.toml

@@ -1,41 +1,27 @@
 [package]
 name = "altherego"
 version = "0.9.9"
-authors = ["Aleksandr Trushkin <atrushkin@outlook.com>"]
+authors = ["Aleksandr Trushkin <aleksandr.trushkin@rt.ru>"]
-edition = "2024"
+edition = "2018"
-default-run = "altherego"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-teloxide = { version = "0.12.2", features = ["macros", "auto-send"] }
+teloxide = { version = "0.9.0", features = ["macros", "auto-send"] }
-tokio = { version = "1.8", features = ["full"] }
+tokio = {version = "1.8", features = ["full"]}
 uuid = { version = "0.8.1", features = ["v4"] }
 log = "0.4"
 env_logger = "0.8.1"
 envconfig = "0.9.1"
-serde = "1.0.219"
+serde = "1.0.137"
 reqwest = { version = "0.11.10", features = ["tokio-native-tls"] }
-serde_json = "1.0.140"
+serde_json = "1.0.81"
-sqlx = { version = "0.8.3", features = [
+sqlx = { version = "0.5.13", features = ["sqlite", "runtime-tokio-native-tls", "chrono", "migrate"] }
-    "sqlite",
+chrono = "0.4.19"
-    "runtime-tokio-native-tls",
+anyhow = "1.0.57"
-    "chrono",
-    "migrate",
-] }
-chrono = "0.4.40"
-anyhow = "1.0.97"
 async-trait = "0.1.53"
 tokio-stream = "0.1.8"
 rand = "0.8.5"
 
-[[bin]]
-name = "altherego"
-path = "src/main.rs"
-
-[[bin]]
-name = "migrator"
-path = "src/migrator/main.rs"
-
 [profile.dev.package.sqlx-macros]
 opt-level = 3

build.rs

@@ -1,12 +1,12 @@
 use std::env;
 
-fn main() -> Result<(), Box<dyn std::error::Error>> {
+fn main() {
     let rev = get_value_from_env("GIT_VERSION")
-        .or_else(|| get_value_from_command("git", ["rev-parse", "--short", "HEAD"]))
+        .or_else(|| get_value_from_command("git", &["rev-parse", "--short", "HEAD"]))
         .unwrap_or_else(|| "unknown".to_owned());
 
     let branch = get_value_from_env("GIT_BRANCH")
-        .or_else(|| get_value_from_command("git", ["rev-parse", "--abbrev-ref", "HEAD"]))
+        .or_else(|| get_value_from_command("git", &["rev-parse", "--abbrev-ref", "HEAD"]))
         .unwrap_or_else(|| "unknown".to_owned());
 
     println!("cargo:rustc-env=GIT_REVISION={}", rev);
@@ -14,27 +14,25 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     println!("cargo:rerun-if-env-changed=GIT_REVISION");
 
     if let Ok(data) = std::fs::read_to_string(".env") {
-        data.split('\n').for_each(|v| {
+        data.split('\n').into_iter().for_each(|v| {
+            if v.starts_with("DATABASE") {
+                return;
+            }
+
             let kv: Vec<&str> = v.split('=').collect();
             if kv.len() != 2 {
                 return;
             }
+
             let (key, value) = (kv[0], kv[1]);
-
-            if key == "DATABASE_URL" {
-                return;
-            }
-
             println!("cargo:rustc-env={}={}", key, value);
             println!("cargo:rerun-if-env-changed={}", key);
         })
     }
-
-    Ok(())
 }
 
 fn get_value_from_env(key: &str) -> Option<String> {
-    env::var(key).ok()
+    env::var(key).map_or_else(|_| None, |v| Some(v))
 }
 
 fn get_value_from_command<I: IntoIterator<Item = S>, S: AsRef<std::ffi::OsStr>>(

db/001_initial.sql

@@ -1,3 +1,5 @@
+BEGIN;
+
 CREATE TABLE IF NOT EXISTS users (
   `user_id` integer NOT NULL PRIMARY KEY AUTOINCREMENT,
   `chat_id` integer NOT NULL UNIQUE,
@@ -26,3 +28,10 @@ CREATE TABLE IF NOT EXISTS actions (
     REFERENCES users(user_id)
       ON DELETE CASCADE
 );
+
+COMMIT;
+
+-- drop index actions_action_id_user_id_idx;
+-- drop table users;
+-- drop table parameters;
+-- drop table actions;

makefile

@@ -3,8 +3,7 @@ export DOCKER_BUILDKIT=1
 DOCKERFLAGS:=-it --rm \
 	-v "${PWD}":"/app" \
 	--workdir "/app" \
-	-e "PWD=/app" \
+	-e "PWD=/app"
-	-u $(shell id -u):$(shell id -g)
 
 DOCKERIMG:="rust-build-env:V1"
 
@@ -28,10 +27,6 @@ build_release_arm:
 	docker run ${DOCKERFLAGS} ${DOCKERIMG} /bin/sh -c 'cargo build --release --target=armv7-unknown-linux-gnueabihf'
 .PHONY: build_release_arm
 
-inside:
-	docker run ${DOCKERFLAGS} ${DOCKERIMG} /bin/bash
-.PHONY: inside
-
 docker_build_release_arm:
 	docker run ${DOCKERFLAGS} ${DOCKERIMG} make build_release_arm
 
@@ -43,11 +38,3 @@ dronefile:
 	-V target_arch=${TARGET_ARCH}
 	drone sign frx/altherego --save
 .PHONY: dronefile
-
-init_db:
-	rm -rf .testdata
-	mkdir .testdata
-	sqlite3 -init ./db/001_initial.sql ./.testdata/db.sqlite '.q'
-
-open_db:
-	sqlite3 ./.testdata/db.sqlite

src/http.rs

@@ -1,36 +0,0 @@
-#[macro_use]
-extern crate rocket;
-
-use rocket::http::CookieJar;
-use rocket::serde::{json::Json, Deserialize};
-use rocket::State;
-use serde::Deserialize;
-
-#[derive(Debug, Deserialize)]
-#[serde(crate = "rocker::serde")]
-struct NotifyBody<'r> {
-    pub message: &'r str,
-}
-
-struct BotContainer {
-    bot: Arc<teloxide::Bot>,
-}
-
-#[post("/notify", format = "json")]
-async fn handle_notifications(
-    cookies: &CookieJar<'_>,
-    body: Json<NotifyBody<'_>>,
-    bot: &State<BotContainer>,
-) -> &'static str {
-    "oh well"
-}
-
-async fn launch(bot: Arc<teloxide::Bot>) -> Result<(), rocket::Error> {
-    rocket::build()
-        .manage(BotContainer { bot })
-        .mount("/", routes![handle_notifications])
-        .launch()
-        .await?;
-
-    Ok(())
-}

src/main.rs

@@ -1,7 +1,6 @@
 #![allow(unused)]
 
 mod climate;
-mod http;
 mod repo;
 mod utils;
 
@@ -10,7 +9,7 @@ use climate::SelfTemperature;
 use envconfig::Envconfig;
 use log::{debug, info, warn};
 use teloxide::{
-    dispatching::{UpdateFilterExt, update_listeners::AsUpdateStream},
+    dispatching::{update_listeners::AsUpdateStream, UpdateFilterExt},
     dptree::di::Injectable,
     filter_command,
     payloads::SendMessage,
@@ -29,6 +28,7 @@ async fn main() {
     env_logger::init();
 
     debug!("starting the application");
+    println!("starting the application");
 
     tokio::spawn(run()).await.unwrap();
 }
@@ -58,9 +58,11 @@ async fn run() -> anyhow::Result<()> {
     info!("starting");
 
     let settings = Settings::init_from_env().expect("reading config values");
-    let bot = teloxide::Bot::new(&settings.telegram_token);
+    let bot = teloxide::Bot::new(&settings.telegram_token).auto_send();
+    let migrate = std::env::args().any(|v| v == "migrate");
     let repo_config = repo::SqliteConfig {
         source: settings.db_source,
+        migrate,
         ..Default::default()
     };
 
@@ -71,7 +73,7 @@ async fn run() -> anyhow::Result<()> {
     let climate_client = climate::Client::new(&settings.climate_dsn);
 
     let self_temp_client = {
-        let splitted: Vec<&str> = settings.hosttemp_cmd.split(' ').collect();
+        let splitted: Vec<&str> = settings.hosttemp_cmd.split(' ').into_iter().collect();
         let (cmd, arg) = (splitted[0], splitted[1]);
 
         climate::SelfTemperature::new(cmd, arg)
@@ -109,7 +111,6 @@ async fn run() -> anyhow::Result<()> {
         .branch(dptree::case![Command::RoomTemperature].endpoint(handle_temperature_sensor))
         .branch(dptree::case![Command::HostTemperature].endpoint(handle_host_temperature))
         .branch(dptree::case![Command::VersionRequest].endpoint(handle_version))
-        .branch(dptree::case![Command::ChatID].endpoint(handle_chat_id))
         .branch(dptree::case![Command::Help].endpoint(handle_help));
 
     let mut dependencies = DependencyMap::new();
@@ -122,11 +123,11 @@ async fn run() -> anyhow::Result<()> {
 
     Dispatcher::builder(bot, handler)
         .dependencies(dependencies)
-        .enable_ctrlc_handler()
         .default_handler(|upd| async move {
             warn!("unhandled update: {:?}", upd);
         })
         .build()
+        .setup_ctrlc_handler()
         .dispatch()
         .await;
 
@@ -140,7 +141,7 @@ fn error_msg(reqid: &utils::RequestID) -> String {
 }
 
 async fn handle_temperature_sensor(
-    bot: Bot,
+    bot: AutoSend<Bot>,
     msg: Message,
     climate: climate::Client,
     next_req_id: utils::Generators,
@@ -174,7 +175,7 @@ async fn handle_temperature_sensor(
 }
 
 async fn handle_host_temperature(
-    bot: Bot,
+    bot: AutoSend<Bot>,
     msg: Message,
     temp: SelfTemperature,
     next_req_id: utils::Generators,
@@ -201,7 +202,7 @@ async fn handle_host_temperature(
     Ok(())
 }
 
-async fn handle_version(bot: Bot, msg: Message) -> Result<()> {
+async fn handle_version(bot: AutoSend<Bot>, msg: Message) -> Result<()> {
     let chat_id = msg.chat.id;
     let text = format!("Bot version is {} (branch: {})", VERSION, BRANCH,);
 
@@ -210,16 +211,7 @@ async fn handle_version(bot: Bot, msg: Message) -> Result<()> {
     Ok(())
 }
 
-async fn handle_chat_id(bot: Bot, msg: Message) -> Result<()> {
+async fn handle_help(bot: AutoSend<Bot>, msg: Message) -> Result<()> {
-    let chat_id = msg.chat.id;
-    let text = format!("Current chat id: {chat_id}");
-
-    bot.send_message(chat_id, text).await?;
-
-    Ok(())
-}
-
-async fn handle_help(bot: Bot, msg: Message) -> Result<()> {
     let chat_id = msg.chat.id;
 
     bot.send_message(chat_id, Command::descriptions().to_string())
@@ -262,16 +254,14 @@ struct Climate {
 }
 
 #[derive(BotCommands, Debug, Clone, PartialEq, Eq)]
-#[command(description = "These commands are supported:")]
+#[command(rename = "lowercase", description = "These commands are supported:")]
 enum Command {
-    #[command(rename = "help", description = "display this text.")]
+    #[command(description = "display this text.")]
     Help,
-    #[command(rename = "roomtemp", description = "temperature of your room.")]
+    #[command(description = "temperature of your room.")]
     RoomTemperature,
-    #[command(rename = "hosttemp", description = "temperature of raspberry.")]
+    #[command(description = "temperature of raspberry.")]
     HostTemperature,
-    #[command(rename = "version", description = "prints current version.")]
+    #[command(description = "prints current version.")]
     VersionRequest,
-    #[command(rename = "chatid", description = "prints current chat id.")]
-    ChatID,
 }

src/migrator/main.rs

@@ -1,44 +0,0 @@
-use std::str::FromStr;
-
-use anyhow::Result;
-use log::{debug, info};
-use envconfig::Envconfig;
-use sqlx::{
-    SqlitePool,
-    sqlite::SqliteConnectOptions,
-    migrate,
-};
-
-#[derive(Envconfig)]
-struct Settings {
-    #[envconfig(from = "ALTEREGO_DATABASE_URL", default = "./db.sqlite")]
-    pub db_source: String,
-}
-
-
-#[tokio::main]
-async fn main() -> Result<()> {
-    env_logger::init();
-
-    info!("starting the application");
-
-    tokio::spawn(run()).await?
-}
-
-async fn run() -> Result<()> {
-    debug!("running migrations");
-
-    let settings = Settings::init_from_env().expect("reading config values");
-
-    info!("opening database {}", settings.db_source);
-
-    let opts = SqliteConnectOptions::from_str(&settings.db_source)?
-    .create_if_missing(true)
-    .journal_mode(sqlx::sqlite::SqliteJournalMode::Wal);
-
-    let pool = SqlitePool::connect_with(opts).await?;
-
-    migrate!("./db/").run(&pool).await?;
-
-    Ok(())
-}

src/repo.rs

@@ -3,10 +3,10 @@ use std::str::FromStr;
 use anyhow::Result;
 use log::debug;
 use sqlx::{
-    Executor, Pool, Sqlite,
     sqlite::{
         SqliteConnectOptions, SqliteError, SqliteJournalMode, SqlitePoolOptions, SqliteSynchronous,
     },
+    Executor, Pool, Sqlite,
 };
 use teloxide::types::User;
 
@@ -15,6 +15,7 @@ pub struct SqliteConfig {
     pub source: String,
     pub timeout: std::time::Duration,
     pub max_conns: u32,
+    pub migrate: bool,
 }
 
 impl Default for SqliteConfig {
@@ -23,6 +24,7 @@ impl Default for SqliteConfig {
             source: ":memory:".to_string(),
             timeout: std::time::Duration::from_secs(10),
             max_conns: 2,
+            migrate: false,
         }
     }
 }
@@ -50,9 +52,14 @@ impl SqliteRepo {
 
         let pool = SqlitePoolOptions::new()
             .max_connections(config.max_conns)
+            .connect_timeout(config.timeout)
             .connect_with(opts)
             .await?;
 
+        if config.migrate {
+            sqlx::migrate!("./db").run(&pool).await?;
+        }
+
         sqlx::query("pragma temp_store = memory;")
             .execute(&pool)
             .await?;