fix surrealdb Thing

This commit is contained in:
Elijah McMorris 2024-08-25 20:30:14 -07:00
parent 5c6963c8ff
commit 58938e8f71
Signed by: NexVeridian
SSH key fingerprint: SHA256:bsA1SKZxuEcEVHAy3gY1HUeM5ykRJl0U0kQHQn0hMg8

View file

@ -1,7 +1,7 @@
use lazy_static::lazy_static; use lazy_static::lazy_static;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::env; use std::env;
use surrealdb::sql::Thing; use surrealdb::sql::{Id, Thing};
use wikidata::{ClaimValue, ClaimValueData, Entity, Lang, Pid, WikiId}; use wikidata::{ClaimValue, ClaimValueData, Entity, Lang, Pid, WikiId};
lazy_static! { lazy_static! {
@ -19,18 +19,13 @@ pub enum ClaimData {
impl ClaimData { impl ClaimData {
fn from_cvd(cvd: ClaimValueData) -> Self { fn from_cvd(cvd: ClaimValueData) -> Self {
match cvd { match cvd {
ClaimValueData::Item(qid) => ClaimData::Thing(Thing { ClaimValueData::Item(qid) => ClaimData::Thing(Thing::from(("Entity", Id::from(qid.0)))),
id: qid.0.into(), ClaimValueData::Property(pid) => {
tb: "Entity".to_string(), ClaimData::Thing(Thing::from(("Property", Id::from(pid.0))))
}), }
ClaimValueData::Property(pid) => ClaimData::Thing(Thing { ClaimValueData::Lexeme(lid) => {
id: pid.0.into(), ClaimData::Thing(Thing::from(("Lexeme", Id::from(lid.0))))
tb: "Property".to_string(), }
}),
ClaimValueData::Lexeme(lid) => ClaimData::Thing(Thing {
id: lid.0.into(),
tb: "Lexeme".to_string(),
}),
_ => ClaimData::ClaimValueData(cvd), _ => ClaimData::ClaimValueData(cvd),
} }
} }
@ -60,10 +55,7 @@ pub struct EntityMini {
impl EntityMini { impl EntityMini {
pub fn from_entity(entity: Entity) -> (Claims, Self) { pub fn from_entity(entity: Entity) -> (Claims, Self) {
let thing_claim = Thing { let thing_claim = Thing::from(("Claims", get_id_entity(&entity).id));
id: get_id_entity(&entity).id,
tb: "Claims".to_string(),
};
( (
Claims { Claims {
@ -86,19 +78,13 @@ impl EntityMini {
.iter() .iter()
.flat_map(|(pid, claim_value)| { .flat_map(|(pid, claim_value)| {
let mut flattened = vec![Claim { let mut flattened = vec![Claim {
id: Thing { id: Thing::from(("Property", Id::from(pid.0))),
id: pid.0.into(),
tb: "Property".to_string(),
},
value: ClaimData::from_cvd(claim_value.data.clone()), value: ClaimData::from_cvd(claim_value.data.clone()),
}]; }];
flattened.extend(claim_value.qualifiers.iter().map( flattened.extend(claim_value.qualifiers.iter().map(
|(qualifier_pid, qualifier_value)| Claim { |(qualifier_pid, qualifier_value)| Claim {
id: Thing { id: Thing::from(("Claims", Id::from(qualifier_pid.0))),
id: qualifier_pid.0.into(),
tb: "Property".to_string(),
},
value: ClaimData::from_cvd(qualifier_value.clone()), value: ClaimData::from_cvd(qualifier_value.clone()),
}, },
)); ));
@ -117,7 +103,7 @@ fn get_id_entity(entity: &Entity) -> Thing {
_ => todo!("Not implemented"), _ => todo!("Not implemented"),
}; };
Thing { id: id.into(), tb } Thing::from((tb, Id::from(id)))
} }
fn get_name(entity: &Entity) -> String { fn get_name(entity: &Entity) -> String {