Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
using System;
using System.ComponentModel.DataAnnotations;
using FinanceAPI.Attributes;
using FinanceAPICore;
using FinanceAPIData;
Expand All @@ -19,10 +20,10 @@ public TransactionsController(TransactionProcessor transactionProcessor)
}

[HttpGet]
public IActionResult GetTransactions(string accountId = null)
public IActionResult GetTransactions(string accountId = null, DateTime? startDate = null, DateTime? endDate = null)
{
string clientId = Request.HttpContext.Items["ClientId"]?.ToString();
return Json(_transactionProcessor.GetTransactions(clientId, accountId));
return Json(_transactionProcessor.GetTransactions(clientId, accountId, startDate, endDate));
}

[HttpPost]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;

namespace FinanceAPICore.DataService
{
Expand All @@ -10,7 +11,7 @@ public interface ITransactionsDataService
bool UpdateTransactionLogo(string transactionId, string logo);
bool DeleteTransaction(string transactionId, string clientId);
bool DeleteAllAccountTransactions(string accountId, string clientId);
List<Transaction> GetTransactions(string clientId);
List<Transaction> GetTransactions(string clientId, DateTime? startDate = null, DateTime? endDate = null);
bool ImportDatafeedTransaction(Transaction transaction);
}
}
4 changes: 2 additions & 2 deletions src/FinanceAPI/FinanceAPIData/TransactionProcessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@ public bool DeleteTransaction(string transactionId, string clientId)
return false;
}

public List<Transaction> GetTransactions(string clientId, string accountId = null)
public List<Transaction> GetTransactions(string clientId, string accountId = null, DateTime? startDate = null, DateTime? endDate = null)
{
if (string.IsNullOrEmpty(clientId))
return null;

List<Transaction> transactions = _transactionDataService.GetTransactions(clientId);
List<Transaction> transactions = _transactionDataService.GetTransactions(clientId, startDate, endDate);
LoadTransactionAccountNames(transactions, clientId);

if (!string.IsNullOrEmpty(accountId))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,17 @@ public Transaction GetTransactionById(string transactionId, string clientId)
return null;
}

public List<Transaction> GetTransactions(string clientId)
public List<Transaction> GetTransactions(string clientId, DateTime? startDate = null, DateTime? endDate = null)
{
MongoDatabase database = new MongoDatabase(databaseName, _connectionString);
var filter = Builders<Transaction>.Filter.Eq("ClientID", clientId);

if (startDate.HasValue)
filter &= Builders<Transaction>.Filter.Gte(t => t.Date, startDate.Value);

if (endDate.HasValue)
filter &= Builders<Transaction>.Filter.Lte(t => t.Date, endDate.Value);

return database.LoadRecordsByFilter(tableName, filter).OrderByDescending(t => t.Date).ToList();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public void RunTest(Transaction originalTransaction, string expectedLogo)
Dictionary<string, string> transactionLogos = new Dictionary<string, string>();
// Setup mocks
Mock<ITransactionsDataService> mockITransactionsDataService = new Mock<ITransactionsDataService>();
mockITransactionsDataService.Setup(db => db.GetTransactions(It.IsAny<string>())).Returns(new List<Transaction>{originalTransaction});
mockITransactionsDataService.Setup(db => db.GetTransactions(It.IsAny<string>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>())).Returns(new List<Transaction>{originalTransaction});
mockITransactionsDataService.Setup(db => db.UpdateTransactionLogo(It.IsAny<string>(), It.IsAny<string>())).Callback((string id, string logo) => transactionLogos.Add(id, logo)).Returns(true);
mock._transactionsDataService = mockITransactionsDataService.Object;

Expand Down
Loading