diff --git a/BankingBot/ActionManagers/AccountManagers/AccountManager.cs b/BankingBot/ActionManagers/AccountManagers/AccountManager.cs index 51f08b6..34c5fad 100644 --- a/BankingBot/ActionManagers/AccountManagers/AccountManager.cs +++ b/BankingBot/ActionManagers/AccountManagers/AccountManager.cs @@ -27,9 +27,18 @@ namespace BankingBot.ActionManagers.AccountManagers providerAccountManager = (IProviderAccountManager)Activator.CreateInstance(providerAccountManagerType, BrowserBot, scriptManager); } + #region Behaviours + public IEnumerable GetAccounts() { return providerAccountManager.GetAccounts(); } + + public IEnumerable GetTransactions(string accountNumber) + { + return providerAccountManager.GetTransactions(accountNumber); + } + + #endregion } } diff --git a/BankingBot/ActionManagers/AccountManagers/LloydsAccountManager.cs b/BankingBot/ActionManagers/AccountManagers/LloydsAccountManager.cs index 8aa7381..87fe9ae 100644 --- a/BankingBot/ActionManagers/AccountManagers/LloydsAccountManager.cs +++ b/BankingBot/ActionManagers/AccountManagers/LloydsAccountManager.cs @@ -1,6 +1,7 @@ using BankingBot.Attributes; using BankingBot.Contracts; using BankingBot.Enums; +using BankingBot.Extensions; using BankingBot.Models; using BankingBot.Urls; using OpenQA.Selenium; @@ -19,6 +20,16 @@ namespace BankingBot.ActionManagers.AccountManagers readonly IBrowserBot browserBot; readonly IScriptManager scriptManager; + private enum TransactionTableColumn + { + Date = 0, + Description = 1, + Type = 2, + In = 3, + Out = 4, + Balance = 5 + } + public LloydsAccountManager( IBrowserBot browserBot, IScriptManager scriptManager) @@ -61,5 +72,70 @@ namespace BankingBot.ActionManagers.AccountManagers return accounts; } + + public IEnumerable GetTransactions(string accountNumber) + { + var transactions = new List(); + + var ajaxIdentifier = GetAjaxIdentifierForAccountNumber(accountNumber); + var accountDetailsUrl = $"{LloydsUrls.AccountDetails}/{ajaxIdentifier}"; + browserBot.WebDriver.Url = accountDetailsUrl; + + var transactionsTableBody = browserBot.WebDriver + .FindElement(By.ClassName("statements-wrap")) + .FindElement(By.ClassName("cwa-tbody")); + + var transactionRows = transactionsTableBody.FindElements(By.CssSelector("tr[aria-expanded='false']")); + foreach (var row in transactionRows) + { + var rowCells = row.FindElements(By.TagName("td")); + + var transaction = new Transaction + { + Date = DateTime.Parse(rowCells[(int)TransactionTableColumn.Date].Text), + IsPending = false, + Description = rowCells[(int)TransactionTableColumn.Description].Text + }; + + var amountIn = rowCells[(int)TransactionTableColumn.In].Text; + var amountOut = rowCells[(int)TransactionTableColumn.Out].Text; + if (amountIn != "") + { + transaction.Amount = decimal.Parse(amountIn); + } + else + { + transaction.Amount = -(decimal.Parse(amountOut)); + } + + transactions.Add(transaction); + } + + return transactions; + } + + private string GetAjaxIdentifierForAccountNumber(string accountNumber) + { + var currentUrl = browserBot.WebDriver.Url; + + browserBot.WebDriver.Url = LloydsUrls.AccountOverview; + + IWebElement accountContainer = null; + var accountContainers = browserBot.WebDriver.FindElements(By.ClassName("des-m-sat-xx-account-tile")); + foreach (var cnt in accountContainers) + { + if (cnt.HasElement(By.ClassName("account-number"))) + { + accountContainer = cnt; + break; + } + } + + if (accountContainer == null) + throw new InvalidOperationException($"Could not find account with account number '{accountNumber}'"); + + return accountContainer.GetAttribute("data-ajax-identifier"); + } + } } diff --git a/BankingBot/BankingBot.csproj b/BankingBot/BankingBot.csproj index 15fd1c5..39d04d0 100644 --- a/BankingBot/BankingBot.csproj +++ b/BankingBot/BankingBot.csproj @@ -69,6 +69,7 @@ + diff --git a/BankingBot/BankingClient.cs b/BankingBot/BankingClient.cs index 3eba517..137c5bf 100644 --- a/BankingBot/BankingClient.cs +++ b/BankingBot/BankingClient.cs @@ -58,6 +58,11 @@ namespace BankingBot return accountManager.GetAccounts(); } + public IEnumerable GetTransactions(string accountNumber) + { + return accountManager.GetTransactions(accountNumber); + } + #endregion #region IDisposable Support @@ -93,6 +98,8 @@ namespace BankingBot // TODO: uncomment the following line if the finalizer is overridden above. // GC.SuppressFinalize(this); } + + #endregion } diff --git a/BankingBot/Contracts/IAccountManager.cs b/BankingBot/Contracts/IAccountManager.cs index 3b8edb9..c6b90a9 100644 --- a/BankingBot/Contracts/IAccountManager.cs +++ b/BankingBot/Contracts/IAccountManager.cs @@ -7,6 +7,9 @@ namespace BankingBot.Contracts public interface IAccountManager { void Init(Provider provider); + IEnumerable GetAccounts(); + + IEnumerable GetTransactions(string accountNumber); } } diff --git a/BankingBot/Contracts/IClient.cs b/BankingBot/Contracts/IClient.cs index 387118b..8662d44 100644 --- a/BankingBot/Contracts/IClient.cs +++ b/BankingBot/Contracts/IClient.cs @@ -10,5 +10,7 @@ namespace BankingBot.Contracts decimal GetBalance(); IEnumerable GetAccounts(); + + IEnumerable GetTransactions(string accountNumber); } } \ No newline at end of file diff --git a/BankingBot/Contracts/IProviderAccountManager.cs b/BankingBot/Contracts/IProviderAccountManager.cs index b2abd7e..5c27d8d 100644 --- a/BankingBot/Contracts/IProviderAccountManager.cs +++ b/BankingBot/Contracts/IProviderAccountManager.cs @@ -10,5 +10,7 @@ namespace BankingBot.Contracts public interface IProviderAccountManager { IEnumerable GetAccounts(); + + IEnumerable GetTransactions(string accountNumber); } } diff --git a/BankingBot/Enums/TransactionType.cs b/BankingBot/Enums/TransactionType.cs index 3976738..13412a9 100644 --- a/BankingBot/Enums/TransactionType.cs +++ b/BankingBot/Enums/TransactionType.cs @@ -8,5 +8,47 @@ namespace BankingBot.Enums { public enum TransactionType { + BGC, + BNS, + BP, + CHG, + CHQ, + COM, + COR, + CPT, + CSH, + CSQ, + DD, + DEB, + DEP, + EFT, + EUR, + FE, + FEE, + FPC, + FPI, + FPO, + IB, + INT, + MPI, + MPO, + MTG, + NS, + NSC, + OTH, + PAY, + PSB, + PSV, + SAL, + SPB, + SO, + STK, + TD, + TDG, + TDI, + TDN, + TFR, + UT, + SUR } -} +} \ No newline at end of file diff --git a/BankingBot/Extensions/IWebElementExtensions.cs b/BankingBot/Extensions/IWebElementExtensions.cs new file mode 100644 index 0000000..44f1aa3 --- /dev/null +++ b/BankingBot/Extensions/IWebElementExtensions.cs @@ -0,0 +1,25 @@ +using OpenQA.Selenium; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankingBot.Extensions +{ + public static class IWebElementExtensions + { + public static bool HasElement(this IWebElement element, By by) + { + try + { + element.FindElement(by); + return true; + } + catch (NoSuchElementException) + { + return false; + } + } + } +} diff --git a/BankingBot/Models/Transaction.cs b/BankingBot/Models/Transaction.cs index ffc2840..4fae2b5 100644 --- a/BankingBot/Models/Transaction.cs +++ b/BankingBot/Models/Transaction.cs @@ -5,8 +5,6 @@ namespace BankingBot.Models { public class Transaction { - public Account Account { get; set; } - public decimal Amount { get; set; } public TransactionType Type { get; set; } @@ -14,5 +12,7 @@ namespace BankingBot.Models public string Description { get; set; } public DateTime Date { get; set; } + + public bool IsPending { get; set; } } } diff --git a/BankingBot/Urls/LloydsUrls.cs b/BankingBot/Urls/LloydsUrls.cs index f8227ea..e144818 100644 --- a/BankingBot/Urls/LloydsUrls.cs +++ b/BankingBot/Urls/LloydsUrls.cs @@ -5,5 +5,6 @@ public const string Login = "https://online.lloydsbank.co.uk/personal/logon/login.jsp"; public const string MemorableInfo = "https://secure.lloydsbank.co.uk/personal/a/logon/entermemorableinformation.jsp"; public const string AccountOverview = "https://secure.lloydsbank.co.uk/personal/a/account_overview_personal/"; + public const string AccountDetails = "https://secure.lloydsbank.co.uk/personal/a/account_details_ress"; } }