Working on email templating, updating with swagger

api/src/airports/model/airport.rs

@@ -1,20 +1,22 @@
-use std::collections::HashMap;
-use std::str::FromStr;
+use crate::airports::{
+  AirportCategory, Communication, CommunicationRow, Runway, RunwayRow, UpdateCommunication,
+  UpdateRunway,
+};
+use crate::db;
+use crate::error::{ApiResult, Error};
+use crate::metars::Metar;
 use chrono::{DateTime, Utc};
 use futures_util::try_join;
 use reqwest::Client;
 use serde::{Deserialize, Serialize};
 use sqlx::{Postgres, QueryBuilder};
-use crate::airports::{
-  AirportCategory, Communication, CommunicationRow, Runway, RunwayRow, UpdateCommunication, UpdateRunway,
-};
-use crate::db;
-use crate::error::{ApiResult, Error};
-use crate::metars::Metar;
+use std::collections::HashMap;
+use std::str::FromStr;
+use utoipa::{IntoParams, ToSchema};
 
 const TABLE_NAME: &str = "airports";
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, ToSchema)]
 pub struct Airport {
   pub icao: String,
   #[serde(skip_serializing_if = "Option::is_none")]
@@ -40,7 +42,8 @@ pub struct Airport {
   pub latest_metar: Option<Metar>,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, ToSchema, IntoParams)]
+#[into_params(parameter_in = Query)]
 pub struct AirportQuery {
   pub page: Option<u32>,
   pub limit: Option<u32>,
@@ -75,7 +78,7 @@ impl Default for AirportQuery {
   }
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, ToSchema)]
 pub struct Bounds {
   pub north_east_lat: f32,
   pub north_east_lon: f32,
@@ -125,7 +128,7 @@ struct AirportRow {
   pub metar_observation_time: Option<DateTime<Utc>>,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, ToSchema)]
 pub struct UpdateAirport {
   pub icao: Option<String>,
   pub iata: Option<String>,

api/src/airports/model/airport_category.rs

@@ -1,8 +1,9 @@
+use serde::{Deserialize, Serialize};
 use std::fmt::Display;
 use std::str::FromStr;
-use serde::{Deserialize, Serialize};
+use utoipa::ToSchema;
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
 pub enum AirportCategory {
   #[serde(rename = "small_airport")]
   Small,

api/src/airports/model/communication.rs

@@ -1,13 +1,14 @@
-use std::collections::HashMap;
-use serde::{Deserialize, Serialize};
-use sqlx::{Postgres, QueryBuilder};
-use uuid::Uuid;
 use crate::db;
 use crate::error::ApiResult;
+use serde::{Deserialize, Serialize};
+use sqlx::{Postgres, QueryBuilder};
+use std::collections::HashMap;
+use utoipa::ToSchema;
+use uuid::Uuid;
 
 const TABLE_NAME: &str = "communications";
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
 pub struct Communication {
   pub id: String,
   #[serde(skip_serializing_if = "Option::is_none")]
@@ -27,7 +28,7 @@ pub struct CommunicationRow {
   pub phone: Option<String>,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, ToSchema)]
 pub struct UpdateCommunication {
   #[serde(skip_serializing_if = "Option::is_none")]
   pub icao: Option<String>,

api/src/airports/model/runway.rs

@@ -1,13 +1,14 @@
-use std::collections::HashMap;
-use serde::{Deserialize, Serialize};
-use sqlx::{Postgres, QueryBuilder};
-use uuid::Uuid;
 use crate::db;
 use crate::error::ApiResult;
+use serde::{Deserialize, Serialize};
+use sqlx::{Postgres, QueryBuilder};
+use std::collections::HashMap;
+use utoipa::ToSchema;
+use uuid::Uuid;
 
 const TABLE_NAME: &str = "runways";
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
 pub struct Runway {
   #[serde(rename = "id")]
   pub runway_id: String,
@@ -26,7 +27,7 @@ pub struct RunwayRow {
   pub surface: String,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, ToSchema)]
 pub struct UpdateRunway {
   #[serde(skip_serializing_if = "Option::is_none")]
   pub icao: Option<String>,