src/db.rs

@@ -261,7 +261,6 @@ mod db_impl {
                     name TEXT NOT NULL,
                     description TEXT,
                     wikidata_id TEXT,
-                    item_order INTEGER NOT NULL DEFAULT 0,
                     FOREIGN KEY (url_id) REFERENCES urls(id) ON DELETE CASCADE
                 );",
             )
@@ -378,68 +377,42 @@ mod db_impl {
             log!("Fetching items for URL '{}' (ID: {})", url, url_id);
 
             let mut stmt = conn.prepare(
-                "WITH ordered_items AS (
-                    SELECT 
-                        i.id,
-                        i.name,
-                        i.description,
-                        i.wikidata_id,
-                        i.item_order
-                    FROM items i
-                    WHERE i.url_id = ?
-                    ORDER BY i.item_order ASC
-                )
-                SELECT 
-                    oi.id,
-                    oi.name,
-                    oi.description,
-                    oi.wikidata_id,
-                    p.name AS prop_name,
-                    ip.value
-                FROM ordered_items oi
-                LEFT JOIN item_properties ip ON oi.id = ip.item_id
-                LEFT JOIN properties p ON ip.property_id = p.id
-                ORDER BY oi.item_order ASC"
+                "SELECT i.id, i.name, i.description, i.wikidata_id, 
+                        p.name AS prop_name, ip.value
+                 FROM items i
+                 LEFT JOIN item_properties ip ON i.id = ip.item_id
+                 LEFT JOIN properties p ON ip.property_id = p.id
+                 WHERE i.url_id = ?",
             )?;
-        
-            // Change from HashMap to Vec to preserve order
-            let mut items: Vec<Item> = Vec::new();
-            let mut current_id: Option<String> = None;
-        
+            let mut items: HashMap<String, Item> = HashMap::new();
+
             let rows = stmt.query_map([url_id], |row| {
                 Ok((
-                    row.get::<_, String>(0)?,  // id
-                    row.get::<_, String>(1)?,  // name
-                    row.get::<_, String>(2)?,  // description
-                    row.get::<_, Option<String>>(3)?,  // wikidata_id
-                    row.get::<_, Option<String>>(4)?,  // prop_name
-                    row.get::<_, Option<String>>(5)?,  // value
+                    row.get::<_, String>(0)?,         // id
+                    row.get::<_, String>(1)?,         // name
+                    row.get::<_, String>(2)?,         // description
+                    row.get::<_, Option<String>>(3)?, // wikidata_id
+                    row.get::<_, Option<String>>(4)?, // prop_name
+                    row.get::<_, Option<String>>(5)?, // value
                 ))
             })?;
-        
+
             for row in rows {
                 let (id, name, desc, wd_id, prop, val) = row?;
-                
-                if current_id.as_ref() != Some(&id) {
-                    // New item - push to vector
-                    items.push(Item {
-                        id: id.clone(),
-                        name,
-                        description: desc,
-                        wikidata_id: wd_id,
-                        custom_properties: HashMap::new(),
-                    });
-                    current_id = Some(id);
-                }
-        
+                let item = items.entry(id.clone()).or_insert(Item {
+                    id,
+                    name,
+                    description: desc,
+                    wikidata_id: wd_id,
+                    custom_properties: HashMap::new(),
+                });
+
                 if let (Some(p), Some(v)) = (prop, val) {
-                    if let Some(last_item) = items.last_mut() {
-                        last_item.custom_properties.insert(p, v);
-                    }
+                    item.custom_properties.insert(p, v);
                 }
             }
-        
-            Ok(items)
+
+            Ok(items.into_values().collect())
         }
 
         async fn get_or_create_property(
@@ -494,30 +467,22 @@ mod db_impl {
                 Err(e) => return Err(e.into()),
             };
 
-            let max_order: i32 = tx.query_row(
-                "SELECT COALESCE(MAX(item_order), 0) FROM items WHERE url_id = ?",
-                [url_id],
-                |row| row.get(0),
-            )?;
-
             // 4. Item insertion
             log!("[DB] Upserting item");
             tx.execute(
-                "INSERT INTO items (id, url_id, name, description, wikidata_id, item_order)
-                VALUES (?, ?, ?, ?, ?, ?)
+                "INSERT INTO items (id, url_id, name, description, wikidata_id)
+                VALUES (?, ?, ?, ?, ?)
                 ON CONFLICT(id) DO UPDATE SET
                     url_id = excluded.url_id,
                     name = excluded.name,
                     description = excluded.description,
-                    wikidata_id = excluded.wikidata_id,
-                    item_order = excluded.item_order",
+                    wikidata_id = excluded.wikidata_id",
                 rusqlite::params![
                     &item.id,
                     url_id,
                     &item.name,
                     &item.description,
-                    &item.wikidata_id,
-                    max_order + 1
+                    &item.wikidata_id
                 ],
             )?;
             log!("[DB] Item upserted successfully");