Rename filter properties

src/get.rs

@@ -9,7 +9,7 @@ async fn handler(info: web::Path<AnyId>, ctx: web::Data<Context>) -> impl Respon
         AnyId::Account(account_id) => (
             false,
             Filter {
-                spends: vec![account_id],
+                from: vec![account_id],
                 typ: vec![Type::Deposit, Type::Withdrawal, Type::Transaction],
                 ..Default::default()
             },

utxo/src/filter.rs

@@ -11,9 +11,9 @@ pub enum PrimaryFilter {
     /// By revision ID
     Revision(Vec<RevId>),
     /// By accounts
-    Spends(Vec<AccountId>),
+    From(Vec<AccountId>),
     /// By accounts
-    Receives(Vec<AccountId>),
+    To(Vec<AccountId>),
     /// By transaction type
     Type(Vec<Type>),
     /// By transaction status
@@ -36,9 +36,9 @@ pub enum FilterableValue {
     /// Revision ID
     Revision(RevId),
     /// Account
-    Spends(AccountId),
+    From(AccountId),
     /// Account
-    Receives(AccountId),
+    To(AccountId),
     /// Status
     Status(Status),
     /// Transaction type
@@ -57,13 +57,10 @@ impl From<PrimaryFilter> for Vec<FilterableValue> {
                 .into_iter()
                 .map(FilterableValue::Revision)
                 .collect(),
-            PrimaryFilter::Spends(accounts) => {
-                accounts.into_iter().map(FilterableValue::Spends).collect()
+            PrimaryFilter::From(accounts) => {
+                accounts.into_iter().map(FilterableValue::From).collect()
             }
-            PrimaryFilter::Receives(accounts) => accounts
-                .into_iter()
-                .map(FilterableValue::Receives)
-                .collect(),
+            PrimaryFilter::To(accounts) => accounts.into_iter().map(FilterableValue::To).collect(),
             PrimaryFilter::Status(statuses) => {
                 statuses.into_iter().map(FilterableValue::Status).collect()
             }
@@ -88,10 +85,10 @@ pub struct Filter {
     pub revisions: Vec<RevId>,
     /// List of accounts spending funds to query their transactions
     #[serde(skip_serializing_if = "Vec::is_empty", default)]
-    pub spends: Vec<AccountId>,
+    pub from: Vec<AccountId>,
     /// List of accounts receiving funds to query their transactions
     #[serde(skip_serializing_if = "Vec::is_empty", default)]
-    pub receives: Vec<AccountId>,
+    pub to: Vec<AccountId>,
     /// List of transaction types-kind
     #[serde(rename = "type", skip_serializing_if = "Vec::is_empty", default)]
     pub typ: Vec<Type>,
@@ -131,10 +128,10 @@ impl Filter {
             PrimaryFilter::Revision(std::mem::take(&mut self.revisions))
         } else if !self.ids.is_empty() {
             PrimaryFilter::TxId(std::mem::take(&mut self.ids))
-        } else if !self.spends.is_empty() {
-            PrimaryFilter::Spends(std::mem::take(&mut self.spends))
-        } else if !self.receives.is_empty() {
-            PrimaryFilter::Receives(std::mem::take(&mut self.receives))
+        } else if !self.from.is_empty() {
+            PrimaryFilter::From(std::mem::take(&mut self.from))
+        } else if !self.to.is_empty() {
+            PrimaryFilter::To(std::mem::take(&mut self.to))
         } else if !self.typ.is_empty() {
             PrimaryFilter::Type(std::mem::take(&mut self.typ))
         } else if !self.tags.is_empty() {
@@ -152,8 +149,8 @@ impl Filter {
     pub fn prepare(mut self) -> Self {
         self.ids.sort();
         self.revisions.sort();
-        self.spends.sort();
-        self.receives.sort();
+        self.from.sort();
+        self.to.sort();
         self.typ.sort();
         self.status.sort();
         self.tags.sort();
@@ -196,10 +193,10 @@ impl Filter {
 
         let accounts = base.accounts();
 
-        if !self.spends.is_empty() {
+        if !self.from.is_empty() {
             let mut found = false;
             for account in accounts.spends.iter() {
-                if self.spends.binary_search(account).is_ok() {
+                if self.from.binary_search(account).is_ok() {
                     found = true;
                     break;
                 }
@@ -209,10 +206,10 @@ impl Filter {
             }
         }
 
-        if !self.receives.is_empty() {
+        if !self.to.is_empty() {
             let mut found = false;
             for account in accounts.receives.iter() {
-                if self.receives.binary_search(account).is_ok() {
+                if self.to.binary_search(account).is_ok() {
                     found = true;
                     break;
                 }
@@ -246,13 +243,13 @@ impl Filter {
 
     /// Adds a spending account to the filter
     pub fn spends(mut self, account: AccountId) -> Self {
-        self.spends.push(account);
+        self.from.push(account);
         self
     }
 
     /// Adds a receiving account to the filter
     pub fn receives(mut self, account: AccountId) -> Self {
-        self.receives.push(account);
+        self.to.push(account);
         self
     }
 
@@ -299,7 +296,7 @@ impl From<RevId> for Filter {
 impl From<AccountId> for Filter {
     fn from(value: AccountId) -> Self {
         Filter {
-            spends: vec![value],
+            from: vec![value],
             ..Default::default()
         }
     }

utxo/src/storage/mod.rs

@@ -1161,7 +1161,7 @@ pub mod test {
                 storage
                     .find(Filter {
                         typ: vec![Type::Withdrawal],
-                        spends: vec![account],
+                        from: vec![account],
                         ..Default::default()
                     })
                     .await

utxo/src/storage/sqlite/mod.rs

@@ -110,7 +110,7 @@ where
             }
             query.fetch_all(executor).await
         }
-        PrimaryFilter::Receives(account_ids) => {
+        PrimaryFilter::To(account_ids) => {
             let sql = format!(
                 r#"
                     SELECT
@@ -145,7 +145,7 @@ where
             }
             query.fetch_all(executor).await
         }
-        PrimaryFilter::Spends(account_ids) => {
+        PrimaryFilter::From(account_ids) => {
             let sql = format!(
                 r#"
                     SELECT

utxo/src/tests/tx.rs

@@ -40,7 +40,7 @@ async fn multi_account_transfers() {
     );
 
     let filter = Filter {
-        spends: vec![accounts[0].clone()],
+        from: vec![accounts[0].clone()],
         typ: vec![Type::Exchange],
         ..Default::default()
     };
@@ -51,7 +51,7 @@ async fn multi_account_transfers() {
 
     for _ in &accounts {
         let filter = Filter {
-            spends: vec![accounts[0].clone()],
+            from: vec![accounts[0].clone()],
             typ: vec![Type::Exchange],
             ..Default::default()
         };

utxo/src/transaction/mod.rs

@@ -134,11 +134,11 @@ impl Transaction {
         let accounts = self.accounts();
 
         for account in accounts.spends {
-            filters.push(FilterableValue::Spends(account));
+            filters.push(FilterableValue::From(account));
         }
 
         for account in accounts.receives {
-            filters.push(FilterableValue::Receives(account));
+            filters.push(FilterableValue::To(account));
         }
 
         for tag in &self.revision.tags {