Refactor document retrieval and enhance query specifications

- Updated the document retrieval method to use a generic type for fetching `Customer` instances, improving type safety.
- Introduced an `include_deleted` flag in the `QuerySpec` struct to allow querying of soft-deleted documents.
- Added methods to `DocumentQueryContext` and `DocumentQuery` for including or filtering only deleted documents, enhancing query flexibility.
- Updated integration tests to reflect changes in document retrieval logic, ensuring consistency and correctness.

Author: jordcodes

examples/quickstart.rs

@@ -20,7 +20,7 @@ async fn main() -> rillflow::Result<()> {
     };
 
     store.docs().upsert(&customer.id, &customer).await?;
-    let fetched: Option<Customer> = store.docs().get(&customer.id).await?;
+    let fetched = store.docs().get::<Customer>(&customer.id).await?;
     println!("Fetched: {fetched:?}");
 
     store

src/query/mod.rs

@@ -62,6 +62,7 @@ pub(crate) struct QuerySpec {
     sort: Vec<SortSpec>,
     limit: Option<i64>,
     offset: Option<i64>,
+    include_deleted: bool,
 }
 
 impl Default for QuerySpec {
@@ -72,6 +73,7 @@ impl Default for QuerySpec {
             sort: Vec::new(),
             limit: None,
             offset: None,
+            include_deleted: false,
         }
     }
 }
@@ -128,6 +130,7 @@ impl QuerySpec {
             sort,
             limit,
             offset,
+            include_deleted,
         } = self;
 
         let mut builder = QueryBuilder::new("select ");
@@ -158,8 +161,10 @@ impl QuerySpec {
 
         builder.push(" from docs");
 
+        let mut has_where = false;
         if !filters.is_empty() {
             builder.push(" where ");
+            has_where = true;
             let mut iter = filters.into_iter();
             if let Some(first) = iter.next() {
                 first.push_sql(&mut builder);
@@ -169,6 +174,11 @@ impl QuerySpec {
                 predicate.push_sql(&mut builder);
             }
         }
+        if !include_deleted {
+            builder.push(if has_where { " and " } else { " where " });
+            builder.push("deleted_at is null");
+            has_where = true;
+        }
 
         if !sort.is_empty() {
             builder.push(" order by ");
@@ -273,6 +283,17 @@ impl DocumentQueryContext {
         self
     }
 
+    pub fn include_deleted(&mut self) -> &mut Self {
+        self.spec.include_deleted = true;
+        self
+    }
+
+    pub fn only_deleted(&mut self) -> &mut Self {
+        self.spec.include_deleted = true;
+        self.spec.push_filter(Predicate::exists("deleted_at"));
+        self
+    }
+
     pub fn select_fields(&mut self, fields: &[(&str, &str)]) -> &mut Self {
         let projections = fields
             .iter()
@@ -671,6 +692,17 @@ impl<T> DocumentQuery<T> {
         self
     }
 
+    pub fn include_deleted(mut self) -> Self {
+        self.spec.include_deleted = true;
+        self
+    }
+
+    pub fn only_deleted(mut self) -> Self {
+        self.spec.include_deleted = true;
+        self.spec.push_filter(Predicate::exists("deleted_at"));
+        self
+    }
+
     pub fn select_fields(mut self, fields: &[(&str, &str)]) -> Self {
         let projections = fields
             .iter()

tests/integration_postgres.rs

@@ -70,7 +70,7 @@ async fn roundtrip() -> Result<()> {
     };
 
     store.docs().upsert(&id, &customer).await?;
-    let fetched: Option<Customer> = store.docs().get(&id).await?;
+    let fetched = store.docs().get::<Customer>(&id).await?;
     assert!(fetched.is_some());
 
     store