From 115910120ce0c57cbb90ab8f8afc0bace6b76390 Mon Sep 17 00:00:00 2001
From: Jeff Baskin <jeff.l.baskin@gmail.com>
Date: Fri, 13 Feb 2026 12:48:17 -0500
Subject: [PATCH] Moved Oid into document module.

---
 src/document.rs        |  2 +-
 src/document/create.rs |  4 ++--
 src/document/record.rs | 30 ++++++++++++++++++++++++++-
 src/message/wrapper.rs | 47 ------------------------------------------
 4 files changed, 32 insertions(+), 51 deletions(-)

diff --git a/src/document.rs b/src/document.rs
index c74e29c..92d99b6 100644
--- a/src/document.rs
+++ b/src/document.rs
@@ -5,7 +5,7 @@ mod field;
 mod record;
 mod session;
 
-use record::{InternalRecord, InternalRecords};
+use record::{InternalRecord, InternalRecords, Oid};
 
 pub use clock::Clock;
 pub use create::CreateDoc;
diff --git a/src/document/create.rs b/src/document/create.rs
index cdf3ead..394b7bd 100644
--- a/src/document/create.rs
+++ b/src/document/create.rs
@@ -1,11 +1,11 @@
-use super::{InternalRecord, InternalRecords};
+use super::{InternalRecord, InternalRecords, Oid};
 use crate::{
     action::{Action, CalcValue, Calculation, MsgAction, Query, Records},
     document::{
         definition::{DocDef, DocFuncType},
         field::Field,
     },
-    message::wrapper::{Message, Oid, Reply, Update},
+    message::wrapper::{Message, Reply, Update},
     mtterror::{ErrorID, MTTError},
     name::NameType,
     queue::{
diff --git a/src/document/record.rs b/src/document/record.rs
index c0f947a..fa72602 100644
--- a/src/document/record.rs
+++ b/src/document/record.rs
@@ -1,12 +1,40 @@
 use crate::{
     action::Field,
-    message::wrapper::Oid,
     mtterror::{ErrorID, MTTError},
     name::{Name, NameType, Names},
 };
 use std::collections::HashMap;
 use uuid::Uuid;
 
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+pub struct Oid {
+    oid: Uuid,
+}
+
+impl Oid {
+    pub fn new() -> Self {
+        Self {
+            oid: Uuid::new_v4(),
+        }
+    }
+}
+
+#[cfg(test)]
+mod oids {
+    use super::*;
+
+    #[test]
+    fn are_oids_random() {
+        let count = 10;
+        let mut holder: Vec<Oid> = Vec::new();
+        while holder.len() < count {
+            let result = Oid::new();
+            assert!(!holder.contains(&result));
+            holder.push(result);
+        }
+    }
+}
+
 #[derive(Clone, Debug)]
 pub struct InternalRecord {
     data: HashMap<Uuid, Field>,
diff --git a/src/message/wrapper.rs b/src/message/wrapper.rs
index f746c99..86a9450 100644
--- a/src/message/wrapper.rs
+++ b/src/message/wrapper.rs
@@ -266,24 +266,6 @@ impl Operation {
     }
 }
 
-#[allow(dead_code)]
-#[derive(Clone, Debug)]
-enum QueryType {
-    Query(Query),
-    Oids(HashSet<Oid>),
-}
-
-impl From<Query> for QueryType {
-    fn from(value: Query) -> Self {
-        QueryType::Query(value)
-    }
-}
-
-impl From<HashSet<Oid>> for QueryType {
-    fn from(value: HashSet<Oid>) -> Self {
-        QueryType::Oids(value)
-    }
-}
 
 #[allow(dead_code)]
 #[derive(Clone, Debug)]
@@ -490,32 +472,3 @@ impl Update {
         &mut self.values
     }
 }
-
-#[derive(Clone, Debug, Eq, Hash, PartialEq)]
-pub struct Oid {
-    oid: Uuid,
-}
-
-impl Oid {
-    pub fn new() -> Self {
-        Self {
-            oid: Uuid::new_v4(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod oids {
-    use super::*;
-
-    #[test]
-    fn are_oids_random() {
-        let count = 10;
-        let mut holder: Vec<Oid> = Vec::new();
-        while holder.len() < count {
-            let result = Oid::new();
-            assert!(!holder.contains(&result));
-            holder.push(result);
-        }
-    }
-}