Skip to content

Commit

Permalink
Made public all model's fields
Browse files Browse the repository at this point in the history
  • Loading branch information
0xCAB0 committed Apr 2, 2024
1 parent ef1b452 commit a419a1b
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 33 deletions.
2 changes: 1 addition & 1 deletion src/model/filter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ pub mod size;
/// let filter: Filter = Filter::builder()
/// .catalog_ids(Some(String::from("4,16")))
/// .brand_ids(Some(String::from("14,53")))
/// .build();
/// .build();
///
/// // Women shoes and Women clothes that are only from brands Adidas and Nike.
///
Expand Down
21 changes: 12 additions & 9 deletions src/model/payment_method.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,22 @@ use redis_macros::{FromRedisValue, ToRedisArgs};
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Hash, Eq)]
#[cfg_attr(feature = "redis", derive(FromRedisValue, ToRedisArgs,))]
pub struct PayInMethod {
id: i32,
code: String,
requires_credit_card: bool,
pub id: i32,
/// Code of the payment method given by Vinted
pub code: String,
/// If the payment method requires a credit card
pub requires_credit_card: bool,
#[serde(skip_serializing_if = "Option::is_none")]
event_tracking_code: Option<String>,
pub event_tracking_code: Option<String>,
/// Icon of the payment method
#[serde(skip_serializing_if = "Option::is_none")]
icon: Option<String>,
enabled: bool,
pub icon: Option<String>,
pub enabled: bool,
#[serde(skip_serializing_if = "Option::is_none")]
translated_name: Option<String>,
pub translated_name: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
note: Option<String>,
method_change_possible: bool,
pub note: Option<String>,
pub method_change_possible: bool,
}

impl fmt::Display for PayInMethod {
Expand Down
54 changes: 31 additions & 23 deletions src/model/user.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,43 +9,51 @@ use super::{payment_method::PayInMethod, photo::Photo};
#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, Hash)]
#[cfg_attr(feature = "redis", derive(FromRedisValue, ToRedisArgs,))]
pub struct User {
id: i64,
login: String, //usernameredis_macros
photo: Photo,
pub id: i64,
// Username
pub login: String,
/// User's profile picture URL
pub photo: Photo,
}

/// All avalible fields for a user
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Hash, Eq)]
#[cfg_attr(feature = "redis", derive(FromRedisValue, ToRedisArgs,))]
pub struct AdvancedUser {
id: i64,
login: String, //username
pub id: i64,
/// Username
pub login: String,
/// User's profile picture URL
#[serde(skip_serializing_if = "Option::is_none")]
photo: Option<Photo>,

pub photo: Option<Photo>,
/// User's real name
#[serde(skip_serializing_if = "Option::is_none")]
real_name: Option<String>,
pub real_name: Option<String>,
/// User's email
#[serde(skip_serializing_if = "Option::is_none")]
email: Option<String>,
pub email: Option<String>,
/// User's birthday
#[serde(skip_serializing_if = "Option::is_none")]
birthday: Option<String>,
pub birthday: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
gender: Option<String>,

pub gender: Option<String>,
/// Last time the user logged in
#[serde(skip_serializing_if = "Option::is_none")]
last_loged_on_ts: Option<String>,
expose_location: bool,
country_id: i32,
pub last_loged_on_ts: Option<String>,
/// If the user wants to expose his location
pub expose_location: bool,
/// See [`Country`](crate::model::Country)
pub country_id: i32,
#[serde(skip_serializing_if = "Option::is_none")]
city_id: Option<i32>,
pub city_id: Option<i32>,
/// City name
#[serde(skip_serializing_if = "Option::is_none")]
city: Option<String>,

pub city: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
path: Option<String>,
pub path: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
about: Option<String>,

accepted_pay_in_methods: Vec<PayInMethod>,
pub about: Option<String>,
/// Payment methods accepted by the user
pub accepted_pay_in_methods: Vec<PayInMethod>,
}

impl fmt::Display for AdvancedUser {
Expand Down

0 comments on commit a419a1b

Please sign in to comment.