ayham
/
PaperTrader
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

returnflags swap: update

This commit is contained in:
realaltffour 2020-09-06 06:52:39 +03:00
parent 11f17d67b6
commit 63700b36c2
No known key found for this signature in database
GPG Key ID: C1265D839D44DCB1
8 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libtrader/common/misc/return_flags.rs
View File

@ -16,6 +16,16 @@ bitflags! {
const SERVER_DB_CONNECT_FAILED = 0x008;
const SERVER_DB_WRITE_FAILED = 0x008;
const SERVER_DB_USER_HASH_NOT_FOUND = 0x009;
const SERVER_DB_USER_SALT_NOT_FOUND = 0x009;
const SERVER_DB_CREATE_TRANSACTION_FAILED = 0x015;
const SERVER_DB_CREATE_POSITION_FAILED = 0x015;
const SERVER_DB_CREATE_STOCK_FAILED = 0x015;
const SERVER_DB_SEARCH_STOCK_NOT_FOUND = 0x016;
const SERVER_DB_SEARCH_COMPANY_NOT_FOUND = 0x016;
const SERVER_REGISTER_INV_MSG = 0x008;
const SERVER_LOGIN_INV_MSG = 0x009;
@ -34,9 +44,7 @@ bitflags! {
const SERVER_RETRIEVE_PORTFOLIO_FAILED = 0x012;
const SERVER_RETRIEVE_PORTFOLIO_INV_MSG = 0x013;
const SERVER_CREATE_COMPANY_FAILED = 0x014;
const SERVER_CREATE_STOCK_FAILED = 0x015;
const SERVER_CREATE_JWT_TOKEN_FAILED = 0x016;

5
src/libtrader/server/db/cmd/create_position.rs
View File

@ -1,6 +1,7 @@
use crate::server::db::config::{DB_PORTFOLIO_USER, DB_PORTFOLIO_PASS};
use crate::server::db::initializer::db_connect;
use crate::common::account::position::Position;
use crate::common::misc::return_flags::ReturnFlags;
/// Creates a position on the postgre SQL database
///
@ -17,7 +18,7 @@ use crate::common::account::position::Position;
/// Err(err) => panic!("TEST_CMD_CREATE_PORTFOLIO_FAILED: {}", err)
/// }
/// ```
pub fn create_position(user_id: i64, position: Position) -> Result<(), String> {
pub fn create_position(user_id: i64, position: Position) -> Result<(), ReturnFlags> {
/*
* Creates a position entry in database in portfolio_schema.positions.
* */
@ -33,7 +34,7 @@ pub fn create_position(user_id: i64, position: Position) -> Result<(), String> {
&position.stock_open_cost, &position.stock_close_amount, &position.stock_close_price,
&position.open_epoch, &position.close_epoch, &position.is_buy, &position.is_open]) {
Ok(_rows) => Ok(()),
Err(err) => Err(format!("CMD_CREATE_POSITION_FAILED: {}", err)),
Err(err) => Err(ReturnFlags::SERVER_DB_CREATE_POSITION_FAILED),
}
}

6
src/libtrader/server/db/cmd/create_stock.rs
View File

@ -1,6 +1,8 @@
use crate::server::db::config::{DB_USER, DB_PASS};
use crate::server::db::initializer::db_connect;
use crate::common::misc::return_flags::ReturnFlags;
/// Creates a stock on the postgres SQL database.
///
/// Takes in a stock name and creates a table in the ```asset_schema``` schema
@ -17,7 +19,7 @@ use crate::server::db::initializer::db_connect;
/// Err(err) => error!("failed to create stock table {}", err),
/// }
/// ```
pub fn create_stock(stock_name: &str) -> Result<(), String> {
pub fn create_stock(stock_name: &str) -> Result<(), ReturnFlags> {
/*
* Creates a stock table in database in assets schema.
*/
@ -34,7 +36,7 @@ pub fn create_stock(stock_name: &str) -> Result<(), String> {
volume BIGINT NOT NULL \
)", stock_name).as_str(), &[]) {
Ok(_rows) => Ok(()),
Err(err) => Err(format!("DB_FAILED_TO_CREATE_STOCK_TABLE: {}", err)),
Err(err) => Err(ReturnFlags::SERVER_DB_CREATE_STOCK_FAILED),
}
}
#[cfg(test)]

5
src/libtrader/server/db/cmd/create_transaction.rs
View File

@ -1,6 +1,7 @@
use crate::server::db::config::{DB_ACC_USER, DB_ACC_PASS};
use crate::server::db::initializer::db_connect;
use crate::common::account::transaction::Transaction;
use crate::common::misc::return_flags::ReturnFlags;
/// Creates a trasnaction on the postgre SQL database
///
@ -17,7 +18,7 @@ use crate::common::account::transaction::Transaction;
/// Err(err) => panic!("TEST_CMD_CREATE_TRANSACTION_FAILED: {}", err)
/// }
/// ```
pub fn create_transaction(user_id: i64, transaction: &Transaction) -> Result<(), String> {
pub fn create_transaction(user_id: i64, transaction: &Transaction) -> Result<(), ReturnFlags> {
/*
* Creates a transaction entry in database in accounts_schema.transactions.
* */
@ -31,7 +32,7 @@ pub fn create_transaction(user_id: i64, transaction: &Transaction) -> Result<(),
&[&user_id, &transaction.stock_symbol, &transaction.shares_size, &transaction.shares_cost,
&transaction.is_buy]) {
Ok(_rows) => Ok(()),
Err(err) => Err(format!("CMD_CREATE_TRANSACTION_FAILED: {}", err)),
Err(err) => Err(ReturnFlags::SERVER_DB_CREATE_TRANSACTION_FAILED),
}
}

5
src/libtrader/server/db/cmd/get_company.rs
View File

@ -1,6 +1,7 @@
use crate::server::db::config::{DB_USER, DB_PASS};
use crate::server::db::initializer::db_connect;
use crate::common::generic::company::Company;
use crate::common::misc::return_flags::ReturnFlags;
/// Returns a company from the postgres SQL database.
///
@ -19,7 +20,7 @@ use crate::common::generic::company::Company;
/// Err(err) => error!("we must found the sacred company! err: {}", err),
/// }
/// ```
pub fn get_company_from_db(searched_symbol: &str) -> Result<Company, String> {
pub fn get_company_from_db(searched_symbol: &str) -> Result<Company, ReturnFlags> {
/*
* Returns company entry from database
*/
@ -41,7 +42,7 @@ pub fn get_company_from_db(searched_symbol: &str) -> Result<Company, String> {
return Ok(found_company);
},
Err(err) => Err(format!("DB_SEARCH_COMPANY_NOT_FOUND: {}", err)),
Err(err) => Err(ReturnFlags::SERVER_DB_SEARCH_COMOPANY_NOT_FOUND),
}
}

13
src/libtrader/server/db/cmd/get_stock.rs
View File

@ -1,6 +1,7 @@
use crate::server::db::config::{DB_USER, DB_PASS};
use crate::server::db::initializer::db_connect;
use crate::common::generic::stock_val::StockVal;
use crate::common::misc::return_flags::ReturnFlags;
/// Returns the whole stock data from the postgres SQL database.
///
@ -20,7 +21,7 @@ use crate::common::generic::stock_val::StockVal;
/// Err(err) => panic!("failed to get the stock value, reason: {}", err)
/// };
/// ```
pub fn get_stock_from_db(searched_symbol: &str) -> Result<Vec<StockVal>, String> {
pub fn get_stock_from_db(searched_symbol: &str) -> Result<Vec<StockVal>, ReturnFlags> {
/*
* Returns all stock values from database.
*/
@ -43,7 +44,7 @@ pub fn get_stock_from_db(searched_symbol: &str) -> Result<Vec<StockVal>, String>
}
Ok(stocks)
},
Err(err) => Err(format!("DB_SEARCH_STOCK_NOT_FOUND: {}", err))
Err(err) => Err(ReturnFlags::SERVER_DB_SEARCH_STOCK_NOT_FOUND)
}
}
@ -66,7 +67,7 @@ pub fn get_stock_from_db(searched_symbol: &str) -> Result<Vec<StockVal>, String>
/// Err(err) => panic!("failed to get the stock value, reason: {}", err)
/// };
/// ```
pub fn get_stock_from_db_since_epoch(searched_symbol: &str, time_epoch: i64) -> Result<Vec<StockVal>, String> {
pub fn get_stock_from_db_since_epoch(searched_symbol: &str, time_epoch: i64) -> Result<Vec<StockVal>, ReturnFlags> {
/*
* Returns all stock values from database since a time epoch.
*/
@ -90,7 +91,7 @@ pub fn get_stock_from_db_since_epoch(searched_symbol: &str, time_epoch: i64) ->
}
Ok(stocks)
},
Err(err) => Err(format!("DB_SEARCH_STOCK_NOT_FOUND: {}", err))
Err(err) => Err(ReturnFlags::SERVER_DB_SEARCH_STOCK_NOT_FOUND)
}
}
@ -116,7 +117,7 @@ pub fn get_stock_from_db_since_epoch(searched_symbol: &str, time_epoch: i64) ->
/// };
/// ```
pub fn get_stock_from_db_between_epochs(searched_symbol: &str, first_time_epoch: i64,
second_time_epoch: i64) -> Result<Vec<StockVal>, String> {
second_time_epoch: i64) -> Result<Vec<StockVal>, ReturnFlags> {
/*
* Returns all stock values from database between two time epochs.
*/
@ -140,7 +141,7 @@ pub fn get_stock_from_db_between_epochs(searched_symbol: &str, first_time_epoch:
}
Ok(stocks)
},
Err(err) => Err(format!("DB_SEARCH_STOCK_NOT_FOUND: {}", err))
Err(err) => Err(ReturnFlags::SERVER_DB_SEARCH_STOCK_NOT_FOUND)
}
}

6
src/libtrader/server/db/cmd/get_user_hash.rs
View File

@ -1,9 +1,11 @@
use crate::common::misc::return_flags::ReturnFlags;
use crate::server::db::initializer::db_connect;
use crate::server::db::config::{DB_ACC_USER, DB_ACC_PASS};
use crate::server::db::cmd::user_exists::user_exists;
pub fn get_user_hash(username: &str, is_email: bool) -> Result<String, String> {
pub fn get_user_hash(username: &str, is_email: bool) -> Result<String, ReturnFlags> {
/* check that user exists*/
if user_exists(username) {
let mut client = db_connect(DB_ACC_USER, DB_ACC_PASS)?;
@ -22,5 +24,5 @@ pub fn get_user_hash(username: &str, is_email: bool) -> Result<String, String> {
}
}
Err("GET_USER_HASH_NOT_FOUND".to_string())
Err(ReturnFlags::SERVER_DB_USER_HASH_NOT_FOUND)
}

5
src/libtrader/server/db/cmd/get_user_salt.rs
View File

@ -1,9 +1,10 @@
use crate::common::misc::return_flags::ReturnFlags;
use crate::server::db::initializer::db_connect;
use crate::server::db::config::{DB_ACC_USER, DB_ACC_PASS};
use crate::server::db::cmd::user_exists::user_exists;
pub fn get_user_salt(username: &str, is_email: bool, is_server: bool) -> Result<String, String> {
pub fn get_user_salt(username: &str, is_email: bool, is_server: bool) -> Result<String, ReturnFlags> {
/* check that user exists*/
if user_exists(username) {
let mut client = db_connect(DB_ACC_USER, DB_ACC_PASS)?;
@ -38,5 +39,5 @@ pub fn get_user_salt(username: &str, is_email: bool, is_server: bool) -> Result<
}
}
Err("GET_USER_SALT_NOT_FOUND".to_string())
Err(ReturnFlags::SERVER_DB_USER_SALT_NOT_FOUND)
}