refactor: re-added the join_prefix

Author: petertonysmith94

crates/domains/src/blocks/query_params.rs

@@ -86,6 +86,7 @@ impl QueryParamsBuilder for BlocksQuery {
             &mut query_builder,
             &self.pagination,
             cursor_fields,
+            None,
         );
 
         query_builder

crates/domains/src/infra/repository/query_builder.rs

@@ -107,14 +107,22 @@ pub trait QueryParamsBuilder {
         }
 
         if let Some(after) = pagination.after.as_ref() {
-            let after_conditions =
-                Self::create_pagination_conditions(cursor_fields, after, ">");
+            let after_conditions = Self::create_pagination_conditions(
+                cursor_fields,
+                after,
+                ">",
+                join_prefix,
+            );
             conditions.push(after_conditions);
         }
 
         if let Some(before) = pagination.before.as_ref() {
-            let before_conditions =
-                Self::create_pagination_conditions(cursor_fields, before, "<");
+            let before_conditions = Self::create_pagination_conditions(
+                cursor_fields,
+                before,
+                "<",
+                join_prefix,
+            );
             conditions.push(before_conditions);
         }
 
@@ -151,11 +159,16 @@ pub trait QueryParamsBuilder {
         cursor_fields: &[&str],
         cursor: &Cursor,
         operation: &str,
+        join_prefix: Option<&str>,
     ) -> String {
         if cursor_fields.is_empty() || cursor.is_empty() {
             return String::new();
         }
 
+        let cursor_fields = cursor_fields
+            .iter()
+            .map(|f| Self::prefix_field(f, join_prefix))
+            .collect::<Vec<_>>();
         let cursor_values = cursor.split();
 
         let result = (0..cursor_values.len())
@@ -186,6 +199,7 @@ pub trait QueryParamsBuilder {
         query_builder: &mut QueryBuilder<Postgres>,
         pagination: &QueryPagination,
         cursor_fields: &[&str],
+        join_prefix: Option<&str>,
     ) {
         let order_by: OrderBy;
         let limit: i32;
@@ -206,7 +220,8 @@ pub trait QueryParamsBuilder {
             }
         }
 
-        let order_by_sql = Self::order_by_statement(cursor_fields, order_by);
+        let order_by_sql =
+            Self::order_by_statement(cursor_fields, order_by, join_prefix);
         query_builder.push(order_by_sql);
         query_builder.push(format!(" LIMIT {limit}"));
         if let Some(offset) = pagination.offset {
@@ -217,9 +232,11 @@ pub trait QueryParamsBuilder {
     fn order_by_statement(
         order_by_fields: &[&str],
         order_by: OrderBy,
+        join_prefix: Option<&str>,
     ) -> String {
         let fields = order_by_fields
             .iter()
+            .map(|field| Self::prefix_field(field, join_prefix))
             .map(|field| format!("{field} {order_by}"))
             .collect::<Vec<_>>()
             .join(", ");

crates/domains/src/inputs/query_params.rs

@@ -152,6 +152,7 @@ impl QueryParamsBuilder for InputsQuery {
             &mut query_builder,
             &self.pagination,
             cursor_fields,
+            None,
         );
 
         query_builder

crates/domains/src/messages/query_params.rs

@@ -121,6 +121,7 @@ impl QueryParamsBuilder for MessagesQuery {
             &mut query_builder,
             &self.pagination,
             cursor_fields,
+            None,
         );
 
         query_builder

crates/domains/src/outputs/query_params.rs

@@ -132,6 +132,7 @@ impl QueryParamsBuilder for OutputsQuery {
             &mut query_builder,
             &self.pagination,
             cursor_fields,
+            None,
         );
 
         query_builder

crates/domains/src/predicates/query_params.rs

@@ -86,8 +86,7 @@ impl QueryParamsBuilder for PredicatesQuery {
             conditions.push(format!("pt.asset_id = '{}'", asset));
         }
 
-        let cursor_fields =
-            &["pt.block_height", "pt.tx_index", "pt.input_index"];
+        let cursor_fields = &["block_height", "tx_index", "input_index"];
         let join_prefix = Some("pt.");
 
         Self::apply_conditions(
@@ -103,6 +102,7 @@ impl QueryParamsBuilder for PredicatesQuery {
             &mut query_builder,
             &self.pagination,
             cursor_fields,
+            join_prefix,
         );
 
         query_builder

crates/domains/src/receipts/query_params.rs

@@ -152,6 +152,7 @@ impl QueryParamsBuilder for ReceiptsQuery {
             &mut query_builder,
             &self.pagination,
             cursor_fields,
+            None,
         );
 
         query_builder

crates/domains/src/transactions/query_params.rs

@@ -129,6 +129,7 @@ impl QueryParamsBuilder for TransactionsQuery {
             &mut query_builder,
             &self.pagination,
             cursor_fields,
+            None,
         );
 
         query_builder

crates/domains/src/utxos/query_params.rs

@@ -185,6 +185,7 @@ impl QueryParamsBuilder for UtxosQuery {
             &mut query_builder,
             &self.pagination,
             cursor_fields,
+            None,
         );
 
         query_builder