Compare commits
8 Commits
master
...
56fc4be355
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
56fc4be355 | ||
|
|
1ae32dd595 | ||
|
|
21a6b91139 | ||
|
|
e25c1b5ceb | ||
|
|
b3ee37fbe3 | ||
|
|
952a37892d | ||
|
|
7270399f35 | ||
|
|
bddf92686c |
8
.editorconfig
Normal file
8
.editorconfig
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
root = true
|
||||||
|
|
||||||
|
[*]
|
||||||
|
end_of_line = lf
|
||||||
|
insert_final_newline = true
|
||||||
|
|
||||||
|
[Makefile]
|
||||||
|
indent_style = tab
|
||||||
2
.gitignore
vendored
2
.gitignore
vendored
@@ -2,4 +2,4 @@
|
|||||||
.idea
|
.idea
|
||||||
.vscode
|
.vscode
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
.env
|
||||||
|
|||||||
1722
Cargo.lock
generated
Normal file
1722
Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
20
Cargo.toml
20
Cargo.toml
@@ -6,3 +6,23 @@ edition = "2021"
|
|||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
async-trait = "0.1.81"
|
||||||
|
axum = {version = "0.7.5", features = ["macros"]}
|
||||||
|
axum-extra = { version = "0.9.3", features = ["typed-header"] }
|
||||||
|
chrono = {version = "0.4", features = ["serde"]}
|
||||||
|
deadpool-diesel = {version ="0.6.1", features = ["postgres"]}
|
||||||
|
diesel = { version = "2", features = ["postgres", "chrono"] }
|
||||||
|
dotenvy = "0.15"
|
||||||
|
jsonwebtoken = "9.3.0"
|
||||||
|
serde = { version = "1.0.202", features = ["derive"] }
|
||||||
|
serde_json = "1"
|
||||||
|
tokio = { version = "1.37.0", features = ["full"] }
|
||||||
|
tower = "0.4.13"
|
||||||
|
tower-http = {version= "0.5.2", features=["trace", "cors"] }
|
||||||
|
tracing = "0.1"
|
||||||
|
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
||||||
|
once_cell = "1.19.0"
|
||||||
|
axum-macros = "0.4.1"
|
||||||
|
pbkdf2 = { version = "0.12", features = ["simple"] }
|
||||||
|
rand_core ={version = "0.6", features = ["std"]}
|
||||||
|
regex = {version = "1.10"}
|
||||||
|
|||||||
2
Makefile
Normal file
2
Makefile
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
build-schema:
|
||||||
|
diesel print-schema > src/model/schema.rs
|
||||||
9
diesel.toml
Normal file
9
diesel.toml
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
# For documentation on how to configure this file,
|
||||||
|
# see https://diesel.rs/guides/configuring-diesel-cli
|
||||||
|
|
||||||
|
[print_schema]
|
||||||
|
file = "src/schema.rs"
|
||||||
|
custom_type_derives = ["diesel::query_builder::QueryId", "Clone"]
|
||||||
|
|
||||||
|
[migrations_directory]
|
||||||
|
dir = "/data/codes/helios-server-rs/migrations"
|
||||||
0
migrations/.keep
Normal file
0
migrations/.keep
Normal file
6
migrations/00000000000000_diesel_initial_setup/down.sql
Normal file
6
migrations/00000000000000_diesel_initial_setup/down.sql
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
-- This file was automatically created by Diesel to setup helper functions
|
||||||
|
-- and other internal bookkeeping. This file is safe to edit, any future
|
||||||
|
-- changes will be added to existing projects as new migrations.
|
||||||
|
|
||||||
|
DROP FUNCTION IF EXISTS diesel_manage_updated_at(_tbl regclass);
|
||||||
|
DROP FUNCTION IF EXISTS diesel_set_updated_at();
|
||||||
36
migrations/00000000000000_diesel_initial_setup/up.sql
Normal file
36
migrations/00000000000000_diesel_initial_setup/up.sql
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
-- This file was automatically created by Diesel to setup helper functions
|
||||||
|
-- and other internal bookkeeping. This file is safe to edit, any future
|
||||||
|
-- changes will be added to existing projects as new migrations.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
-- Sets up a trigger for the given table to automatically set a column called
|
||||||
|
-- `updated_at` whenever the row is modified (unless `updated_at` was included
|
||||||
|
-- in the modified columns)
|
||||||
|
--
|
||||||
|
-- # Example
|
||||||
|
--
|
||||||
|
-- ```sql
|
||||||
|
-- CREATE TABLE users (id SERIAL PRIMARY KEY, updated_at TIMESTAMP NOT NULL DEFAULT NOW());
|
||||||
|
--
|
||||||
|
-- SELECT diesel_manage_updated_at('users');
|
||||||
|
-- ```
|
||||||
|
CREATE OR REPLACE FUNCTION diesel_manage_updated_at(_tbl regclass) RETURNS VOID AS $$
|
||||||
|
BEGIN
|
||||||
|
EXECUTE format('CREATE TRIGGER set_updated_at BEFORE UPDATE ON %s
|
||||||
|
FOR EACH ROW EXECUTE PROCEDURE diesel_set_updated_at()', _tbl);
|
||||||
|
END;
|
||||||
|
$$ LANGUAGE plpgsql;
|
||||||
|
|
||||||
|
CREATE OR REPLACE FUNCTION diesel_set_updated_at() RETURNS trigger AS $$
|
||||||
|
BEGIN
|
||||||
|
IF (
|
||||||
|
NEW IS DISTINCT FROM OLD AND
|
||||||
|
NEW.updated_at IS NOT DISTINCT FROM OLD.updated_at
|
||||||
|
) THEN
|
||||||
|
NEW.updated_at := current_timestamp;
|
||||||
|
END IF;
|
||||||
|
RETURN NEW;
|
||||||
|
END;
|
||||||
|
$$ LANGUAGE plpgsql;
|
||||||
11
migrations/2024-07-07-151037_base_schema/down.sql
Normal file
11
migrations/2024-07-07-151037_base_schema/down.sql
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
-- This file should undo anything in `up.sql`
|
||||||
|
-- This file should undo anything in `up.sql`
|
||||||
|
DROP TABLE IF EXISTS "categories";
|
||||||
|
DROP TABLE IF EXISTS "tags";
|
||||||
|
DROP TABLE IF EXISTS "books";
|
||||||
|
DROP TABLE IF EXISTS "transactions";
|
||||||
|
DROP TABLE IF EXISTS "transaction_tag_rels";
|
||||||
|
DROP TABLE IF EXISTS "accounts";
|
||||||
|
DROP TABLE IF EXISTS "amounts";
|
||||||
|
|
||||||
|
DROP TABLE IF EXISTS "users";
|
||||||
89
migrations/2024-07-07-151037_base_schema/up.sql
Normal file
89
migrations/2024-07-07-151037_base_schema/up.sql
Normal file
@@ -0,0 +1,89 @@
|
|||||||
|
-- Your SQL goes here
|
||||||
|
-- Your SQL goes here
|
||||||
|
CREATE TABLE "categories" (
|
||||||
|
"id" BIGSERIAL PRIMARY KEY,
|
||||||
|
"uid" BIGINT NOT NULL,
|
||||||
|
"book_id" BIGINT NOT NULL,
|
||||||
|
"name" TEXT NOT NULL,
|
||||||
|
"level" INT NOT NULL DEFAULT 0,
|
||||||
|
"parent_category_id" BIGINT NOT NULL DEFAULT 0,
|
||||||
|
"is_delete" BOOLEAN NOT NULL DEFAULT FALSE,
|
||||||
|
"create_at" TIMESTAMP NOT NULL DEFAULT current_timestamp,
|
||||||
|
"update_at" TIMESTAMP NOT NULL DEFAULT current_timestamp
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE "tags" (
|
||||||
|
"id" BIGSERIAL PRIMARY KEY,
|
||||||
|
"uid" BIGINT NOT NULL,
|
||||||
|
"book_id" BIGINT NOT NULL,
|
||||||
|
"name" TEXT NOT NULL,
|
||||||
|
"level" INT NOT NULL DEFAULT 0,
|
||||||
|
"parent_tag_id" BIGINT NOT NULL DEFAULT 0,
|
||||||
|
"is_delete" BOOLEAN NOT NULL DEFAULT FALSE,
|
||||||
|
"create_at" TIMESTAMP NOT NULL DEFAULT current_timestamp,
|
||||||
|
"update_at" TIMESTAMP NOT NULL DEFAULT current_timestamp
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE "books" (
|
||||||
|
"id" BIGSERIAL PRIMARY KEY,
|
||||||
|
"uid" BIGINT NOT NULL,
|
||||||
|
"name" TEXT NOT NULL,
|
||||||
|
"is_delete" BOOLEAN NOT NULL DEFAULT FALSE,
|
||||||
|
"create_at" TIMESTAMP NOT NULL DEFAULT current_timestamp,
|
||||||
|
"update_at" TIMESTAMP NOT NULL DEFAULT current_timestamp
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE "transactions" (
|
||||||
|
"id" BIGSERIAL PRIMARY KEY,
|
||||||
|
"uid" BIGINT NOT NULL,
|
||||||
|
"book_id" BIGINT NOT NULL,
|
||||||
|
"description" TEXT NOT NULL,
|
||||||
|
"category_id" BIGINT NOT NULL,
|
||||||
|
"is_delete" BOOLEAN NOT NULL DEFAULT FALSE,
|
||||||
|
"time" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT current_timestamp,
|
||||||
|
"create_at" TIMESTAMP NOT NULL DEFAULT current_timestamp,
|
||||||
|
"update_at" TIMESTAMP NOT NULL DEFAULT current_timestamp
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE "transaction_tag_rels" (
|
||||||
|
"id" BIGSERIAL PRIMARY KEY,
|
||||||
|
"uid" BIGINT NOT NULL,
|
||||||
|
"transaction_id" BIGINT NOT NULL,
|
||||||
|
"tag_id" BIGINT NOT NULL,
|
||||||
|
"is_delete" BOOLEAN NOT NULL DEFAULT FALSE,
|
||||||
|
"create_at" TIMESTAMP NOT NULL DEFAULT current_timestamp,
|
||||||
|
"update_at" TIMESTAMP NOT NULL DEFAULT current_timestamp
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE "accounts" (
|
||||||
|
"id" BIGSERIAL PRIMARY KEY,
|
||||||
|
"uid" BIGINT NOT NULL,
|
||||||
|
"name" TEXT NOT NULL,
|
||||||
|
"account_type" BIGINT NOT NULL DEFAULT 0,
|
||||||
|
"is_delete" BOOLEAN NOT NULL DEFAULT FALSE,
|
||||||
|
"create_at" TIMESTAMP NOT NULL DEFAULT current_timestamp,
|
||||||
|
"update_at" TIMESTAMP NOT NULL DEFAULT current_timestamp
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE "amounts" (
|
||||||
|
"id" BIGSERIAL PRIMARY KEY,
|
||||||
|
"uid" BIGINT NOT NULL,
|
||||||
|
"account_id" BIGINT NOT NULL,
|
||||||
|
"transaction_id" BIGINT NOT NULL,
|
||||||
|
"value" BIGINT NOT NULL DEFAULT 0,
|
||||||
|
"expo" BIGINT NOT NULL DEFAULT 5,
|
||||||
|
"currency" TEXT NOT NULL DEFAULT '',
|
||||||
|
"is_delete" BOOLEAN NOT NULL DEFAULT FALSE,
|
||||||
|
"create_at" TIMESTAMP NOT NULL DEFAULT current_timestamp,
|
||||||
|
"update_at" TIMESTAMP NOT NULL DEFAULT current_timestamp
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE "users" (
|
||||||
|
"id" BIGSERIAL PRIMARY KEY,
|
||||||
|
"username" TEXT NOT NULL UNIQUE,
|
||||||
|
"password" TEXT NOT NULL,
|
||||||
|
"mail" TEXT NOT NULL,
|
||||||
|
"is_delete" BOOLEAN NOT NULL DEFAULT FALSE,
|
||||||
|
"create_at" TIMESTAMP NOT NULL DEFAULT current_timestamp,
|
||||||
|
"update_at" TIMESTAMP NOT NULL DEFAULT current_timestamp
|
||||||
|
);
|
||||||
150
src/ledger/account.rs
Normal file
150
src/ledger/account.rs
Normal file
@@ -0,0 +1,150 @@
|
|||||||
|
// use std::sync::Arc;
|
||||||
|
use axum::routing::{get, post};
|
||||||
|
use axum::{
|
||||||
|
extract::{Path, State},
|
||||||
|
http::StatusCode,
|
||||||
|
Json, Router,
|
||||||
|
};
|
||||||
|
use axum_macros::debug_handler;
|
||||||
|
use diesel::prelude::*;
|
||||||
|
// use diesel::update;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
// use serde_json::to_string;
|
||||||
|
use crate::model::db_model;
|
||||||
|
use crate::model::schema;
|
||||||
|
use crate::util;
|
||||||
|
use crate::util::req::CommonResp;
|
||||||
|
use chrono::prelude::*;
|
||||||
|
use tracing::info;
|
||||||
|
use crate::middleware::auth;
|
||||||
|
use crate::middleware::auth::Claims;
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct CreateAccountRequest {
|
||||||
|
name: String,
|
||||||
|
account_type: i64,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
pub struct CreateAccountResponse {
|
||||||
|
id: i64,
|
||||||
|
name: String,
|
||||||
|
account_type: i64,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_nest_handlers() -> Router<crate::AppState> {
|
||||||
|
Router::new()
|
||||||
|
.route("/", post(create_account).get(get_all_accounts))
|
||||||
|
.route("/:id", post(update_account).get(get_account))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[debug_handler]
|
||||||
|
pub async fn create_account(
|
||||||
|
State(app_state): State<crate::AppState>,
|
||||||
|
claims: Claims,
|
||||||
|
Json(payload): Json<CreateAccountRequest>,
|
||||||
|
) -> Result<Json<db_model::Account>, (StatusCode, String)> {
|
||||||
|
let uid: i64 = claims.uid.clone();
|
||||||
|
let conn = app_state
|
||||||
|
.db
|
||||||
|
.get()
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
let new_account = db_model::AccountForm {
|
||||||
|
name: payload.name,
|
||||||
|
account_type: payload.account_type,
|
||||||
|
uid: uid,
|
||||||
|
};
|
||||||
|
let res = conn
|
||||||
|
.interact(move |conn| {
|
||||||
|
diesel::insert_into(schema::accounts::table)
|
||||||
|
.values(&new_account)
|
||||||
|
.returning(db_model::Account::as_returning())
|
||||||
|
.get_result(conn)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
Ok(Json(res))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn update_account(
|
||||||
|
Path(id): Path<i64>,
|
||||||
|
State(app_state): State<crate::AppState>,
|
||||||
|
claims: Claims,
|
||||||
|
Json(payload): Json<CreateAccountRequest>,
|
||||||
|
) -> Result<Json<CommonResp>, (StatusCode, String)> {
|
||||||
|
let uid: i64 = claims.uid.clone();
|
||||||
|
let conn = app_state
|
||||||
|
.db
|
||||||
|
.get()
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
let now = Utc::now().naive_utc();
|
||||||
|
let res = conn
|
||||||
|
.interact(move |conn| {
|
||||||
|
diesel::update(schema::accounts::table)
|
||||||
|
.filter(schema::accounts::id.eq(id))
|
||||||
|
.filter(schema::accounts::uid.eq(uid))
|
||||||
|
.set((
|
||||||
|
schema::accounts::name.eq(payload.name),
|
||||||
|
schema::accounts::account_type.eq(payload.account_type),
|
||||||
|
schema::accounts::update_at.eq(now),
|
||||||
|
))
|
||||||
|
.execute(conn)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
let resp = util::req::CommonResp { code: 0 };
|
||||||
|
Ok(Json(resp))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_account(
|
||||||
|
Path(id): Path<i64>,
|
||||||
|
State(app_state): State<crate::AppState>,
|
||||||
|
claims: Claims,
|
||||||
|
) -> Result<Json<db_model::Account>, (StatusCode, String)> {
|
||||||
|
let uid: i64 = claims.uid.clone();
|
||||||
|
let conn = app_state
|
||||||
|
.db
|
||||||
|
.get()
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
let res = conn
|
||||||
|
.interact(move |conn| {
|
||||||
|
schema::accounts::table
|
||||||
|
.filter(schema::accounts::id.eq(id))
|
||||||
|
.filter(schema::accounts::uid.eq(uid))
|
||||||
|
.select(db_model::Account::as_select())
|
||||||
|
.limit(1)
|
||||||
|
.get_result(conn)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
Ok(Json(res))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_all_accounts(
|
||||||
|
State(app_state): State<crate::AppState>,
|
||||||
|
claims: Claims,
|
||||||
|
) -> Result<Json<Vec<db_model::Account>>, (StatusCode, String)> {
|
||||||
|
let uid: i64 = claims.uid.clone();
|
||||||
|
let conn = app_state
|
||||||
|
.db
|
||||||
|
.get()
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
let res = conn
|
||||||
|
.interact(move |conn| {
|
||||||
|
schema::accounts::table
|
||||||
|
.filter(schema::accounts::uid.eq(uid))
|
||||||
|
.select(db_model::Account::as_select())
|
||||||
|
.load(conn)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
Ok(Json(res))
|
||||||
|
}
|
||||||
145
src/ledger/book.rs
Normal file
145
src/ledger/book.rs
Normal file
@@ -0,0 +1,145 @@
|
|||||||
|
use axum::routing::{get, post};
|
||||||
|
use axum::{
|
||||||
|
extract::{Path, State},
|
||||||
|
http::StatusCode,
|
||||||
|
Json, Router,
|
||||||
|
};
|
||||||
|
use axum_macros::debug_handler;
|
||||||
|
use diesel::prelude::*;
|
||||||
|
// use diesel::update;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
// use serde_json::to_string;
|
||||||
|
use crate::model::db_model;
|
||||||
|
use crate::model::schema;
|
||||||
|
use crate::util;
|
||||||
|
use crate::util::req::CommonResp;
|
||||||
|
use chrono::prelude::*;
|
||||||
|
use tracing::info;
|
||||||
|
use crate::middleware::auth;
|
||||||
|
use crate::middleware::auth::Claims;
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct CreateBookRequest {
|
||||||
|
name: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
pub struct CreateBookResponse {
|
||||||
|
id: i64,
|
||||||
|
name: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_nest_handlers() -> Router<crate::AppState> {
|
||||||
|
Router::new()
|
||||||
|
.route("/", post(create_book).get(get_all_books))
|
||||||
|
.route("/:id", post(update_book).get(get_book))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[debug_handler]
|
||||||
|
pub async fn create_book(
|
||||||
|
State(app_state): State<crate::AppState>,
|
||||||
|
claims: Claims,
|
||||||
|
Json(payload): Json<CreateBookRequest>,
|
||||||
|
) -> Result<Json<db_model::Book>, (StatusCode, String)> {
|
||||||
|
let uid: i64 = claims.uid.clone();
|
||||||
|
let conn = app_state
|
||||||
|
.db
|
||||||
|
.get()
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
let new_book = db_model::BookForm {
|
||||||
|
name: payload.name,
|
||||||
|
uid,
|
||||||
|
};
|
||||||
|
let res = conn
|
||||||
|
.interact(move |conn| {
|
||||||
|
diesel::insert_into(schema::books::table)
|
||||||
|
.values(&new_book)
|
||||||
|
.returning(db_model::Book::as_returning())
|
||||||
|
.get_result(conn)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
Ok(Json(res))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn update_book(
|
||||||
|
Path(id): Path<i64>,
|
||||||
|
State(app_state): State<crate::AppState>,
|
||||||
|
claims: Claims,
|
||||||
|
Json(payload): Json<CreateBookRequest>,
|
||||||
|
) -> Result<Json<CommonResp>, (StatusCode, String)> {
|
||||||
|
let uid: i64 = claims.uid.clone();
|
||||||
|
let conn = app_state
|
||||||
|
.db
|
||||||
|
.get()
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
let now = Utc::now().naive_utc();
|
||||||
|
let res = conn
|
||||||
|
.interact(move |conn| {
|
||||||
|
diesel::update(schema::books::table)
|
||||||
|
.filter(schema::books::id.eq(id))
|
||||||
|
.filter(schema::books::uid.eq(uid))
|
||||||
|
.set((
|
||||||
|
schema::books::name.eq(payload.name),
|
||||||
|
schema::books::update_at.eq(now),
|
||||||
|
))
|
||||||
|
.execute(conn)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
let resp = util::req::CommonResp { code: 0 };
|
||||||
|
Ok(Json(resp))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_book(
|
||||||
|
Path(id): Path<i64>,
|
||||||
|
State(app_state): State<crate::AppState>,
|
||||||
|
claims: Claims,
|
||||||
|
) -> Result<Json<db_model::Book>, (StatusCode, String)> {
|
||||||
|
let uid: i64 = claims.uid.clone();
|
||||||
|
let conn = app_state
|
||||||
|
.db
|
||||||
|
.get()
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
let res = conn
|
||||||
|
.interact(move |conn| {
|
||||||
|
schema::books::table
|
||||||
|
.filter(schema::books::id.eq(id))
|
||||||
|
.filter(schema::books::uid.eq(uid))
|
||||||
|
.select(db_model::Book::as_select())
|
||||||
|
.limit(1)
|
||||||
|
.get_result(conn)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
Ok(Json(res))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_all_books(
|
||||||
|
State(app_state): State<crate::AppState>,
|
||||||
|
claims: Claims,
|
||||||
|
) -> Result<Json<Vec<db_model::Book>>, (StatusCode, String)> {
|
||||||
|
let uid: i64 = claims.uid.clone();
|
||||||
|
let conn = app_state
|
||||||
|
.db
|
||||||
|
.get()
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
let res = conn
|
||||||
|
.interact(move |conn| {
|
||||||
|
schema::books::table
|
||||||
|
.filter(schema::books::uid.eq(uid))
|
||||||
|
.select(db_model::Book::as_select())
|
||||||
|
.load(conn)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
Ok(Json(res))
|
||||||
|
}
|
||||||
162
src/ledger/category.rs
Normal file
162
src/ledger/category.rs
Normal file
@@ -0,0 +1,162 @@
|
|||||||
|
// use std::sync::Arc;
|
||||||
|
use axum::routing::{get, post};
|
||||||
|
use axum::{
|
||||||
|
extract::{Path, State},
|
||||||
|
http::StatusCode,
|
||||||
|
Json, Router,
|
||||||
|
};
|
||||||
|
use axum_macros::debug_handler;
|
||||||
|
use diesel::prelude::*;
|
||||||
|
// use diesel::update;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
// use serde_json::to_string;
|
||||||
|
use crate::model::db_model;
|
||||||
|
use crate::model::schema;
|
||||||
|
use crate::util;
|
||||||
|
// use crate::model::schema::categories::dsl::categories;
|
||||||
|
use crate::util::req::CommonResp;
|
||||||
|
use chrono::prelude::*;
|
||||||
|
use tracing::info;
|
||||||
|
use crate::middleware::auth;
|
||||||
|
use crate::middleware::auth::Claims;
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
pub struct CreateCategoryResponse {
|
||||||
|
id: i64,
|
||||||
|
name: String,
|
||||||
|
level: i32,
|
||||||
|
parent_category_id: i64,
|
||||||
|
book_id: i64,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_nest_handlers() -> Router<crate::AppState> {
|
||||||
|
Router::new()
|
||||||
|
.route("/", post(create_category).get(get_all_categories))
|
||||||
|
.route("/:id", post(update_category).get(get_category))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct CreateCategoryRequest {
|
||||||
|
name: String,
|
||||||
|
level: i32,
|
||||||
|
parent_category_id: i64,
|
||||||
|
book_id: i64,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[debug_handler]
|
||||||
|
pub async fn create_category(
|
||||||
|
State(app_state): State<crate::AppState>,
|
||||||
|
claims: Claims,
|
||||||
|
Json(payload): Json<CreateCategoryRequest>,
|
||||||
|
) -> Result<Json<db_model::Category>, (StatusCode, String)> {
|
||||||
|
let uid: i64 = claims.uid.clone(); // TODO replace with actual user id.
|
||||||
|
// let ret = CreateCategoryResponse{id: 134132413541, name: "24532452".to_string()};
|
||||||
|
let conn = app_state
|
||||||
|
.db
|
||||||
|
.get()
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
let new_category = db_model::CategoryForm {
|
||||||
|
name: payload.name,
|
||||||
|
uid: uid,
|
||||||
|
level: payload.level,
|
||||||
|
parent_category_id: payload.parent_category_id,
|
||||||
|
book_id: payload.book_id,
|
||||||
|
};
|
||||||
|
let res = conn
|
||||||
|
.interact(move |conn| {
|
||||||
|
diesel::insert_into(schema::categories::table)
|
||||||
|
.values(&new_category)
|
||||||
|
.returning(db_model::Category::as_returning())
|
||||||
|
.get_result(conn)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
// let ret = CreateCategoryResponse{id: res.id, name: res.name};
|
||||||
|
Ok(Json(res))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn update_category(
|
||||||
|
Path(id): Path<i64>,
|
||||||
|
State(app_state): State<crate::AppState>,
|
||||||
|
claims: Claims,
|
||||||
|
Json(payload): Json<CreateCategoryRequest>,
|
||||||
|
) -> Result<Json<CommonResp>, (StatusCode, String)> {
|
||||||
|
let uid: i64 = claims.uid.clone(); // TODO replace with actual user id.
|
||||||
|
// let ret = CreateCategoryResponse{id: 134132413541, name: "24532452".to_string()};
|
||||||
|
let conn = app_state
|
||||||
|
.db
|
||||||
|
.get()
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
let now = Utc::now().naive_utc();
|
||||||
|
let res = conn
|
||||||
|
.interact(move |conn| {
|
||||||
|
diesel::update(schema::categories::table)
|
||||||
|
.filter(schema::categories::id.eq(id))
|
||||||
|
.filter(schema::categories::uid.eq(uid))
|
||||||
|
.set((
|
||||||
|
schema::categories::name.eq(payload.name),
|
||||||
|
schema::categories::level.eq(payload.level),
|
||||||
|
schema::categories::parent_category_id.eq(payload.parent_category_id),
|
||||||
|
schema::categories::update_at.eq(now),
|
||||||
|
))
|
||||||
|
.execute(conn)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
// let ret = CreateCategoryResponse{id: res.id, name: res.name};
|
||||||
|
let resp = util::req::CommonResp { code: 0 };
|
||||||
|
Ok(Json(resp))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_category(
|
||||||
|
Path(id): Path<i64>,
|
||||||
|
State(app_state): State<crate::AppState>,
|
||||||
|
claims: Claims,
|
||||||
|
) -> Result<Json<db_model::Category>, (StatusCode, String)> {
|
||||||
|
let uid: i64 = claims.uid.clone();
|
||||||
|
let conn = app_state
|
||||||
|
.db
|
||||||
|
.get()
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
let res = conn
|
||||||
|
.interact(move |conn| {
|
||||||
|
schema::categories::table
|
||||||
|
.filter(schema::categories::id.eq(id))
|
||||||
|
.filter(schema::categories::uid.eq(uid))
|
||||||
|
.select(db_model::Category::as_select())
|
||||||
|
.limit(1)
|
||||||
|
.get_result(conn)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
Ok(Json(res))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_all_categories(
|
||||||
|
State(app_state): State<crate::AppState>,
|
||||||
|
claims: Claims,
|
||||||
|
) -> Result<Json<Vec<db_model::Category>>, (StatusCode, String)> {
|
||||||
|
let uid: i64 = claims.uid.clone();
|
||||||
|
let conn = app_state
|
||||||
|
.db
|
||||||
|
.get()
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
let res = conn
|
||||||
|
.interact(move |conn| {
|
||||||
|
schema::categories::table
|
||||||
|
.filter(schema::categories::uid.eq(uid))
|
||||||
|
.select(db_model::Category::as_select())
|
||||||
|
.load(conn)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
Ok(Json(res))
|
||||||
|
}
|
||||||
5
src/ledger/mod.rs
Normal file
5
src/ledger/mod.rs
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
pub mod category;
|
||||||
|
pub mod tag;
|
||||||
|
pub mod book;
|
||||||
|
pub mod account;
|
||||||
|
pub mod transaction;
|
||||||
157
src/ledger/tag.rs
Normal file
157
src/ledger/tag.rs
Normal file
@@ -0,0 +1,157 @@
|
|||||||
|
// use std::sync::Arc;
|
||||||
|
use axum::routing::{get, post};
|
||||||
|
use axum::{
|
||||||
|
extract::{Path, State},
|
||||||
|
http::StatusCode,
|
||||||
|
Json, Router,
|
||||||
|
};
|
||||||
|
use axum_macros::debug_handler;
|
||||||
|
use diesel::prelude::*;
|
||||||
|
// use diesel::update;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
// use serde_json::to_string;
|
||||||
|
use crate::model::db_model;
|
||||||
|
use crate::model::schema;
|
||||||
|
use crate::util;
|
||||||
|
use crate::util::req::CommonResp;
|
||||||
|
use chrono::prelude::*;
|
||||||
|
use tracing::info;
|
||||||
|
use crate::middleware::auth;
|
||||||
|
use crate::middleware::auth::Claims;
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct CreateTagRequest {
|
||||||
|
book_id: i64,
|
||||||
|
name: String,
|
||||||
|
level: i32,
|
||||||
|
parent_tag_id: i64,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
pub struct CreateTagResponse {
|
||||||
|
id: i64,
|
||||||
|
name: String,
|
||||||
|
book_id: i64,
|
||||||
|
level: i32,
|
||||||
|
parent_tag_id: i64,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_nest_handlers() -> Router<crate::AppState> {
|
||||||
|
Router::new()
|
||||||
|
.route("/", post(create_tag).get(get_all_tags))
|
||||||
|
.route("/:id", post(update_tag).get(get_tag))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[debug_handler]
|
||||||
|
pub async fn create_tag(
|
||||||
|
State(app_state): State<crate::AppState>,
|
||||||
|
claims: Claims,
|
||||||
|
Json(payload): Json<CreateTagRequest>,
|
||||||
|
) -> Result<Json<db_model::Tag>, (StatusCode, String)> {
|
||||||
|
let uid: i64 = claims.uid.clone();
|
||||||
|
let conn = app_state
|
||||||
|
.db
|
||||||
|
.get()
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
let new_tag = db_model::TagForm {
|
||||||
|
book_id:payload.book_id,
|
||||||
|
name: payload.name,
|
||||||
|
uid: uid,
|
||||||
|
level: payload.level,
|
||||||
|
parent_tag_id: payload.parent_tag_id,
|
||||||
|
};
|
||||||
|
let res = conn
|
||||||
|
.interact(move |conn| {
|
||||||
|
diesel::insert_into(schema::tags::table)
|
||||||
|
.values(&new_tag)
|
||||||
|
.returning(db_model::Tag::as_returning())
|
||||||
|
.get_result(conn)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
Ok(Json(res))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn update_tag(
|
||||||
|
Path(id): Path<i64>,
|
||||||
|
State(app_state): State<crate::AppState>,
|
||||||
|
claims: Claims,
|
||||||
|
Json(payload): Json<CreateTagRequest>,
|
||||||
|
) -> Result<Json<CommonResp>, (StatusCode, String)> {
|
||||||
|
let uid: i64 = claims.uid.clone();
|
||||||
|
let conn = app_state
|
||||||
|
.db
|
||||||
|
.get()
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
let now = Utc::now().naive_utc();
|
||||||
|
let res = conn
|
||||||
|
.interact(move |conn| {
|
||||||
|
diesel::update(schema::tags::table)
|
||||||
|
.filter(schema::tags::id.eq(id))
|
||||||
|
.filter(schema::tags::uid.eq(uid))
|
||||||
|
.set((
|
||||||
|
schema::tags::name.eq(payload.name),
|
||||||
|
schema::tags::level.eq(payload.level),
|
||||||
|
schema::tags::parent_tag_id.eq(payload.parent_tag_id),
|
||||||
|
schema::tags::update_at.eq(now),
|
||||||
|
))
|
||||||
|
.execute(conn)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
let resp = util::req::CommonResp { code: 0 };
|
||||||
|
Ok(Json(resp))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_tag(
|
||||||
|
Path(id): Path<i64>,
|
||||||
|
State(app_state): State<crate::AppState>,
|
||||||
|
claims: Claims,
|
||||||
|
) -> Result<Json<db_model::Tag>, (StatusCode, String)> {
|
||||||
|
let uid: i64 = claims.uid.clone();
|
||||||
|
let conn = app_state
|
||||||
|
.db
|
||||||
|
.get()
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
let res = conn
|
||||||
|
.interact(move |conn| {
|
||||||
|
schema::tags::table
|
||||||
|
.filter(schema::tags::id.eq(id))
|
||||||
|
.filter(schema::tags::uid.eq(uid))
|
||||||
|
.select(db_model::Tag::as_select())
|
||||||
|
.limit(1)
|
||||||
|
.get_result(conn)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
Ok(Json(res))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_all_tags(
|
||||||
|
State(app_state): State<crate::AppState>,
|
||||||
|
claims: Claims,
|
||||||
|
) -> Result<Json<Vec<db_model::Tag>>, (StatusCode, String)> {
|
||||||
|
let uid: i64 = claims.uid.clone();
|
||||||
|
let conn = app_state
|
||||||
|
.db
|
||||||
|
.get()
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
let res = conn
|
||||||
|
.interact(move |conn| {
|
||||||
|
schema::tags::table
|
||||||
|
.filter(schema::tags::uid.eq(uid))
|
||||||
|
.select(db_model::Tag::as_select())
|
||||||
|
.load(conn)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
Ok(Json(res))
|
||||||
|
}
|
||||||
364
src/ledger/transaction.rs
Normal file
364
src/ledger/transaction.rs
Normal file
@@ -0,0 +1,364 @@
|
|||||||
|
use axum::extract::Query;
|
||||||
|
use axum::routing::{get, post};
|
||||||
|
use axum::{
|
||||||
|
extract::{Path, State},
|
||||||
|
http::StatusCode,
|
||||||
|
Json, Router,
|
||||||
|
};
|
||||||
|
use axum_macros::debug_handler;
|
||||||
|
use diesel::dsl::exists;
|
||||||
|
use diesel::prelude::*;
|
||||||
|
use std::fmt;
|
||||||
|
// use diesel::update;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
// use serde_json::to_string;
|
||||||
|
use crate::middleware::auth;
|
||||||
|
use crate::middleware::auth::Claims;
|
||||||
|
use crate::model::{db_model,schema,req};
|
||||||
|
use crate::util;
|
||||||
|
use crate::util::req::CommonResp;
|
||||||
|
use chrono::prelude::*;
|
||||||
|
use tracing::info;
|
||||||
|
use crate::model::req::Params;
|
||||||
|
|
||||||
|
const PAYMENT_STORE_EXPO: i64 = 5;
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct SubmitTransactionRequest {
|
||||||
|
description: String,
|
||||||
|
book_id: i64,
|
||||||
|
category_id: i64,
|
||||||
|
tag_ids: Vec<i64>,
|
||||||
|
time: String,
|
||||||
|
amounts: Vec<SubmitTransactionAmountRequest>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct SubmitTransactionAmountRequest {
|
||||||
|
account_id: i64,
|
||||||
|
payment: String,
|
||||||
|
expo: i32,
|
||||||
|
currency: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
pub struct CreateTransactionResponse {
|
||||||
|
pub id: i64,
|
||||||
|
pub book_id: i64,
|
||||||
|
pub description: String,
|
||||||
|
pub category_id: i64,
|
||||||
|
pub time: chrono::DateTime<Utc>,
|
||||||
|
pub tag_ids: Vec<i64>,
|
||||||
|
pub amount_ids: Vec<i64>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_nest_handlers() -> Router<crate::AppState> {
|
||||||
|
Router::new()
|
||||||
|
.route(
|
||||||
|
"/entry",
|
||||||
|
post(create_transaction) // create new transaction entry with amount
|
||||||
|
.get(get_all_transactions),// get all transactions with entry
|
||||||
|
)
|
||||||
|
.route("/entry/:id", get(get_transaction)) // get transaction entry
|
||||||
|
.route("/amount", get(get_amounts_by_tid))
|
||||||
|
// .route("/entry/amount/:id", post(update_amount).get(get_amount)) // require query param tid=transaction_id
|
||||||
|
}
|
||||||
|
// implementation, or do something in between.
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
struct TransactionError;
|
||||||
|
|
||||||
|
impl fmt::Display for TransactionError {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||||
|
write!(f, "invalid transaction insert result")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[debug_handler]
|
||||||
|
pub async fn create_transaction(
|
||||||
|
State(app_state): State<crate::AppState>,
|
||||||
|
claims: Claims,
|
||||||
|
Json(payload): Json<SubmitTransactionRequest>,
|
||||||
|
) -> Result<String, (StatusCode, String)> {
|
||||||
|
// ) -> Result<Json<db_model::Transaction>, (StatusCode, String)> {
|
||||||
|
let uid: i64 = claims.uid.clone();
|
||||||
|
let conn = app_state
|
||||||
|
.db
|
||||||
|
.get()
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
|
||||||
|
// 1. check related ids
|
||||||
|
// 1.1 check book id
|
||||||
|
if payload.book_id <= 0 {
|
||||||
|
return Err((StatusCode::BAD_REQUEST, "invalid book id".to_string()));
|
||||||
|
}
|
||||||
|
let check_book = conn
|
||||||
|
.interact(move |conn| {
|
||||||
|
diesel::select(exists(
|
||||||
|
schema::books::table
|
||||||
|
.filter(schema::books::uid.eq(uid))
|
||||||
|
.filter(schema::books::id.eq(payload.book_id)),
|
||||||
|
))
|
||||||
|
.get_result::<bool>(conn)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
|
||||||
|
println!("book valid: {}", check_book);
|
||||||
|
if !check_book {
|
||||||
|
return Err((StatusCode::BAD_REQUEST, "invalid book id".to_string()));
|
||||||
|
}
|
||||||
|
// 1.2 check category id
|
||||||
|
if payload.category_id <= 0 {
|
||||||
|
return Err((StatusCode::BAD_REQUEST, "invalid category id".to_string()));
|
||||||
|
}
|
||||||
|
let check_category = conn
|
||||||
|
.interact(move |conn| {
|
||||||
|
diesel::select(exists(
|
||||||
|
schema::categories::table
|
||||||
|
.filter(schema::categories::uid.eq(uid))
|
||||||
|
.filter(schema::categories::id.eq(payload.category_id)),
|
||||||
|
))
|
||||||
|
.get_result::<bool>(conn)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
|
||||||
|
println!("category valid: {}", check_category);
|
||||||
|
if !check_category {
|
||||||
|
return Err((StatusCode::BAD_REQUEST, "invalid category id".to_string()));
|
||||||
|
}
|
||||||
|
// 1.3 check tag ids
|
||||||
|
let payload_tag_size = payload.tag_ids.len() as i64;
|
||||||
|
let mut check_tag = payload_tag_size == 0;
|
||||||
|
if !check_tag {
|
||||||
|
let check_tag_count = conn
|
||||||
|
.interact(move |conn| {
|
||||||
|
schema::tags::table
|
||||||
|
.filter(schema::tags::uid.eq(uid))
|
||||||
|
.filter(schema::tags::id.eq_any(payload.tag_ids))
|
||||||
|
.select(diesel::dsl::count(schema::tags::id))
|
||||||
|
.first(conn)
|
||||||
|
.map(|x: i64| x as i64)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
println!("check tag: {}", check_tag_count);
|
||||||
|
check_tag = check_tag_count == payload_tag_size;
|
||||||
|
}
|
||||||
|
|
||||||
|
println!("tag valid: {}", check_tag);
|
||||||
|
|
||||||
|
if !check_tag {
|
||||||
|
return Err((StatusCode::BAD_REQUEST, "invalid tag ids".to_string()));
|
||||||
|
}
|
||||||
|
|
||||||
|
// 1.4 check account
|
||||||
|
let mut check_amount = true;
|
||||||
|
let mut amounts: Vec<db_model::AmountForm> = Vec::new();
|
||||||
|
for amount_req in payload.amounts {
|
||||||
|
// Parse and check payment
|
||||||
|
let parse_payment_result =
|
||||||
|
util::math::parse_payment_to_value_expo(amount_req.payment.clone(), PAYMENT_STORE_EXPO);
|
||||||
|
let value: i64;
|
||||||
|
let expo: i64;
|
||||||
|
match parse_payment_result {
|
||||||
|
Ok((val, expon)) => {
|
||||||
|
value = val;
|
||||||
|
expo = expon;
|
||||||
|
}
|
||||||
|
Err(_) => {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let amount = db_model::AmountForm {
|
||||||
|
uid: uid,
|
||||||
|
account_id: amount_req.account_id,
|
||||||
|
transaction_id: 0,
|
||||||
|
value: value,
|
||||||
|
expo: expo,
|
||||||
|
currency: amount_req.currency.clone(),
|
||||||
|
};
|
||||||
|
check_amount = check_amount && true;
|
||||||
|
amounts.push(amount);
|
||||||
|
}
|
||||||
|
|
||||||
|
if !check_amount || amounts.len() == 0 {
|
||||||
|
return Err((StatusCode::BAD_REQUEST, "invalid amount".to_string()));
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. build and insert into db
|
||||||
|
|
||||||
|
let mut transaction_resp: CreateTransactionResponse;
|
||||||
|
let mut amount_ids: Vec<i64> = Vec::new();
|
||||||
|
|
||||||
|
let transaction = conn
|
||||||
|
.interact(move |conn| {
|
||||||
|
conn.transaction(|conn| {
|
||||||
|
let new_transaction = db_model::TransactionForm {
|
||||||
|
id: None,
|
||||||
|
uid: uid,
|
||||||
|
book_id: payload.book_id,
|
||||||
|
description: payload.description,
|
||||||
|
category_id: payload.category_id,
|
||||||
|
// time: payload
|
||||||
|
time: Utc::now(),
|
||||||
|
};
|
||||||
|
let inserted_transactions = diesel::insert_into(schema::transactions::table)
|
||||||
|
.values(&new_transaction)
|
||||||
|
.returning(db_model::Transaction::as_returning())
|
||||||
|
.get_results(conn);
|
||||||
|
|
||||||
|
let mut new_tr_vec: Vec<db_model::Transaction>;
|
||||||
|
match inserted_transactions {
|
||||||
|
Ok(tr) => new_tr_vec = tr,
|
||||||
|
Err(e) => {
|
||||||
|
return diesel::result::QueryResult::Err(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let mut new_tid = 0 as i64;
|
||||||
|
let new_tr = new_tr_vec.get(0);
|
||||||
|
match new_tr {
|
||||||
|
Some(tr) =>new_tid = tr.id,
|
||||||
|
None => new_tid = 0,
|
||||||
|
}
|
||||||
|
if new_tid <= 0 {
|
||||||
|
return diesel::result::QueryResult::Err(diesel::result::Error::NotFound);
|
||||||
|
}
|
||||||
|
for amount in amounts.iter_mut() {
|
||||||
|
amount.transaction_id = new_tid;
|
||||||
|
}
|
||||||
|
let inserted_amounts = diesel::insert_into(schema::amounts::table)
|
||||||
|
.values(&amounts)
|
||||||
|
.returning(db_model::Amount::as_returning())
|
||||||
|
.get_results(conn);
|
||||||
|
let new_amounts: Vec<db_model::Amount> = match inserted_amounts {
|
||||||
|
Ok(ams) => ams,
|
||||||
|
Err(_) => Vec::new(),
|
||||||
|
};
|
||||||
|
for am in new_amounts {
|
||||||
|
amount_ids.push(am.id)
|
||||||
|
};
|
||||||
|
diesel::result::QueryResult::Ok(())
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
|
||||||
|
// 3. build response data.
|
||||||
|
|
||||||
|
// Ok(Json(res))
|
||||||
|
Ok("finish".to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn update_transaction(
|
||||||
|
Path(id): Path<i64>,
|
||||||
|
State(app_state): State<crate::AppState>,
|
||||||
|
claims: Claims,
|
||||||
|
Json(payload): Json<SubmitTransactionRequest>,
|
||||||
|
) -> Result<Json<CommonResp>, (StatusCode, String)> {
|
||||||
|
let uid: i64 = claims.uid.clone();
|
||||||
|
let conn = app_state
|
||||||
|
.db
|
||||||
|
.get()
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
let now = Utc::now().naive_utc();
|
||||||
|
let res = conn
|
||||||
|
.interact(move |conn| {
|
||||||
|
diesel::update(schema::transactions::table)
|
||||||
|
.filter(schema::transactions::id.eq(id))
|
||||||
|
.filter(schema::transactions::uid.eq(uid))
|
||||||
|
.set((
|
||||||
|
schema::transactions::description.eq(payload.description),
|
||||||
|
schema::transactions::update_at.eq(now),
|
||||||
|
))
|
||||||
|
.execute(conn)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
let resp = util::req::CommonResp { code: 0 };
|
||||||
|
Ok(Json(resp))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_transaction(
|
||||||
|
Path(id): Path<i64>,
|
||||||
|
State(app_state): State<crate::AppState>,
|
||||||
|
claims: Claims,
|
||||||
|
) -> Result<Json<db_model::Transaction>, (StatusCode, String)> {
|
||||||
|
let uid: i64 = claims.uid.clone();
|
||||||
|
let conn = app_state
|
||||||
|
.db
|
||||||
|
.get()
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
let res = conn
|
||||||
|
.interact(move |conn| {
|
||||||
|
schema::transactions::table
|
||||||
|
.filter(schema::transactions::id.eq(id))
|
||||||
|
.filter(schema::transactions::uid.eq(uid))
|
||||||
|
.select(db_model::Transaction::as_select())
|
||||||
|
.limit(1)
|
||||||
|
.get_result(conn)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
Ok(Json(res))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_all_transactions(
|
||||||
|
State(app_state): State<crate::AppState>,
|
||||||
|
claims: Claims,
|
||||||
|
) -> Result<Json<Vec<db_model::Transaction>>, (StatusCode, String)> {
|
||||||
|
let uid: i64 = claims.uid.clone();
|
||||||
|
let conn = app_state
|
||||||
|
.db
|
||||||
|
.get()
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
let res = conn
|
||||||
|
.interact(move |conn| {
|
||||||
|
schema::transactions::table
|
||||||
|
.filter(schema::transactions::uid.eq(uid))
|
||||||
|
.select(db_model::Transaction::as_select())
|
||||||
|
.load(conn)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
Ok(Json(res))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_amounts_by_tid(
|
||||||
|
State(app_state): State<crate::AppState>,
|
||||||
|
claims: Claims,
|
||||||
|
Query(params): Query<Params>,
|
||||||
|
) -> Result<Json<Vec<db_model::Amount>>, (StatusCode, String)> {
|
||||||
|
info!(params.transaction_id);
|
||||||
|
let tid = match params.transaction_id {
|
||||||
|
None => 0,
|
||||||
|
Some(idx) => idx,
|
||||||
|
};
|
||||||
|
let uid: i64 = claims.uid.clone();
|
||||||
|
let conn = app_state
|
||||||
|
.db
|
||||||
|
.get()
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
let res = conn.interact(move |conn| {
|
||||||
|
schema::amounts::table
|
||||||
|
.filter(schema::amounts::uid.eq(uid))
|
||||||
|
.filter(schema::amounts::transaction_id.eq(tid))
|
||||||
|
.select(db_model::Amount::as_select())
|
||||||
|
.load(conn)
|
||||||
|
}).await
|
||||||
|
.map_err(util::req::internal_error)?
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
Ok(Json(res))
|
||||||
|
}
|
||||||
107
src/main.rs
107
src/main.rs
@@ -1,3 +1,106 @@
|
|||||||
fn main() {
|
use std::env;
|
||||||
println!("Hello, world!");
|
use axum::{
|
||||||
|
// http::StatusCode,
|
||||||
|
// routing::{get, post},
|
||||||
|
// Json,
|
||||||
|
Router,
|
||||||
|
};
|
||||||
|
use axum::http::Method;
|
||||||
|
// use pbkdf2::password_hash::Error;
|
||||||
|
// use serde::{Deserialize, Serialize};
|
||||||
|
use tower::ServiceBuilder;
|
||||||
|
use tower_http::cors::{Any, CorsLayer};
|
||||||
|
use tower_http::trace::TraceLayer;
|
||||||
|
use tracing::info;
|
||||||
|
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
|
||||||
|
use crate::util::pass::get_pbkdf2_from_psw;
|
||||||
|
|
||||||
|
// Project modules
|
||||||
|
mod ledger;
|
||||||
|
mod middleware;
|
||||||
|
mod model;
|
||||||
|
mod util;
|
||||||
|
mod user;
|
||||||
|
|
||||||
|
// Passed App State
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct AppState {
|
||||||
|
db: deadpool_diesel::postgres::Pool,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::main]
|
||||||
|
async fn main() {
|
||||||
|
dotenvy::dotenv().unwrap();
|
||||||
|
tracing_subscriber::registry()
|
||||||
|
.with(tracing_subscriber::fmt::layer())
|
||||||
|
.init();
|
||||||
|
|
||||||
|
let args: Vec<String> = env::args().collect();
|
||||||
|
|
||||||
|
if args.len() <= 1 {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// initialize db connection
|
||||||
|
let db_url = std::env::var("DATABASE_URL").unwrap();
|
||||||
|
|
||||||
|
let manager = deadpool_diesel::postgres::Manager::new(db_url, deadpool_diesel::Runtime::Tokio1);
|
||||||
|
let pool = deadpool_diesel::postgres::Pool::builder(manager)
|
||||||
|
.build()
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let shared_state = AppState { db: pool };
|
||||||
|
let cmd = args[1].clone();
|
||||||
|
|
||||||
|
match cmd.as_str() {
|
||||||
|
"add_user" => {
|
||||||
|
println!("adding user");
|
||||||
|
if args.len() <= 4 {
|
||||||
|
println!("insufficient arg number");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let user = args[2].clone();
|
||||||
|
let psw = args[3].clone();
|
||||||
|
let mail = args[4].clone();
|
||||||
|
println!("adding user {}", user);
|
||||||
|
let hashed = get_pbkdf2_from_psw(psw);
|
||||||
|
let mut hash_psw = "".to_string();
|
||||||
|
match hashed {
|
||||||
|
Ok(val) => {
|
||||||
|
println!("get hash {}", val);
|
||||||
|
hash_psw=val;
|
||||||
|
}
|
||||||
|
Err(_) => {}
|
||||||
|
}
|
||||||
|
let res = user::dal::add_user(shared_state, user, hash_psw, mail)
|
||||||
|
.await;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
println!("unknown command {}", cmd);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Register routers
|
||||||
|
let cors_layer = CorsLayer::new()
|
||||||
|
.allow_methods([Method::GET, Method::POST])
|
||||||
|
.allow_origin(Any);
|
||||||
|
let global_layer = ServiceBuilder::new()
|
||||||
|
.layer(TraceLayer::new_for_http())
|
||||||
|
.layer(cors_layer);
|
||||||
|
|
||||||
|
let app = Router::new()
|
||||||
|
// V1 apis
|
||||||
|
.nest("/api/v1/category", ledger::category::get_nest_handlers())
|
||||||
|
.nest("/api/v1/tag", ledger::tag::get_nest_handlers())
|
||||||
|
.nest("/api/v1/book", ledger::book::get_nest_handlers())
|
||||||
|
.nest("/api/v1/account", ledger::account::get_nest_handlers())
|
||||||
|
.nest("/api/v1/transaction", ledger::transaction::get_nest_handlers())
|
||||||
|
.nest("/api/v1/user", user::handler::get_nest_handlers())
|
||||||
|
.with_state(shared_state)
|
||||||
|
.layer(global_layer);
|
||||||
|
|
||||||
|
let listener = tokio::net::TcpListener::bind("0.0.0.0:8987").await.unwrap();
|
||||||
|
info!("starting server on 0.0.0.0:8987");
|
||||||
|
axum::serve(listener, app).await.unwrap();
|
||||||
}
|
}
|
||||||
|
|||||||
118
src/middleware/auth.rs
Normal file
118
src/middleware/auth.rs
Normal file
@@ -0,0 +1,118 @@
|
|||||||
|
use axum::{
|
||||||
|
async_trait,
|
||||||
|
extract::FromRequestParts,
|
||||||
|
http::{
|
||||||
|
request::Parts,
|
||||||
|
StatusCode,
|
||||||
|
},
|
||||||
|
Json, RequestPartsExt,
|
||||||
|
response::{IntoResponse, Response},
|
||||||
|
};
|
||||||
|
use axum_extra::{
|
||||||
|
headers::{authorization::Bearer, Authorization},
|
||||||
|
TypedHeader,
|
||||||
|
};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use serde_json::json;
|
||||||
|
use jsonwebtoken::{decode,encode, DecodingKey, EncodingKey, Header, Validation};
|
||||||
|
use std::fmt::Display;
|
||||||
|
use once_cell::sync::Lazy;
|
||||||
|
use crate::util;
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
pub struct Claims {
|
||||||
|
sub: String,
|
||||||
|
// company: String,
|
||||||
|
exp: usize,
|
||||||
|
pub uid: i64,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize)]
|
||||||
|
struct AuthBody {
|
||||||
|
access_token: String,
|
||||||
|
token_type: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize)]
|
||||||
|
struct AuthPayload {
|
||||||
|
client_id: String,
|
||||||
|
client_secret: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub enum AuthError {
|
||||||
|
WrongCredentials,
|
||||||
|
MissingCredentials,
|
||||||
|
TokenCreation,
|
||||||
|
InvalidToken,
|
||||||
|
}
|
||||||
|
|
||||||
|
static KEYS: Lazy<Keys> = Lazy::new(|| {
|
||||||
|
let secret = std::env::var("JWT_SECRET").expect("JWT_SECRET must be set");
|
||||||
|
Keys::new(secret.as_bytes())
|
||||||
|
});
|
||||||
|
|
||||||
|
struct Keys {
|
||||||
|
encoding: EncodingKey,
|
||||||
|
decoding: DecodingKey,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Keys {
|
||||||
|
fn new(secret: &[u8]) -> Self {
|
||||||
|
Self {
|
||||||
|
encoding: EncodingKey::from_secret(secret),
|
||||||
|
decoding: DecodingKey::from_secret(secret),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Display for Claims {
|
||||||
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
|
write!(f, "Email: {}", self.sub)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl AuthBody {
|
||||||
|
fn new(access_token: String) -> Self {
|
||||||
|
Self {
|
||||||
|
access_token,
|
||||||
|
token_type: "Bearer".to_string(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[async_trait]
|
||||||
|
impl<S> FromRequestParts<S> for Claims
|
||||||
|
where
|
||||||
|
S: Send + Sync,
|
||||||
|
{
|
||||||
|
type Rejection = (StatusCode, String);
|
||||||
|
|
||||||
|
async fn from_request_parts(parts: &mut Parts, _state: &S) -> Result<Self, Self::Rejection> {
|
||||||
|
// Extract the token from the authorization header
|
||||||
|
let TypedHeader(Authorization(bearer)) = parts
|
||||||
|
.extract::<TypedHeader<Authorization<Bearer>>>()
|
||||||
|
.await
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
// Decode the user data
|
||||||
|
let token_data = decode::<Claims>(bearer.token(), &KEYS.decoding, &Validation::default())
|
||||||
|
.map_err(util::req::internal_error)?;
|
||||||
|
|
||||||
|
Ok(token_data.claims)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl IntoResponse for AuthError {
|
||||||
|
fn into_response(self) -> Response {
|
||||||
|
let (status, error_message) = match self {
|
||||||
|
AuthError::WrongCredentials => (StatusCode::UNAUTHORIZED, "Wrong credentials"),
|
||||||
|
AuthError::MissingCredentials => (StatusCode::BAD_REQUEST, "Missing credentials"),
|
||||||
|
AuthError::TokenCreation => (StatusCode::INTERNAL_SERVER_ERROR, "Token creation error"),
|
||||||
|
AuthError::InvalidToken => (StatusCode::BAD_REQUEST, "Invalid token"),
|
||||||
|
};
|
||||||
|
let body = Json(json!({
|
||||||
|
"error": error_message,
|
||||||
|
}));
|
||||||
|
(status, body).into_response()
|
||||||
|
}
|
||||||
|
}
|
||||||
1
src/middleware/mod.rs
Normal file
1
src/middleware/mod.rs
Normal file
@@ -0,0 +1 @@
|
|||||||
|
pub mod auth;
|
||||||
164
src/model/db_model.rs
Normal file
164
src/model/db_model.rs
Normal file
@@ -0,0 +1,164 @@
|
|||||||
|
use crate::model::schema;
|
||||||
|
use diesel::prelude::*;
|
||||||
|
use chrono::{DateTime, Utc};
|
||||||
|
|
||||||
|
#[derive(Queryable, Selectable, serde::Serialize, serde::Deserialize)]
|
||||||
|
#[diesel(table_name = schema::categories)]
|
||||||
|
#[diesel(check_for_backend(diesel::pg::Pg))]
|
||||||
|
pub struct Category {
|
||||||
|
id: i64,
|
||||||
|
uid: i64,
|
||||||
|
name: String,
|
||||||
|
level: i32,
|
||||||
|
parent_category_id: i64,
|
||||||
|
book_id: i64,
|
||||||
|
is_delete: bool,
|
||||||
|
create_at: chrono::NaiveDateTime,
|
||||||
|
update_at: chrono::NaiveDateTime,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(serde::Deserialize, Insertable)]
|
||||||
|
#[diesel(table_name = schema::categories)]
|
||||||
|
pub struct CategoryForm {
|
||||||
|
pub uid: i64,
|
||||||
|
pub name: String,
|
||||||
|
pub book_id: i64,
|
||||||
|
pub level: i32,
|
||||||
|
pub parent_category_id: i64,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Queryable, Selectable, serde::Serialize, serde::Deserialize)]
|
||||||
|
#[diesel(table_name = schema::tags)]
|
||||||
|
#[diesel(check_for_backend(diesel::pg::Pg))]
|
||||||
|
pub struct Tag {
|
||||||
|
id: i64,
|
||||||
|
uid: i64,
|
||||||
|
book_id: i64,
|
||||||
|
name: String,
|
||||||
|
level: i32,
|
||||||
|
parent_tag_id: i64,
|
||||||
|
is_delete: bool,
|
||||||
|
create_at: chrono::NaiveDateTime,
|
||||||
|
update_at: chrono::NaiveDateTime,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(serde::Deserialize, Insertable)]
|
||||||
|
#[diesel(table_name = schema::tags)]
|
||||||
|
pub struct TagForm {
|
||||||
|
pub uid: i64,
|
||||||
|
pub book_id: i64,
|
||||||
|
pub name: String,
|
||||||
|
pub level: i32,
|
||||||
|
pub parent_tag_id: i64,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Queryable, Selectable, serde::Serialize, serde::Deserialize)]
|
||||||
|
#[diesel(table_name = schema::books)]
|
||||||
|
#[diesel(check_for_backend(diesel::pg::Pg))]
|
||||||
|
pub struct Book {
|
||||||
|
id: i64,
|
||||||
|
uid: i64,
|
||||||
|
name: String,
|
||||||
|
is_delete: bool,
|
||||||
|
create_at: chrono::NaiveDateTime,
|
||||||
|
update_at: chrono::NaiveDateTime,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(serde::Deserialize, Insertable)]
|
||||||
|
#[diesel(table_name = schema::books)]
|
||||||
|
pub struct BookForm {
|
||||||
|
pub uid: i64,
|
||||||
|
pub name: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Queryable, Selectable, serde::Serialize, serde::Deserialize)]
|
||||||
|
#[diesel(table_name = schema::accounts)]
|
||||||
|
#[diesel(check_for_backend(diesel::pg::Pg))]
|
||||||
|
pub struct Account {
|
||||||
|
id: i64,
|
||||||
|
uid: i64,
|
||||||
|
name: String,
|
||||||
|
account_type: i64,
|
||||||
|
is_delete: bool,
|
||||||
|
create_at: chrono::NaiveDateTime,
|
||||||
|
update_at: chrono::NaiveDateTime,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(serde::Deserialize, Insertable)]
|
||||||
|
#[diesel(table_name = schema::accounts)]
|
||||||
|
pub struct AccountForm {
|
||||||
|
pub uid: i64,
|
||||||
|
pub name: String,
|
||||||
|
pub account_type: i64,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Queryable, Selectable, serde::Serialize, serde::Deserialize)]
|
||||||
|
#[diesel(table_name = schema::transactions)]
|
||||||
|
#[diesel(check_for_backend(diesel::pg::Pg))]
|
||||||
|
pub struct Transaction {
|
||||||
|
pub id: i64,
|
||||||
|
uid: i64,
|
||||||
|
pub book_id: i64,
|
||||||
|
pub description: String,
|
||||||
|
pub category_id: i64,
|
||||||
|
pub time: chrono::DateTime<Utc>,
|
||||||
|
is_delete: bool,
|
||||||
|
create_at: chrono::NaiveDateTime,
|
||||||
|
update_at: chrono::NaiveDateTime,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(serde::Deserialize, Insertable)]
|
||||||
|
#[diesel(table_name = schema::transactions)]
|
||||||
|
pub struct TransactionForm {
|
||||||
|
pub id: Option<i64>,
|
||||||
|
pub uid: i64,
|
||||||
|
pub book_id: i64,
|
||||||
|
pub description: String,
|
||||||
|
pub category_id: i64,
|
||||||
|
pub time: chrono::DateTime<Utc>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Queryable, Selectable, serde::Serialize, serde::Deserialize)]
|
||||||
|
#[diesel(table_name = schema::amounts)]
|
||||||
|
#[diesel(check_for_backend(diesel::pg::Pg))]
|
||||||
|
pub struct Amount {
|
||||||
|
pub id: i64,
|
||||||
|
uid: i64,
|
||||||
|
account_id: i64,
|
||||||
|
transaction_id: i64,
|
||||||
|
value: i64,
|
||||||
|
expo: i64,
|
||||||
|
currency: String,
|
||||||
|
is_delete: bool,
|
||||||
|
create_at: chrono::NaiveDateTime,
|
||||||
|
update_at: chrono::NaiveDateTime,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(serde::Deserialize, Insertable)]
|
||||||
|
#[diesel(table_name = schema::amounts)]
|
||||||
|
pub struct AmountForm {
|
||||||
|
pub uid: i64,
|
||||||
|
pub transaction_id: i64,
|
||||||
|
pub account_id: i64,
|
||||||
|
pub value: i64,
|
||||||
|
pub expo: i64,
|
||||||
|
pub currency: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Queryable, Selectable, serde::Serialize)]
|
||||||
|
#[diesel(table_name = schema::users)]
|
||||||
|
pub struct User {
|
||||||
|
pub id: i64,
|
||||||
|
pub username: String,
|
||||||
|
pub password: String,
|
||||||
|
pub mail: String,
|
||||||
|
pub is_delete: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Insertable)]
|
||||||
|
#[diesel(table_name = schema::users)]
|
||||||
|
pub struct UserForm {
|
||||||
|
pub username: String,
|
||||||
|
pub password: String,
|
||||||
|
pub mail: String,
|
||||||
|
}
|
||||||
3
src/model/mod.rs
Normal file
3
src/model/mod.rs
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
pub mod db_model;
|
||||||
|
pub mod schema;
|
||||||
|
pub mod req;
|
||||||
23
src/model/req.rs
Normal file
23
src/model/req.rs
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
use std::fmt;
|
||||||
|
use std::str::FromStr;
|
||||||
|
use serde::{de, Deserialize, Deserializer};
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize)]
|
||||||
|
pub struct Params {
|
||||||
|
#[serde(default, deserialize_with="empty_string_as_none")]
|
||||||
|
pub transaction_id: Option<i64>,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Serde deserialization decorator to map empty Strings to None,
|
||||||
|
fn empty_string_as_none<'de, D, T>(de: D) -> Result<Option<T>, D::Error>
|
||||||
|
where
|
||||||
|
D: Deserializer<'de>,
|
||||||
|
T: FromStr,
|
||||||
|
T::Err: fmt::Display,
|
||||||
|
{
|
||||||
|
let opt = Option::<String>::deserialize(de)?;
|
||||||
|
match opt.as_deref() {
|
||||||
|
None | Some("") => Ok(None),
|
||||||
|
Some(s) => FromStr::from_str(s).map_err(de::Error::custom).map(Some),
|
||||||
|
}
|
||||||
|
}
|
||||||
116
src/model/schema.rs
Normal file
116
src/model/schema.rs
Normal file
@@ -0,0 +1,116 @@
|
|||||||
|
// @generated automatically by Diesel CLI.
|
||||||
|
|
||||||
|
diesel::table! {
|
||||||
|
accounts (id) {
|
||||||
|
id -> Int8,
|
||||||
|
uid -> Int8,
|
||||||
|
name -> Text,
|
||||||
|
account_type -> Int8,
|
||||||
|
is_delete -> Bool,
|
||||||
|
create_at -> Timestamp,
|
||||||
|
update_at -> Timestamp,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diesel::table! {
|
||||||
|
amounts (id) {
|
||||||
|
id -> Int8,
|
||||||
|
uid -> Int8,
|
||||||
|
account_id -> Int8,
|
||||||
|
transaction_id -> Int8,
|
||||||
|
value -> Int8,
|
||||||
|
expo -> Int8,
|
||||||
|
currency -> Text,
|
||||||
|
is_delete -> Bool,
|
||||||
|
create_at -> Timestamp,
|
||||||
|
update_at -> Timestamp,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diesel::table! {
|
||||||
|
books (id) {
|
||||||
|
id -> Int8,
|
||||||
|
uid -> Int8,
|
||||||
|
name -> Text,
|
||||||
|
is_delete -> Bool,
|
||||||
|
create_at -> Timestamp,
|
||||||
|
update_at -> Timestamp,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diesel::table! {
|
||||||
|
categories (id) {
|
||||||
|
id -> Int8,
|
||||||
|
uid -> Int8,
|
||||||
|
book_id -> Int8,
|
||||||
|
name -> Text,
|
||||||
|
level -> Int4,
|
||||||
|
parent_category_id -> Int8,
|
||||||
|
is_delete -> Bool,
|
||||||
|
create_at -> Timestamp,
|
||||||
|
update_at -> Timestamp,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diesel::table! {
|
||||||
|
tags (id) {
|
||||||
|
id -> Int8,
|
||||||
|
uid -> Int8,
|
||||||
|
book_id -> Int8,
|
||||||
|
name -> Text,
|
||||||
|
level -> Int4,
|
||||||
|
parent_tag_id -> Int8,
|
||||||
|
is_delete -> Bool,
|
||||||
|
create_at -> Timestamp,
|
||||||
|
update_at -> Timestamp,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diesel::table! {
|
||||||
|
transaction_tag_rels (id) {
|
||||||
|
id -> Int8,
|
||||||
|
uid -> Int8,
|
||||||
|
transaction_id -> Int8,
|
||||||
|
tag_id -> Int8,
|
||||||
|
is_delete -> Bool,
|
||||||
|
create_at -> Timestamp,
|
||||||
|
update_at -> Timestamp,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diesel::table! {
|
||||||
|
transactions (id) {
|
||||||
|
id -> Int8,
|
||||||
|
uid -> Int8,
|
||||||
|
book_id -> Int8,
|
||||||
|
description -> Text,
|
||||||
|
category_id -> Int8,
|
||||||
|
is_delete -> Bool,
|
||||||
|
time -> Timestamptz,
|
||||||
|
create_at -> Timestamp,
|
||||||
|
update_at -> Timestamp,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diesel::table! {
|
||||||
|
users (id) {
|
||||||
|
id -> Int8,
|
||||||
|
username -> Text,
|
||||||
|
password -> Text,
|
||||||
|
mail -> Text,
|
||||||
|
is_delete -> Bool,
|
||||||
|
create_at -> Timestamp,
|
||||||
|
update_at -> Timestamp,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diesel::allow_tables_to_appear_in_same_query!(
|
||||||
|
accounts,
|
||||||
|
amounts,
|
||||||
|
books,
|
||||||
|
categories,
|
||||||
|
tags,
|
||||||
|
transaction_tag_rels,
|
||||||
|
transactions,
|
||||||
|
users,
|
||||||
|
);
|
||||||
116
src/schema.rs
Normal file
116
src/schema.rs
Normal file
@@ -0,0 +1,116 @@
|
|||||||
|
// @generated automatically by Diesel CLI.
|
||||||
|
|
||||||
|
diesel::table! {
|
||||||
|
accounts (id) {
|
||||||
|
id -> Int8,
|
||||||
|
uid -> Int8,
|
||||||
|
name -> Text,
|
||||||
|
account_type -> Int8,
|
||||||
|
is_delete -> Bool,
|
||||||
|
create_at -> Timestamp,
|
||||||
|
update_at -> Timestamp,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diesel::table! {
|
||||||
|
amounts (id) {
|
||||||
|
id -> Int8,
|
||||||
|
uid -> Int8,
|
||||||
|
account_id -> Int8,
|
||||||
|
transaction_id -> Int8,
|
||||||
|
value -> Int8,
|
||||||
|
expo -> Int8,
|
||||||
|
currency -> Text,
|
||||||
|
is_delete -> Bool,
|
||||||
|
create_at -> Timestamp,
|
||||||
|
update_at -> Timestamp,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diesel::table! {
|
||||||
|
books (id) {
|
||||||
|
id -> Int8,
|
||||||
|
uid -> Int8,
|
||||||
|
name -> Text,
|
||||||
|
is_delete -> Bool,
|
||||||
|
create_at -> Timestamp,
|
||||||
|
update_at -> Timestamp,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diesel::table! {
|
||||||
|
categories (id) {
|
||||||
|
id -> Int8,
|
||||||
|
uid -> Int8,
|
||||||
|
book_id -> Int8,
|
||||||
|
name -> Text,
|
||||||
|
level -> Int4,
|
||||||
|
parent_category_id -> Int8,
|
||||||
|
is_delete -> Bool,
|
||||||
|
create_at -> Timestamp,
|
||||||
|
update_at -> Timestamp,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diesel::table! {
|
||||||
|
tags (id) {
|
||||||
|
id -> Int8,
|
||||||
|
uid -> Int8,
|
||||||
|
book_id -> Int8,
|
||||||
|
name -> Text,
|
||||||
|
level -> Int4,
|
||||||
|
parent_tag_id -> Int8,
|
||||||
|
is_delete -> Bool,
|
||||||
|
create_at -> Timestamp,
|
||||||
|
update_at -> Timestamp,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diesel::table! {
|
||||||
|
transaction_tag_rels (id) {
|
||||||
|
id -> Int8,
|
||||||
|
uid -> Int8,
|
||||||
|
transaction_id -> Int8,
|
||||||
|
tag_id -> Int8,
|
||||||
|
is_delete -> Bool,
|
||||||
|
create_at -> Timestamp,
|
||||||
|
update_at -> Timestamp,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diesel::table! {
|
||||||
|
transactions (id) {
|
||||||
|
id -> Int8,
|
||||||
|
uid -> Int8,
|
||||||
|
book_id -> Int8,
|
||||||
|
description -> Text,
|
||||||
|
category_id -> Int8,
|
||||||
|
is_delete -> Bool,
|
||||||
|
time -> Timestamptz,
|
||||||
|
create_at -> Timestamp,
|
||||||
|
update_at -> Timestamp,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diesel::table! {
|
||||||
|
users (id) {
|
||||||
|
id -> Int8,
|
||||||
|
username -> Text,
|
||||||
|
password -> Text,
|
||||||
|
mail -> Text,
|
||||||
|
is_delete -> Bool,
|
||||||
|
create_at -> Timestamp,
|
||||||
|
update_at -> Timestamp,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diesel::allow_tables_to_appear_in_same_query!(
|
||||||
|
accounts,
|
||||||
|
amounts,
|
||||||
|
books,
|
||||||
|
categories,
|
||||||
|
tags,
|
||||||
|
transaction_tag_rels,
|
||||||
|
transactions,
|
||||||
|
users,
|
||||||
|
);
|
||||||
118
src/user/dal.rs
Normal file
118
src/user/dal.rs
Normal file
@@ -0,0 +1,118 @@
|
|||||||
|
use diesel::prelude::*;
|
||||||
|
use crate::model::{db_model, schema};
|
||||||
|
use std::error::Error;
|
||||||
|
use std::fmt::Debug;
|
||||||
|
use pbkdf2::password_hash::{PasswordHash, PasswordVerifier};
|
||||||
|
use pbkdf2::Pbkdf2;
|
||||||
|
use serde_json::json;
|
||||||
|
|
||||||
|
pub async fn add_user(app_state: crate::AppState, username: String, password: String, mail: String) -> Result<(), ()> {
|
||||||
|
let conn = app_state
|
||||||
|
.db
|
||||||
|
.get()
|
||||||
|
.await
|
||||||
|
.map_err(|_| {
|
||||||
|
println!("fail to get db connection");
|
||||||
|
()
|
||||||
|
})?;
|
||||||
|
let target_username = username.clone();
|
||||||
|
// 1. check if current username exists.
|
||||||
|
let res = conn.interact(
|
||||||
|
move |conn| {
|
||||||
|
schema::users::table
|
||||||
|
.filter(schema::users::username.eq(target_username.clone()))
|
||||||
|
.count()
|
||||||
|
.get_result::<i64>(conn)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|_res| {
|
||||||
|
()
|
||||||
|
})?
|
||||||
|
.map_err(|_res| {
|
||||||
|
()
|
||||||
|
})?;
|
||||||
|
println!("ret {}", res);
|
||||||
|
if res > 0 {
|
||||||
|
println!("user already exists.");
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
let new_user_form = db_model::UserForm {
|
||||||
|
username: username.clone(),
|
||||||
|
password: password.clone(),
|
||||||
|
mail: mail.clone(),
|
||||||
|
};
|
||||||
|
// 2. adding user
|
||||||
|
let add_res = conn.interact(
|
||||||
|
move |conn| {
|
||||||
|
diesel::insert_into(schema::users::table)
|
||||||
|
.values(&new_user_form)
|
||||||
|
.returning(db_model::User::as_returning())
|
||||||
|
.get_result(conn)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|_e| {
|
||||||
|
()
|
||||||
|
})?
|
||||||
|
.map_err(|_e| {
|
||||||
|
()
|
||||||
|
})?;
|
||||||
|
let out = json!(add_res);
|
||||||
|
println!("new user {}", out.to_string());
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn check_user_psw(app_state: crate::AppState, username: String, password: String) -> bool {
|
||||||
|
let conn_res = app_state
|
||||||
|
.db
|
||||||
|
.get()
|
||||||
|
.await
|
||||||
|
.map_err(|_| {
|
||||||
|
println!("fail to get db connection");
|
||||||
|
()
|
||||||
|
});
|
||||||
|
let conn = match conn_res {
|
||||||
|
Ok(res) => res,
|
||||||
|
Err(_err) => { return false; }
|
||||||
|
};
|
||||||
|
// 1. get psw hash
|
||||||
|
let query_username = username.clone();
|
||||||
|
let user_rr = conn.interact(
|
||||||
|
|conn| {
|
||||||
|
schema::users::table
|
||||||
|
.filter(schema::users::username.eq(query_username))
|
||||||
|
.select(db_model::User::as_select())
|
||||||
|
.get_results(conn)
|
||||||
|
})
|
||||||
|
.await;
|
||||||
|
|
||||||
|
let user_res = match user_rr {
|
||||||
|
Ok(res) => res,
|
||||||
|
Err(_) => return false,
|
||||||
|
};
|
||||||
|
println!("get user_res success");
|
||||||
|
let user = match user_res {
|
||||||
|
Ok(u) => u,
|
||||||
|
Err(_) => return false,
|
||||||
|
};
|
||||||
|
|
||||||
|
println!("get user success");
|
||||||
|
|
||||||
|
if user.len() != 1 {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
println!("get uniq user success");
|
||||||
|
let cur_user = user.get(0);
|
||||||
|
let psw = match cur_user {
|
||||||
|
Some(usr) => usr.password.clone(),
|
||||||
|
None => "".to_string(),
|
||||||
|
};
|
||||||
|
println!("comparing psw, get {}, stored {}.", password.clone(), psw.clone());
|
||||||
|
|
||||||
|
let hash_res = PasswordHash::new(psw.as_str());
|
||||||
|
let hash = match hash_res {
|
||||||
|
Ok(rs) => rs,
|
||||||
|
Err(_) => return false,
|
||||||
|
};
|
||||||
|
let check_res = Pbkdf2.verify_password(password.as_bytes(), &hash);
|
||||||
|
return check_res.is_ok();
|
||||||
|
}
|
||||||
29
src/user/handler.rs
Normal file
29
src/user/handler.rs
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
use axum::{
|
||||||
|
extract::State, http::StatusCode, routing::post, Json, Router
|
||||||
|
};
|
||||||
|
use axum_macros::debug_handler;
|
||||||
|
use crate::middleware::auth::Claims;
|
||||||
|
use super::dal::check_user_psw;
|
||||||
|
|
||||||
|
pub fn get_nest_handlers() -> Router<crate::AppState> {
|
||||||
|
Router::new()
|
||||||
|
.route("/login", post(login))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(serde::Deserialize)]
|
||||||
|
pub struct LoginCredentialRequest {
|
||||||
|
pub username: String,
|
||||||
|
pub password: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[debug_handler]
|
||||||
|
pub async fn login(
|
||||||
|
State(app_state): State<crate::AppState>,
|
||||||
|
Json(payload): Json<LoginCredentialRequest>,
|
||||||
|
) -> Result<(), (StatusCode, String)> {
|
||||||
|
let res = check_user_psw(app_state, payload.username.clone(), payload.password.clone()).await;
|
||||||
|
if !res {
|
||||||
|
return Err((StatusCode::UNAUTHORIZED, "invalid credentials".to_string()));
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
2
src/user/mod.rs
Normal file
2
src/user/mod.rs
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
pub mod dal;
|
||||||
|
pub mod handler;
|
||||||
45
src/util/math.rs
Normal file
45
src/util/math.rs
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
use regex::Regex;
|
||||||
|
|
||||||
|
pub fn parse_payment_to_value_expo(payment_str: String, target_expo: i64) -> Result<(i64, i64), ()> {
|
||||||
|
// 1. check format
|
||||||
|
let re = Regex::new(r"[1-9]{0,9}[0-9]\.[0-9]{2,6}$").unwrap();
|
||||||
|
let res_format = re.is_match(payment_str.as_str());
|
||||||
|
if !res_format {
|
||||||
|
return Err(())
|
||||||
|
}
|
||||||
|
let mut value: i64 = 0;
|
||||||
|
let mut expo : i64 = 0;
|
||||||
|
|
||||||
|
let dot_index = payment_str.find('.');
|
||||||
|
let (int_part, decimal_part) = match dot_index {
|
||||||
|
Some(pos) => (&payment_str[..pos], &payment_str[pos+1..]),
|
||||||
|
None => (payment_str.as_str(), ""),
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut dec_part_padding = format!("{:0<width$}", decimal_part, width=target_expo as usize);
|
||||||
|
if dec_part_padding.len() > target_expo as usize {
|
||||||
|
let pd = &dec_part_padding[..target_expo as usize];
|
||||||
|
dec_part_padding = pd.to_string();
|
||||||
|
}
|
||||||
|
let num_str = format!("{}{}", int_part, dec_part_padding);
|
||||||
|
println!("parsed num string \"{}\"", num_str);
|
||||||
|
let num = num_str.parse::<i64>().unwrap();
|
||||||
|
let value = num;
|
||||||
|
let expo = target_expo;
|
||||||
|
|
||||||
|
Ok((value, expo))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
#[test]
|
||||||
|
fn test_parse_payment(){
|
||||||
|
let r1 = parse_payment_to_value_expo("1.345".to_string(), 6);
|
||||||
|
assert_eq!(r1, Ok((1345000, 6)));
|
||||||
|
let r2 = parse_payment_to_value_expo("0.01".to_string(), 6);
|
||||||
|
assert_eq!(r2, Ok((10000, 6)));
|
||||||
|
let r3 = parse_payment_to_value_expo("0.10000001".to_string(), 6);
|
||||||
|
assert_eq!(r3, Err(()));
|
||||||
|
}
|
||||||
|
}
|
||||||
3
src/util/mod.rs
Normal file
3
src/util/mod.rs
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
pub mod req;
|
||||||
|
pub mod pass;
|
||||||
|
pub mod math;
|
||||||
16
src/util/pass.rs
Normal file
16
src/util/pass.rs
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
use std::error::Error;
|
||||||
|
use pbkdf2::{
|
||||||
|
password_hash::{
|
||||||
|
rand_core::OsRng,
|
||||||
|
PasswordHash,SaltString,
|
||||||
|
},
|
||||||
|
Pbkdf2,
|
||||||
|
};
|
||||||
|
use pbkdf2::password_hash::PasswordHasher;
|
||||||
|
|
||||||
|
pub fn get_pbkdf2_from_psw(password:String) -> Result<String, pbkdf2::password_hash::Error> {
|
||||||
|
let salt = SaltString::generate(&mut OsRng);
|
||||||
|
let password_hash = Pbkdf2.hash_password(password.as_bytes(), &salt)?.to_string();
|
||||||
|
println!("{}",password_hash);
|
||||||
|
return Ok(password_hash)
|
||||||
|
}
|
||||||
14
src/util/req.rs
Normal file
14
src/util/req.rs
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
use axum::http::StatusCode;
|
||||||
|
use serde::Serialize;
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
pub struct CommonResp {
|
||||||
|
pub code: i64,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn internal_error<E>(err: E) -> (StatusCode, String)
|
||||||
|
where
|
||||||
|
E: std::error::Error,
|
||||||
|
{
|
||||||
|
(StatusCode::INTERNAL_SERVER_ERROR, err.to_string())
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user