From a942c7c8e17eb829ef1581c0b556665784f19e33 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Thu, 7 Nov 2019 03:57:33 -0500 Subject: update openapi spec and regenerate with newer openapi-generator the newer openapi-generator picks up fixes for optional parameters, among other things --- src/apis/transactions_api.rs | 68 ++++++++++++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 21 deletions(-) (limited to 'src/apis/transactions_api.rs') diff --git a/src/apis/transactions_api.rs b/src/apis/transactions_api.rs index 9b3fcb4..138fa4d 100644 --- a/src/apis/transactions_api.rs +++ b/src/apis/transactions_api.rs @@ -10,6 +10,8 @@ use std::rc::Rc; use std::borrow::Borrow; +#[allow(unused_imports)] +use std::option::Option; use reqwest; @@ -22,7 +24,7 @@ pub struct TransactionsApiClient { impl TransactionsApiClient { pub fn new(configuration: Rc) -> TransactionsApiClient { TransactionsApiClient { - configuration: configuration, + configuration, } } } @@ -30,10 +32,10 @@ impl TransactionsApiClient { pub trait TransactionsApi { fn create_transaction(&self, budget_id: &str, data: crate::models::SaveTransactionsWrapper) -> Result; fn get_transaction_by_id(&self, budget_id: &str, transaction_id: &str) -> Result; - fn get_transactions(&self, budget_id: &str, since_date: String, _type: &str, last_knowledge_of_server: i64) -> Result; - fn get_transactions_by_account(&self, budget_id: &str, account_id: &str, since_date: String, _type: &str, last_knowledge_of_server: i64) -> Result; - fn get_transactions_by_category(&self, budget_id: &str, category_id: &str, since_date: String, _type: &str, last_knowledge_of_server: i64) -> Result; - fn get_transactions_by_payee(&self, budget_id: &str, payee_id: &str, since_date: String, _type: &str, last_knowledge_of_server: i64) -> Result; + fn get_transactions(&self, budget_id: &str, since_date: Option, _type: Option<&str>, last_knowledge_of_server: Option) -> Result; + fn get_transactions_by_account(&self, budget_id: &str, account_id: &str, since_date: Option, _type: Option<&str>, last_knowledge_of_server: Option) -> Result; + fn get_transactions_by_category(&self, budget_id: &str, category_id: &str, since_date: Option, _type: Option<&str>, last_knowledge_of_server: Option) -> Result; + fn get_transactions_by_payee(&self, budget_id: &str, payee_id: &str, since_date: Option, _type: Option<&str>, last_knowledge_of_server: Option) -> Result; fn update_transaction(&self, budget_id: &str, transaction_id: &str, data: crate::models::SaveTransactionWrapper) -> Result; fn update_transactions(&self, budget_id: &str, data: crate::models::UpdateTransactionsWrapper) -> Result; } @@ -90,16 +92,22 @@ impl TransactionsApi for TransactionsApiClient { Ok(client.execute(req)?.error_for_status()?.json()?) } - fn get_transactions(&self, budget_id: &str, since_date: String, _type: &str, last_knowledge_of_server: i64) -> Result { + fn get_transactions(&self, budget_id: &str, since_date: Option, _type: Option<&str>, last_knowledge_of_server: Option) -> Result { let configuration: &configuration::Configuration = self.configuration.borrow(); let client = &configuration.client; let uri_str = format!("{}/budgets/{budget_id}/transactions", configuration.base_path, budget_id=crate::apis::urlencode(budget_id)); let mut req_builder = client.get(uri_str.as_str()); - req_builder = req_builder.query(&[("since_date", &since_date.to_string())]); - req_builder = req_builder.query(&[("type", &_type.to_string())]); - req_builder = req_builder.query(&[("last_knowledge_of_server", &last_knowledge_of_server.to_string())]); + if let Some(ref s) = since_date { + req_builder = req_builder.query(&[("since_date", &s.to_string())]); + } + if let Some(ref s) = _type { + req_builder = req_builder.query(&[("type", &s.to_string())]); + } + if let Some(ref s) = last_knowledge_of_server { + req_builder = req_builder.query(&[("last_knowledge_of_server", &s.to_string())]); + } if let Some(ref user_agent) = configuration.user_agent { req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); } @@ -118,16 +126,22 @@ impl TransactionsApi for TransactionsApiClient { Ok(client.execute(req)?.error_for_status()?.json()?) } - fn get_transactions_by_account(&self, budget_id: &str, account_id: &str, since_date: String, _type: &str, last_knowledge_of_server: i64) -> Result { + fn get_transactions_by_account(&self, budget_id: &str, account_id: &str, since_date: Option, _type: Option<&str>, last_knowledge_of_server: Option) -> Result { let configuration: &configuration::Configuration = self.configuration.borrow(); let client = &configuration.client; let uri_str = format!("{}/budgets/{budget_id}/accounts/{account_id}/transactions", configuration.base_path, budget_id=crate::apis::urlencode(budget_id), account_id=crate::apis::urlencode(account_id)); let mut req_builder = client.get(uri_str.as_str()); - req_builder = req_builder.query(&[("since_date", &since_date.to_string())]); - req_builder = req_builder.query(&[("type", &_type.to_string())]); - req_builder = req_builder.query(&[("last_knowledge_of_server", &last_knowledge_of_server.to_string())]); + if let Some(ref s) = since_date { + req_builder = req_builder.query(&[("since_date", &s.to_string())]); + } + if let Some(ref s) = _type { + req_builder = req_builder.query(&[("type", &s.to_string())]); + } + if let Some(ref s) = last_knowledge_of_server { + req_builder = req_builder.query(&[("last_knowledge_of_server", &s.to_string())]); + } if let Some(ref user_agent) = configuration.user_agent { req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); } @@ -146,16 +160,22 @@ impl TransactionsApi for TransactionsApiClient { Ok(client.execute(req)?.error_for_status()?.json()?) } - fn get_transactions_by_category(&self, budget_id: &str, category_id: &str, since_date: String, _type: &str, last_knowledge_of_server: i64) -> Result { + fn get_transactions_by_category(&self, budget_id: &str, category_id: &str, since_date: Option, _type: Option<&str>, last_knowledge_of_server: Option) -> Result { let configuration: &configuration::Configuration = self.configuration.borrow(); let client = &configuration.client; let uri_str = format!("{}/budgets/{budget_id}/categories/{category_id}/transactions", configuration.base_path, budget_id=crate::apis::urlencode(budget_id), category_id=crate::apis::urlencode(category_id)); let mut req_builder = client.get(uri_str.as_str()); - req_builder = req_builder.query(&[("since_date", &since_date.to_string())]); - req_builder = req_builder.query(&[("type", &_type.to_string())]); - req_builder = req_builder.query(&[("last_knowledge_of_server", &last_knowledge_of_server.to_string())]); + if let Some(ref s) = since_date { + req_builder = req_builder.query(&[("since_date", &s.to_string())]); + } + if let Some(ref s) = _type { + req_builder = req_builder.query(&[("type", &s.to_string())]); + } + if let Some(ref s) = last_knowledge_of_server { + req_builder = req_builder.query(&[("last_knowledge_of_server", &s.to_string())]); + } if let Some(ref user_agent) = configuration.user_agent { req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); } @@ -174,16 +194,22 @@ impl TransactionsApi for TransactionsApiClient { Ok(client.execute(req)?.error_for_status()?.json()?) } - fn get_transactions_by_payee(&self, budget_id: &str, payee_id: &str, since_date: String, _type: &str, last_knowledge_of_server: i64) -> Result { + fn get_transactions_by_payee(&self, budget_id: &str, payee_id: &str, since_date: Option, _type: Option<&str>, last_knowledge_of_server: Option) -> Result { let configuration: &configuration::Configuration = self.configuration.borrow(); let client = &configuration.client; let uri_str = format!("{}/budgets/{budget_id}/payees/{payee_id}/transactions", configuration.base_path, budget_id=crate::apis::urlencode(budget_id), payee_id=crate::apis::urlencode(payee_id)); let mut req_builder = client.get(uri_str.as_str()); - req_builder = req_builder.query(&[("since_date", &since_date.to_string())]); - req_builder = req_builder.query(&[("type", &_type.to_string())]); - req_builder = req_builder.query(&[("last_knowledge_of_server", &last_knowledge_of_server.to_string())]); + if let Some(ref s) = since_date { + req_builder = req_builder.query(&[("since_date", &s.to_string())]); + } + if let Some(ref s) = _type { + req_builder = req_builder.query(&[("type", &s.to_string())]); + } + if let Some(ref s) = last_knowledge_of_server { + req_builder = req_builder.query(&[("last_knowledge_of_server", &s.to_string())]); + } if let Some(ref user_agent) = configuration.user_agent { req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); } -- cgit v1.2.3-54-g00ecf