fix: cleanup structure

Author: zk-steve

Cargo.lock

@@ -1,3 +1,5 @@
 [workspace]
 resolver = "2"
-members = ["src/public"]
+members = [
+    "src/public",
+]

Cargo.toml

@@ -1,6 +1,6 @@
 # Using the `rust-musl-builder` as base image, instead of
 # the official Rust toolchain
-FROM clux/muslrust:stable AS chef
+FROM --platform=linux/amd64 clux/muslrust:stable AS chef
 USER root
 RUN cargo install cargo-chef
 WORKDIR /app
@@ -21,13 +21,13 @@ RUN cargo build --release --target x86_64-unknown-linux-musl --bin cli
 
 FROM scratch AS prod
 WORKDIR /user
-COPY config/00-default.toml 00-default.toml
+COPY src/public/config/00-default.toml 00-default.toml
 COPY --from=builder /app/target/x86_64-unknown-linux-musl/release/cli /usr/local/bin/rust-server
 ENTRYPOINT ["/usr/local/bin/rust-server", "--config-path=*.toml"]
 
 FROM alpine AS dev
 WORKDIR /user
-COPY config/00-default.toml 00-default.toml
+COPY src/public/config/00-default.toml 00-default.toml
 COPY --from=builder /app/target/x86_64-unknown-linux-musl/release/cli /usr/local/bin/rust-server
 COPY --from=bunyan /root/.cargo/bin/bunyan /usr/local/bin/
 ENTRYPOINT ["/bin/sh"]

Dockerfile

@@ -1,4 +1,4 @@
-POSTGRES_DIR="./library/src/adapter/repositories/postgres"
+POSTGRES_DIR="./src/adapter/src/repositories/postgres"
 DATABASE_URL="postgres://postgres:changeme@127.0.0.1:5432/postgres"
 
 PKG_NAME=rust-api-server
@@ -35,5 +35,5 @@ build:
 build-dev:
 	BUILDKIT_PROGRESS=plain DOCKER_BUILDKIT=1 docker build --ssh default -t $(PKG_NAME):$(BUILD_VERSION) --target=dev .
 
-profiling:
-	CARGO_PROFILE_RELEASE_DEBUG=true cargo flamegraph --root --  -c ./config/* -c deploy/local/custom.toml
+profiling-public:
+	CARGO_PROFILE_RELEASE_DEBUG=true cargo flamegraph --root -- -c ./src/public/config/* -c ./deploy/local/custom.toml

Makefile

@@ -4,10 +4,10 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-rust-core = { path = "../core" }
+rust_core = { path = "../core" }
 async-trait = { version = "0.1.77" }
-tokio = { version = "1.2", features = ["full"] }
-diesel = { version = "2.1.0", features = [
+tokio = { version = "1.36.0", features = ["full"] }
+diesel = { version = "2.1.4", features = [
     "postgres",
     "postgres_backend",
     "uuid",
@@ -16,4 +16,3 @@ serde = { version = "1.0", features = ["derive"] }
 deadpool-diesel = { version = "0.5.0", features = ["postgres", "serde"] }
 diesel_migrations = "2.1.0"
 testcontainers-modules = { version = "0.3.4", features = ["postgres"] }
-futures = "*"

src/adapter/Cargo.toml

@@ -1,11 +1,12 @@
-use async_trait::async_trait;
-use rust_core::common::errors::Error;
-use rust_core::common::errors::Error::NotFound;
-use rust_core::entities::question::{QuestionEntity, QuestionId};
 use std::collections::HashMap;
 use std::sync::Arc;
+
+use async_trait::async_trait;
 use tokio::sync::RwLock;
 
+use rust_core::common::errors::Error;
+use rust_core::common::errors::Error::NotFound;
+use rust_core::entities::question::{QuestionEntity, QuestionId};
 use rust_core::entities::question_filter::QuestionFilter;
 use rust_core::ports::question::QuestionPort;
 

src/adapter/src/repositories/in_memory/question.rs

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

src/adapter/src/repositories/mod.rs

@@ -1,2 +1 @@
-pub mod id;
 pub mod question;

src/adapter/src/repositories/postgres/models/id.rs

@@ -1,9 +1,9 @@
+use std::time::SystemTime;
+
 use diesel::{AsChangeset, Identifiable, Insertable, Queryable, Selectable};
-use rust_core::entities::question::QuestionEntity;
 use serde::Serialize;
-use std::time::SystemTime;
 
-use super::id::ToId;
+use rust_core::entities::question::QuestionEntity;
 
 #[derive(Debug, Queryable, Serialize, Selectable, Insertable, AsChangeset, Identifiable)]
 #[diesel(table_name = super::super::schema::questions)]
@@ -23,7 +23,7 @@ pub struct QuestionModel {
 impl QuestionModel {
     pub fn from(entity: QuestionEntity) -> Self {
         QuestionModel {
-            id: entity.id.to_id(),
+            id: entity.id.to_string().parse().unwrap(),
             title: entity.title,
             content: entity.content,
             tags: entity.tags.map(|v| v.into_iter().map(Some).collect()),