diff --git a/backend/src/models.rs b/backend/src/models.rs index bbfd31b..8db473e 100644 --- a/backend/src/models.rs +++ b/backend/src/models.rs @@ -4,28 +4,28 @@ use serde::{Deserialize, Serialize}; #[derive(Debug, Clone, Serialize, Deserialize)] pub struct Voucher { - id: String, + pub id: String, #[serde(rename = "createdAt")] pub created_at: String, pub name: String, - code: String, + pub code: String, #[serde(rename = "authorizedGuestLimit")] - authorized_guest_limit: Option, + pub authorized_guest_limit: Option, #[serde(rename = "authorizedGuestCount")] - authorized_guest_count: u64, + pub authorized_guest_count: u64, #[serde(rename = "activatedAt")] pub activated_at: Option, #[serde(rename = "expiresAt")] pub expires_at: Option, - expired: bool, + pub expired: bool, #[serde(rename = "timeLimitMinutes")] - time_limit_minutes: u64, + pub time_limit_minutes: u64, #[serde(rename = "dataUsageLimitMBytes")] - data_usage_limit_mbytes: Option, + pub data_usage_limit_mbytes: Option, #[serde(rename = "rxRateLimitKbps")] - rx_rate_limit_kbps: Option, + pub rx_rate_limit_kbps: Option, #[serde(rename = "txRateLimitKbps")] - tx_rate_limit_kbps: Option, + pub tx_rate_limit_kbps: Option, } #[derive(Debug, Clone, Serialize, Deserialize)] @@ -80,7 +80,7 @@ pub struct DetailsRequest { pub struct Site { pub id: String, #[serde(rename = "internalReference")] - internal_reference: String, + pub internal_reference: String, pub name: String, } diff --git a/backend/src/unifi_api.rs b/backend/src/unifi_api.rs index c676336..88f1068 100644 --- a/backend/src/unifi_api.rs +++ b/backend/src/unifi_api.rs @@ -290,7 +290,9 @@ impl<'a> UnifiAPI<'a> { .data .iter() .find(|voucher| { - voucher.name.starts_with(ROLLING_VOUCHER_NAME_PREFIX) && voucher.name.ends_with(ip) + !voucher.expired + && voucher.name.starts_with(ROLLING_VOUCHER_NAME_PREFIX) + && voucher.name.ends_with(ip) }) .cloned();