add order_by

packages/fuel-indexer-plugin/src/wasm.rs

@@ -161,21 +161,35 @@ pub trait Entity<'a>: Sized + PartialEq + Eq + std::fmt::Debug {
     }
 }
 
+// Some(BinaryOp { left: BinaryOp { left: Identifier("a"), op: Gt, right: Identifier("b") }, op: And, right: BinaryOp { left: Identifier("b"), op: Lt, right: Value(Long(100))
+
 pub struct Constraint<T> {
     constraint: String,
+    order_by: Option<String>,
+    order_by_asc: Option<bool>,
     phantom: std::marker::PhantomData<T>,
 }
 
 impl<T> std::fmt::Display for Constraint<T> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.constraint)
+        write!(f, "{}", self.constraint)?;
+        if let Some(ref field) = self.order_by {
+            let order = self
+                .order_by_asc
+                .map(|b| if b { " ASC" } else { " DESC" })
+                .unwrap_or("");
+            write!(f, " ORDER BY {field}{order}")?;
+        }
+        Ok(())
     }
 }
 
 impl<T> Constraint<T> {
     fn new(constraint: String) -> Self {
         Self {
             constraint,
+            order_by: None,
+            order_by_asc: None,
             phantom: std::marker::PhantomData,
         }
     }
@@ -187,6 +201,8 @@ impl<T> Constraint<T> {
                 &self.constraint,
                 &c.constraint.to_string()
             ),
+            order_by: None,
+            order_by_asc: None,
             phantom: std::marker::PhantomData,
         }
     }
@@ -198,9 +214,23 @@ impl<T> Constraint<T> {
                 &self.constraint,
                 &c.constraint.to_string()
             ),
+            order_by: None,
+            order_by_asc: None,
             phantom: std::marker::PhantomData,
         }
     }
+
+    pub fn order_by_asc<F>(mut self, f: Field<T, F>) -> Constraint<T> {
+        self.order_by = Some(f.field);
+        self.order_by_asc = Some(true);
+        self
+    }
+
+    pub fn order_by_desc<F>(mut self, f: Field<T, F>) -> Constraint<T> {
+        self.order_by = Some(f.field);
+        self.order_by_asc = Some(false);
+        self
+    }
 }
 
 pub struct Field<T, F> {

packages/fuel-indexer-tests/indexers/fuel-indexer-test/src/lib.rs

@@ -604,6 +604,24 @@ mod fuel_indexer_test {
             assert_eq!(i.block_height, 1);
             FindEntity::new(i.block_height as u64).save();
         } else if block_data.height == 5 {
+            // Test >= 2 order_by_asc. We have 4 indexed blocks, so the result should be 2.
+            let i = IndexMetadataEntity::find(
+                IndexMetadataEntity::block_height()
+                    .ge(2)
+                    .order_by_asc(IndexMetadataEntity::block_height()),
+            )
+            .unwrap();
+            assert_eq!(i.block_height, 1);
+
+            // Test >= 2 order_by_desc. We have 4 indexed blocks, so the result should be 4.
+            let i = IndexMetadataEntity::find(
+                IndexMetadataEntity::block_height()
+                    .ge(2)
+                    .order_by_desc(IndexMetadataEntity::block_height()),
+            )
+            .unwrap();
+            assert_eq!(i.block_height, 4);
+        } else if block_data.height == 6 {
             // There is no such block. The lookup will fail.
             let i =
                 IndexMetadataEntity::find(IndexMetadataEntity::block_height().eq(777))

packages/fuel-indexer-tests/tests/indexing.rs

@@ -752,6 +752,7 @@ async fn test_find() {
 
     assert_eq!(values, vec![2, 1]);
 
+    mock_request("/find").await;
     mock_request("/find").await;
 
     node.abort();