refactor dto

README.md

@@ -14,6 +14,8 @@ The service provides a convenient means of sharing files without the necessity f
 **Requirements**
 
 - [rust](https://www.rust-lang.org/tools/install)
+- [curl](https://curl.se/) 
+- [qr](https://jqlang.github.io/jq/)
 - [docker](https://www.docker.com/)
 - [docker-compose](https://docs.docker.com/compose/)
 
@@ -23,7 +25,7 @@ The service provides a convenient means of sharing files without the necessity f
 * Anonymous Uploads
 * File Expiration
 * Burn After Reading
-* QRCode
+* QR code Generator
 * Command Line Interface (CLI)
 
 **Run Backend Service Locally**
@@ -54,8 +56,8 @@ $ docker run --name pf-api --rm -p 8080:8080 \
 ```sh
 # Ping the server.
 $ curl -X GET http://127.0.0.1:8080/healthz
-# Upload a file.
-$ curl -F "file=@{file_name}" 127.0.0.1:8080/upload
+# Upload a file and then get download url.
+$ curl -s -F "file=@{file_name}" 127.0.0.1:8080/upload | jq -r '.url'
 # Download file.
 $ curl -o {file_name} http://127.0.0.1:8080/{code}/{file_name}
 # Upload a file with basic authentication.

api/src/database/mod.rs

@@ -9,7 +9,7 @@ use crate::{
   error::{ApiError, ApiResult},
 };
 use chrono::{DateTime, Utc};
-use sdk::model::response::MetaDataFileResponse;
+use sdk::dto::response::MetaDataFileResponse;
 use serde::{Deserialize, Serialize};
 use sled::IVec;
 use std::sync::RwLock;

api/src/handler/file.rs

@@ -6,7 +6,7 @@ use axum::{
   Json,
 };
 
-use sdk::model::{
+use sdk::dto::{
   request::UploadQueryParam,
   response::{MessageResponse, MetaDataFileResponse, UploadResponse},
 };

api/src/handler/mod.rs

@@ -1,7 +1,7 @@
 pub mod file;
 
 use axum::Json;
-use sdk::model::response::MessageResponse;
+use sdk::dto::response::MessageResponse;
 
 pub async fn health_check() -> Json<MessageResponse> {
   Json(MessageResponse {

api/src/service/file.rs

@@ -6,7 +6,7 @@ use axum::extract::multipart::Field;
 use axum::extract::Multipart;
 use chrono::{DateTime, Utc};
 use futures_util::TryStreamExt;
-use sdk::model::request::UploadQueryParam;
+use sdk::dto::request::UploadQueryParam;
 use std::path::PathBuf;
 use tokio::fs::File;
 use tokio::io::BufWriter;

api/tests/api/helper/mod.rs

@@ -8,7 +8,7 @@ use api::util::tracing::INIT_SUBSCRIBER;
 use fake::{Fake, Faker};
 use once_cell::sync::Lazy;
 use sdk::client::PasteFileClient;
-use sdk::model::request::UploadQueryParam;
+use sdk::dto::request::UploadQueryParam;
 use test_context::AsyncTestContext;
 
 pub struct ApiTestContext {

api/tests/api/upload_api_test.rs

@@ -1,5 +1,5 @@
 use api::{assert_err, assert_ok};
-use sdk::{error::BodyResponseError, model::request::UploadQueryParam};
+use sdk::{dto::request::UploadQueryParam, error::BodyResponseError};
 use test_context::test_context;
 
 use crate::helper::ApiTestContext;

cli/src/main.rs

@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use clap::{Parser, Subcommand};
-use sdk::{client::PasteFileClient, model::request::UploadQueryParam, result::ApiResponseResult};
+use sdk::{client::PasteFileClient, dto::request::UploadQueryParam, result::ApiResponseResult};
 use std::{error::Error, path::PathBuf};
 use tokio::io::AsyncWriteExt;
 
@@ -191,7 +191,7 @@ mod tests {
   use fake::{Fake, Faker};
   use once_cell::sync::Lazy;
   use project_root::get_project_root;
-  use sdk::model::response::{MessageResponse, MetaDataFileResponse, UploadResponse};
+  use sdk::dto::response::{MessageResponse, MetaDataFileResponse, UploadResponse};
   use std::process::Stdio;
   use test_context::AsyncTestContext;
   use tokio::io::AsyncWriteExt;

sdk/examples/upload.rs

@@ -1,4 +1,4 @@
-use sdk::{client::PasteFileClient, model::request::UploadQueryParam};
+use sdk::{client::PasteFileClient, dto::request::UploadQueryParam};
 
 const SERVER_URL: &str = "127.0.0.1:8080";
 

sdk/src/client.rs

@@ -1,11 +1,11 @@
 use std::path::Path;
 
 use crate::{
-  error::BodyResponseError,
-  model::{
+  dto::{
     request::UploadQueryParam,
     response::{MetaDataFileResponse, UploadResponse},
   },
+  error::BodyResponseError,
   result::ApiResponseResult,
   util::progress::progress_bar,
 };

sdk/src/lib.rs

@@ -1,5 +1,5 @@
 pub mod client;
+pub mod dto;
 pub mod error;
-pub mod model;
 pub mod result;
 pub mod util;

sdk/src/result.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::{error::BodyResponseError, model::response::MessageResponse};
+use crate::{dto::response::MessageResponse, error::BodyResponseError};
 
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(untagged)]