Fixed docker issue temporarily

api/src/airports/model/airport.rs

@@ -1,6 +1,7 @@
 use std::collections::HashMap;
 use std::str::FromStr;
 use futures_util::try_join;
+use reqwest::Client;
 use serde::{Deserialize, Serialize};
 use sqlx::{Postgres, QueryBuilder};
 use crate::airports::{
@@ -194,7 +195,7 @@ impl From<AirportRow> for Airport {
 }
 
 impl Airport {
-  pub async fn select(icao: &str, metar: bool) -> Option<Self> {
+  pub async fn select(client: &Client, icao: &str, metar: bool) -> Option<Self> {
     let pool = db::pool();
 
     let airport_fut = async {
@@ -206,7 +207,7 @@ impl Airport {
 
     let metar_fut = async {
       if metar {
-        match Metar::find_all(&vec![icao.to_string()]).await {
+        match Metar::find_all(client, &vec![icao.to_string()], &false).await {
           Ok(m) => Some(m.into_iter().nth(0)),
           Err(err) => {
             log::error!("{}", err);
@@ -269,7 +270,7 @@ impl Airport {
     })
   }
 
-  pub async fn select_all(query: &AirportQuery) -> ApiResult<Vec<Self>> {
+  pub async fn select_all(client: &Client, query: &AirportQuery) -> ApiResult<Vec<Self>> {
     let pool = db::pool();
 
     let mut builder = QueryBuilder::<Postgres>::new("SELECT * FROM ");
@@ -337,7 +338,7 @@ impl Airport {
     let runway_future = Runway::select_all_map(icaos.clone());
     let frequency_future = Frequency::select_all_map(icaos.clone());
     let metar_future = if query.metars.unwrap_or(false) {
-      Some(Metar::find_all(&icaos))
+      Some(Metar::find_all(client, &icaos, &false))
     } else {
       None
     };

api/src/airports/routes.rs

@@ -4,6 +4,7 @@ use crate::{
   airports::Airport,
   db::Paged,
   auth::{Auth, verify_role},
+  AppState,
 };
 use actix_multipart::Multipart;
 use actix_web::{delete, get, post, put, web, HttpResponse, HttpRequest, ResponseError};
@@ -53,7 +54,7 @@ async fn import_airports(mut payload: Multipart, auth: Auth) -> HttpResponse {
 }
 
 #[get("")]
-async fn get_airports(req: HttpRequest) -> HttpResponse {
+async fn get_airports(data: web::Data<AppState>, req: HttpRequest) -> HttpResponse {
   let mut query = match web::Query::<AirportQuery>::from_query(req.query_string()) {
     Ok(q) => q.into_inner(),
     Err(err) => {
@@ -71,7 +72,8 @@ async fn get_airports(req: HttpRequest) -> HttpResponse {
   query.limit = Some(limit);
   query.page = Some(page);
 
-  match Airport::select_all(&query).await {
+  let client = &data.client;
+  match Airport::select_all(client, &query).await {
     Ok(airports) => HttpResponse::Ok().json(Paged {
       data: airports,
       page,
@@ -86,7 +88,11 @@ async fn get_airports(req: HttpRequest) -> HttpResponse {
 }
 
 #[get("/{icao}")]
-async fn get_airport(icao: web::Path<String>, req: HttpRequest) -> HttpResponse {
+async fn get_airport(
+  data: web::Data<AppState>,
+  icao: web::Path<String>,
+  req: HttpRequest,
+) -> HttpResponse {
   let metar = match web::Query::<AirportQuery>::from_query(req.query_string()) {
     Ok(q) => q.metars.unwrap_or_else(|| false),
     Err(err) => {
@@ -95,7 +101,8 @@ async fn get_airport(icao: web::Path<String>, req: HttpRequest) -> HttpResponse
     }
   };
 
-  match Airport::select(&icao.into_inner(), metar).await {
+  let client = &data.client;
+  match Airport::select(client, &icao.into_inner(), metar).await {
     Some(airport) => HttpResponse::Ok().json(airport),
     None => HttpResponse::NotFound().finish(),
   }