Updates to account, ui, etc
This commit is contained in:
@@ -11,6 +11,8 @@ const TABLE_NAME: &str = "frequencies";
|
||||
pub struct Frequency {
|
||||
#[serde(rename = "id")]
|
||||
pub frequency_id: String,
|
||||
#[serde(rename = "name")]
|
||||
pub frequency_name: Option<String>,
|
||||
pub frequency_mhz: f32,
|
||||
}
|
||||
|
||||
@@ -19,6 +21,7 @@ pub struct FrequencyRow {
|
||||
pub id: Uuid,
|
||||
pub icao: String,
|
||||
pub frequency_id: String,
|
||||
pub frequency_name: Option<String>,
|
||||
pub frequency_mhz: f32,
|
||||
}
|
||||
|
||||
@@ -28,6 +31,8 @@ pub struct UpdateFrequency {
|
||||
pub icao: Option<String>,
|
||||
#[serde(rename = "id", skip_serializing_if = "Option::is_none")]
|
||||
pub frequency_id: Option<String>,
|
||||
#[serde(rename = "name", skip_serializing_if = "Option::is_none")]
|
||||
pub frequency_name: Option<String>,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub frequency_mhz: Option<f32>,
|
||||
}
|
||||
@@ -36,6 +41,7 @@ impl From<FrequencyRow> for Frequency {
|
||||
fn from(frequency: FrequencyRow) -> Self {
|
||||
Self {
|
||||
frequency_id: frequency.frequency_id.clone(),
|
||||
frequency_name: frequency.frequency_name.clone(),
|
||||
frequency_mhz: frequency.frequency_mhz,
|
||||
}
|
||||
}
|
||||
@@ -47,6 +53,7 @@ impl Frequency {
|
||||
id: Uuid::new_v4(),
|
||||
icao: icao.to_string(),
|
||||
frequency_id: frequency.frequency_id.clone(),
|
||||
frequency_name: frequency.frequency_name.clone(),
|
||||
frequency_mhz: frequency.frequency_mhz.clone(),
|
||||
}
|
||||
}
|
||||
@@ -96,13 +103,14 @@ impl Frequency {
|
||||
|
||||
for chunk in frequencies.chunks(chunk_size) {
|
||||
let mut query_builder: QueryBuilder<Postgres> = QueryBuilder::new(&format!(
|
||||
"INSERT INTO {} (id, icao, frequency_id, frequency_mhz) ",
|
||||
"INSERT INTO {} (id, icao, frequency_id, frequency_name, frequency_mhz) ",
|
||||
TABLE_NAME
|
||||
));
|
||||
query_builder.push_values(chunk, |mut b, row| {
|
||||
b.push_bind(&row.id)
|
||||
.push_bind(&row.icao)
|
||||
.push_bind(&row.frequency_id)
|
||||
.push_bind(&row.frequency_name)
|
||||
.push_bind(&row.frequency_mhz);
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user