From 741ef41422e0fda6ef8e1ea1bcecc00fd3f8ccba Mon Sep 17 00:00:00 2001
From: Jeff Baskin <jeff.l.baskin@gmail.com>
Date: Tue, 12 Aug 2025 09:01:25 -0400
Subject: [PATCH] Refactor

---
 src/message.rs | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/message.rs b/src/message.rs
index 0abc4e4..830c77b 100644
--- a/src/message.rs
+++ b/src/message.rs
@@ -1540,10 +1540,12 @@ mod document_files {
         .to_vec()
     }
 
-    fn create_docdef(num: usize) -> DocDef {
+    fn create_docdef(field_types: Vec<FieldType>) -> DocDef {
         let mut output = DocDef::new();
-        for count in 0..num {
-            output.add_field(format!("field{}", count), FieldType::Uuid);
+        let mut count = 0;
+        for field_type in field_types.iter() {
+            output.add_field(format!("field{}", count), field_type.clone());
+            count += 1;
         }
         output
     }
@@ -1749,7 +1751,11 @@ mod document_files {
     fn errors_on_wrong_field_name() {
         let doc_name = "mismatch";
         let field_name = Uuid::new_v4().to_string();
-        let (queue, rx) = test_doc(doc_name, create_docdef(1), standard_routes());
+        let (queue, rx) = test_doc(
+            doc_name,
+            create_docdef([FieldType::Uuid].to_vec()),
+            standard_routes(),
+        );
         let mut addition = Addition::new();
         addition.add_field(field_name.clone(), Uuid::new_v4());
         let msg = Message::new(doc_name, addition);
@@ -1767,7 +1773,11 @@ mod document_files {
     #[test]
     fn errors_on_wrong_field_type() {
         let doc_name = "mismatch";
-        let (queue, rx) = test_doc(doc_name, create_docdef(1), standard_routes());
+        let (queue, rx) = test_doc(
+            doc_name,
+            create_docdef([FieldType::Uuid].to_vec()),
+            standard_routes(),
+        );
         let mut addition = Addition::new();
         addition.add_field("field0".to_string(), "astring");
         let msg = Message::new(doc_name, addition);
@@ -1791,7 +1801,11 @@ mod document_files {
     #[test]
     fn errors_on_missing_fields() {
         let doc_name = "missing";
-        let (queue, rx) = test_doc(doc_name, create_docdef(2), standard_routes());
+        let (queue, rx) = test_doc(
+            doc_name,
+            create_docdef([FieldType::Uuid, FieldType::Uuid].to_vec()),
+            standard_routes(),
+        );
         let mut addition = Addition::new();
         addition.add_field("field0".to_string(), Uuid::nil());
         let msg = Message::new(doc_name, addition);
@@ -1809,7 +1823,11 @@ mod document_files {
     #[test]
     fn does_query_return_related_entries() {
         let doc_name = "query";
-        let (queue, rx) = test_doc(doc_name, create_docdef(2), standard_routes());
+        let (queue, rx) = test_doc(
+            doc_name,
+            create_docdef([FieldType::Uuid, FieldType::Uuid].to_vec()),
+            standard_routes(),
+        );
         let field0 = Uuid::new_v4();
         let field1 = Uuid::new_v4();
         for _ in 0..3 {