Cargo.lock

@@ -349,9 +349,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "axum"
-version = "0.5.15"
+version = "0.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de18bc5f2e9df8f52da03856bf40e29b747de5a84e43aefff90e3dc4a21529b"
+checksum = "acee9fd5073ab6b045a275b3e709c163dd36c90685219cb21804a147b58dba43"
 dependencies = [
  "async-trait",
  "axum-core",
@@ -384,9 +384,9 @@ dependencies = [
 
 [[package]]
 name = "axum-core"
-version = "0.2.7"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4f44a0e6200e9d11a1cdc989e4b358f6e3d354fbf48478f345a17f4e43f8635"
+checksum = "37e5939e02c56fecd5c017c37df4238c0a839fa76b7f97acdd7efb804fd181cc"
 dependencies = [
  "async-trait",
  "bytes",
@@ -394,6 +394,8 @@ dependencies = [
  "http",
  "http-body",
  "mime",
+ "tower-layer",
+ "tower-service",
 ]
 
 [[package]]

README.md

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

como_api/Cargo.toml

@@ -13,7 +13,7 @@ como_infrastructure = { path = "../como_infrastructure" }
 
 async-graphql = "4.0.6"
 async-graphql-axum = "*"
-axum = "0.5.13"
+axum = "0.5.17"
 axum-extra = { version = "*", features = ["cookie", "cookie-private"] }
 axum-sessions = { version = "*" }
 serde = { version = "1.0", features = ["derive"] }

como_api/src/router.rs

@@ -12,7 +12,7 @@ use crate::controllers::graphql::GraphQLController;
 pub struct Api;
 
 impl Api {
-    pub async fn new(
+    pub async fn run_api(
         port: u32,
         cors_origin: &str,
         service_register: ServiceRegister,

como_bin/Cargo.toml

@@ -14,7 +14,7 @@ como_api = { path = "../como_api" }
 
 async-graphql = "4.0.6"
 async-graphql-axum = "*"
-axum = "0.5.13"
+axum = "0.5.17"
 axum-extra = { version = "*", features = ["cookie", "cookie-private"] }
 axum-sessions = { version = "*" }
 serde = { version = "1.0", features = ["derive"] }

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

@@ -29,7 +29,7 @@ async fn main() -> anyhow::Result<()> {
 
     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

@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 como_domain = { path = "../como_domain" }
 tokio = { version = "1", features = ["full"] }
-axum = "0.5.1"
+axum = "0.5.17"
 
 # utilty crates
 serde = { version = "1.0.136", features = ["derive"] }

como_domain/src/item/mod.rs

@@ -2,7 +2,7 @@ pub mod queries;
 pub mod requests;
 pub mod responses;
 
-use async_graphql::{Enum, InputObject, SimpleObject};
+use async_graphql::{Enum, InputObject};
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 

como_gql/Cargo.toml

@@ -12,7 +12,7 @@ como_infrastructure = { path = "../como_infrastructure" }
 
 async-graphql = "4.0.6"
 async-graphql-axum = "*"
-axum = "0.5.13"
+axum = "0.5.17"
 axum-extra = { version = "*", features = ["cookie", "cookie-private"] }
 axum-sessions = { version = "*" }
 serde = { version = "1.0", features = ["derive"] }

como_gql/src/graphql.rs

@@ -4,8 +4,6 @@ use como_domain::{
     item::{
         queries::{GetItemQuery, GetItemsQuery},
         requests::CreateItemDto,
-        responses::CreatedItemDto,
-        ItemDto,
     },
     projects::{
         queries::{GetProjectQuery, GetProjectsQuery},

como_gql/src/items.rs

@@ -35,19 +35,19 @@ pub struct Item {
 #[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> {

como_infrastructure/Cargo.toml

@@ -11,7 +11,7 @@ como_domain = { path = "../como_domain" }
 
 async-graphql = "4.0.6"
 async-graphql-axum = "*"
-axum = "0.5.13"
+axum = "0.5.17"
 axum-extra = { version = "*", features = ["cookie", "cookie-private"] }
 axum-sessions = { version = "*" }
 serde = { version = "1.0", features = ["derive"] }

como_infrastructure/src/register.rs

@@ -7,8 +7,7 @@ use crate::{
     configs::AppConfig,
     database::ConnectionPool,
     services::{
-        item_service::{DefaultItemService, MemoryItemService},
-        project_service::{DefaultProjectService, MemoryProjectService},
+        item_service::MemoryItemService, project_service::MemoryProjectService,
         user_service::DefaultUserService,
     },
 };
@@ -26,14 +25,14 @@ impl ServiceRegister {
 
         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 user_service = Arc::new(DefaultUserService::new(pool)) as DynUserService;
 
         info!("services created succesfully");
 
-        return Self {
+        Self {
             item_service,
             user_service,
             project_service,
-        };
+        }
     }
 }

como_infrastructure/src/services/item_service.rs

@@ -3,6 +3,7 @@ use std::{
     sync::{Arc, Mutex},
 };
 
+use anyhow::Context;
 use axum::async_trait;
 use como_core::items::ItemService;
 use como_domain::item::{
@@ -21,6 +22,12 @@ impl DefaultItemService {
     }
 }
 
+impl Default for DefaultItemService {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 #[async_trait]
 impl ItemService for DefaultItemService {
     async fn add_item(&self, _item: CreateItemDto) -> anyhow::Result<CreatedItemDto> {
@@ -48,6 +55,12 @@ impl MemoryItemService {
     }
 }
 
+impl Default for MemoryItemService {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 #[async_trait]
 impl ItemService for MemoryItemService {
     async fn add_item(&self, create_item: CreateItemDto) -> anyhow::Result<CreatedItemDto> {
@@ -71,7 +84,7 @@ impl ItemService for MemoryItemService {
         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"))

como_infrastructure/src/services/project_service.rs

@@ -1,5 +1,6 @@
 use std::{collections::HashMap, sync::Arc};
 
+use anyhow::Context;
 use axum::async_trait;
 use como_core::projects::ProjectService;
 use como_domain::projects::{
@@ -16,6 +17,12 @@ impl DefaultProjectService {
     }
 }
 
+impl Default for DefaultProjectService {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 #[async_trait]
 impl ProjectService for DefaultProjectService {
     async fn get_project(&self, _query: GetProjectQuery) -> anyhow::Result<ProjectDto> {
@@ -38,6 +45,12 @@ impl MemoryProjectService {
     }
 }
 
+impl Default for MemoryProjectService {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 #[async_trait]
 impl ProjectService for MemoryProjectService {
     async fn get_project(&self, query: GetProjectQuery) -> anyhow::Result<ProjectDto> {
@@ -45,7 +58,7 @@ impl ProjectService for MemoryProjectService {
         if let Some(item_id) = query.item_id {
             Ok(ps
                 .get(&item_id.to_string())
-                .ok_or(anyhow::anyhow!("could not find project"))?
+                .context("could not find project")?
                 .clone())
         } else {
             Err(anyhow::anyhow!("could not find project"))

renovate.json

@@ -0,0 +1,3 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
+}