Skip to content

Commit

Permalink
fix: fix merge conflicts for get-all-accounts branch into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
mobinbr committed Aug 19, 2024
2 parents f6c9c6b + dc5f4f6 commit bcc1c34
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace Application.DTOs.TransactionCsv;

public class GetAllTransactionsResponse
{
public List<TransactionCsvModel> Transactions { get; set; } = new();
namespace Application.DTOs.TransactionCsv;

public class GetAllTransactionsResponse
{
public List<TransactionCsvModel> Transactions { get; set; } = new();
}
8 changes: 4 additions & 4 deletions src/Web/Controllers/AccountController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public AccountController(IAccountService accountService)
{
_accountService = accountService;
}

[HttpPost]
public async Task<IActionResult> ImportAccounts([FromForm] IFormFile file)
{
Expand All @@ -34,7 +34,7 @@ public async Task<IActionResult> ImportAccounts([FromForm] IFormFile file)

return Ok("Accounts imported successfully.");
}

[HttpGet("{accountId}")]
public async Task<IActionResult> GetAccountById(long accountId)
{
Expand All @@ -57,10 +57,10 @@ public async Task<IActionResult> GetTransactionsByUserId(long accountId)
}

var transactions = result.Value;

return Ok(transactions!.Select(t => t.ToTransactionDto()));
}

[HttpGet]
[Authorize]
public async Task<IActionResult> GetAllAccounts()
Expand Down

0 comments on commit bcc1c34

Please sign in to comment.