nv-redfish-core 0.8.1

Semantic-unaware foundation used by code generated from CSDL for nv-redfish
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
// SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// SPDX-License-Identifier: Apache-2.0
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

//! OData query parameter builders for Redfish API requests.
//!
//! This module provides type-safe builders for constructing OData query parameters
//! according to the Redfish specification (DSP0266). These query parameters allow
//! clients to customize API responses through resource expansion and filtering.
//!
//! # Query Parameters
//!
//! ## Expand Query (`$expand`)
//!
//! The [`ExpandQuery`] builder constructs `$expand` parameters to request inline expansion
//! of navigation properties, reducing the number of HTTP requests needed.
//!
//! ```rust
//! use nv_redfish_core::query::ExpandQuery;
//!
//! // Expand current resource with 2 levels
//! let query = ExpandQuery::current().levels(2);
//! assert_eq!(query.to_query_string(), "$expand=.($levels=2)");
//! ```
//!
//! ## Filter Query (`$filter`)
//!
//! The [`FilterQuery`] builder constructs `$filter` parameters to request server-side
//! filtering of collection members or resource properties using OData filter expressions.
//!
//! ```rust
//! use nv_redfish_core::query::FilterQuery;
//!
//! // Filter for resources where Status/Health equals "OK"
//! let query = FilterQuery::eq(&"Status/Health", "OK");
//! assert_eq!(query.to_query_string(), "$filter=Status/Health eq 'OK'");
//!
//! // Complex filter with logical operators
//! let query = FilterQuery::gt(&"Temperature", 50)
//!     .and()
//!     .lt_then(&"Temperature", 80);
//! assert_eq!(query.to_query_string(), "$filter=Temperature gt 50 and Temperature lt 80");
//! ```
//!
//! # Type Safety
//!
//! Both builders use traits to ensure type safety:
//!
//! - [`crate::FilterProperty`]: Types that can be used as filter property paths
//! - [`ToFilterLiteral`]: Types that can be converted to filter literal values
//!
//! Property paths can be:
//! - String literals (`"PropertyName"`)
//! - Generated property accessors from CSDL compilation
//! - Nested paths (`"Parent/Child"`)
//!
//! # References
//!
//! - [Redfish Specification DSP0266](https://redfish.dmtf.org/schemas/DSP0266_1.15.0.html)
//! - [OData Version 4.0 Protocol](http://docs.oasis-open.org/odata/odata/v4.0/os/part2-url-conventions/odata-v4.0-os-part2-url-conventions.html)

/// Builder for Redfish `$expand` query parameters according to DSP0266 specification.
///
/// The `$expand` query parameter allows clients to request that the server expand
/// navigation properties inline instead of returning just references. This is particularly
/// useful for reducing the number of HTTP requests needed to retrieve related data.
///
/// According to the [Redfish specification Table 9](https://redfish.dmtf.org/schemas/DSP0266_1.15.0.html#the-expand-query-parameter),
/// the supported expand options are:
///
/// | Option | Description | Example URL |
/// |--------|-------------|-------------|
/// | `*` | Expand all hyperlinks, including payload annotations | `?$expand=*` |
/// | `.` | Expand hyperlinks not in links property instances | `?$expand=.` |
/// | `~` | Expand hyperlinks in links property instances | `?$expand=~` |
/// | `$levels` | Number of levels to cascade expansion | `?$expand=.($levels=2)` |
///
/// # Examples
///
/// ```rust
/// use nv_redfish_core::query::ExpandQuery;
///
/// // Default: expand current resource one level
/// let default = ExpandQuery::default();
/// assert_eq!(default.to_query_string(), "$expand=.($levels=1)");
///
/// // Expand all hyperlinks
/// let all = ExpandQuery::all();
/// assert_eq!(all.to_query_string(), "$expand=*($levels=1)");
///
/// // Expand with multiple levels
/// let deep = ExpandQuery::current().levels(3);
/// assert_eq!(deep.to_query_string(), "$expand=.($levels=3)");
///
/// // Expand specific navigation property
/// let thermal = ExpandQuery::property("Thermal");
/// assert_eq!(thermal.to_query_string(), "$expand=Thermal($levels=1)");
/// ```
#[derive(Debug, Clone)]
pub struct ExpandQuery {
    /// The expand expression (*, ., ~, or specific navigation properties)
    expand_expression: String,
    /// Number of levels to cascade the expand operation (default is 1)
    levels: Option<u32>,
}

impl Default for ExpandQuery {
    /// Default expand query: $expand=.($levels=1)
    /// Expands all hyperlinks not in any links property instances of the resource
    fn default() -> Self {
        Self {
            expand_expression: ".".to_string(),
            levels: Some(1),
        }
    }
}

impl ExpandQuery {
    /// Create a new expand query with default values.
    ///
    /// This is equivalent to [`ExpandQuery::default()`] and creates a query
    /// that expands the current resource one level deep: `$expand=.($levels=1)`.
    ///
    /// # Examples
    ///
    /// ```rust
    /// use nv_redfish_core::query::ExpandQuery;
    ///
    /// let query = ExpandQuery::new();
    /// assert_eq!(query.to_query_string(), "$expand=.($levels=1)");
    /// ```
    #[must_use]
    pub fn new() -> Self {
        Self::default()
    }

    /// Expand all hyperlinks excluding links.
    ///
    /// # Examples
    ///
    /// ```rust
    /// use nv_redfish_core::query::ExpandQuery;
    ///
    /// let query = ExpandQuery::no_links();
    /// assert_eq!(query.to_query_string(), "$expand=.");
    /// ```
    #[must_use]
    pub fn no_links() -> Self {
        Self {
            expand_expression: ".".to_string(),
            levels: None,
        }
    }

    /// Expand all hyperlinks, including those in payload annotations.
    ///
    /// This expands all hyperlinks found in the resource, including those in payload
    /// annotations such as `@Redfish.Settings`, `@Redfish.ActionInfo`, and
    /// `@Redfish.CollectionCapabilities`.
    ///
    /// Equivalent to: `$expand=*`
    ///
    /// # Examples
    ///
    /// ```rust
    /// use nv_redfish_core::query::ExpandQuery;
    ///
    /// let query = ExpandQuery::all();
    /// assert_eq!(query.to_query_string(), "$expand=*($levels=1)");
    ///
    /// // With multiple levels
    /// let deep = ExpandQuery::all().levels(3);
    /// assert_eq!(deep.to_query_string(), "$expand=*($levels=3)");
    /// ```
    #[must_use]
    pub fn all() -> Self {
        Self {
            expand_expression: "*".to_string(),
            levels: Some(1),
        }
    }

    /// Expand all hyperlinks not in any links property instances of the resource.
    ///
    /// This expands hyperlinks found directly in the resource properties, but not
    /// those in dedicated `Links` sections. Includes payload annotations.
    ///
    /// Equivalent to: `$expand=.`
    ///
    /// # Examples
    ///
    /// ```rust
    /// use nv_redfish_core::query::ExpandQuery;
    ///
    /// let query = ExpandQuery::current();
    /// assert_eq!(query.to_query_string(), "$expand=.($levels=1)");
    /// ```
    #[must_use]
    pub fn current() -> Self {
        Self {
            expand_expression: ".".to_string(),
            levels: Some(1),
        }
    }

    /// Expand all hyperlinks found in all links property instances of the resource.
    ///
    /// This expands only hyperlinks found in `Links` sections of the resource,
    /// which typically contain references to related resources.
    ///
    /// Equivalent to: `$expand=~`
    ///
    /// # Examples
    ///
    /// ```rust
    /// use nv_redfish_core::query::ExpandQuery;
    ///
    /// let query = ExpandQuery::links();
    /// assert_eq!(query.to_query_string(), "$expand=~($levels=1)");
    /// ```
    #[must_use]
    pub fn links() -> Self {
        Self {
            expand_expression: "~".to_string(),
            levels: Some(1),
        }
    }

    /// Expand a specific navigation property.
    ///
    /// This expands only the specified navigation property, which is useful when you
    /// know exactly which related data you need.
    ///
    /// # Arguments
    ///
    /// * `property` - The name of the navigation property to expand
    ///
    /// # Examples
    ///
    /// ```rust
    /// use nv_redfish_core::query::ExpandQuery;
    ///
    /// let thermal = ExpandQuery::property("Thermal");
    /// assert_eq!(thermal.to_query_string(), "$expand=Thermal($levels=1)");
    ///
    /// let members = ExpandQuery::property("Members");
    /// assert_eq!(members.to_query_string(), "$expand=Members($levels=1)");
    /// ```
    pub fn property<S: Into<String>>(property: S) -> Self {
        Self {
            expand_expression: property.into(),
            levels: Some(1),
        }
    }

    /// Expand multiple specific navigation properties.
    ///
    /// This allows expanding several navigation properties in a single request,
    /// which is more efficient than making separate requests for each property.
    ///
    /// # Arguments
    ///
    /// * `properties` - A slice of navigation property names to expand
    ///
    /// # Examples
    ///
    /// ```rust
    /// use nv_redfish_core::query::ExpandQuery;
    ///
    /// let env = ExpandQuery::properties(&["Thermal", "Power"]);
    /// assert_eq!(env.to_query_string(), "$expand=Thermal,Power($levels=1)");
    ///
    /// let system = ExpandQuery::properties(&["Processors", "Memory", "Storage"]);
    /// assert_eq!(system.to_query_string(), "$expand=Processors,Memory,Storage($levels=1)");
    /// ```
    #[must_use]
    pub fn properties(properties: &[&str]) -> Self {
        Self {
            expand_expression: properties.join(","),
            levels: Some(1),
        }
    }

    /// Set the number of levels to cascade the expand operation.
    ///
    /// The `$levels` parameter controls how deep the expansion goes:
    /// - Level 1: Expand hyperlinks in the current resource
    /// - Level 2: Also expand hyperlinks in the resources expanded at level 1
    /// - And so on...
    ///
    /// # Arguments
    ///
    /// * `levels` - Number of levels to expand (typically 1-6 in practice)
    ///
    /// # Examples
    ///
    /// ```rust
    /// use nv_redfish_core::query::ExpandQuery;
    ///
    /// let shallow = ExpandQuery::current().levels(1);
    /// assert_eq!(shallow.to_query_string(), "$expand=.($levels=1)");
    ///
    /// let deep = ExpandQuery::all().levels(3);
    /// assert_eq!(deep.to_query_string(), "$expand=*($levels=3)");
    /// ```
    #[must_use]
    pub const fn levels(mut self, levels: u32) -> Self {
        self.levels = Some(levels);
        self
    }

    /// Convert to the `OData` query string according to Redfish specification.
    ///
    /// This generates the actual query parameter string that will be appended to
    /// HTTP requests to Redfish services.
    ///
    /// # Returns
    ///
    /// A query string in the format `$expand=expression($levels=n)` or just
    /// `$expand=expression` if no levels are specified.
    ///
    /// # Examples
    ///
    /// ```rust
    /// use nv_redfish_core::query::ExpandQuery;
    ///
    /// let query = ExpandQuery::property("Thermal").levels(2);
    /// assert_eq!(query.to_query_string(), "$expand=Thermal($levels=2)");
    ///
    /// let query = ExpandQuery::all();
    /// assert_eq!(query.to_query_string(), "$expand=*($levels=1)");
    /// ```
    #[must_use]
    #[allow(clippy::option_if_let_else)]
    pub fn to_query_string(&self) -> String {
        match self.levels {
            Some(levels) => format!("$expand={}($levels={})", self.expand_expression, levels),
            None => format!("$expand={}", self.expand_expression),
        }
    }
}

/// Literal value types supported in filter expressions
#[derive(Debug, Clone)]
pub enum FilterLiteral {
    /// String literal value
    String(String),
    /// Floating point number literal value
    Number(f64),
    /// Integer literal value
    Integer(i64),
    /// Boolean literal value
    Boolean(bool),
}

impl FilterLiteral {
    fn to_odata_string(&self) -> String {
        match self {
            Self::String(s) => format!("'{}'", s.replace('\'', "''")),
            Self::Number(n) => n.to_string(),
            Self::Integer(i) => i.to_string(),
            Self::Boolean(b) => b.to_string(),
        }
    }
}

/// Trait for types that can be converted to filter literals
pub trait ToFilterLiteral {
    /// Convert this value to a filter literal
    fn to_filter_literal(self) -> FilterLiteral;
}

impl ToFilterLiteral for &str {
    fn to_filter_literal(self) -> FilterLiteral {
        FilterLiteral::String(self.to_string())
    }
}

impl ToFilterLiteral for String {
    fn to_filter_literal(self) -> FilterLiteral {
        FilterLiteral::String(self)
    }
}

impl ToFilterLiteral for i32 {
    fn to_filter_literal(self) -> FilterLiteral {
        FilterLiteral::Integer(i64::from(self))
    }
}

impl ToFilterLiteral for i64 {
    fn to_filter_literal(self) -> FilterLiteral {
        FilterLiteral::Integer(self)
    }
}

impl ToFilterLiteral for f64 {
    fn to_filter_literal(self) -> FilterLiteral {
        FilterLiteral::Number(self)
    }
}

impl ToFilterLiteral for bool {
    fn to_filter_literal(self) -> FilterLiteral {
        FilterLiteral::Boolean(self)
    }
}

/// Filter expression component
#[derive(Debug, Clone)]
enum FilterExpr {
    Comparison {
        property: String,
        operator: &'static str,
        value: FilterLiteral,
    },
    And(Box<Self>, Box<Self>),
    Or(Box<Self>, Box<Self>),
    Not(Box<Self>),
    Group(Box<Self>),
}

impl FilterExpr {
    fn to_odata_string(&self) -> String {
        match self {
            Self::Comparison {
                property,
                operator,
                value,
            } => {
                format!("{} {} {}", property, operator, value.to_odata_string())
            }
            Self::And(left, right) => {
                format!("{} and {}", left.to_odata_string(), right.to_odata_string())
            }
            Self::Or(left, right) => {
                format!("{} or {}", left.to_odata_string(), right.to_odata_string())
            }
            Self::Not(expr) => {
                format!("not {}", expr.to_odata_string())
            }
            Self::Group(expr) => {
                format!("({})", expr.to_odata_string())
            }
        }
    }
}

/// Builder for Redfish `$filter` query parameters according to DSP0266 specification.
///
/// The `$filter` query parameter allows clients to request a subset of collection members
/// based on comparison and logical expressions.
///
/// # Supported Operators
///
/// - Comparison: `eq`, `ne`, `gt`, `ge`, `lt`, `le`
/// - Logical: `and`, `or`, `not`
/// - Grouping: `()`
///
/// # Examples
///
/// ```rust
/// use nv_redfish_core::query::FilterQuery;
///
/// // Simple equality
/// let filter = FilterQuery::eq(&"ProcessorSummary/Count", 2);
/// assert_eq!(filter.to_query_string(), "$filter=ProcessorSummary/Count eq 2");
///
/// // Complex expression with logical operators
/// let filter = FilterQuery::eq(&"ProcessorSummary/Count", 2)
///     .and()
///     .gt_then(&"MemorySummary/TotalSystemMemoryGiB", 64);
/// assert_eq!(
///     filter.to_query_string(),
///     "$filter=ProcessorSummary/Count eq 2 and MemorySummary/TotalSystemMemoryGiB gt 64"
/// );
///
/// // With grouping
/// let filter = FilterQuery::eq(&"Status/State", "Enabled")
///     .and()
///     .eq_then(&"Status/Health", "OK")
///     .group()
///     .or()
///     .eq_then(&"SystemType", "Physical");
/// ```
#[derive(Debug, Clone)]
pub struct FilterQuery {
    expr: Option<FilterExpr>,
    pending_logical_op: Option<LogicalOp>,
}

#[derive(Debug, Clone, Copy)]
enum LogicalOp {
    And,
    Or,
}

impl FilterQuery {
    /// Create a new filter with an equality comparison
    pub fn eq<P: crate::FilterProperty, V: ToFilterLiteral>(property: &P, value: V) -> Self {
        Self {
            expr: Some(FilterExpr::Comparison {
                property: property.property_path().to_string(),
                operator: "eq",
                value: value.to_filter_literal(),
            }),
            pending_logical_op: None,
        }
    }

    /// Create a new filter with a not-equal comparison
    pub fn ne<P: crate::FilterProperty, V: ToFilterLiteral>(property: &P, value: V) -> Self {
        Self {
            expr: Some(FilterExpr::Comparison {
                property: property.property_path().to_string(),
                operator: "ne",
                value: value.to_filter_literal(),
            }),
            pending_logical_op: None,
        }
    }

    /// Create a new filter with a greater-than comparison
    pub fn gt<P: crate::FilterProperty, V: ToFilterLiteral>(property: &P, value: V) -> Self {
        Self {
            expr: Some(FilterExpr::Comparison {
                property: property.property_path().to_string(),
                operator: "gt",
                value: value.to_filter_literal(),
            }),
            pending_logical_op: None,
        }
    }

    /// Create a new filter with a greater-than-or-equal comparison
    pub fn ge<P: crate::FilterProperty, V: ToFilterLiteral>(property: &P, value: V) -> Self {
        Self {
            expr: Some(FilterExpr::Comparison {
                property: property.property_path().to_string(),
                operator: "ge",
                value: value.to_filter_literal(),
            }),
            pending_logical_op: None,
        }
    }

    /// Create a new filter with a less-than comparison
    pub fn lt<P: crate::FilterProperty, V: ToFilterLiteral>(property: &P, value: V) -> Self {
        Self {
            expr: Some(FilterExpr::Comparison {
                property: property.property_path().to_string(),
                operator: "lt",
                value: value.to_filter_literal(),
            }),
            pending_logical_op: None,
        }
    }

    /// Create a new filter with a less-than-or-equal comparison
    pub fn le<P: crate::FilterProperty, V: ToFilterLiteral>(property: &P, value: V) -> Self {
        Self {
            expr: Some(FilterExpr::Comparison {
                property: property.property_path().to_string(),
                operator: "le",
                value: value.to_filter_literal(),
            }),
            pending_logical_op: None,
        }
    }

    /// Add a logical AND operator (must be followed by another comparison)
    #[must_use]
    pub const fn and(mut self) -> Self {
        self.pending_logical_op = Some(LogicalOp::And);
        self
    }

    /// Add a logical OR operator (must be followed by another comparison)
    #[must_use]
    pub const fn or(mut self) -> Self {
        self.pending_logical_op = Some(LogicalOp::Or);
        self
    }

    /// Wrap the current expression in a NOT operator
    #[must_use]
    #[allow(clippy::should_implement_trait)]
    pub fn not(mut self) -> Self {
        if let Some(expr) = self.expr.take() {
            self.expr = Some(FilterExpr::Not(Box::new(expr)));
        }
        self
    }

    /// Wrap the current expression in grouping parentheses
    #[must_use]
    pub fn group(mut self) -> Self {
        if let Some(expr) = self.expr.take() {
            self.expr = Some(FilterExpr::Group(Box::new(expr)));
        }
        self
    }

    /// Chain an equality comparison (after .`and()` or .`or()`)
    #[must_use]
    pub fn eq_then<P: crate::FilterProperty, V: ToFilterLiteral>(
        self,
        property: &P,
        value: V,
    ) -> Self {
        let new_expr = FilterExpr::Comparison {
            property: property.property_path().to_string(),
            operator: "eq",
            value: value.to_filter_literal(),
        };
        self.combine_with_pending_op(new_expr)
    }

    /// Chain a not-equal comparison (after .`and()` or .`or()`)
    #[must_use]
    pub fn ne_then<P: crate::FilterProperty, V: ToFilterLiteral>(
        self,
        property: &P,
        value: V,
    ) -> Self {
        let new_expr = FilterExpr::Comparison {
            property: property.property_path().to_string(),
            operator: "ne",
            value: value.to_filter_literal(),
        };
        self.combine_with_pending_op(new_expr)
    }

    /// Chain a greater-than comparison (after .`and()` or .`or()`)
    #[must_use]
    pub fn gt_then<P: crate::FilterProperty, V: ToFilterLiteral>(
        self,
        property: &P,
        value: V,
    ) -> Self {
        let new_expr = FilterExpr::Comparison {
            property: property.property_path().to_string(),
            operator: "gt",
            value: value.to_filter_literal(),
        };
        self.combine_with_pending_op(new_expr)
    }

    /// Chain a greater-than-or-equal comparison (after .`and()` or .`or()`)
    #[must_use]
    pub fn ge_then<P: crate::FilterProperty, V: ToFilterLiteral>(
        self,
        property: &P,
        value: V,
    ) -> Self {
        let new_expr = FilterExpr::Comparison {
            property: property.property_path().to_string(),
            operator: "ge",
            value: value.to_filter_literal(),
        };
        self.combine_with_pending_op(new_expr)
    }

    /// Chain a less-than comparison (after .`and()` or .`or()`)
    #[must_use]
    pub fn lt_then<P: crate::FilterProperty, V: ToFilterLiteral>(
        self,
        property: &P,
        value: V,
    ) -> Self {
        let new_expr = FilterExpr::Comparison {
            property: property.property_path().to_string(),
            operator: "lt",
            value: value.to_filter_literal(),
        };
        self.combine_with_pending_op(new_expr)
    }

    /// Chain a less-than-or-equal comparison (after .`and()` or .`or()`)
    #[must_use]
    pub fn le_then<P: crate::FilterProperty, V: ToFilterLiteral>(
        self,
        property: &P,
        value: V,
    ) -> Self {
        let new_expr = FilterExpr::Comparison {
            property: property.property_path().to_string(),
            operator: "le",
            value: value.to_filter_literal(),
        };
        self.combine_with_pending_op(new_expr)
    }

    fn combine_with_pending_op(mut self, new_expr: FilterExpr) -> Self {
        if let Some(existing) = self.expr.take() {
            self.expr = Some(match self.pending_logical_op.take() {
                Some(LogicalOp::And) => FilterExpr::And(Box::new(existing), Box::new(new_expr)),
                Some(LogicalOp::Or) => FilterExpr::Or(Box::new(existing), Box::new(new_expr)),
                None => new_expr,
            });
        } else {
            self.expr = Some(new_expr);
        }
        self
    }

    /// Convert to the `OData` query string
    #[must_use]
    pub fn to_query_string(&self) -> String {
        self.expr.as_ref().map_or_else(String::new, |expr| {
            format!("$filter={}", expr.to_odata_string())
        })
    }
}

/// Implement `FilterProperty` for `&str`
impl crate::FilterProperty for &str {
    fn property_path(&self) -> &str {
        self
    }
}

/// Implement `FilterProperty` for `String`
impl crate::FilterProperty for String {
    fn property_path(&self) -> &str {
        self.as_str()
    }
}

#[cfg(test)]
mod tests {
    use super::*;

    #[test]
    fn test_default_expand() {
        let query = ExpandQuery::default();
        assert_eq!(query.to_query_string(), "$expand=.($levels=1)");
    }

    #[test]
    fn test_expand_all() {
        let query = ExpandQuery::all();
        assert_eq!(query.to_query_string(), "$expand=*($levels=1)");
    }

    #[test]
    fn test_expand_current() {
        let query = ExpandQuery::current();
        assert_eq!(query.to_query_string(), "$expand=.($levels=1)");
    }

    #[test]
    fn test_expand_links() {
        let query = ExpandQuery::links();
        assert_eq!(query.to_query_string(), "$expand=~($levels=1)");
    }

    #[test]
    fn test_expand_property() {
        let query = ExpandQuery::property("Thermal");
        assert_eq!(query.to_query_string(), "$expand=Thermal($levels=1)");
    }

    #[test]
    fn test_expand_properties() {
        let query = ExpandQuery::properties(&["Thermal", "Power"]);
        assert_eq!(query.to_query_string(), "$expand=Thermal,Power($levels=1)");
    }

    #[test]
    fn test_expand_with_levels() {
        let query = ExpandQuery::all().levels(3);
        assert_eq!(query.to_query_string(), "$expand=*($levels=3)");
    }

    #[test]
    fn test_simple_eq() {
        let filter = FilterQuery::eq(&"Count", 2);
        assert_eq!(filter.to_query_string(), "$filter=Count eq 2");
    }

    #[test]
    fn test_string_literal() {
        let filter = FilterQuery::eq(&"SystemType", "Physical");
        assert_eq!(filter.to_query_string(), "$filter=SystemType eq 'Physical'");
    }

    #[test]
    fn test_and_operator() {
        let filter = FilterQuery::eq(&"Count", 2)
            .and()
            .eq_then(&"Type", "Physical");
        assert_eq!(
            filter.to_query_string(),
            "$filter=Count eq 2 and Type eq 'Physical'"
        );
    }

    #[test]
    fn test_or_operator() {
        let filter = FilterQuery::eq(&"Count", 2).or().eq_then(&"Count", 4);
        assert_eq!(filter.to_query_string(), "$filter=Count eq 2 or Count eq 4");
    }

    #[test]
    fn test_not_operator() {
        let filter = FilterQuery::eq(&"Count", 2).not();
        assert_eq!(filter.to_query_string(), "$filter=not Count eq 2");
    }

    #[test]
    fn test_grouping() {
        let filter = FilterQuery::eq(&"State", "Enabled")
            .and()
            .eq_then(&"Health", "OK")
            .group()
            .or()
            .eq_then(&"SystemType", "Physical");
        assert_eq!(
            filter.to_query_string(),
            "$filter=(State eq 'Enabled' and Health eq 'OK') or SystemType eq 'Physical'"
        );
    }

    #[test]
    fn test_all_comparison_operators() {
        assert_eq!(FilterQuery::ne(&"A", 1).to_query_string(), "$filter=A ne 1");
        assert_eq!(FilterQuery::gt(&"B", 2).to_query_string(), "$filter=B gt 2");
        assert_eq!(FilterQuery::ge(&"C", 3).to_query_string(), "$filter=C ge 3");
        assert_eq!(FilterQuery::lt(&"D", 4).to_query_string(), "$filter=D lt 4");
        assert_eq!(FilterQuery::le(&"E", 5).to_query_string(), "$filter=E le 5");
    }

    #[test]
    fn test_boolean_literal() {
        let filter = FilterQuery::eq(&"Enabled", true);
        assert_eq!(filter.to_query_string(), "$filter=Enabled eq true");
    }

    #[test]
    fn test_float_literal() {
        let filter = FilterQuery::gt(&"Temperature", 98.6);
        assert_eq!(filter.to_query_string(), "$filter=Temperature gt 98.6");
    }

    #[test]
    fn test_string_escaping() {
        let filter = FilterQuery::eq(&"Name", "O'Brien");
        assert_eq!(filter.to_query_string(), "$filter=Name eq 'O''Brien'");
    }

    #[test]
    fn test_complex_filter() {
        let filter = FilterQuery::eq(&"ProcessorSummary/Count", 2)
            .and()
            .gt_then(&"MemorySummary/TotalSystemMemoryGiB", 64);
        assert_eq!(
            filter.to_query_string(),
            "$filter=ProcessorSummary/Count eq 2 and MemorySummary/TotalSystemMemoryGiB gt 64"
        );
    }
}