Separated the code (#7)

Reviewed-on: #7

.gitea/workflows/workflow.yml

@@ -19,7 +19,15 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: 1.85.0
-      - run: cargo check
+      - run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
+          chmod 600 ~/.ssh/gitlab_deploy_key
+          ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/gitlab_deploy_key
+          cargo check
 
   test:
     name: Test Suite
@@ -29,7 +37,15 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: 1.85.0
-      - run: cargo test
+      - run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
+          chmod 600 ~/.ssh/gitlab_deploy_key
+          ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/gitlab_deploy_key
+          cargo test
 
   fmt:
     name: Rustfmt
@@ -40,7 +56,15 @@ jobs:
         with:
           toolchain: 1.85.0
       - run: rustup component add rustfmt
-      - run: cargo fmt --all -- --check
+      - run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
+          chmod 600 ~/.ssh/gitlab_deploy_key
+          ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/gitlab_deploy_key
+          cargo fmt --all -- --check
 
   clippy:
     name: Clippy
@@ -51,7 +75,15 @@ jobs:
         with:
           toolchain: 1.85.0
       - run: rustup component add clippy
-      - run: cargo clippy -- -D warnings
+      - run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
+          chmod 600 ~/.ssh/gitlab_deploy_key
+          ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/gitlab_deploy_key
+          cargo clippy -- -D warnings
 
   build:
     name: build
@@ -61,5 +93,13 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: 1.85.0
-      - run: cargo build
+      - run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
+          chmod 600 ~/.ssh/gitlab_deploy_key
+          ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/gitlab_deploy_key
+          cargo build --release
 

Cargo.toml

@@ -9,3 +9,4 @@ serde = { version = "1.0.218", features = ["derive"] }
 serde_json = { version = "1.0.139" }
 tokio = { version = "1.44.1", features = ["rt-multi-thread"] }
 tracing-subscriber = "0.3.19"
+icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.2.0" }

src/callers/common.rs

@@ -0,0 +1,4 @@
+// basic handler that responds with a static string
+pub async fn root() -> &'static str {
+    "Hello, World!"
+}

src/callers/mod.rs

@@ -0,0 +1,7 @@
+pub mod common;
+pub mod register;
+
+pub mod endpoints {
+    pub const ROOT: &str = "/";
+    pub const REGISTER: &str = "api/v2/register";
+}

src/callers/register.rs

@@ -0,0 +1,12 @@
+use axum::{Json, http::StatusCode};
+
+use crate::models;
+
+pub async fn register_user(
+    Json(payload): Json<models::common::CreateUser>,
+) -> (StatusCode, Json<models::common::User>) {
+    let user = models::common::User {
+        username: payload.username.clone(),
+    };
+    (StatusCode::CREATED, Json(user))
+}

src/config/mod.rs

@@ -0,0 +1,10 @@
+pub fn get_full() -> String {
+    get_address() + ":" + &get_port()
+}
+fn get_address() -> String {
+    String::from("0.0.0.0")
+}
+
+fn get_port() -> String {
+    String::from("3000")
+}

src/main.rs

@@ -1,9 +1,11 @@
 use axum::{
-    Json, Router,
+    Router,
-    http::StatusCode,
     routing::{get, post},
 };
-use serde::{Deserialize, Serialize};
+
+pub mod callers;
+pub mod config;
+pub mod models;
 
 #[tokio::main]
 async fn main() {
@@ -12,28 +14,14 @@ async fn main() {
 
     // build our application with a route
     let app = Router::new()
-        // `GET /` goes to `root`
+        .route(callers::endpoints::ROOT, get(callers::common::root))
-        .route("/", get(root));
+        .route(
-    // `POST /users` goes to `create_user`
+            callers::endpoints::REGISTER,
-    // .route("/users", post(create_user));
+            post(callers::register::register_user),
+        );
 
     // run our app with hyper, listening globally on port 3000
-    let listener = tokio::net::TcpListener::bind(get_full()).await.unwrap();
+    let url = config::get_full();
+    let listener = tokio::net::TcpListener::bind(url).await.unwrap();
     axum::serve(listener, app).await.unwrap();
 }
-
-fn get_full() -> String {
-    get_address() + ":" + &get_port()
-}
-fn get_address() -> String {
-    String::from("0.0.0.0")
-}
-
-fn get_port() -> String {
-    String::from("3000")
-}
-
-// basic handler that responds with a static string
-async fn root() -> &'static str {
-    "Hello, World!"
-}

src/models/common.rs

@@ -0,0 +1,11 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Deserialize)]
+pub struct CreateUser {
+    pub username: String,
+}
+
+#[derive(Serialize)]
+pub struct User {
+    pub username: String,
+}

src/models/mod.rs

@@ -0,0 +1 @@
+pub mod common;