added some more changes

src-tauri/src/main.rs

@@ -110,6 +110,27 @@ fn search_move(index: i64) -> MoveSearchResult {
 #[tauri::command]
 fn search(index: i64) -> SearchResult {
   let connection = sqlite::open("./pokemon.db").unwrap();
+  let mut learnset: Vec<PokemonDataLearnset> = vec![];
+  let move_query = "SELECT pl.id, pl.learnset_id, l.name, l.types, l.power, l.category FROM pokemon__learnset pl JOIN learnset l on pl.learnset_id = l.id WHERE pl.pokemon_id = ? ORDER BY usage";
+  for row in connection
+    .prepare(move_query)
+    .unwrap()
+    .into_iter()
+    .bind((1, index))
+    .unwrap()
+    .map(|row| row.unwrap())
+  {
+    let row_result = PokemonDataLearnset {
+      id: row.read::<i64, _>("id"),
+      learset_id: row.read::<i64, _>("learnset_id"),
+      name: row.read::<&str, _>("name").to_string(),
+      types: serde_json::from_str(row.read::<&str, _>("types")).unwrap_or(vec![0]),
+      power: row.read::<i64, _>("power"),
+      category: row.read::<i64, _>("category"),
+    };
+    learnset.push(row_result)
+  }
+  println!("Get Thing2");
   let query = "SELECT * FROM pokemon WHERE id = ?";
   for row in connection
     .prepare(query)
@@ -131,6 +152,7 @@ fn search(index: i64) -> SearchResult {
       special_attack: row.read::<i64, _>("special_attack"),
       special_defense: row.read::<i64, _>("special_defense"),
       speed: row.read::<i64, _>("speed"),
+      learnset: learnset,
     };
     return row_result
   }
@@ -146,6 +168,7 @@ fn search(index: i64) -> SearchResult {
     special_attack: 0,
     special_defense: 0,
     speed: 0,
+    learnset: vec![],
   }
 }
 fn main() {

src-tauri/src/model.rs

@@ -13,8 +13,18 @@ pub struct SearchResult {
   pub speed: i64,
   pub abilities: String,
   pub thumbnail: String,
+  pub learnset: Vec<PokemonDataLearnset>,
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct PokemonDataLearnset {
+  pub id: i64,
+  pub learset_id: i64,
+  pub name: String,
+  pub types: Vec<i64>,
+  pub power: i64,
+  pub category: i64,
+}
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct MoveSearchResult {
   pub id: i64,