Added search by country

src/db.rs

@@ -22,11 +22,12 @@ use bb8_postgres::{
 use postgres_types::ToSql;
 use thiserror::Error;
 
-use crate::model::filter::{brand::Brand, category::Category};
+use crate::model::filter::{brand::Brand, category::Category, country::Country};
 
 const GET_BRAND_BY_NAME: &str = include_str!("sql_queries/GET_BRAND_BY_NAME.sql");
 const GET_BRANDS_BY_NAME: &str = include_str!("sql_queries/GET_BRANDS_BY_NAME.sql");
 const GET_CATEGORY_BY_NAME: &str = include_str!("sql_queries/GET_CATEGORY_BY_NAME.sql");
+const GET_COUNTRY_BY_ISO_CODE: &str = include_str!("sql_queries/GET_COUNTRY_BY_ISO_CODE.sql");
 
 /**
 Represents an error that can occur during database operations.
@@ -122,4 +123,18 @@ where
 
         Ok(cat)
     }
+
+    /// Retrieves a category by its title from the database
+    pub async fn get_country_by_iso<S: AsRef<str> + Sync + ToSql + Display>(
+        &self,
+        code: &S,
+    ) -> Result<Country, DbError> {
+        let conn = self.pool.get().await?;
+        let row: Row = conn.query_one(GET_COUNTRY_BY_ISO_CODE, &[&code]).await?;
+
+        // Works because From<Row> for Category is implemented
+        let country: Country = row.into();
+
+        Ok(country)
+    }
 }

src/model/filter.rs

@@ -79,6 +79,8 @@ pub struct Filter {
     ///
     ///Try it in [Regex 101](https://regex101.com/r/u8ZEpv/1)
     ///
+    /// 
+    /// **Note:** Color names are only avalible in French in our database at the moment
     ///### Example
     ///```rust
     /// use vinted_rs::Filter;

src/model/filter/category.rs

@@ -4,13 +4,13 @@ use typed_builder::TypedBuilder;
 
 #[derive(Debug, Clone, TypedBuilder, PartialEq, Eq)]
 pub struct Category {
-    id: i32,
+    pub id: i32,
     // TODO creo que estos titulos solo estan en ingles
-    title: String,
-    code: String,
-    parent_id: i32,
-    url: String,
-    url_en: String,
+    pub title: String,
+    pub code: String,
+    pub parent_id: i32,
+    pub url: String,
+    pub url_en: String,
 }
 
 #[cfg(feature = "advanced_filters")]

src/model/filter/category_tree.rs

@@ -4,9 +4,9 @@ use typed_builder::TypedBuilder;
 
 #[derive(Debug, Clone, TypedBuilder, PartialEq, Eq)]
 pub struct CategoryTree {
-    id: i32,
-    parent_id: i32,
-    child_id: i32,
+    pub id: i32,
+    pub parent_id: i32,
+    pub child_id: i32,
 }
 
 #[cfg(feature = "advanced_filters")]

src/model/filter/colors.rs

@@ -4,10 +4,9 @@ use typed_builder::TypedBuilder;
 
 #[derive(Debug, Clone, TypedBuilder, PartialEq, Eq)]
 pub struct Color {
-    id: i32,
-    // TODO el titulo solo está en francés valorar que podemos hacer
-    title: String,
-    hex: String,
+    pub id: i32,
+    pub title: String,
+    pub hex: String,
 }
 
 #[cfg(feature = "advanced_filters")]

src/model/filter/country.rs

@@ -3,18 +3,20 @@ use bb8_postgres::tokio_postgres::Row;
 use typed_builder::TypedBuilder;
 
 #[derive(Debug, Clone, TypedBuilder, PartialEq, Eq)]
-struct Country {
-    id: i32,
-    local_name: String,
-    iso_code: String,
-    flag: String,
+pub struct Country {
+    pub id: i32,
+    pub name: String,
+    pub local_name: String,
+    pub iso_code: String,
+    pub flag: String,
 }
 
 #[cfg(feature = "advanced_filters")]
 impl From<Row> for Country {
     fn from(row: Row) -> Self {
         Country::builder()
             .id(row.get("id"))
+            .name(row.get("name"))
             .local_name(row.get("local_name"))
             .iso_code(row.get("iso_code"))
             .flag(row.get("flag"))

src/model/filter/material.rs

@@ -4,10 +4,10 @@ use typed_builder::TypedBuilder;
 
 #[derive(Debug, Clone, TypedBuilder, PartialEq, Eq)]
 pub struct Material {
-    id: i32,
-    material_es: String,
-    material_fr: String,
-    material_en: String,
+    pub id: i32,
+    pub material_es: String,
+    pub material_fr: String,
+    pub material_en: String,
 }
 
 #[cfg(feature = "advanced_filters")]

src/tests/db.rs

@@ -1,6 +1,6 @@
 use crate::{
     db::DbController,
-    model::filter::{brand::Brand, category::Category},
+    model::filter::{brand::Brand, category::Category, country::Country},
 };
 use bb8_postgres::tokio_postgres::NoTls;
 
@@ -56,3 +56,20 @@ async fn test_get_category_by_name() {
             .build()
     );
 }
+
+#[tokio::test]
+async fn test_get_country_by_iso() {
+    let db: DbController<NoTls> = DbController::new(DB_URL, POOL_SIZE, NoTls).await.unwrap();
+    let c = db.get_country_by_iso(&String::from("ES")).await.unwrap();
+
+    assert_eq!(
+        c,
+        Country::builder()
+            .id(7)
+            .name(String::from("Espagne"))
+            .local_name(String::from("España"))
+            .iso_code(String::from("ES"))
+            .flag(String::from("🇪🇸"))
+            .build()
+    );
+}

src/tests/queries.rs

@@ -79,6 +79,53 @@ async fn test_get_items_catalogs_no_db() {
     match vinted.get_items(&filter, 10).await {
         Ok(items) => {
             assert_eq!(items.items.len(), 10);
+            //TODO: Try to test all are from the same catalog somehow
+        }
+        Err(err) => match err {
+            VintedWrapperError::ItemNumberError => unreachable!(),
+            VintedWrapperError::CookiesError(_) => (),
+        },
+    };
+}
+
+#[tokio::test]
+async fn test_get_items_by_price() {
+    let vinted = VintedWrapper::new();
+    let min = 50;
+    let max = 100;
+
+    let filter: Filter = Filter::builder().price_from(min).price_to(max).build();
+
+    match vinted.get_items(&filter, 10).await {
+        Ok(items) => {
+            assert_eq!(items.items.len(), 10);
+            let ok: bool = items.items.iter().all(|item| {
+                let price: f32 = item.price.parse().unwrap();
+                println!("{price}");
+                price <= max as f32 && price >= min as f32
+            });
+
+            assert!(ok);
+        }
+        Err(err) => match err {
+            VintedWrapperError::ItemNumberError => unreachable!(),
+            VintedWrapperError::CookiesError(_) => (),
+        },
+    };
+}
+
+#[tokio::test]
+async fn test_get_items_by_country() {
+    let vinted = VintedWrapper::new();
+    let db: DbController<NoTls> = DbController::new(DB_URL, POOL_SIZE, NoTls).await.unwrap();
+    let country = db.get_country_by_iso(&String::from("ES")).await.unwrap();
+
+    let filter: Filter = Filter::builder().countries_ids(country.id.to_string()).build(); 
+
+    match vinted.get_items(&filter, 20).await {
+        Ok(items) => {
+            assert_eq!(items.items.len(), 20);
+            //TODO: Try to test all are from the same country somehow
         }
         Err(err) => match err {
             VintedWrapperError::ItemNumberError => unreachable!(),