feat: updated the project architecture

race-tech · Feb 5, 2024 · 0ac0dbb · 0ac0dbb
1 parent 73aab10
commit 0ac0dbb
Show file tree

Hide file tree

Showing 38 changed files with 96 additions and 58 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,9 +1,26 @@
 [workspace]
 members = [
-    "application",
-    "api",
-    "infrastructure",
-    "shared",
-    "derives"
+    "crates/*",
+    "api-cmd"
 ]
 resolver = "2"
+
+[workspace.dependencies]
+# Local crates
+api = { path = "./crates/api", version = "0.1.0" }
+application = { path = "./crates/application", version = "0.1.0" }
+derives = { path = "./crates/derives", version = "0.1.0" }
+infrastructure = { path = "./crates/infrastructure", version = "0.1.0" }
+shared = { path = "./crates/shared", version = "0.1.0" }
+
+# External crates
+rocket = { version = "0.5.0", features = ["json"] }
+diesel = { version = "2.1.0", features = ["mysql", "chrono", "r2d2"] }
+chrono = { version = "0.4.31", features = ["serde"] }
+serde = { version = "1.0.195", features = ["derive"] }
+serde_json = "1.0.64"
+dotenvy = "0.15.7"
+r2d2 = "0.8.10"
+proc-macro2 = "1.0.78"
+quote = "1.0.35"
+syn = { version = "2.0.48", features = ["parsing"] }
diff --git a/api-cmd/Cargo.toml b/api-cmd/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "api-cmd"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rocket.workspace = true
+dotenvy.workspace = true
+
+api.workspace = true
+infrastructure.workspace = true
diff --git a/api/src/bin/main.rs → api-cmd/src/main.rs b/api/src/bin/main.rs → api-cmd/src/main.rs
diff --git a/api/Cargo.toml b/api/Cargo.toml
diff --git a/application/Cargo.toml b/application/Cargo.toml
diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "api"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rocket.workspace = true
+diesel.workspace = true
+serde.workspace = true
+r2d2.workspace = true
+serde_json.workspace = true
+
+application.workspace = true
+shared.workspace = true
+infrastructure.workspace = true
diff --git a/api/src/constructors.rs → crates/api/src/constructors.rs b/api/src/constructors.rs → crates/api/src/constructors.rs
diff --git a/api/src/drivers.rs → crates/api/src/drivers.rs b/api/src/drivers.rs → crates/api/src/drivers.rs
diff --git a/api/src/lib.rs → crates/api/src/lib.rs b/api/src/lib.rs → crates/api/src/lib.rs
diff --git a/api/src/seasons.rs → crates/api/src/seasons.rs b/api/src/seasons.rs → crates/api/src/seasons.rs
diff --git a/api/src/standings.rs → crates/api/src/standings.rs b/api/src/standings.rs → crates/api/src/standings.rs
diff --git a/crates/application/Cargo.toml b/crates/application/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "application"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+chrono.workspace = true
+serde.workspace = true
+diesel.workspace = true
+
+shared.workspace = true
diff --git a/application/src/constructor_standing.rs → ...s/application/src/constructor_standing.rs b/application/src/constructor_standing.rs → ...s/application/src/constructor_standing.rs
diff --git a/application/src/constructors.rs → crates/application/src/constructors.rs b/application/src/constructors.rs → crates/application/src/constructors.rs
diff --git a/application/src/driver_standing.rs → crates/application/src/driver_standing.rs b/application/src/driver_standing.rs → crates/application/src/driver_standing.rs
diff --git a/application/src/drivers.rs → crates/application/src/drivers.rs b/application/src/drivers.rs → crates/application/src/drivers.rs
diff --git a/application/src/lib.rs → crates/application/src/lib.rs b/application/src/lib.rs → crates/application/src/lib.rs
diff --git a/application/src/models.rs → crates/application/src/models.rs b/application/src/models.rs → crates/application/src/models.rs
diff --git a/application/src/pagination.rs → crates/application/src/pagination.rs b/application/src/pagination.rs → crates/application/src/pagination.rs
diff --git a/application/src/races.rs → crates/application/src/races.rs b/application/src/races.rs → crates/application/src/races.rs
diff --git a/application/src/schema.rs → crates/application/src/schema.rs b/application/src/schema.rs → crates/application/src/schema.rs
diff --git a/application/src/seasons.rs → crates/application/src/seasons.rs b/application/src/seasons.rs → crates/application/src/seasons.rs
diff --git a/derives/Cargo.toml → crates/derives/Cargo.toml b/derives/Cargo.toml → crates/derives/Cargo.toml
@@ -6,9 +6,9 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-proc-macro2 = "1.0.78"
-quote = "1.0.35"
-syn = { version = "2.0.48", features = ["parsing"] }
+proc-macro2.workspace = true
+quote.workspace = true
+syn.workspace = true
 
 [lib]
 proc-macro = true
diff --git a/derives/src/filter_validation.rs → crates/derives/src/filter_validation.rs b/derives/src/filter_validation.rs → crates/derives/src/filter_validation.rs
diff --git a/derives/src/lib.rs → crates/derives/src/lib.rs b/derives/src/lib.rs → crates/derives/src/lib.rs
diff --git a/infrastructure/Cargo.toml → crates/infrastructure/Cargo.toml b/infrastructure/Cargo.toml → crates/infrastructure/Cargo.toml
@@ -6,6 +6,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-diesel = { version = "2.1.0", features = ["mysql", "r2d2"] }
+diesel.workspace = true
 
-shared = { path = "../shared" }
+shared.workspace = true
diff --git a/infrastructure/src/error.rs → crates/infrastructure/src/error.rs b/infrastructure/src/error.rs → crates/infrastructure/src/error.rs
diff --git a/infrastructure/src/lib.rs → crates/infrastructure/src/lib.rs b/infrastructure/src/lib.rs → crates/infrastructure/src/lib.rs
diff --git a/infrastructure/src/migrations/up.sql → crates/infrastructure/src/migrations/up.sql b/infrastructure/src/migrations/up.sql → crates/infrastructure/src/migrations/up.sql
diff --git a/crates/shared/Cargo.toml b/crates/shared/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "shared"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rocket.workspace = true
+chrono.workspace = true
+diesel.workspace = true
+serde_json.workspace = true
+r2d2.workspace = true
+serde.workspace = true
+
+derives.workspace = true
diff --git a/shared/src/error.rs → crates/shared/src/error.rs b/shared/src/error.rs → crates/shared/src/error.rs
diff --git a/shared/src/filters.rs → crates/shared/src/filters.rs b/shared/src/filters.rs → crates/shared/src/filters.rs
diff --git a/shared/src/lib.rs → crates/shared/src/lib.rs b/shared/src/lib.rs → crates/shared/src/lib.rs
diff --git a/shared/src/models.rs → crates/shared/src/models.rs b/shared/src/models.rs → crates/shared/src/models.rs
diff --git a/shared/src/parameters.rs → crates/shared/src/parameters.rs b/shared/src/parameters.rs → crates/shared/src/parameters.rs
diff --git a/shared/src/responses.rs → crates/shared/src/responses.rs b/shared/src/responses.rs → crates/shared/src/responses.rs
diff --git a/shared/Cargo.toml b/shared/Cargo.toml