improve param building, and fix expense reports endpoint

Author: mschuchard

src/interface/allocation.rs

@@ -42,17 +42,17 @@ pub async fn allocations(
     let mut params = String::from("limit=100");
 
     // optional parameters for LIST
-    if assignment_type_id.is_some() {
-        params = format!("{params}&assignmentTypeId={}", assignment_type_id.unwrap())
+    if let Some(assignment_type_id) = assignment_type_id {
+        params = format!("{params}&assignmentTypeId={}", assignment_type_id)
     }
-    if member_id.is_some() {
-        params = format!("{params}&memberId={}", member_id.unwrap())
+    if let Some(member_id) = member_id {
+        params = format!("{params}&memberId={}", member_id)
     }
-    if start_date.is_some() {
-        params = format!("{params}&startOnBefore={}", start_date.unwrap())
+    if let Some(start_date) = start_date {
+        params = format!("{params}&startOnBefore={}", start_date)
     }
-    if end_date.is_some() {
-        params = format!("{params}&endOnAfter={}", end_date.unwrap())
+    if let Some(end_date) = end_date {
+        params = format!("{params}&endOnAfter={}", end_date)
     }
 
     // retrieve allocations

src/interface/cost.rs

@@ -35,8 +35,8 @@ pub async fn costs(
     let mut params = String::from("limit=100");
 
     // optional parameters for LIST
-    if member_id.is_some() {
-        params = format!("{params}&memberId={}", member_id.unwrap())
+    if let Some(member_id) = member_id {
+        params = format!("{params}&memberId={}", member_id)
     }
 
     // retrieve clients

src/interface/customer.rs

@@ -35,8 +35,8 @@ pub async fn clients(
     let mut params = String::from("limit=100");
 
     // optional parameters for LIST
-    if code.is_some() {
-        params = format!("{params}&code={}", code.unwrap())
+    if let Some(code) = code {
+        params = format!("{params}&code={}", code)
     }
 
     // retrieve clients

src/interface/expense_item.rs

@@ -32,8 +32,8 @@ pub async fn expense_items(
     let mut params = String::from("limit=100");
 
     // optional parameters for LIST
-    if expense_report.is_some() {
-        params = format!("{params}&expenseReportId={}", expense_report.unwrap())
+    if let Some(expense_report) = expense_report {
+        params = format!("{params}&expenseReportId={}", expense_report)
     }
 
     // retrieve expense items

src/interface/expense_report.rs

@@ -29,7 +29,7 @@ pub async fn expense_reports(
 ) -> Result<expense_report::ExpenseReports, Box<dyn std::error::Error>> {
     // retrieve expense reports
     Ok(client
-        .read::<expense_report::ExpenseReports>("expense_reports", Some(&"limit=100"))
+        .read::<expense_report::ExpenseReports>("expense-reports", Some(&"limit=100"))
         .await?)
 }
 

src/interface/member.rs

@@ -33,11 +33,11 @@ pub async fn members(
     let mut params = String::from("limit=100");
 
     // optional parameters for LIST
-    if name_contains.is_some() {
-        params = format!("{params}&nameContains={}", name_contains.unwrap())
+    if let Some(name_contains) = name_contains {
+        params = format!("{params}&nameContains={}", name_contains)
     }
-    if email_contains.is_some() {
-        params = format!("{params}&emailContains={}", email_contains.unwrap())
+    if let Some(email_contains) = email_contains {
+        params = format!("{params}&emailContains={}", email_contains)
     }
 
     // retrieve members

src/interface/project.rs

@@ -41,17 +41,17 @@ pub async fn projects(
     let mut params = String::from("limit=100");
 
     // optional parameters for LIST
-    if client_id.is_some() {
-        params = format!("{params}&clientId={}", client_id.unwrap())
+    if let Some(client_id) = client_id {
+        params = format!("{params}&clientId={}", client_id)
     }
-    if project_type.is_some() {
-        params = format!("{params}&projectTypeId={}", project_type.unwrap())
+    if let Some(project_type) = project_type {
+        params = format!("{params}&projectTypeId={}", project_type)
     }
-    if status.is_some() {
-        params = format!("{params}&statusId={}", status.unwrap());
+    if let Some(status) = status {
+        params = format!("{params}&statusId={}", status);
     }
-    if name_contains.is_some() {
-        params = format!("{params}&nameContains={}", name_contains.unwrap())
+    if let Some(name_contains) = name_contains {
+        params = format!("{params}&nameContains={}", name_contains)
     }
 
     // retrieve projects

src/interface/time.rs

@@ -43,20 +43,20 @@ pub async fn time_entries(
     let mut params = String::from("limit=100");
 
     // optional parameters for LIST
-    if member.is_some() {
-        params = format!("{params}&memberId={}", member.unwrap())
+    if let Some(member) = member {
+        params = format!("{params}&memberId={}", member)
     }
-    if project.is_some() {
-        params = format!("{params}&projectId={}", project.unwrap())
+    if let Some(project) = project {
+        params = format!("{params}&projectId={}", project)
     }
-    if date.is_some() {
-        params = format!("{params}&date={}", date.unwrap())
+    if let Some(date) = date {
+        params = format!("{params}&date={}", date)
     }
-    if begin_date.is_some() {
-        params = format!("{params}&dateOnAfter={}", begin_date.unwrap())
+    if let Some(begin_date) = begin_date {
+        params = format!("{params}&dateOnAfter={}", begin_date)
     }
-    if end_date.is_some() {
-        params = format!("{params}&dateOnBefore={}", end_date.unwrap())
+    if let Some(end_date) = end_date {
+        params = format!("{params}&dateOnBefore={}", end_date)
     }
 
     // retrieve time entries

src/interface/utilization.rs

@@ -35,8 +35,8 @@ pub async fn utilizations(
     let mut params = String::from("limit=100");
 
     // optional parameters for LIST
-    if member_id.is_some() {
-        params = format!("{params}&memberId={}", member_id.unwrap())
+    if let Some(member_id) = member_id {
+        params = format!("{params}&memberId={}", member_id)
     }
 
     // retrieve clients