feat: database (#17)

* feat: database

* fix: test CI

* fix: timeout

.github/workflows/rust-ci.yaml

@@ -46,7 +46,7 @@ jobs:
   test-and-coverage:
     name: Test and Coverage
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4
         with:
@@ -59,4 +59,4 @@ jobs:
       - name: Set PKG_CONFIG_PATH
         run: echo "PKG_CONFIG_PATH=/usr/lib/pkgconfig" >> $GITHUB_ENV
       - name: Run tests
-        run: cargo tarpaulin --all-features --verbose --tests --skip-clean
+        run: cargo tarpaulin --all-features --verbose --tests --skip-clean --engine llvm

Cargo.toml

@@ -24,10 +24,12 @@ axum = { version = "0.8.0-alpha.1" }
 bincode = { version = "1.3.3" }
 clap = { version = "4.5.17" }
 config = { version = "0.14.0" }
+deadpool-diesel = { version = "0.6.1" }
+diesel = { version = "2.2.6" }
+diesel_migrations = { version = "2.2.0" }
 glob = { version = "0.3.1" }
 graphile_worker = { version = "0.8.0" }
 itertools = { version = "0.13.0" }
-lazy_static = { version = "1.5.0" }
 log = { version = "0.4.22" }
 opentelemetry = { version = "0.27.0" }
 opentelemetry-otlp = { version = "0.27.0" }
@@ -46,8 +48,10 @@ test-log = { version = "0.2.16" }
 testcontainers-modules = { version = "0.11.3" }
 thiserror = { version = "2.0.3" }
 tokio = { version = "1.39.3" }
+tower = { version = "0.5.1" }
 tower-http = { version = "0.6.1" }
 tracing = { version = "0.1.40" }
 tracing-bunyan-formatter = { version = "0.3.9" }
 tracing-opentelemetry = { version = "0.28.0" }
 tracing-subscriber = { version = "0.3.18" }
+uuid = { version = "1.11.0" }

Makefile

@@ -1,3 +1,5 @@
+POSTGRES_DIR="./crates/adapter/src/postgres"
+DATABASE_URL="postgres://postgres:[email protected]:5432/postgrest"
 PKG_NAME=zksteve/frog
 BUILD_VERSION=$(shell git describe --long)
 BUILD_RELEASE=$(shell git describe --tags --abbrev=0)
@@ -21,3 +23,18 @@ push:
 	docker push $(PKG_NAME)-server:$(BUILD_VERSION) && \
 	docker push $(PKG_NAME)-client:$(BUILD_VERSION) && \
 	docker push $(PKG_NAME)-worker:$(BUILD_VERSION)
+
+setup-db:
+	diesel setup --database-url ${DATABASE_URL} \
+     --migration-dir ${POSTGRES_DIR}/migrations \
+     --config-file ${POSTGRES_DIR}/diesel.toml
+
+migrate:
+	diesel migration run --database-url ${DATABASE_URL} \
+     --migration-dir ${POSTGRES_DIR}/migrations \
+     --config-file ${POSTGRES_DIR}/diesel.toml
+
+migrate-redo:
+	diesel migration redo --database-url ${DATABASE_URL} \
+     --migration-dir ${POSTGRES_DIR}/migrations \
+     --config-file ${POSTGRES_DIR}/diesel.toml

README.md

@@ -18,8 +18,9 @@ Learn more about the system's architecture [here](docs/architecture.md).
 ## Future Plans
 
 - [ ] Finalize Docker and Kurtosis configurations to simplify deployment on Docker or Kubernetes.
-- [ ] Complete the implementation of the worker service and database (currently, the server processes tasks and stores
-  data locally).
+- [ ] Complete the implementation of the worker service ~~and database (currently, the server processes tasks and stores
+  data locally)~~.
 - [ ] Develop a toolkit similar to [Ignite](https://github.com/ignite/cli) to streamline the development process with a
   CLI for scaffolding and managing projects.
+- [ ] Smarter way to handle common params.
 - [ ] Add more documentation and comments in the codebase to enhance maintainability and usability.

crates/adapter/Cargo.toml

@@ -5,5 +5,17 @@ edition = "2021"
 
 [dependencies]
 async-trait = { workspace = true }
+bincode = { workspace = true }
+deadpool-diesel = { workspace = true, features = ["postgres", "serde"] }
+diesel = { workspace = true, features = [
+  "postgres",
+  "postgres_backend",
+  "uuid",
+  "serde_json",
+] }
+diesel_migrations = { workspace = true }
 frog_core = { workspace = true }
+log = { workspace = true }
 reqwest = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+uuid = { workspace = true }

crates/adapter/src/in_memory/session.rs

@@ -56,13 +56,13 @@ impl SessionPort for SessionInMemoryRepository {
         Ok(session_id)
     }
 
-    async fn delete(&self, session_id: SessionId) -> Result<SessionId, CoreError> {
+    async fn delete(&self, session_id: SessionId) -> Result<(), CoreError> {
         self.inner_state
             .write()
             .unwrap()
             .sessions
             .remove(&session_id)
             .ok_or(CoreError::NotFound)?;
-        Ok(session_id)
+        Ok(())
     }
 }

crates/adapter/src/lib.rs

@@ -1,2 +1,3 @@
 pub mod http;
 pub mod in_memory;
+pub mod postgres;

crates/adapter/src/postgres/config.rs

@@ -0,0 +1,7 @@
+use serde::Deserialize;
+
+#[derive(Deserialize, Debug, Clone)]
+pub struct DBConfig {
+    pub url: String,
+    pub max_size: usize,
+}

crates/adapter/src/postgres/diesel.toml

@@ -0,0 +1,9 @@
+# For documentation on how to configure this file,
+# see https://diesel.rs/guides/configuring-diesel-cli
+
+[print_schema]
+custom_type_derives = ["diesel::query_builder::QueryId"]
+file = "schema.rs"
+
+[migrations_directory]
+dir = "migrations"

crates/adapter/src/postgres/migrations/00000000000000_diesel_initial_setup/down.sql

@@ -0,0 +1,6 @@
+-- This file was automatically created by Diesel to setup helper functions
+-- and other internal bookkeeping. This file is safe to edit, any future
+-- changes will be added to existing projects as new migrations.
+
+DROP FUNCTION IF EXISTS diesel_manage_updated_at(_tbl regclass);
+DROP FUNCTION IF EXISTS diesel_set_updated_at();