Fang 0.9 integration

Cargo.toml

@@ -8,13 +8,15 @@ rust-version = "1.62"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+thiserror = "1.0"
+once_cell = "1.13"
 aho-corasick = "0.7"
 atom_syndication = "0.11"
 chrono = "0.4"
-diesel = { version = "1", features = ["postgres", "chrono", "r2d2"] }
+diesel = { version = "2", features = ["postgres","r2d2"] }
 dotenv = "0.15"
 env_logger = "0.9"
-fang = { version = "0.8", features = ["blocking"], default-features = false }
+fang = { version = "0.9", features = ["blocking"], default-features = false }
 feed-rs = "1"
 frankenstein = { version = "0.20", default-features = false, features = ["telegram-trait"] }
 handlebars = "4"
@@ -32,4 +34,4 @@ typed-builder = "0.10"
 url = "2"
 
 [dev-dependencies]
-mockito = "0.31"
+mockito = "0.31"

Makefile

@@ -0,0 +1,20 @@
+db:
+	docker run --rm -d --name postgres -p 5432:5432 \
+  -e POSTGRES_DB=el_monitorro \
+  -e POSTGRES_USER=postgres \
+  -e POSTGRES_PASSWORD=postgres \
+  postgres:latest
+clippy:
+	cargo clippy --all-features
+diesel:
+	DATABASE_URL=postgres://postgres:postgres@localhost/el_monitorro diesel migration run
+stop:
+	docker kill postgres
+tests:
+	DATABASE_URL=postgres://postgres:postgres@localhost/el_monitorro cargo test --all-features -- --color always --nocapture
+
+ignored:
+	DATABASE_URL=postgres://postgres:postgres@localhost/el_monitorro cargo test --all-features -- --color always --nocapture --ignored
+
+doc:
+	cargo doc --open

migrations/2022-09-02-144340_change_fang_tables/down.sql

@@ -0,0 +1,29 @@
+DROP TABLE fang_periodic_tasks;
+DROP TABLE fang_tasks;
+
+CREATE TABLE fang_tasks (
+     id uuid PRIMARY KEY DEFAULT uuid_generate_v4(),
+     metadata jsonb NOT NULL,
+     error_message TEXT,
+     state fang_task_state default 'new' NOT NULL,
+     task_type VARCHAR default 'common' NOT NULL,
+     created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
+     updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
+);
+
+CREATE INDEX fang_tasks_state_index ON fang_tasks(state);
+CREATE INDEX fang_tasks_type_index ON fang_tasks(task_type);
+CREATE INDEX fang_tasks_created_at_index ON fang_tasks(created_at);
+CREATE INDEX fang_tasks_metadata_index ON fang_tasks(metadata);
+
+CREATE TABLE fang_periodic_tasks (
+  id uuid PRIMARY KEY DEFAULT uuid_generate_v4(),
+  metadata jsonb NOT NULL,
+  period_in_millis BIGINT NOT NULL,
+  scheduled_at TIMESTAMP WITH TIME ZONE,
+  created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
+  updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
+);
+
+CREATE INDEX fang_periodic_tasks_scheduled_at_index ON fang_periodic_tasks(scheduled_at);
+CREATE INDEX fang_periodic_tasks_metadata_index ON fang_periodic_tasks(metadata);

migrations/2022-09-02-144340_change_fang_tables/up.sql

@@ -0,0 +1,19 @@
+DROP TABLE fang_periodic_tasks;
+DROP TABLE fang_tasks;
+
+CREATE TABLE fang_tasks (
+     id uuid PRIMARY KEY DEFAULT uuid_generate_v4(),
+     metadata jsonb NOT NULL,
+     error_message TEXT,
+     state fang_task_state DEFAULT 'new' NOT NULL,
+     task_type VARCHAR DEFAULT 'common' NOT NULL,
+     uniq_hash CHAR(64),
+     scheduled_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
+     created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
+     updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
+);
+
+CREATE INDEX fang_tasks_state_index ON fang_tasks(state);
+CREATE INDEX fang_tasks_type_index ON fang_tasks(task_type);
+CREATE INDEX fang_tasks_scheduled_at_index ON fang_tasks(scheduled_at);
+CREATE INDEX fang_tasks_uniq_hash ON fang_tasks(uniq_hash);

src/bin/cleaner.rs

@@ -5,7 +5,9 @@ fn main() {
     dotenv().ok();
     env_logger::init();
 
-    let queue = Queue::new();
+    let queue = Queue::builder()
+        .connection_pool(el_monitorro::db::pool().clone())
+        .build();
 
     el_monitorro::start_clean_workers(&queue);
 

src/bin/deliver.rs

@@ -5,7 +5,9 @@ fn main() {
     dotenv().ok();
     env_logger::init();
 
-    let queue = Queue::new();
+    let queue = Queue::builder()
+        .connection_pool(el_monitorro::db::pool().clone())
+        .build();
 
     el_monitorro::start_delivery_workers(&queue);
 

src/bin/sync.rs

@@ -5,7 +5,9 @@ fn main() {
     dotenv().ok();
     env_logger::init();
 
-    let queue = Queue::new();
+    let queue = Queue::builder()
+        .connection_pool(el_monitorro::db::pool().clone())
+        .build();
 
     el_monitorro::start_sync_workers(&queue);