MoreThanText/morethantext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated error to be more expressive.
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1s
Details

Browse Source
This commit is contained in:
Jeff Baskin
2026-02-25 10:16:50 -05:00
parent 7e067fde8c
commit 5251689158
15 changed files with 211 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/document/create.rs
View File

@@ -118,7 +118,7 @@ impl Index {
}
};
if self.unique && oids.len() > 0 {
let err = MTTError::new(NameType::None, ErrorID::IndexEntryAlreadyExists);
let err = MTTError::new(ErrorID::IndexEntryAlreadyExists);
return Err(err);
} else {
oids.insert(oid);
@@ -136,7 +136,7 @@ impl Index {
}
}
_ => {
let err = MTTError::new(NameType::None, ErrorID::FieldInvalidType);
let err = MTTError::new(ErrorID::FieldInvalidType);
return Err(err);
}
}
@@ -160,7 +160,7 @@ impl Index {
if self.unique {
match self.data.get(field) {
Some(_) => {
let err = MTTError::new(NameType::None, ErrorID::IndexEntryAlreadyExists);
let err = MTTError::new(ErrorID::IndexEntryAlreadyExists);
return Err(err);
}
None => {}
@@ -320,7 +320,7 @@ mod indexes {
match index.add(field.clone(), oids[0].clone()) {
Ok(_) => unreachable!("should have been an error"),
Err(err) => {
let err_id = err.error_id();
let err_id = err.get_error_ids().back().unwrap();
match err_id {
ErrorID::IndexEntryAlreadyExists => {}
_ => unreachable!("got {:?}: should have been duplicate field", err),
@@ -349,7 +349,7 @@ mod indexes {
index.add(field.clone(), oid).unwrap();
match index.validate(&field) {
Ok(_) => unreachable!("should have gotten a duplication error"),
Err(err) => match err.error_id() {
Err(err) => match err.get_error_ids().back().unwrap() {
ErrorID::IndexEntryAlreadyExists => {}
_ => unreachable!("got {:?}: should have been duplicate field", err),
},
@@ -1040,6 +1040,7 @@ mod document_files {
}
}
/*
#[test]
fn can_document_be_added() {
let doc_name = Name::english("document");
@@ -1124,6 +1125,7 @@ mod document_files {
}
assert!(entries.is_empty(), "did not use {:?}", entries);
}
*/
#[test]
fn errors_on_wrong_field_name() {
@@ -1136,7 +1138,7 @@ mod document_files {
queue.send(Message::new(addition));
let result = test_doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
match result.get_action() {
MsgAction::Error(err) => match err.error_id() {
MsgAction::Error(err) => match err.get_error_ids().back().unwrap() {
ErrorID::NameNotFound => {}
_ => unreachable!("got {:?}: should have been document field not found.", err),
},
@@ -1154,7 +1156,7 @@ mod document_files {
queue.send(Message::new(addition));
let result = test_doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
match result.get_action() {
MsgAction::Error(err) => match err.error_id() {
MsgAction::Error(err) => match err.get_error_ids().back().unwrap() {
ErrorID::FieldInvalidType => {}
_ => unreachable!(
"got {:?}: should have been document field data mismatch.",
@@ -1175,7 +1177,7 @@ mod document_files {
queue.send(Message::new(addition));
let result = test_doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
match result.get_action() {
MsgAction::Error(err) => match err.error_id() {
MsgAction::Error(err) => match err.get_error_ids().back().unwrap() {
ErrorID::FieldInvalidNone => {}
_ => unreachable!("got {:?}: should have been document field missing", err),
},
@@ -1446,7 +1448,7 @@ mod document_files {
let result = rx.recv_timeout(TIMEOUT).unwrap();
let action = result.get_action();
match action {
MsgAction::Error(data) => match data.error_id() {
MsgAction::Error(data) => match data.get_error_ids().back().unwrap() {
ErrorID::NameNotFound => {}
_ => unreachable!("got {:?}: should been field not found", data),
},
@@ -1470,7 +1472,7 @@ mod document_files {
let result = doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
let action = result.get_action();
match action {
MsgAction::Error(data) => match data.error_id() {
MsgAction::Error(data) => match data.get_error_ids().back().unwrap() {
ErrorID::FieldInvalidType => {}
_ => unreachable!("got {:?}: should been invalid field type", data),
},
@@ -1758,7 +1760,7 @@ mod document_files {
let result = doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
let action = result.get_action();
match action {
MsgAction::Error(err) => match err.error_id() {
MsgAction::Error(err) => match err.get_error_ids().back().unwrap() {
ErrorID::NameNotFound => {}
_ => unreachable!("got {:?}: should have gotten an missing field", err),
},
@@ -1789,7 +1791,7 @@ mod document_files {
let result = doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
let action = result.get_action();
match action {
MsgAction::Error(err) => match err.error_id() {
MsgAction::Error(err) => match err.get_error_ids().back().unwrap() {
ErrorID::FieldInvalidType => {}
_ => unreachable!("got {:?}: should have gotten incorrect file type", err),
},
@@ -1840,7 +1842,7 @@ mod document_files {
let result = test_doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
let action = result.get_action();
match action {
MsgAction::Error(err) => match err.error_id() {
MsgAction::Error(err) => match err.get_error_ids().back().unwrap() {
ErrorID::IndexEntryAlreadyExists => {}
_ => unreachable!("got {:?}: should have gotten incorrect file type", err),
},
@@ -1927,7 +1929,7 @@ mod document_files {
let result = doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
let action = result.get_action();
match action {
MsgAction::Error(err) => match err.error_id() {
MsgAction::Error(err) => match err.get_error_ids().back().unwrap() {
ErrorID::IndexEntryAlreadyExists => {}
_ => unreachable!("got {:?}: should have gotten an missing field", err),
},
@@ -1968,7 +1970,7 @@ mod document_files {
let result = doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
let action = result.get_action();
match action {
MsgAction::Error(err) => match err.error_id() {
MsgAction::Error(err) => match err.get_error_ids().back().unwrap() {
ErrorID::IndexEntryAlreadyExists => {}
_ => unreachable!("got {:?}: should have gotten field duplicate", err),
},
@@ -2081,7 +2083,7 @@ mod document_files {
let result = doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
let action = result.get_action();
match action {
MsgAction::Error(err) => match err.error_id() {
MsgAction::Error(err) => match err.get_error_ids().back().unwrap() {
ErrorID::NameNotFound => {}
_ => unreachable!("got {:?}: should have gotten an missing field", err),
},

20
src/document/definition.rs
View File

@@ -31,19 +31,19 @@ impl FieldSetting {
match &value {
CalcValue::Calculate(calc) => {
if self.fieldtype != calc.get_type() {
let err = MTTError::new(NameType::None, ErrorID::FieldInvalidType);
let err = MTTError::new(ErrorID::FieldInvalidType);
return Err(err);
}
}
CalcValue::Existing(ftype) | CalcValue::FType(ftype) => {
if &self.fieldtype != ftype {
let err = MTTError::new(NameType::None, ErrorID::FieldInvalidType);
let err = MTTError::new(ErrorID::FieldInvalidType);
return Err(err);
}
}
CalcValue::Value(ref item) => {
if item.get_type() != self.fieldtype {
let err = MTTError::new(NameType::None, ErrorID::FieldInvalidType);
let err = MTTError::new(ErrorID::FieldInvalidType);
return Err(err);
}
}
@@ -56,13 +56,13 @@ impl FieldSetting {
fn validate(&self, value: &Field) -> Result<Field, MTTError> {
match value {
Field::None => match &self.default_value {
CalcValue::None => Err(MTTError::new(NameType::None, ErrorID::FieldInvalidNone)),
CalcValue::None => Err(MTTError::new(ErrorID::FieldInvalidNone)),
_ => Ok(self.default_value.get(&Field::None)),
},
_ => {
let vft: FieldType = value.into();
if vft != self.fieldtype {
let err = MTTError::new(NameType::None, ErrorID::FieldInvalidType);
let err = MTTError::new(ErrorID::FieldInvalidType);
return Err(err);
}
Ok(value.clone())
@@ -94,7 +94,7 @@ mod fieldsettings {
let value: Field = "text".into();
match fset.validate(&value) {
Ok(data) => unreachable!("got {:?}: should have gotten an error", data),
Err(err) => match err.error_id() {
Err(err) => match err.get_error_ids().back().unwrap() {
ErrorID::FieldInvalidType => {}
_ => unreachable!("got {:?}: should have gotten a value", err),
},
@@ -106,7 +106,7 @@ mod fieldsettings {
let fset = FieldSetting::new(FieldType::Uuid);
match fset.validate(&Field::None) {
Ok(data) => unreachable!("got {:?}: should have gotten an error", data),
Err(err) => match err.error_id() {
Err(err) => match err.get_error_ids().back().unwrap() {
ErrorID::FieldInvalidNone => {}
_ => unreachable!("got {:?}: should have gotten a invalid none", err),
},
@@ -407,7 +407,7 @@ mod docdefs {
let name = Name::english(Uuid::new_v4().to_string().as_str());
match docdef.get_field(&name) {
Ok(_) => unreachable!("should return non existant field error"),
Err(err) => match err.error_id() {
Err(err) => match err.get_error_ids().back().unwrap() {
ErrorID::NameNotFound => {}
_ => unreachable!("got {:?}: should have been document field not found", err),
},
@@ -455,7 +455,7 @@ mod docdefs {
let field_name = Name::english(Uuid::new_v4().to_string().as_str());
match docdef.set_default(&field_name, FieldType::Uuid) {
Ok(_) => unreachable!("should be an error"),
Err(err) => match err.error_id() {
Err(err) => match err.get_error_ids().back().unwrap() {
ErrorID::NameNotFound => {}
_ => unreachable!("got {:?}: should have been field not found", err),
},
@@ -470,7 +470,7 @@ mod docdefs {
docdef.add_field(name.clone(), FieldType::Uuid);
match docdef.set_default(&name, "fred") {
Ok(data) => unreachable!("got {:?}, should be an error", data),
Err(err) => match err.error_id() {
Err(err) => match err.get_error_ids().back().unwrap() {
ErrorID::FieldInvalidType => {}
_ => unreachable!("got {:?}: should have been field not found", err),
},

2
src/document/record.rs
View File

@@ -136,7 +136,7 @@ impl Record {
};
match self.data.get(&id) {
Some(data) => Ok(data.clone()),
None => Err(MTTError::new(NameType::None, ErrorID::FieldMissingData)),
None => Err(MTTError::new(ErrorID::FieldMissingData)),
}
}
}