refactor

.env

@@ -0,0 +1,11 @@
+POSTGRES_DB=como
+POSTGRES_USER=como
+POSTGRES_PASSWORD=somenotverysecurepassword
+
+DATABASE_URL="postgres://como:somenotverysecurepassword@localhost:5432/como"
+RUST_LOG=como_api=info,como_bin=info,como_core=info,como_domain=info,como_gql=info,como_infrastructure=info,sqlx=debug,tower_http=debug
+TOKEN_SECRET=something
+API_PORT=3001
+CORS_ORIGIN=http://localhost:3000
+RUN_MIGRATIONS=true
+SEED=true

.gitignore

@@ -1,4 +1,3 @@
 /target
 .cuddle/
 node_modules/
-.env

Cargo.toml

@@ -7,47 +7,3 @@ members = [
   "como_gql",
   "como_api",
 ]
-resolver = "2"
-
-[workspace.dependencies]
-como_bin = { path = "./como_bin/" }
-como_core = { path = "./como_core/" }
-como_domain = { path = "./como_domain/" }
-como_infrastructure = { path = "./como_infrastructure/" }
-como_gql = { path = "./como_gql/" }
-como_api = { path = "./como_api/" }
-
-async-trait = "0.1.68"
-async-graphql = { version = "5.0.9", features = ["uuid"] }
-async-graphql-axum = "5.0.9"
-
-axum = { version = "0.6.18", features = ["headers", "macros"] }
-axum-extra = { version = "0.7.4", features = ["cookie", "cookie-private"] }
-axum-sessions = { version = "0.5.0" }
-async-sqlx-session = { version = "0.4.0", features = ["pg"] }
-
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0.68"
-
-sqlx = { version = "0.6.2", features = [
-  "runtime-tokio-rustls",
-  "postgres",
-  "migrate",
-  "uuid",
-  "offline",
-  "time",
-  "chrono",
-] }
-chrono = { version = "0.4.26", features = ["serde"] }
-
-tokio = { version = "1.28.2", features = ["full"] }
-
-uuid = { version = "1.3.3", features = ["v4", "fast-rng", "serde"] }
-anyhow = "1.0.71"
-dotenv = "0.15.0"
-tracing = "0.1.37"
-tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
-clap = { version = "4.3.0", features = ["derive", "env"] }
-
-argon2 = { version = "0.5.0" }
-rand_core = { version = "0.6.4" }

README.md

@@ -1,3 +1 @@
 # Cibus Backend
-
-Some text

como_api/Cargo.toml

@@ -6,27 +6,34 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-como_gql.workspace = true
+como_gql = { path = "../como_gql" }
-como_core.workspace = true
+como_core = { path = "../como_core" }
-como_domain.workspace = true
+como_domain = { path = "../como_domain" }
-como_infrastructure.workspace = true
+como_infrastructure = { path = "../como_infrastructure" }
 
-async-graphql.workspace = true
+async-graphql = "4.0.6"
-async-graphql-axum.workspace = true
+async-graphql-axum = "*"
-axum.workspace = true
+axum = "0.5.13"
-axum-extra.workspace = true
+axum-extra = { version = "*", features = ["cookie", "cookie-private"] }
-axum-sessions.workspace = true
+axum-sessions = { version = "*" }
-serde.workspace = true
+serde = { version = "1.0", features = ["derive"] }
-serde_json.workspace = true
+serde_json = "1.0.68"
-tokio.workspace = true
-uuid.workspace = true
-sqlx.workspace = true
-anyhow.workspace = true
-tracing.workspace = true
-async-sqlx-session.workspace = true
 
-zitadel = { version = "3.3.1", features = ["axum"] }
+tokio = { version = "1.20.1", features = ["full"] }
-tower = "0.4.13"
+uuid = { version = "1.1.2", features = ["v4", "fast-rng"] }
-tower-http = { version = "0.4.0", features = ["cors", "trace"] }
+sqlx = { version = "0.6", features = [
-oauth2 = "4.4.0"
+  "runtime-tokio-rustls",
-openidconnect = "3.0.0"
+  "postgres",
+  "migrate",
+  "uuid",
+  "offline",
+] }
+anyhow = "1.0.60"
+dotenv = "0.15.0"
+tracing = "0.1.36"
+tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
+argon2 = "0.4"
+rand_core = { version = "0.6", features = ["std"] }
+cookie = { version = "0.16", features = ["secure", "percent-encode"] }
+tower = { version = "0.4", features = ["timeout"] }
+tower-http = { version = "0.3", features = ["trace", "cors"] }

como_api/src/controllers/auth.rs

@@ -1,186 +0,0 @@
-use std::borrow::Cow;
-
-use crate::router::AppState;
-use crate::zitadel::{IntrospectionConfig, IntrospectionState};
-
-use async_sqlx_session::PostgresSessionStore;
-use axum::extract::{FromRef, FromRequestParts, Query, State};
-use axum::headers::authorization::Basic;
-use axum::headers::{Authorization, Cookie};
-use axum::http::request::Parts;
-use axum::http::StatusCode;
-use axum::http::{header::SET_COOKIE, HeaderMap};
-use axum::response::{IntoResponse, Redirect};
-use axum::routing::get;
-use axum::{async_trait, RequestPartsExt, Router, TypedHeader};
-use axum_sessions::async_session::{Session, SessionStore};
-use como_domain::users::User;
-use como_infrastructure::register::ServiceRegister;
-use oauth2::basic::BasicClient;
-use oauth2::{reqwest::async_http_client, AuthorizationCode, CsrfToken, Scope, TokenResponse};
-use oauth2::{RedirectUrl, TokenIntrospectionResponse};
-use serde::Deserialize;
-use zitadel::oidc::introspection::introspect;
-
-#[derive(Debug, Deserialize)]
-pub struct ZitadelAuthParams {
-    return_url: Option<String>,
-}
-
-pub async fn zitadel_auth(State(client): State<BasicClient>) -> impl IntoResponse {
-    let (auth_url, _csrf_token) = client
-        .authorize_url(CsrfToken::new_random)
-        .add_scope(Scope::new("identify".to_string()))
-        .add_scope(Scope::new("openid".to_string()))
-        .url();
-
-    Redirect::to(auth_url.as_ref())
-}
-
-pub static COOKIE_NAME: &str = "SESSION";
-
-#[derive(Debug, Deserialize)]
-#[allow(dead_code)]
-pub struct AuthRequest {
-    code: String,
-    state: String,
-}
-
-pub async fn login_authorized(
-    Query(query): Query<AuthRequest>,
-    State(store): State<PostgresSessionStore>,
-    State(oauth_client): State<BasicClient>,
-    State(introspection_state): State<IntrospectionState>,
-) -> impl IntoResponse {
-    let token = oauth_client
-        .exchange_code(AuthorizationCode::new(query.code.clone()))
-        .request_async(async_http_client)
-        .await
-        .unwrap();
-
-    let config = IntrospectionConfig::from_ref(&introspection_state);
-
-    let res = introspect(
-        &config.introspection_uri,
-        &config.authority,
-        &config.authentication,
-        token.access_token().secret(),
-    )
-    .await
-    .unwrap();
-
-    let mut session = Session::new();
-    session
-        .insert(
-            "user",
-            User {
-                id: res.sub().unwrap().into(),
-            },
-        )
-        .unwrap();
-
-    let cookie = store.store_session(session).await.unwrap().unwrap();
-
-    let cookie = format!("{}={}; SameSite=Lax; Path=/", COOKIE_NAME, cookie);
-
-    let mut headers = HeaderMap::new();
-    headers.insert(SET_COOKIE, cookie.parse().unwrap());
-
-    (headers, Redirect::to("http://localhost:3000/dash/home"))
-}
-
-pub struct AuthController;
-
-impl AuthController {
-    pub async fn new_router(
-        _service_register: ServiceRegister,
-        app_state: AppState,
-    ) -> anyhow::Result<Router> {
-        Ok(Router::new()
-            .route("/zitadel", get(zitadel_auth))
-            .route("/authorized", get(login_authorized))
-            .with_state(app_state))
-    }
-}
-
-pub struct UserFromSession {
-    pub user: User,
-}
-
-#[async_trait]
-impl<S> FromRequestParts<S> for UserFromSession
-where
-    PostgresSessionStore: FromRef<S>,
-    BasicClient: FromRef<S>,
-    IntrospectionState: FromRef<S>,
-    S: Send + Sync,
-{
-    type Rejection = (StatusCode, &'static str);
-
-    async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
-        let store = PostgresSessionStore::from_ref(state);
-
-        let cookie: Option<TypedHeader<Cookie>> = parts.extract().await.unwrap();
-
-        let session_cookie = cookie.as_ref().and_then(|cookie| cookie.get(COOKIE_NAME));
-        if let None = session_cookie {
-            let introspection_state = IntrospectionState::from_ref(state);
-
-            let basic: Option<TypedHeader<Authorization<Basic>>> = parts.extract().await.unwrap();
-
-            if let Some(basic) = basic {
-                let config = IntrospectionConfig::from_ref(&introspection_state);
-
-                let res = introspect(
-                    &config.introspection_uri,
-                    &config.authority,
-                    &config.authentication,
-                    basic.password(),
-                )
-                .await
-                .unwrap();
-
-                return Ok(UserFromSession {
-                    user: User {
-                        id: res.sub().unwrap().into(),
-                    },
-                });
-            }
-
-            return Err((StatusCode::UNAUTHORIZED, "No session was found"));
-        }
-
-        let session_cookie = session_cookie.unwrap();
-
-        tracing::debug!(
-            "UserFromSession: got session cookie from user agent, {}={}",
-            COOKIE_NAME,
-            session_cookie
-        );
-        // continue to decode the session cookie
-        let user =
-            if let Some(session) = store.load_session(session_cookie.to_owned()).await.unwrap() {
-                if let Some(user) = session.get::<User>("user") {
-                    tracing::debug!(
-                        "UserFromSession: session decoded success, user_id={:?}",
-                        user.id
-                    );
-                    user
-                } else {
-                    return Err((
-                        StatusCode::INTERNAL_SERVER_ERROR,
-                        "No `user_id` found in session",
-                    ));
-                }
-            } else {
-                tracing::debug!(
-                    "UserIdFromSession: err session not exists in store, {}={}",
-                    COOKIE_NAME,
-                    session_cookie
-                );
-                return Err((StatusCode::BAD_REQUEST, "No session found for cookie"));
-            };
-
-        Ok(UserFromSession { user })
-    }
-}

como_api/src/controllers/graphql.rs

@@ -1,48 +1,21 @@
-use super::auth::UserFromSession;
-use crate::router::AppState;
-
-use async_graphql::http::{playground_source, GraphQLPlaygroundConfig};
 use async_graphql::{EmptySubscription, Schema};
-use async_graphql_axum::{GraphQLRequest, GraphQLResponse};
+use axum::{routing::get, Extension, Router};
-use axum::response::Html;
+use como_gql::{
-use axum::{http::StatusCode, response::IntoResponse, routing::get, Extension, Router};
+    graphql::{MutationRoot, QueryRoot},
-
+    graphql_handler, graphql_playground,
-use como_domain::user::ContextUserExt;
+};
-use como_domain::Context;
-use como_gql::graphql::{ComoSchema, MutationRoot, QueryRoot};
 use como_infrastructure::register::ServiceRegister;
-use tower::ServiceBuilder;
 
 pub struct GraphQLController;
 
 impl GraphQLController {
-    pub fn new_router(service_register: ServiceRegister, state: AppState) -> Router {
+    pub fn new_router(service_register: ServiceRegister) -> Router {
         let schema = Schema::build(QueryRoot, MutationRoot, EmptySubscription)
             .data(service_register)
             .finish();
 
         Router::new()
             .route("/", get(graphql_playground).post(graphql_handler))
-            .layer(ServiceBuilder::new().layer(Extension(schema)))
+            .layer(Extension(schema))
-            .with_state(state)
     }
 }
-
-pub async fn graphql_handler(
-    user: UserFromSession,
-    schema: Extension<ComoSchema>,
-    req: GraphQLRequest,
-) -> Result<GraphQLResponse, StatusCode> {
-    let req = req.into_inner();
-    let req = req.data(user.user.clone());
-
-    let context = Context::new();
-    let context = context.set_user_id(user.user.id.clone());
-    let req = req.data(context);
-
-    Ok(schema.execute(req).await.into())
-}
-
-pub async fn graphql_playground() -> impl IntoResponse {
-    Html(playground_source(GraphQLPlaygroundConfig::new("/graphql")))
-}

como_api/src/controllers/mod.rs

@@ -1,2 +1 @@
-pub mod auth;
 pub mod graphql;

como_api/src/lib.rs

@@ -1,3 +1,2 @@
 mod controllers;
 pub mod router;
-pub mod zitadel;

como_api/src/router.rs

@@ -1,74 +1,40 @@
-use std::env;
-
 use anyhow::Context;
-use async_sqlx_session::PostgresSessionStore;
+use axum::{
-use axum::extract::FromRef;
+    http::{HeaderValue, Method},
-use axum::http::{HeaderValue, Method};
+    Router,
-use axum::Router;
+};
 use como_infrastructure::register::ServiceRegister;
-use oauth2::basic::BasicClient;
 use tower::ServiceBuilder;
 use tower_http::{cors::CorsLayer, trace::TraceLayer};
 
-use crate::controllers::auth::AuthController;
 use crate::controllers::graphql::GraphQLController;
-use crate::zitadel::client::oauth_client;
-use crate::zitadel::{IntrospectionState, IntrospectionStateBuilder};
 
 pub struct Api;
 
 impl Api {
-    pub async fn new(
+    pub async fn run_api(
         port: u32,
         cors_origin: &str,
         service_register: ServiceRegister,
     ) -> anyhow::Result<()> {
-        let client_id = env::var("CLIENT_ID").expect("Missing CLIENT_ID!");
-        let client_secret = env::var("CLIENT_SECRET").expect("Missing CLIENT_SECRET!");
-        let zitadel_url = env::var("ZITADEL_URL").expect("missing ZITADEL_URL");
-
-        let is = IntrospectionStateBuilder::new(&zitadel_url)
-            .with_basic_auth(&client_id, &client_secret)
-            .build()
-            .await?;
-
-        let oauth_client = oauth_client();
-        let app_state = AppState {
-            oauth_client,
-            store: service_register.session_store.clone(),
-            introspection_state: is,
-        };
-
         let router = Router::new()
-            .nest(
-                "/auth",
-                AuthController::new_router(service_register.clone(), app_state.clone()).await?,
-            )
             .nest(
                 "/graphql",
-                GraphQLController::new_router(service_register.clone(), app_state.clone()),
+                GraphQLController::new_router(service_register.clone()),
             )
+            .layer(ServiceBuilder::new().layer(TraceLayer::new_for_http()))
             .layer(
-                ServiceBuilder::new()
+                CorsLayer::new()
-                    .layer(TraceLayer::new_for_http())
+                    .allow_origin(
-                    .layer(
+                        cors_origin
-                        CorsLayer::new()
+                            .parse::<HeaderValue>()
-                            .allow_origin(
+                            .context("could not parse cors origin as header")?,
-                                cors_origin
+                    )
-                                    .parse::<HeaderValue>()
+                    .allow_headers([axum::http::header::CONTENT_TYPE])
-                                    .context("could not parse cors origin as header")?,
+                    .allow_methods([Method::GET, Method::POST, Method::OPTIONS]),
-                            )
-                            .allow_headers([axum::http::header::CONTENT_TYPE])
-                            .allow_methods([Method::GET, Method::POST, Method::OPTIONS])
-                            .allow_credentials(true),
-                    ),
             );
 
-        let host = env::var("HOST").unwrap_or("0.0.0.0".to_string());
+        axum::Server::bind(&format!("0.0.0.0:{}", port).parse().unwrap())
-
-        tracing::info!("running on: {host}:{}", port);
-
-        axum::Server::bind(&format!("{host}:{}", port).parse().unwrap())
             .serve(router.into_make_service())
             .await
             .context("error while starting API")?;
@@ -76,28 +42,3 @@ impl Api {
         Ok(())
     }
 }
-
-#[derive(Clone)]
-pub struct AppState {
-    oauth_client: BasicClient,
-    introspection_state: IntrospectionState,
-    store: PostgresSessionStore,
-}
-
-impl FromRef<AppState> for BasicClient {
-    fn from_ref(state: &AppState) -> Self {
-        state.oauth_client.clone()
-    }
-}
-
-impl FromRef<AppState> for PostgresSessionStore {
-    fn from_ref(state: &AppState) -> Self {
-        state.store.clone()
-    }
-}
-
-impl FromRef<AppState> for IntrospectionState {
-    fn from_ref(input: &AppState) -> Self {
-        input.introspection_state.clone()
-    }
-}

como_api/src/zitadel/client.rs

@@ -1,20 +0,0 @@
-use oauth2::{basic::BasicClient, AuthUrl, ClientId, ClientSecret, RedirectUrl, TokenUrl};
-use std::env;
-
-pub fn oauth_client() -> BasicClient {
-    let client_id = env::var("CLIENT_ID").expect("Missing CLIENT_ID!");
-    let client_secret = env::var("CLIENT_SECRET").expect("Missing CLIENT_SECRET!");
-    let redirect_url = env::var("REDIRECT_URL").expect("missing REDIRECT_URL");
-
-    let auth_url = env::var("AUTH_URL").expect("missing AUTH_URL");
-
-    let token_url = env::var("TOKEN_URL").expect("missing TOKEN_URL");
-
-    BasicClient::new(
-        ClientId::new(client_id),
-        Some(ClientSecret::new(client_secret)),
-        AuthUrl::new(auth_url).unwrap(),
-        Some(TokenUrl::new(token_url).unwrap()),
-    )
-    .set_redirect_uri(RedirectUrl::new(redirect_url).unwrap())
-}

como_api/src/zitadel/mod.rs

@@ -1,90 +0,0 @@
-pub mod client;
-
-use axum::extract::FromRef;
-use openidconnect::IntrospectionUrl;
-use zitadel::{
-    axum::introspection::IntrospectionStateBuilderError,
-    credentials::Application,
-    oidc::{discovery::discover, introspection::AuthorityAuthentication},
-};
-
-#[derive(Clone, Debug)]
-pub struct IntrospectionState {
-    pub(crate) config: IntrospectionConfig,
-}
-
-/// Configuration that must be inject into the axum application state. Used by the
-/// [IntrospectionStateBuilder](super::IntrospectionStateBuilder). This struct is also used to create the [IntrospectionState](IntrospectionState)
-#[derive(Debug, Clone)]
-pub struct IntrospectionConfig {
-    pub(crate) authority: String,
-    pub(crate) authentication: AuthorityAuthentication,
-    pub(crate) introspection_uri: IntrospectionUrl,
-}
-
-impl FromRef<IntrospectionState> for IntrospectionConfig {
-    fn from_ref(input: &IntrospectionState) -> Self {
-        input.config.clone()
-    }
-}
-
-pub struct IntrospectionStateBuilder {
-    authority: String,
-    authentication: Option<AuthorityAuthentication>,
-}
-
-/// Builder for [IntrospectionConfig]
-impl IntrospectionStateBuilder {
-    pub fn new(authority: &str) -> Self {
-        Self {
-            authority: authority.to_string(),
-            authentication: None,
-        }
-    }
-
-    pub fn with_basic_auth(
-        &mut self,
-        client_id: &str,
-        client_secret: &str,
-    ) -> &mut IntrospectionStateBuilder {
-        self.authentication = Some(AuthorityAuthentication::Basic {
-            client_id: client_id.to_string(),
-            client_secret: client_secret.to_string(),
-        });
-
-        self
-    }
-
-    pub fn with_jwt_profile(&mut self, application: Application) -> &mut IntrospectionStateBuilder {
-        self.authentication = Some(AuthorityAuthentication::JWTProfile { application });
-
-        self
-    }
-
-    pub async fn build(&mut self) -> Result<IntrospectionState, IntrospectionStateBuilderError> {
-        if self.authentication.is_none() {
-            return Err(IntrospectionStateBuilderError::NoAuthSchema);
-        }
-
-        let metadata = discover(&self.authority)
-            .await
-            .map_err(|source| IntrospectionStateBuilderError::Discovery { source })?;
-
-        let introspection_uri = metadata
-            .additional_metadata()
-            .introspection_endpoint
-            .clone();
-
-        if introspection_uri.is_none() {
-            return Err(IntrospectionStateBuilderError::NoIntrospectionUrl);
-        }
-
-        Ok(IntrospectionState {
-            config: IntrospectionConfig {
-                authority: self.authority.clone(),
-                introspection_uri: introspection_uri.unwrap(),
-                authentication: self.authentication.as_ref().unwrap().clone(),
-            },
-        })
-    }
-}

como_bin/Cargo.toml

@@ -6,18 +6,34 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-como_gql.workspace = true
+como_gql = { path = "../como_gql" }
-como_core.workspace = true
+como_core = { path = "../como_core" }
-como_domain.workspace = true
+como_domain = { path = "../como_domain" }
-como_infrastructure.workspace = true
+como_infrastructure = { path = "../como_infrastructure" }
-como_api.workspace = true
+como_api = { path = "../como_api" }
 
-
+async-graphql = "4.0.6"
-axum.workspace = true
+async-graphql-axum = "*"
-serde_json.workspace = true
+axum = "0.5.13"
-tokio.workspace = true
+axum-extra = { version = "*", features = ["cookie", "cookie-private"] }
-anyhow.workspace = true
+axum-sessions = { version = "*" }
-dotenv.workspace = true
+serde = { version = "1.0", features = ["derive"] }
-tracing.workspace = true
+serde_json = "1.0.68"
-tracing-subscriber.workspace = true
+tokio = { version = "1.20.1", features = ["full"] }
-clap.workspace = true
+uuid = { version = "1.1.2", features = ["v4", "fast-rng"] }
+sqlx = { version = "0.6", features = [
+  "runtime-tokio-rustls",
+  "postgres",
+  "migrate",
+  "uuid",
+  "offline",
+] }
+anyhow = "1.0.60"
+dotenv = "0.15.0"
+tracing = "0.1.36"
+tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
+tower-http = { version = "0.3.4", features = ["full"] }
+argon2 = "0.4"
+rand_core = { version = "0.6", features = ["std"] }
+cookie = { version = "0.16", features = ["secure", "percent-encode"] }
+clap = { version = "3", features = ["derive", "env"] }

como_bin/src/error.rs

@@ -1,6 +1,7 @@
 use axum::{http::StatusCode, response::IntoResponse, Json};
 use serde_json::json;
 
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum AppError {
     WrongCredentials,

como_bin/src/main.rs

@@ -27,9 +27,9 @@ async fn main() -> anyhow::Result<()> {
 
     let pool = ConnectionPoolManager::new_pool(&config.database_url, true).await?;
 
-    let service_register = ServiceRegister::new(pool, config.clone()).await?;
+    let service_register = ServiceRegister::new(pool, config.clone());
 
-    Api::new(
+    Api::run_api(
         config.api_port,
         &config.cors_origin,
         service_register.clone(),

como_core/Cargo.toml

@@ -6,7 +6,26 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-como_domain.workspace = true
+como_domain = { path = "../como_domain" }
+tokio = { version = "1", features = ["full"] }
+axum = "0.5.1"
 
-async-trait.workspace = true
+# utilty crates
-anyhow.workspace = true
+serde = { version = "1.0.136", features = ["derive"] }
+sqlx = { version = "0.5", features = [
+  "runtime-tokio-rustls",
+  "postgres",
+  "time",
+] }
+serde_json = "1.0.81"
+dotenv = "0.15.0"
+tracing = "0.1"
+tracing-subscriber = "0.3"
+anyhow = "1"
+validator = { version = "0.15", features = ["derive"] }
+async-trait = "0.1"
+thiserror = "1"
+rust-argon2 = "1.0"
+clap = { version = "3", features = ["derive", "env"] }
+mockall = "0.11.1"
+time = "0.2"

como_core/report.json

@@ -1,5 +0,0 @@
-{
-  "version": 0,
-  "root_name": "Workspace",
-  "workspace_crates": {}
-}

como_core/src/items/mod.rs

@@ -1,31 +1,18 @@
 use std::sync::Arc;
 
 use async_trait::async_trait;
-use como_domain::{
+use como_domain::item::{
-    item::{
+    queries::{GetItemQuery, GetItemsQuery},
-        queries::{GetItemQuery, GetItemsQuery},
+    requests::CreateItemDto,
-        requests::{CreateItemDto, UpdateItemDto},
+    responses::CreatedItemDto,
-        responses::CreatedItemDto,
+    ItemDto,
-        ItemDto,
-    },
-    Context,
 };
 
 pub type DynItemService = Arc<dyn ItemService + Send + Sync>;
 
 #[async_trait]
 pub trait ItemService {
-    async fn add_item(
+    async fn add_item(&self, item: CreateItemDto) -> anyhow::Result<CreatedItemDto>;
-        &self,
+    async fn get_item(&self, query: GetItemQuery) -> anyhow::Result<ItemDto>;
-        context: &Context,
+    async fn get_items(&self, query: GetItemsQuery) -> anyhow::Result<Vec<ItemDto>>;
-        item: CreateItemDto,
-    ) -> anyhow::Result<CreatedItemDto>;
-    async fn get_item(&self, context: &Context, query: GetItemQuery) -> anyhow::Result<ItemDto>;
-    async fn get_items(
-        &self,
-        context: &Context,
-        query: GetItemsQuery,
-    ) -> anyhow::Result<Vec<ItemDto>>;
-
-    async fn update_item(&self, context: &Context, item: UpdateItemDto) -> anyhow::Result<ItemDto>;
 }

como_core/src/projects/mod.rs

@@ -1,24 +1,15 @@
 use std::sync::Arc;
 
 use async_trait::async_trait;
-use como_domain::{
+use como_domain::projects::{
-    projects::{mutation::CreateProjectMutation, queries::GetProjectQuery, ProjectDto},
+    queries::{GetProjectQuery, GetProjectsQuery},
-    Context,
+    ProjectDto,
 };
 
 pub type DynProjectService = Arc<dyn ProjectService + Send + Sync>;
 
 #[async_trait]
 pub trait ProjectService {
-    async fn get_project(
+    async fn get_project(&self, query: GetProjectQuery) -> anyhow::Result<ProjectDto>;
-        &self,
+    async fn get_projects(&self, query: GetProjectsQuery) -> anyhow::Result<Vec<ProjectDto>>;
-        context: &Context,
-        query: GetProjectQuery,
-    ) -> anyhow::Result<ProjectDto>;
-    async fn get_projects(&self, context: &Context) -> anyhow::Result<Vec<ProjectDto>>;
-    async fn create_project(
-        &self,
-        context: &Context,
-        name: CreateProjectMutation,
-    ) -> anyhow::Result<ProjectDto>;
 }

como_core/src/users/mod.rs

@@ -1,21 +1,14 @@
 use std::sync::Arc;
 
 use async_trait::async_trait;
-use como_domain::Context;
 
 pub type DynUserService = Arc<dyn UserService + Send + Sync>;
 
 #[async_trait]
 pub trait UserService {
-    async fn add_user(
+    async fn add_user(&self, username: String, password: String) -> anyhow::Result<String>;
-        &self,
-        context: &Context,
-        username: String,
-        password: String,
-    ) -> anyhow::Result<String>;
     async fn validate_user(
         &self,
-        context: &Context,
         username: String,
         password: String,
     ) -> anyhow::Result<Option<String>>;

como_domain/Cargo.toml

@@ -6,7 +6,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-async-graphql.workspace = true
+async-graphql = { version = "4.0.6", features = ["uuid"] }
-serde.workspace = true
+anyhow = "1.0.60"
-serde_json.workspace = true
+serde = { version = "1.0", features = ["derive"] }
-uuid.workspace = true
+serde_json = "1.0.68"
+uuid = { version = "1.1.2", features = ["v4", "fast-rng", "serde"] }

como_domain/src/common/mod.rs

@@ -1,37 +0,0 @@
-pub mod user;
-
-use std::collections::BTreeMap;
-
-#[derive(Debug, Clone)]
-pub struct Context {
-    values: BTreeMap<String, String>,
-}
-
-impl Context {
-    pub fn new() -> Self {
-        Self {
-            values: Default::default(),
-        }
-    }
-
-    pub fn with_value(&self, key: impl Into<String>, value: impl Into<String>) -> Self {
-        let mut values = self.values.clone();
-
-        let _ = values.insert(key.into(), value.into());
-
-        Self { values }
-    }
-
-    pub fn with_value_mut(
-        &mut self,
-        key: impl Into<String>,
-        value: impl Into<String>,
-    ) -> &mut Self {
-        self.values.insert(key.into(), value.into());
-        self
-    }
-
-    pub fn get(&self, key: impl AsRef<str>) -> Option<&str> {
-        self.values.get(key.as_ref()).map(|s| s.as_str())
-    }
-}

como_domain/src/common/user.rs

@@ -1,23 +0,0 @@
-use crate::Context;
-
-pub trait ContextUserExt {
-    fn set_user_id(&self, user_id: impl Into<String>) -> Context;
-    fn set_user_id_mut(&mut self, user_id: impl Into<String>) -> &mut Context;
-    fn get_user_id(&self) -> Option<String>;
-}
-
-const USER_ID_KEY: &str = "user_id";
-
-impl ContextUserExt for Context {
-    fn set_user_id(&self, user_id: impl Into<String>) -> Context {
-        self.with_value(USER_ID_KEY, user_id)
-    }
-
-    fn set_user_id_mut(&mut self, user_id: impl Into<String>) -> &mut Context {
-        self.with_value_mut(USER_ID_KEY, user_id)
-    }
-
-    fn get_user_id(&self) -> Option<String> {
-        self.get(USER_ID_KEY).map(|s| s.to_string())
-    }
-}

como_domain/src/item/mod.rs

@@ -20,5 +20,4 @@ pub struct ItemDto {
     pub title: String,
     pub description: Option<String>,
     pub state: ItemState,
-    pub project_id: Uuid,
 }

como_domain/src/item/queries.rs

@@ -9,5 +9,5 @@ pub struct GetItemQuery {
 
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, InputObject)]
 pub struct GetItemsQuery {
-    pub project_id: Uuid,
+    pub user_id: Uuid,
 }

como_domain/src/item/requests.rs

@@ -1,21 +1,7 @@
 use async_graphql::InputObject;
 use serde::{Deserialize, Serialize};
-use uuid::Uuid;
-
-use super::ItemState;
 
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, InputObject)]
 pub struct CreateItemDto {
-    pub title: String,
+    pub name: String,
-    pub description: Option<String>,
-    pub project_id: Uuid,
-}
-
-#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, InputObject)]
-pub struct UpdateItemDto {
-    pub id: Uuid,
-    pub title: Option<String>,
-    pub description: Option<String>,
-    pub state: Option<ItemState>,
-    pub project_id: Option<Uuid>,
 }

como_domain/src/lib.rs

@@ -1,6 +1,3 @@
-pub mod common;
 pub mod item;
 pub mod projects;
 pub mod users;
-
-pub use common::*;

como_domain/src/projects/mod.rs

@@ -1,4 +1,3 @@
-pub mod mutation;
 pub mod queries;
 pub mod requests;
 pub mod responses;
@@ -11,7 +10,4 @@ use uuid::Uuid;
 pub struct ProjectDto {
     pub id: Uuid,
     pub name: String,
-    pub description: Option<String>,
-
-    pub user_id: String,
 }

como_domain/src/projects/mutation.rs

@@ -1,8 +0,0 @@
-use async_graphql::InputObject;
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, InputObject)]
-pub struct CreateProjectMutation {
-    pub name: String,
-    pub description: Option<String>,
-}

como_domain/src/projects/queries.rs

@@ -4,5 +4,11 @@ use uuid::Uuid;
 
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, InputObject)]
 pub struct GetProjectQuery {
-    pub project_id: Uuid,
+    pub project_id: Option<Uuid>,
+    pub item_id: Option<Uuid>,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, InputObject)]
+pub struct GetProjectsQuery {
+    pub user_id: Uuid,
 }

como_domain/src/users/mod.rs

@@ -10,8 +10,3 @@ pub struct UserDto {
     pub username: String,
     pub email: String,
 }
-
-#[derive(Serialize, Deserialize, Clone, Debug)]
-pub struct User {
-    pub id: String,
-}

como_gql/Cargo.toml

@@ -6,11 +6,31 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-como_core.workspace = true
+como_core = { path = "../como_core" }
-como_domain.workspace = true
+como_domain = { path = "../como_domain" }
-como_infrastructure.workspace = true
+como_infrastructure = { path = "../como_infrastructure" }
 
-anyhow.workspace = true
+async-graphql = "4.0.6"
-async-trait.workspace = true
+async-graphql-axum = "*"
-async-graphql.workspace = true
+axum = "0.5.13"
-uuid.workspace = true
+axum-extra = { version = "*", features = ["cookie", "cookie-private"] }
+axum-sessions = { version = "*" }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0.68"
+tokio = { version = "1.20.1", features = ["full"] }
+uuid = { version = "1.1.2", features = ["v4", "fast-rng"] }
+sqlx = { version = "0.6", features = [
+  "runtime-tokio-rustls",
+  "postgres",
+  "migrate",
+  "uuid",
+  "offline",
+] }
+anyhow = "1.0.60"
+dotenv = "0.15.0"
+tracing = "0.1.36"
+tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
+tower-http = { version = "0.3.4", features = ["full"] }
+argon2 = "0.4"
+rand_core = { version = "0.6", features = ["std"] }
+cookie = { version = "0.16", features = ["secure", "percent-encode"] }

como_gql/src/graphql.rs

@@ -1,12 +1,18 @@
-use crate::common::*;
-use crate::items::{CreatedItem, Item};
-use crate::projects::Project;
 use async_graphql::{Context, EmptySubscription, Object, Schema};
-use como_domain::item::queries::{GetItemQuery, GetItemsQuery};
+
-use como_domain::item::requests::{CreateItemDto, UpdateItemDto};
+use como_domain::{
-use como_domain::projects::mutation::CreateProjectMutation;
+    item::{
-use como_domain::projects::queries::GetProjectQuery;
+        queries::{GetItemQuery, GetItemsQuery},
-use como_domain::projects::ProjectDto;
+        requests::CreateItemDto,
+    },
+    projects::{
+        queries::{GetProjectQuery, GetProjectsQuery},
+        ProjectDto,
+    },
+};
+use como_infrastructure::register::ServiceRegister;
+
+use crate::items::{CreatedItem, Item};
 
 pub type ComoSchema = Schema<QueryRoot, MutationRoot, EmptySubscription>;
 
@@ -14,48 +20,67 @@ pub struct MutationRoot;
 
 #[Object]
 impl MutationRoot {
+    async fn login(
+        &self,
+        ctx: &Context<'_>,
+        username: String,
+        password: String,
+    ) -> anyhow::Result<bool> {
+        let service_register = ctx.data_unchecked::<ServiceRegister>();
+
+        let valid = service_register
+            .user_service
+            .validate_user(username, password)
+            .await?;
+        let returnvalid = match valid {
+            Some(..) => true,
+            None => false,
+        };
+
+        Ok(returnvalid)
+    }
+
+    async fn register(
+        &self,
+        ctx: &Context<'_>,
+        username: String,
+        password: String,
+    ) -> anyhow::Result<String> {
+        let service_register = ctx.data_unchecked::<ServiceRegister>();
+
+        let user_id = service_register
+            .user_service
+            .add_user(username, password)
+            .await?;
+
+        Ok(user_id)
+    }
+
     async fn create_item(
         &self,
         ctx: &Context<'_>,
         item: CreateItemDto,
     ) -> anyhow::Result<CreatedItem> {
-        let created_item = item_service(ctx)
+        let services_register = ctx.data_unchecked::<ServiceRegister>();
-            .add_item(get_domain_context(ctx), item)
+
-            .await?;
+        let created_item = services_register.item_service.add_item(item).await?;
 
         Ok(CreatedItem {
             id: created_item.id,
         })
     }
-
-    async fn create_project(
-        &self,
-        ctx: &Context<'_>,
-        request: CreateProjectMutation,
-    ) -> anyhow::Result<ProjectDto> {
-        let project = project_service(ctx)
-            .create_project(get_domain_context(ctx), request)
-            .await?;
-
-        Ok(project)
-    }
-
-    async fn update_item(&self, ctx: &Context<'_>, item: UpdateItemDto) -> anyhow::Result<Item> {
-        let updated_item = item_service(ctx)
-            .update_item(get_domain_context(ctx), item)
-            .await?;
-
-        Ok(updated_item.into())
-    }
 }
 
 pub struct QueryRoot;
 
 #[Object]
 impl QueryRoot {
+    // Items
     async fn get_item(&self, ctx: &Context<'_>, query: GetItemQuery) -> anyhow::Result<Item> {
-        let item = item_service(ctx)
+        let item = ctx
-            .get_item(get_domain_context(ctx), query)
+            .data_unchecked::<ServiceRegister>()
+            .item_service
+            .get_item(query)
             .await?;
 
         Ok(Item::from(item))
@@ -66,8 +91,10 @@ impl QueryRoot {
         ctx: &Context<'_>,
         query: GetItemsQuery,
     ) -> anyhow::Result<Vec<Item>> {
-        let items = item_service(ctx)
+        let items = ctx
-            .get_items(get_domain_context(ctx), query)
+            .data_unchecked::<ServiceRegister>()
+            .item_service
+            .get_items(query)
             .await?;
 
         Ok(items.iter().map(|i| Item::from(i.clone())).collect())
@@ -78,17 +105,21 @@ impl QueryRoot {
         &self,
         ctx: &Context<'_>,
         query: GetProjectQuery,
-    ) -> anyhow::Result<Project> {
+    ) -> anyhow::Result<ProjectDto> {
-        project_service(ctx)
+        ctx.data_unchecked::<ServiceRegister>()
-            .get_project(get_domain_context(ctx), query)
+            .project_service
+            .get_project(query)
             .await
-            .map(|p| p.into())
     }
 
-    async fn get_projects(&self, ctx: &Context<'_>) -> anyhow::Result<Vec<Project>> {
+    async fn get_projects(
-        project_service(ctx)
+        &self,
-            .get_projects(get_domain_context(ctx))
+        ctx: &Context<'_>,
+        query: GetProjectsQuery,
+    ) -> anyhow::Result<Vec<ProjectDto>> {
+        ctx.data_unchecked::<ServiceRegister>()
+            .project_service
+            .get_projects(query)
             .await
-            .map(|p| p.into_iter().map(|p| p.into()).collect())
     }
 }

como_gql/src/items.rs

@@ -1,9 +1,9 @@
-use crate::common::*;
 use async_graphql::{Context, Object};
 use como_domain::{
     item::{queries::GetItemQuery, ItemDto, ItemState},
     projects::queries::GetProjectQuery,
 };
+use como_infrastructure::register::ServiceRegister;
 use uuid::Uuid;
 
 use crate::projects::Project;
@@ -15,8 +15,10 @@ pub struct CreatedItem {
 #[Object]
 impl CreatedItem {
     pub async fn item(&self, ctx: &Context<'_>) -> anyhow::Result<Item> {
-        let item = item_service(ctx)
+        let item = ctx
-            .get_item(get_domain_context(ctx), GetItemQuery { item_id: self.id })
+            .data_unchecked::<ServiceRegister>()
+            .item_service
+            .get_item(GetItemQuery { item_id: self.id })
             .await?;
 
         Ok(item.into())
@@ -28,43 +30,38 @@ pub struct Item {
     pub title: String,
     pub description: Option<String>,
     pub state: ItemState,
-    pub project_id: Uuid,
 }
 
 #[Object]
 impl Item {
     pub async fn id(&self, _ctx: &Context<'_>) -> anyhow::Result<Uuid> {
-        return Ok(self.id);
+        Ok(self.id)
     }
 
     pub async fn title(&self, _ctx: &Context<'_>) -> anyhow::Result<String> {
-        return Ok(self.title.clone());
+        Ok(self.title.clone())
     }
 
     pub async fn description(&self, _ctx: &Context<'_>) -> anyhow::Result<Option<String>> {
-        return Ok(self.description.clone());
+        Ok(self.description.clone())
     }
 
     pub async fn state(&self, _ctx: &Context<'_>) -> anyhow::Result<ItemState> {
-        return Ok(self.state);
+        Ok(self.state)
     }
 
     pub async fn project(&self, ctx: &Context<'_>) -> anyhow::Result<Project> {
-        let project = project_service(ctx)
+        let project = ctx
-            .get_project(
+            .data_unchecked::<ServiceRegister>()
-                get_domain_context(ctx),
+            .project_service
-                GetProjectQuery {
+            .get_project(GetProjectQuery {
-                    project_id: self.project_id,
+                item_id: Some(self.id),
-                },
+                project_id: None,
-            )
+            })
             .await?;
 
         Ok(project.into())
     }
-
-    pub async fn project_id(&self, _ctx: &Context<'_>) -> anyhow::Result<Uuid> {
-        return Ok(self.project_id);
-    }
 }
 
 impl From<ItemDto> for Item {
@@ -74,7 +71,6 @@ impl From<ItemDto> for Item {
             title: dto.title,
             description: dto.description,
             state: dto.state,
-            project_id: dto.project_id,
         }
     }
 }

como_gql/src/lib.rs

@@ -1,33 +1,26 @@
+use async_graphql_axum::{GraphQLRequest, GraphQLResponse};
+use axum::{
+    extract::Extension,
+    http::StatusCode,
+    response::{Html, IntoResponse},
+};
+
+use async_graphql::http::{playground_source, GraphQLPlaygroundConfig};
+use graphql::ComoSchema;
+
 pub mod graphql;
 mod items;
 mod projects;
 
-pub mod common {
+pub async fn graphql_handler(
-    use async_graphql::Context;
+    schema: Extension<ComoSchema>,
-    use como_core::items::DynItemService;
+    req: GraphQLRequest,
-    use como_core::projects::DynProjectService;
+) -> Result<GraphQLResponse, StatusCode> {
-    use como_infrastructure::register::ServiceRegister;
+    let req = req.into_inner();
 
-    #[inline(always)]
+    Ok(schema.execute(req).await.into())
-    pub(crate) fn get_domain_context<'a>(ctx: &Context<'a>) -> &'a como_domain::Context {
+}
-        ctx.data_unchecked::<como_domain::Context>()
+
-    }
+pub async fn graphql_playground() -> impl IntoResponse {
-
+    Html(playground_source(GraphQLPlaygroundConfig::new("/graphql")))
-    #[allow(dead_code)]
-    #[inline(always)]
-    pub(crate) fn get_service_register<'a>(ctx: &Context<'a>) -> &'a ServiceRegister {
-        ctx.data_unchecked::<ServiceRegister>()
-    }
-
-    #[inline(always)]
-    pub(crate) fn project_service<'a>(ctx: &Context<'a>) -> DynProjectService {
-        ctx.data_unchecked::<ServiceRegister>()
-            .project_service
-            .clone()
-    }
-
-    #[inline(always)]
-    pub(crate) fn item_service<'a>(ctx: &Context<'a>) -> DynItemService {
-        ctx.data_unchecked::<ServiceRegister>().item_service.clone()
-    }
 }

como_gql/src/projects.rs

@@ -1,43 +1,13 @@
-use crate::common::*;
+use async_graphql::SimpleObject;
-use async_graphql::{Context, Object};
 use como_domain::projects::ProjectDto;
-
 use uuid::Uuid;
 
-use crate::items::Item;
+#[derive(SimpleObject)]
-
 pub struct Project {
     pub id: Uuid,
     pub name: String,
 }
 
-#[Object]
-impl Project {
-    async fn id(&self) -> &Uuid {
-        &self.id
-    }
-
-    async fn name(&self) -> &String {
-        &self.name
-    }
-
-    async fn items(&self, ctx: &Context<'_>) -> anyhow::Result<Vec<Item>> {
-        let items = item_service(ctx)
-            .get_items(
-                get_domain_context(ctx),
-                como_domain::item::queries::GetItemsQuery {
-                    project_id: self.id,
-                },
-            )
-            .await?
-            .iter()
-            .map(|i| Item::from(i.clone()))
-            .collect::<Vec<_>>();
-
-        Ok(items)
-    }
-}
-
 impl From<ProjectDto> for Project {
     fn from(dto: ProjectDto) -> Self {
         Self {

como_infrastructure/Cargo.toml

@@ -6,22 +6,31 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-como_core.workspace = true
+como_core = { path = "../como_core" }
-como_domain.workspace = true
+como_domain = { path = "../como_domain" }
 
-
+async-graphql = "4.0.6"
-axum.workspace = true
+async-graphql-axum = "*"
-async-trait.workspace = true
+axum = "0.5.13"
-uuid.workspace = true
+axum-extra = { version = "*", features = ["cookie", "cookie-private"] }
-anyhow.workspace = true
+axum-sessions = { version = "*" }
-sqlx.workspace = true
+serde = { version = "1.0", features = ["derive"] }
-chrono.workspace = true
+serde_json = "1.0.68"
-serde_json.workspace = true
+tokio = { version = "1.20.1", features = ["full"] }
-
+uuid = { version = "1.1.2", features = ["v4", "fast-rng"] }
-async-sqlx-session.workspace = true
+sqlx = { version = "0.6", features = [
-
+  "runtime-tokio-rustls",
-tokio.workspace = true
+  "postgres",
-clap.workspace = true
+  "migrate",
-tracing.workspace = true
+  "uuid",
-argon2.workspace = true
+  "offline",
-rand_core.workspace = true
+] }
+anyhow = "1.0.60"
+dotenv = "0.15.0"
+tracing = "0.1.36"
+tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
+tower-http = { version = "0.3.4", features = ["full"] }
+argon2 = "0.4"
+rand_core = { version = "0.6", features = ["std"] }
+cookie = { version = "0.16", features = ["secure", "percent-encode"] }
+clap = { version = "3", features = ["derive", "env"] }

como_infrastructure/build.rs

@@ -1,9 +0,0 @@
-fn main() {
-    println!("cargo:rustc-env=SQLX_OFFLINE_DIR='./.sqlx'");
-    // When building in docs.rs, we want to set SQLX_OFFLINE mode to true
-    if std::env::var_os("DOCS_RS").is_some() {
-        println!("cargo:rustc-env=SQLX_OFFLINE=true");
-    } else if std::env::var_os("DOCKER_BUILD").is_some() {
-        println!("cargo:rustc-env=SQLX_OFFLINE=true");
-    }
-}

como_infrastructure/migrations/20230528154039_with-project.sql

@@ -1,10 +0,0 @@
--- Add migration script here
-
-CREATE TABLE IF NOT EXISTS projects (
-  id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-  name varchar not null,
-  description varchar default null,
-  user_id varchar not null,
-  created_at timestamp not null,
-  updated_at timestamp not null
-);

como_infrastructure/migrations/20230603152353_items.sql

@@ -1,17 +0,0 @@
--- Add migration script here
-
-create table if not exists items (
-  id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-  title varchar not null,
-  description varchar default null,
-  state integer not null,
-  user_id varchar not null,
-  project_id UUID not null,
-  created_at timestamp not null,
-  updated_at timestamp not null,
-  CONSTRAINT fk_project
-    FOREIGN KEY(project_id)
-      REFERENCES projects(id)
-        ON DELETE CASCADE
-)
-

como_infrastructure/migrations/20230604084033_alter_state_string.sql

@@ -1,4 +0,0 @@
--- Add migration script here
-
-ALTER TABLE items ALTER COLUMN state TYPE varchar(255);
-

como_infrastructure/sqlx-data.json

@@ -1,346 +0,0 @@
-{
-  "db": "PostgreSQL",
-  "05d0a7901f0481d7443f125655df26eeacd63f2b023723a0c09c662617e0baf5": {
-    "describe": {
-      "columns": [
-        {
-          "name": "id",
-          "ordinal": 0,
-          "type_info": "Uuid"
-        },
-        {
-          "name": "title",
-          "ordinal": 1,
-          "type_info": "Varchar"
-        },
-        {
-          "name": "description",
-          "ordinal": 2,
-          "type_info": "Varchar"
-        },
-        {
-          "name": "state",
-          "ordinal": 3,
-          "type_info": "Varchar"
-        },
-        {
-          "name": "project_id",
-          "ordinal": 4,
-          "type_info": "Uuid"
-        }
-      ],
-      "nullable": [
-        false,
-        false,
-        true,
-        false,
-        false
-      ],
-      "parameters": {
-        "Left": [
-          "Uuid",
-          "Text"
-        ]
-      }
-    },
-    "query": "\n            SELECT id, title, description, state, project_id\n            FROM items\n            WHERE id = $1 AND user_id = $2\n            "
-  },
-  "3b4484c5ccfd4dcb887c4e978fe6e45d4c9ecc2a73909be207dced79ddf17d87": {
-    "describe": {
-      "columns": [
-        {
-          "name": "id",
-          "ordinal": 0,
-          "type_info": "Uuid"
-        }
-      ],
-      "nullable": [
-        false
-      ],
-      "parameters": {
-        "Left": [
-          "Varchar",
-          "Varchar"
-        ]
-      }
-    },
-    "query": "\n            INSERT INTO users (username, password_hash) \n            VALUES ( $1, $2 ) \n            RETURNING id\n            "
-  },
-  "4ec32ebd0ee991cec625d9de51de0d3e0ddfc8afda0568327fa9c818bde08e1f": {
-    "describe": {
-      "columns": [
-        {
-          "name": "id",
-          "ordinal": 0,
-          "type_info": "Uuid"
-        }
-      ],
-      "nullable": [
-        false
-      ],
-      "parameters": {
-        "Left": [
-          "Uuid",
-          "Varchar",
-          "Varchar",
-          "Varchar",
-          "Timestamp",
-          "Timestamp"
-        ]
-      }
-    },
-    "query": "\n            INSERT INTO projects (id, name, description, user_id, created_at, updated_at)\n            VALUES ($1, $2, $3, $4, $5, $6)\n            RETURNING id\n            "
-  },
-  "7901e81b1f1f08f0c7e72a967a8116efb62f40d99f80900f1e56cd13ad4f6bb2": {
-    "describe": {
-      "columns": [
-        {
-          "name": "id",
-          "ordinal": 0,
-          "type_info": "Uuid"
-        },
-        {
-          "name": "title",
-          "ordinal": 1,
-          "type_info": "Varchar"
-        },
-        {
-          "name": "description",
-          "ordinal": 2,
-          "type_info": "Varchar"
-        },
-        {
-          "name": "state",
-          "ordinal": 3,
-          "type_info": "Varchar"
-        },
-        {
-          "name": "project_id",
-          "ordinal": 4,
-          "type_info": "Uuid"
-        }
-      ],
-      "nullable": [
-        false,
-        false,
-        true,
-        false,
-        false
-      ],
-      "parameters": {
-        "Left": [
-          "Uuid",
-          "Varchar",
-          "Varchar",
-          "Varchar",
-          "Uuid",
-          "Varchar"
-        ]
-      }
-    },
-    "query": "\n            INSERT INTO items (id, title, description, state, project_id, user_id, created_at, updated_at)\n            VALUES ($1, $2, $3, $4, $5, $6, now(), now())\n            RETURNING id, title, description, state, project_id\n            "
-  },
-  "a188dc748025cf3311820d16002b111a75f571d18f44f54b730ac14e9b2e10ea": {
-    "describe": {
-      "columns": [
-        {
-          "name": "id",
-          "ordinal": 0,
-          "type_info": "Uuid"
-        },
-        {
-          "name": "name",
-          "ordinal": 1,
-          "type_info": "Varchar"
-        },
-        {
-          "name": "description",
-          "ordinal": 2,
-          "type_info": "Varchar"
-        },
-        {
-          "name": "user_id",
-          "ordinal": 3,
-          "type_info": "Varchar"
-        }
-      ],
-      "nullable": [
-        false,
-        false,
-        true,
-        false
-      ],
-      "parameters": {
-        "Left": [
-          "Uuid",
-          "Text"
-        ]
-      }
-    },
-    "query": "\n            SELECT id, name, description, user_id\n            FROM projects\n            WHERE id = $1 and user_id = $2\n            "
-  },
-  "b930a7123d22d543e4d8ed70a1bc10477362127969ceca9653e445f26670003a": {
-    "describe": {
-      "columns": [
-        {
-          "name": "id",
-          "ordinal": 0,
-          "type_info": "Uuid"
-        },
-        {
-          "name": "name",
-          "ordinal": 1,
-          "type_info": "Varchar"
-        },
-        {
-          "name": "description",
-          "ordinal": 2,
-          "type_info": "Varchar"
-        },
-        {
-          "name": "user_id",
-          "ordinal": 3,
-          "type_info": "Varchar"
-        }
-      ],
-      "nullable": [
-        false,
-        false,
-        true,
-        false
-      ],
-      "parameters": {
-        "Left": [
-          "Text"
-        ]
-      }
-    },
-    "query": "\n            SELECT id, name, description, user_id\n            FROM projects\n            WHERE user_id = $1\n            LIMIT 500\n            "
-  },
-  "bacf3c8a2f302d50991483fa36a06965c3536c2ef3837c19c6e6361eff312848": {
-    "describe": {
-      "columns": [
-        {
-          "name": "id",
-          "ordinal": 0,
-          "type_info": "Uuid"
-        },
-        {
-          "name": "title",
-          "ordinal": 1,
-          "type_info": "Varchar"
-        },
-        {
-          "name": "description",
-          "ordinal": 2,
-          "type_info": "Varchar"
-        },
-        {
-          "name": "state",
-          "ordinal": 3,
-          "type_info": "Varchar"
-        },
-        {
-          "name": "project_id",
-          "ordinal": 4,
-          "type_info": "Uuid"
-        }
-      ],
-      "nullable": [
-        false,
-        false,
-        true,
-        false,
-        false
-      ],
-      "parameters": {
-        "Left": [
-          "Varchar",
-          "Varchar",
-          "Varchar",
-          "Uuid",
-          "Uuid",
-          "Text"
-        ]
-      }
-    },
-    "query": "\n            UPDATE items\n            SET \n                title = COALESCE($1, title), \n                description = COALESCE($2, description), \n                state = COALESCE($3, state), \n                project_id = COALESCE($4, project_id), \n                updated_at = now()\n            WHERE id = $5 AND user_id = $6\n            RETURNING id, title, description, state, project_id\n            "
-  },
-  "bd2407ffb9637afcff3ffe1101e7c1920b8cf0be423ab0313d14acc9c76e0f93": {
-    "describe": {
-      "columns": [
-        {
-          "name": "id",
-          "ordinal": 0,
-          "type_info": "Uuid"
-        },
-        {
-          "name": "title",
-          "ordinal": 1,
-          "type_info": "Varchar"
-        },
-        {
-          "name": "description",
-          "ordinal": 2,
-          "type_info": "Varchar"
-        },
-        {
-          "name": "state",
-          "ordinal": 3,
-          "type_info": "Varchar"
-        },
-        {
-          "name": "project_id",
-          "ordinal": 4,
-          "type_info": "Uuid"
-        }
-      ],
-      "nullable": [
-        false,
-        false,
-        true,
-        false,
-        false
-      ],
-      "parameters": {
-        "Left": [
-          "Text",
-          "Uuid"
-        ]
-      }
-    },
-    "query": "\n            SELECT id, title, description, state, project_id\n            FROM items\n            WHERE user_id = $1 and project_id = $2\n            LIMIT 500\n            "
-  },
-  "d3f222cf6c3d9816705426fdbed3b13cb575bb432eb1f33676c0b414e67aecaf": {
-    "describe": {
-      "columns": [
-        {
-          "name": "id",
-          "ordinal": 0,
-          "type_info": "Uuid"
-        },
-        {
-          "name": "username",
-          "ordinal": 1,
-          "type_info": "Varchar"
-        },
-        {
-          "name": "password_hash",
-          "ordinal": 2,
-          "type_info": "Varchar"
-        }
-      ],
-      "nullable": [
-        false,
-        false,
-        false
-      ],
-      "parameters": {
-        "Left": [
-          "Text"
-        ]
-      }
-    },
-    "query": "\n            SELECT * from users\n            where username=$1\n            "
-  }
-}

como_infrastructure/src/configs/mod.rs

@@ -1,27 +1,17 @@
-use clap::ValueEnum;
-
 #[derive(clap::Parser)]
 pub struct AppConfig {
     #[clap(long, env)]
     pub database_url: String,
-    #[clap(long, env, default_value = "postgres")]
-    pub database_type: DatabaseType,
     #[clap(long, env)]
     pub rust_log: String,
     #[clap(long, env)]
     pub token_secret: String,
-    #[clap(long, env, default_value = "3001")]
+    #[clap(long, env)]
     pub api_port: u32,
-    #[clap(long, env, default_value = "true")]
+    #[clap(long, env)]
     pub run_migrations: bool,
-    #[clap(long, env, default_value = "false")]
+    #[clap(long, env)]
     pub seed: bool,
     #[clap(long, env)]
     pub cors_origin: String,
 }
-
-#[derive(Clone, Debug, ValueEnum)]
-pub enum DatabaseType {
-    Postgres,
-    InMemory,
-}

como_infrastructure/src/register.rs

@@ -1,15 +1,13 @@
 use std::sync::Arc;
 
-use async_sqlx_session::PostgresSessionStore;
 use como_core::{items::DynItemService, projects::DynProjectService, users::DynUserService};
 use tracing::log::info;
 
 use crate::{
-    configs::{AppConfig, DatabaseType},
+    configs::AppConfig,
     database::ConnectionPool,
     services::{
-        item_service::{DefaultItemService, MemoryItemService},
+        item_service::MemoryItemService, project_service::MemoryProjectService,
-        project_service::{DefaultProjectService, MemoryProjectService},
         user_service::DefaultUserService,
     },
 };
@@ -19,49 +17,22 @@ pub struct ServiceRegister {
     pub item_service: DynItemService,
     pub project_service: DynProjectService,
     pub user_service: DynUserService,
-    pub session_store: PostgresSessionStore,
 }
 
 impl ServiceRegister {
-    pub async fn new(pool: ConnectionPool, config: Arc<AppConfig>) -> anyhow::Result<Self> {
+    pub fn new(pool: ConnectionPool, _config: Arc<AppConfig>) -> Self {
         info!("creating services");
 
-        let s = match config.database_type {
+        let item_service = Arc::new(MemoryItemService::new()) as DynItemService;
-            DatabaseType::Postgres => {
+        let project_service = Arc::new(MemoryProjectService::new()) as DynProjectService;
-                let item_service =
+        let user_service = Arc::new(DefaultUserService::new(pool)) as DynUserService;
-                    Arc::new(DefaultItemService::new(pool.clone())) as DynItemService;
-                let project_service =
-                    Arc::new(DefaultProjectService::new(pool.clone())) as DynProjectService;
-                let user_service =
-                    Arc::new(DefaultUserService::new(pool.clone())) as DynUserService;
-                let store = PostgresSessionStore::new(&config.database_url).await?;
-                store.migrate().await?;
 
-                Self {
-                    item_service,
-                    user_service,
-                    project_service,
-                    session_store: store,
-                }
-            }
-            DatabaseType::InMemory => {
-                let item_service = Arc::new(MemoryItemService::new()) as DynItemService;
-                let project_service = Arc::new(MemoryProjectService::new()) as DynProjectService;
-                let user_service =
-                    Arc::new(DefaultUserService::new(pool.clone())) as DynUserService;
-                let store = PostgresSessionStore::new(&config.database_url).await?;
-                store.migrate().await?;
-
-                Self {
-                    item_service,
-                    user_service,
-                    project_service,
-                    session_store: store,
-                }
-            }
-        };
         info!("services created succesfully");
 
-        Ok(s)
+        Self {
+            item_service,
+            user_service,
+            project_service,
+        }
     }
 }

como_infrastructure/src/repositories/mod.rs

@@ -1 +0,0 @@
-

como_infrastructure/src/services/item_service.rs

@@ -1,158 +1,45 @@
-use crate::database::ConnectionPool;
-use async_trait::async_trait;
-use como_core::items::ItemService;
-use como_domain::{
-    item::{
-        queries::{GetItemQuery, GetItemsQuery},
-        requests::{CreateItemDto, UpdateItemDto},
-        responses::CreatedItemDto,
-        ItemDto,
-    },
-    user::ContextUserExt,
-    Context,
-};
 use std::{
     collections::HashMap,
     sync::{Arc, Mutex},
 };
+
+use anyhow::Context;
+use axum::async_trait;
+use como_core::items::ItemService;
+use como_domain::item::{
+    queries::{GetItemQuery, GetItemsQuery},
+    requests::CreateItemDto,
+    responses::CreatedItemDto,
+    ItemDto,
+};
 use uuid::Uuid;
 
-pub struct DefaultItemService {
+pub struct DefaultItemService {}
-    pool: ConnectionPool,
-}
 
 impl DefaultItemService {
-    pub fn new(connection_pool: ConnectionPool) -> Self {
+    pub fn new() -> Self {
-        Self {
+        Self {}
-            pool: connection_pool,
+    }
-        }
+}
+
+impl Default for DefaultItemService {
+    fn default() -> Self {
+        Self::new()
     }
 }
 
 #[async_trait]
 impl ItemService for DefaultItemService {
-    async fn add_item(
+    async fn add_item(&self, _item: CreateItemDto) -> anyhow::Result<CreatedItemDto> {
-        &self,
+        todo!()
-        context: &Context,
-        item: CreateItemDto,
-    ) -> anyhow::Result<CreatedItemDto> {
-        let state = serde_json::to_string(&como_domain::item::ItemState::Created {})?;
-        let user_id = context.get_user_id().ok_or(anyhow::anyhow!("no user id"))?;
-
-        let rec = sqlx::query!(
-            r#"
-            INSERT INTO items (id, title, description, state, project_id, user_id, created_at, updated_at)
-            VALUES ($1, $2, $3, $4, $5, $6, now(), now())
-            RETURNING id, title, description, state, project_id
-            "#,
-            Uuid::new_v4(),
-            item.title,
-            item.description,
-            state,
-            item.project_id,
-            user_id,
-        )
-        .fetch_one(&self.pool)
-        .await?;
-
-        Ok(CreatedItemDto {
-            id: rec.id,
-            title: rec.title,
-            description: rec.description,
-            state: como_domain::item::ItemState::Created {},
-            project_id: rec.project_id,
-        })
     }
 
-    async fn get_item(&self, context: &Context, query: GetItemQuery) -> anyhow::Result<ItemDto> {
+    async fn get_item(&self, _query: GetItemQuery) -> anyhow::Result<ItemDto> {
-        let user_id = context.get_user_id().ok_or(anyhow::anyhow!("no user id"))?;
+        todo!()
-
-        let rec = sqlx::query!(
-            r#"
-            SELECT id, title, description, state, project_id
-            FROM items
-            WHERE id = $1 AND user_id = $2
-            "#,
-            query.item_id,
-            user_id,
-        )
-        .fetch_one(&self.pool)
-        .await?;
-
-        Ok(ItemDto {
-            id: rec.id,
-            title: rec.title,
-            description: rec.description,
-            state: serde_json::from_str(&rec.state)?,
-            project_id: rec.project_id,
-        })
     }
 
-    async fn get_items(
+    async fn get_items(&self, _query: GetItemsQuery) -> anyhow::Result<Vec<ItemDto>> {
-        &self,
+        todo!()
-        context: &Context,
-        query: GetItemsQuery,
-    ) -> anyhow::Result<Vec<ItemDto>> {
-        let user_id = context.get_user_id().ok_or(anyhow::anyhow!("no user id"))?;
-
-        let recs = sqlx::query!(
-            r#"
-            SELECT id, title, description, state, project_id
-            FROM items
-            WHERE user_id = $1 and project_id = $2
-            LIMIT 500
-            "#,
-            user_id,
-            query.project_id,
-        )
-        .fetch_all(&self.pool)
-        .await?;
-
-        Ok(recs
-            .into_iter()
-            .map(|rec| ItemDto {
-                id: rec.id,
-                title: rec.title,
-                description: rec.description,
-                state: serde_json::from_str(&rec.state).unwrap(),
-                project_id: rec.project_id,
-            })
-            .collect())
-    }
-
-    async fn update_item(&self, context: &Context, item: UpdateItemDto) -> anyhow::Result<ItemDto> {
-        let state = item.state.map(|s| serde_json::to_string(&s)).transpose()?;
-        let user_id = context.get_user_id().ok_or(anyhow::anyhow!("no user id"))?;
-
-        let rec = sqlx::query!(
-            r#"
-            UPDATE items
-            SET 
-                title = COALESCE($1, title), 
-                description = COALESCE($2, description), 
-                state = COALESCE($3, state), 
-                project_id = COALESCE($4, project_id), 
-                updated_at = now()
-            WHERE id = $5 AND user_id = $6
-            RETURNING id, title, description, state, project_id
-            "#,
-            item.title,
-            item.description,
-            state,
-            item.project_id,
-            item.id,
-            user_id,
-        )
-        .fetch_one(&self.pool)
-        .await?;
-
-        Ok(ItemDto {
-            id: rec.id,
-            title: rec.title,
-            description: rec.description,
-            state: serde_json::from_str(&rec.state)?,
-            project_id: rec.project_id,
-        })
     }
 }
 
@@ -168,20 +55,21 @@ impl MemoryItemService {
     }
 }
 
+impl Default for MemoryItemService {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 #[async_trait]
 impl ItemService for MemoryItemService {
-    async fn add_item(
+    async fn add_item(&self, create_item: CreateItemDto) -> anyhow::Result<CreatedItemDto> {
-        &self,
-        _context: &Context,
-        create_item: CreateItemDto,
-    ) -> anyhow::Result<CreatedItemDto> {
         if let Ok(mut item_store) = self.item_store.lock() {
             let item = ItemDto {
                 id: Uuid::new_v4(),
-                title: create_item.title,
+                title: create_item.name,
-                description: create_item.description,
+                description: None,
                 state: como_domain::item::ItemState::Created,
-                project_id: create_item.project_id,
             };
 
             item_store.insert(item.id.to_string(), item.clone());
@@ -192,26 +80,18 @@ impl ItemService for MemoryItemService {
         }
     }
 
-    async fn get_item(&self, _context: &Context, query: GetItemQuery) -> anyhow::Result<ItemDto> {
+    async fn get_item(&self, query: GetItemQuery) -> anyhow::Result<ItemDto> {
         if let Ok(item_store) = self.item_store.lock() {
             let item = item_store
                 .get(&query.item_id.to_string())
-                .ok_or(anyhow::anyhow!("could not find item"))?;
+                .context("could not find item")?;
             return Ok(item.clone());
         } else {
             Err(anyhow::anyhow!("could not unlock item_store"))
         }
     }
 
-    async fn get_items(
+    async fn get_items(&self, _query: GetItemsQuery) -> anyhow::Result<Vec<ItemDto>> {
-        &self,
-        _context: &Context,
-        _query: GetItemsQuery,
-    ) -> anyhow::Result<Vec<ItemDto>> {
-        todo!()
-    }
-
-    async fn update_item(&self, _context: &Context, _item: UpdateItemDto) -> anyhow::Result<ItemDto> {
         todo!()
     }
 }

como_infrastructure/src/services/project_service.rs

@@ -1,110 +1,35 @@
 use std::{collections::HashMap, sync::Arc};
 
+use anyhow::Context;
 use axum::async_trait;
 use como_core::projects::ProjectService;
-use como_domain::{
+use como_domain::projects::{
-    projects::{mutation::CreateProjectMutation, queries::GetProjectQuery, ProjectDto},
+    queries::{GetProjectQuery, GetProjectsQuery},
-    user::ContextUserExt,
+    ProjectDto,
-    Context,
 };
 use tokio::sync::Mutex;
 
-use crate::database::ConnectionPool;
+pub struct DefaultProjectService {}
-
-pub struct DefaultProjectService {
-    pool: ConnectionPool,
-}
 
 impl DefaultProjectService {
-    pub fn new(connection_pool: ConnectionPool) -> Self {
+    pub fn new() -> Self {
-        Self {
+        Self {}
-            pool: connection_pool,
+    }
-        }
+}
+
+impl Default for DefaultProjectService {
+    fn default() -> Self {
+        Self::new()
     }
 }
 
 #[async_trait]
 impl ProjectService for DefaultProjectService {
-    async fn get_project(
+    async fn get_project(&self, _query: GetProjectQuery) -> anyhow::Result<ProjectDto> {
-        &self,
+        todo!()
-        context: &Context,
-        query: GetProjectQuery,
-    ) -> anyhow::Result<ProjectDto> {
-        let user_id = context.get_user_id().ok_or(anyhow::anyhow!("no user id"))?;
-
-        let rec = sqlx::query!(
-            r#"
-            SELECT id, name, description, user_id
-            FROM projects
-            WHERE id = $1 and user_id = $2
-            "#,
-            query.project_id,
-            &user_id
-        )
-        .fetch_one(&self.pool)
-        .await?;
-
-        Ok(ProjectDto {
-            id: rec.id,
-            name: rec.name,
-            description: rec.description,
-            user_id: rec.user_id,
-        })
     }
-    async fn get_projects(&self, context: &Context) -> anyhow::Result<Vec<ProjectDto>> {
+    async fn get_projects(&self, _query: GetProjectsQuery) -> anyhow::Result<Vec<ProjectDto>> {
-        let user_id = context.get_user_id().ok_or(anyhow::anyhow!("no user id"))?;
+        todo!()
-
-        let recs = sqlx::query!(
-            r#"
-            SELECT id, name, description, user_id
-            FROM projects
-            WHERE user_id = $1
-            LIMIT 500
-            "#,
-            &user_id
-        )
-        .fetch_all(&self.pool)
-        .await?;
-
-        Ok(recs
-            .into_iter()
-            .map(|rec| ProjectDto {
-                id: rec.id,
-                name: rec.name,
-                description: rec.description,
-                user_id: rec.user_id,
-            })
-            .collect::<_>())
-    }
-    async fn create_project(
-        &self,
-        context: &Context,
-        request: CreateProjectMutation,
-    ) -> anyhow::Result<ProjectDto> {
-        let user_id = context.get_user_id().ok_or(anyhow::anyhow!("no user id"))?;
-
-        let rec = sqlx::query!(
-            r#"
-            INSERT INTO projects (id, name, description, user_id, created_at, updated_at)
-            VALUES ($1, $2, $3, $4, $5, $6)
-            RETURNING id
-            "#,
-            uuid::Uuid::new_v4(),
-            request.name,
-            request.description,
-            &user_id,
-            chrono::Utc::now().naive_utc(),
-            chrono::Utc::now().naive_utc(),
-        )
-        .fetch_one(&self.pool)
-        .await?;
-
-        Ok(ProjectDto {
-            id: rec.id,
-            name: request.name,
-            description: request.description,
-            user_id: user_id.clone(),
-        })
     }
 }
 
@@ -120,48 +45,26 @@ impl MemoryProjectService {
     }
 }
 
-#[async_trait]
+impl Default for MemoryProjectService {
-impl ProjectService for MemoryProjectService {
+    fn default() -> Self {
-    async fn get_project(
+        Self::new()
-        &self,
+    }
-        _context: &Context,
+}
-        query: GetProjectQuery,
+
-    ) -> anyhow::Result<ProjectDto> {
+#[async_trait]
-        let ps = self.project_store.lock().await;
+impl ProjectService for MemoryProjectService {
-        Ok(ps
+    async fn get_project(&self, query: GetProjectQuery) -> anyhow::Result<ProjectDto> {
-            .get(&query.project_id.to_string())
+        let ps = self.project_store.lock().await;
-            .ok_or(anyhow::anyhow!("could not find project"))?
+        if let Some(item_id) = query.item_id {
-            .clone())
+            Ok(ps
-    }
+                .get(&item_id.to_string())
-    async fn get_projects(&self, context: &Context) -> anyhow::Result<Vec<ProjectDto>> {
+                .context("could not find project")?
-        let user_id = context.get_user_id().ok_or(anyhow::anyhow!("no user id"))?;
+                .clone())
-
+        } else {
-        Ok(self
+            Err(anyhow::anyhow!("could not find project"))
-            .project_store
+        }
-            .lock()
+    }
-            .await
+    async fn get_projects(&self, _query: GetProjectsQuery) -> anyhow::Result<Vec<ProjectDto>> {
-            .values()
+        todo!()
-            .filter(|p| p.user_id == user_id)
-            .cloned()
-            .collect::<_>())
-    }
-
-    async fn create_project(
-        &self,
-        context: &Context,
-        mutation: CreateProjectMutation,
-    ) -> anyhow::Result<ProjectDto> {
-        let user_id = context.get_user_id().ok_or(anyhow::anyhow!("no user id"))?;
-
-        let mut ps = self.project_store.lock().await;
-        let project = ProjectDto {
-            id: uuid::Uuid::new_v4(),
-            name: mutation.name,
-            description: None,
-            user_id,
-        };
-
-        ps.insert(project.id.to_string(), project.clone());
-        Ok(project)
     }
 }

como_infrastructure/src/services/user_service.rs

@@ -1,7 +1,6 @@
 use argon2::{password_hash::SaltString, Argon2, PasswordHash, PasswordHasher, PasswordVerifier};
 use axum::async_trait;
 use como_core::users::UserService;
-use como_domain::Context;
 use rand_core::OsRng;
 
 use crate::database::ConnectionPool;
@@ -15,7 +14,7 @@ impl DefaultUserService {
         Self { pool }
     }
 
-    fn hash_password(&self, _context: &Context, password: String) -> anyhow::Result<String> {
+    fn hash_password(&self, password: String) -> anyhow::Result<String> {
         let salt = SaltString::generate(&mut OsRng);
         let argon2 = Argon2::default();
 
@@ -27,12 +26,7 @@ impl DefaultUserService {
         Ok(password_hash)
     }
 
-    fn validate_password(
+    fn validate_password(&self, password: String, hashed_password: String) -> anyhow::Result<bool> {
-        &self,
-        _context: &Context,
-        password: String,
-        hashed_password: String,
-    ) -> anyhow::Result<bool> {
         let argon2 = Argon2::default();
 
         let parsed_hash = PasswordHash::new(&hashed_password).map_err(|e| anyhow::anyhow!(e))?;
@@ -45,13 +39,8 @@ impl DefaultUserService {
 
 #[async_trait]
 impl UserService for DefaultUserService {
-    async fn add_user(
+    async fn add_user(&self, username: String, password: String) -> anyhow::Result<String> {
-        &self,
+        let hashed_password = self.hash_password(password)?;
-        context: &Context,
-        username: String,
-        password: String,
-    ) -> anyhow::Result<String> {
-        let hashed_password = self.hash_password(context, password)?;
 
         let rec = sqlx::query!(
             r#"
@@ -70,7 +59,6 @@ impl UserService for DefaultUserService {
 
     async fn validate_user(
         &self,
-        context: &Context,
         username: String,
         password: String,
     ) -> anyhow::Result<Option<String>> {
@@ -85,7 +73,7 @@ impl UserService for DefaultUserService {
         .await?;
 
         match rec {
-            Some(user) => match self.validate_password(context, password, user.password_hash)? {
+            Some(user) => match self.validate_password(password, user.password_hash)? {
                 true => Ok(Some(user.id.to_string())),
                 false => Ok(None),
             },

como_infrastructure/target/sqlx/query-4e07408562bedb8b60ce05c1decfe3ad16b72230967de01f640b7e4729b49fce.json

@@ -0,0 +1,33 @@
+{
+  "query": "\n            SELECT * from users\n            where username=$1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Uuid"
+      },
+      {
+        "ordinal": 1,
+        "name": "username",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "password_hash",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "d3f222cf6c3d9816705426fdbed3b13cb575bb432eb1f33676c0b414e67aecaf"
+}

cuddle.yaml

@@ -4,8 +4,7 @@ base: "git@git.front.kjuulh.io:kjuulh/cuddle-rust-plan.git"
 
 vars:
   service: "como-backend"
-  deployments: "git@git.front.kjuulh.io:kjuulh/como-deployments.git"
+  deployments: "git@git.front.kjuulh.io:como/deployments.git"
-  bin_name: como_bin
 
 scripts:
   render_como_templates:
@@ -18,20 +17,3 @@ scripts:
     type: shell
   migrate_como:
     type: shell
-  new_migration:
-    type: shell
-    description: "creates a new migration in `como_infrastructure` with the given name prefixed with a date"
-    args:
-      name:
-        type: "flag"
-        name: "name"
-        description: "the name of the migration"
-        required: true
-  "sqlx:prepare":
-    type: shell
-
-  "deploy":
-    type: shell
-
-  "test":
-    type: lua

scripts/deploy.sh

@@ -1,8 +0,0 @@
-export $(cat .env | xargs)
-
-cuddle x start_deployment
-cuddle x render_templates
-cuddle x render_como_templates
-cuddle x build_release
-cuddle x push_release
-cuddle x deploy_release

scripts/local_down.sh

@@ -2,6 +2,6 @@
 
 set -e
 
-cuddle render_template --template-file $TMP/docker-compose.local_up.yml.tmpl --dest $TMP/docker-compose.local_up.yml
+cuddle_cli render_template --template-file $TMP/docker-compose.local_up.yml.tmpl --dest $TMP/docker-compose.local_up.yml
 
 docker compose -f $TMP/docker-compose.local_up.yml down -v

scripts/local_up.sh

@@ -2,6 +2,6 @@
 
 set -e
 
-cuddle render_template --template-file $TMP/docker-compose.local_up.yml.tmpl --dest $TMP/docker-compose.local_up.yml
+cuddle_cli render_template --template-file $TMP/docker-compose.local_up.yml.tmpl --dest $TMP/docker-compose.local_up.yml
 
 docker compose -f $TMP/docker-compose.local_up.yml up -d --remove-orphans --build

scripts/lua/commands/init.lua

@@ -1,11 +0,0 @@
-M = {}
-
-function M.something()
-  local io = require("io")
-  local output = io.popen("ls"):read("a*")
-  print(output)
-
-  print("hello-world!")
-end
-
-return M

scripts/new_migration.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export $(cat .env | xargs)
-
-cargo sqlx migrate add --source como_infrastructure/migrations $NAME

scripts/render_como_templates.sh

@@ -4,7 +4,7 @@ set -e
 
 deploymentrepo="$TMP/deployments"
 
-CUDDLE_FETCH_POLICY=never cuddle render_template \
+CUDDLE_FETCH_POLICY=never cuddle_cli render_template \
   --template-file "$TMP/.env.example.tmpl" \
   --dest "$deploymentrepo/$SERVICE/env.example"
 

scripts/sqlx:prepare.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-export $(cat .env | xargs)
-
-cd como_infrastructure || return
-
-cargo sqlx prepare -- --all-targets --all-features

scripts/test.lua

@@ -1,5 +0,0 @@
-print("from test")
-
-local init = require("commands")
-
-init.something()

templates/init-user-db.sh

@@ -1,4 +1,4 @@
-#!bin/bash
+#!/bin/bash
 set -e
 
 psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL