going somewhere.

src/db/_test_utils.rs

@@ -2,6 +2,7 @@ use rusqlite::{Result, Transaction};
 
 use crate::db::{_securities, _users};
 use crate::db::_accounts::create_account;
+use crate::db::_external_id::UserId;
 use crate::db::_securities::{NewSecurity, Security, SecurityType};
 use crate::db::_users::User;
 use crate::db::accounts::Account;
@@ -28,22 +29,26 @@ pub fn setup_users(tx: &Transaction) -> Result<Vec<User>> {
     return Ok(vec![user_1, user_2]);
 }
 
-pub fn setup_securities(tx: &Transaction, owner: &User) -> Result<Vec<Security>> {
+pub fn setup_securities(tx: &Transaction, owner: &UserId) -> Result<Vec<Security>> {
     let sec_1 = _securities::create_security(tx, &mock_currency_1(), owner)?;
     let sec_2 = _securities::create_security(tx, &mock_currency_2(), owner)?;
     return Ok(vec![sec_1, sec_2]);
 }
 
-pub fn setup_users_and_securities(tx: &Transaction) ->  Result<(Vec<User>, Vec<Security>)>{
+pub fn setup_users_and_securities(tx: &Transaction) -> Result<(Vec<User>, Vec<Security>)> {
     let users = setup_users(tx)?;
-    let securities = setup_securities(tx, users.get(0).unwrap())?;
+    let securities = setup_securities(tx, &users.get(0).unwrap().id())?;
     Ok((users, securities))
 }
 
 pub fn setup_basic_environment(tx: &Transaction) -> Result<(Vec<User>, Vec<Security>, Vec<Account>)> {
     let (users, securities) = setup_users_and_securities(tx)?;
 
-    let acc1 = create_account(tx, securities.get(0).unwrap(), users.get(0).unwrap())?;
-    let acc2 = create_account(tx, securities.get(1).unwrap(), users.get(1).unwrap())?;
+    let acc1 = create_account(tx,
+                              &securities.get(0).unwrap().id(),
+                              &users.get(0).unwrap().id())?;
+    let acc2 = create_account(tx,
+                              &securities.get(1).unwrap().id(),
+                              &users.get(1).unwrap().id())?;
     Ok((users, securities, vec![acc1, acc2]))
 }