Merge pull request #23 from Virtual-Finland-Development/refactor/fix-clippy-warnings

refactor: cleanup the api_app lib from clippy warnings

Author: lsipii

.gitignore

@@ -1,6 +1,6 @@
 # Generated by Cargo
 # will have compiled files and executables
-/target/
+target
 
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
 # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
@@ -15,4 +15,4 @@ infra/build/*
 .cargo_home
 
 # idea
-.idea
+.idea

src/lib/api_app/src/api/requests.rs

@@ -200,7 +200,7 @@ async fn engage_request<I: Debug + Serialize>(
 
     let response_status = response.status();
     let response_headers = response.headers().clone();
-    let response_body = response.text().await.unwrap_or("No response body received".to_string());
+    let response_body = response.text().await.unwrap_or_else(|_| "No response body received".to_string());
 
     log::debug!(
         "Request: {}, status code: {:#?}, elapsed time: {}ms",

src/lib/api_app/src/api/responses.rs

@@ -195,7 +195,7 @@ pub fn resolve_external_service_bad_response(
     // Ensure JSON response
     let response_json = serde_json
         ::from_str::<serde_json::Value>(&response_body)
-        .unwrap_or(json!({"content": response_body}));
+        .unwrap_or_else(|_| json!({"content": response_body}));
 
     // Use the status code from the response if it's a valid HTTP status code
     if response_json.is_object() {
@@ -209,9 +209,9 @@ pub fn resolve_external_service_bad_response(
     }
 
     Ok(APIRoutingResponse {
-        status_code: status_code,
+        status_code,
         body: json!({
-            "message": format!("External service responded with a status: {}", status_code).to_string(),
+            "message": format!("External service responded with a status: {}", status_code),
             "data": response_json,
         }).to_string(),
         headers: get_default_headers(),

src/lib/api_app/src/api/routes/application.rs

@@ -68,7 +68,7 @@ pub async fn get_external_service_bad_response(
 ) -> Result<APIRoutingResponse, APIRoutingError> {
     let status_code = response.status();
     let response_body = response.text().await?;
-    return resolve_external_service_bad_response(status_code, response_body);
+    resolve_external_service_bad_response(status_code, response_body)
 }
 
 pub async fn wake_up_external_services(

src/lib/api_app/src/api/routes/testbed/mod.rs

@@ -82,5 +82,5 @@ fn access_control_check(proxy_destination_url: &str) -> bool {
         }
     }
 
-    return !acl_is_satisfied;
+    !acl_is_satisfied
 }

src/lib/api_app/src/api/routes/testbed/productizers/job/job_input_extenders.rs

@@ -33,7 +33,7 @@ fn extend_job_occupation_uris(occupation_uri: String, codesets: &Vec<Occupation>
     let mut extended_occupation_uris: Vec<String> = Vec::new();
 
     for codeset in codesets {
-        if !codeset.uri.is_some() || !codeset.broader.is_some() {
+        if codeset.uri.is_none() || codeset.broader.is_none() {
             continue;
         }
 
@@ -55,7 +55,7 @@ fn extend_job_occupation_uris(occupation_uri: String, codesets: &Vec<Occupation>
 
 fn get_esco_occupations_codeset() -> Vec<Occupation> {
     let contents = include_str!("../../../../resources/testbed/jobs/esco-1.1.0-occupations.json");
-    return deserialize_json_from_string::<Vec<Occupation>>(contents.as_ref()).expect(
+    deserialize_json_from_string::<Vec<Occupation>>(contents).expect(
         "Failed to parse the ESCO occupations codeset"
-    );
+    )
 }

src/lib/api_app/src/api/routes/testbed/productizers/job/job_models.rs

@@ -64,7 +64,7 @@ pub struct JobPostingResponse<T> {
     #[serde(rename = "totalCount")]
     pub total_count: i32,
 }
-#[derive(Deserialize, Serialize, Debug, PartialEq)]
+#[derive(Deserialize, Serialize, Debug, PartialEq, Eq)]
 pub struct JobPosting {
     pub employer: String,
     pub location: Location,
@@ -78,13 +78,13 @@ pub struct JobPosting {
     pub application_url: Option<String>,
 }
 
-#[derive(Deserialize, Serialize, Debug, PartialEq, Clone)]
+#[derive(Deserialize, Serialize, Debug, PartialEq, Eq, Clone)]
 pub struct Location {
     pub municipality: String,
     pub postcode: String,
 }
 
-#[derive(Deserialize, Serialize, Debug, PartialEq, Clone)]
+#[derive(Deserialize, Serialize, Debug, PartialEq, Eq, Clone)]
 pub struct BasicInfo {
     pub title: String,
     pub description: String,
@@ -96,7 +96,7 @@ pub struct BasicInfo {
 // Transformed outputs for the frontend app
 // @TODO: there must be a better way to do this in rust
 //
-#[derive(Deserialize, Serialize, Debug, PartialEq)]
+#[derive(Deserialize, Serialize, Debug, PartialEq, Eq)]
 pub struct JobPostingForFrontend {
     pub id: String,
     #[serde(rename = "jobsSource")]

src/lib/api_app/src/api/routes/testbed/productizers/job/mod.rs

@@ -124,16 +124,16 @@ pub fn construct_productizer_requests(
         requirements: request_input.requirements,
         paging: RequestPaging {
             limit: request_limit,
-            offset: offset,
+            offset,
         },
     };
 
-    return Ok(ProductizerRequest {
-        endpoint_urls: endpoint_urls,
+    Ok(ProductizerRequest {
+        endpoint_urls,
         request_input: jobs_request,
         headers: request_headers,
-        original_input: original_input,
-    });
+        original_input,
+    })
 }
 
 pub fn parse_job_request_input(request_input: &JobsRequestFromFrontend) -> JobsRequestFromFrontend {
@@ -153,7 +153,7 @@ pub fn parse_job_request_input(request_input: &JobsRequestFromFrontend) -> JobsR
  * Merge the job posting results, by mutation
  */
 pub fn merge_job_posting_results(results: &mut Vec<JobPostingForFrontend>) {
-    results.sort_by(|a, b| job_postings_sort_comparator(a, b));
+    results.sort_by(job_postings_sort_comparator);
     results.dedup_by(|a, b| is_job_postings_the_same(a, b));
 }
 
@@ -174,10 +174,10 @@ fn is_job_postings_the_same(a: &JobPostingForFrontend, b: &JobPostingForFrontend
  */
 pub fn transform_job_posting_results(
     jobs_source: String,
-    results: &mut Vec<JobPosting>
+    results: &mut [JobPosting]
 ) -> Vec<JobPostingForFrontend> {
     results
-        .into_iter()
+        .iter_mut()
         .map(|job_posting| JobPostingForFrontend {
             id: generate_job_posting_id(job_posting),
             jobs_source: jobs_source.to_string(),
@@ -198,9 +198,9 @@ pub fn transform_job_posting_results(
 // Generate ID for the job posting
 
 fn generate_job_posting_id(job_posting: &JobPosting) -> String {
-    let job_now = job_posting.clone();
+    let job_now = job_posting;
     let app_url = job_now.application_url.clone();
-    let url_part = app_url.unwrap_or("".to_string());
+    let url_part = app_url.unwrap_or_default();
 
     let mut hasher = DefaultHasher::new();
     let mut id_parts = String::new();

src/lib/api_app/src/api/routes/testbed/productizers/mod.rs

@@ -18,7 +18,7 @@ fn parse_testbed_request_headers(request: ParsedRequest) -> Result<HeaderMap, AP
         "authorization",
         request.headers
             .get("authorization")
-            .ok_or(APIRoutingError::UnprocessableEntity("No authorization header".to_string()))?
+            .ok_or_else(|| APIRoutingError::UnprocessableEntity("No authorization header".to_string()))?
             .clone()
     );
 
@@ -27,7 +27,7 @@ fn parse_testbed_request_headers(request: ParsedRequest) -> Result<HeaderMap, AP
             "x-consent-token",
             request.headers
                 .get("x-consent-token")
-                .ok_or(
+                .ok_or_else(||
                     APIRoutingError::UnprocessableEntity("No x-consent-token header".to_string())
                 )?
                 .clone()

src/lib/api_app/src/api/routes/testbed/productizers/user/mod.rs

@@ -31,7 +31,7 @@ pub async fn fetch_user_status_info(
     let endpoint_url = env
         ::var("USER_STATUS_INFO_PRODUCTIZER_ENDPOINT")
         .expect("USER_STATUS_INFO_PRODUCTIZER_ENDPOINT must be set");
-    let request_input: JSONValue = serde_json::from_str(request.body.as_str()).unwrap_or(json!({})); // Pass through body
+    let request_input: JSONValue = serde_json::from_str(request.body.as_str()).unwrap_or_else(|_| json!({})); // Pass through body
     let request_headers = parse_testbed_request_headers(request)?;
     let response = post_json_request::<JSONValue, JSONValue>(
         endpoint_url.to_string(),
@@ -47,7 +47,7 @@ pub async fn update_user_status_info(
     let endpoint_url = env
         ::var("USER_STATUS_INFO_WRITE_PRODUCTIZER_ENDPOINT")
         .expect("USER_STATUS_INFO_WRITE_PRODUCTIZER_ENDPOINT must be set");
-    let request_input: JSONValue = serde_json::from_str(request.body.as_str()).unwrap_or(json!({})); // Pass through body
+    let request_input: JSONValue = serde_json::from_str(request.body.as_str()).unwrap_or_else(|_| json!({})); // Pass through body
     let request_headers = parse_testbed_request_headers(request)?;
     let response = post_json_request::<JSONValue, JSONValue>(
         endpoint_url.to_string(),