diff --git a/src/Managing.Api/Controllers/AccountController.cs b/src/Managing.Api/Controllers/AccountController.cs index f5952167..21c35130 100644 --- a/src/Managing.Api/Controllers/AccountController.cs +++ b/src/Managing.Api/Controllers/AccountController.cs @@ -153,11 +153,11 @@ namespace Managing.Api.Controllers /// Returns a list showing each exchange with its initialization status (true/false). /// /// A list of exchange approval statuses. - [HttpGet("exchange-approval-status")] - public async Task>> GetExchangeApprovalStatus() + [HttpGet("exchanges-initialized-status")] + public async Task>> GetExchangeApprovalStatus() { var user = await GetUser(); - var exchangeStatuses = await _AccountService.GetExchangeApprovalStatusAsync(user); + var exchangeStatuses = await _AccountService.GetExchangeInitializedStatusAsync(user); return Ok(exchangeStatuses); } } diff --git a/src/Managing.Application.Abstractions/Services/IAccountService.cs b/src/Managing.Application.Abstractions/Services/IAccountService.cs index 1eaad354..32092a7b 100644 --- a/src/Managing.Application.Abstractions/Services/IAccountService.cs +++ b/src/Managing.Application.Abstractions/Services/IAccountService.cs @@ -35,5 +35,5 @@ public interface IAccountService Task SendTokenAsync(User user, string accountName, string recipientAddress, Ticker ticker, decimal amount, int? chainId = null); - Task> GetExchangeApprovalStatusAsync(User user); + Task> GetExchangeInitializedStatusAsync(User user); } \ No newline at end of file diff --git a/src/Managing.Application/Accounts/AccountService.cs b/src/Managing.Application/Accounts/AccountService.cs index 6b81e10f..018c9fe0 100644 --- a/src/Managing.Application/Accounts/AccountService.cs +++ b/src/Managing.Application/Accounts/AccountService.cs @@ -333,21 +333,21 @@ public class AccountService : IAccountService } } - public async Task> GetExchangeApprovalStatusAsync(User user) + public async Task> GetExchangeInitializedStatusAsync(User user) { var accounts = await GetAccountsByUserAsync(user, hideSecrets: true, getBalance: false); - - var exchangeStatuses = new List(); - + + var exchangeStatuses = new List(); + foreach (var account in accounts) { - exchangeStatuses.Add(new ExchangeApprovalStatus + exchangeStatuses.Add(new ExchangeInitializedStatus { Exchange = TradingExchanges.GmxV2, IsInitialized = account.IsGmxInitialized }); } - + // Future: Add other exchanges here when supported // e.g.: // var hasEvmInitialized = accounts.Any(account => @@ -357,7 +357,7 @@ public class AccountService : IAccountService // Exchange = TradingExchanges.Evm, // IsApproved = hasEvmInitialized // }); - + return exchangeStatuses; } diff --git a/src/Managing.Domain/Accounts/ExchangeApprovalStatus.cs b/src/Managing.Domain/Accounts/ExchangeApprovalStatus.cs deleted file mode 100644 index 035fbbdf..00000000 --- a/src/Managing.Domain/Accounts/ExchangeApprovalStatus.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Orleans; -using static Managing.Common.Enums; - -namespace Managing.Domain.Accounts; - -[GenerateSerializer] -public class ExchangeApprovalStatus -{ - [Id(0)] - public TradingExchanges Exchange { get; set; } - - [Id(1)] - public bool IsInitialized { get; set; } -} diff --git a/src/Managing.Domain/Accounts/ExchangeInitializedStatus.cs b/src/Managing.Domain/Accounts/ExchangeInitializedStatus.cs new file mode 100644 index 00000000..285c2a1d --- /dev/null +++ b/src/Managing.Domain/Accounts/ExchangeInitializedStatus.cs @@ -0,0 +1,12 @@ +using Orleans; +using static Managing.Common.Enums; + +namespace Managing.Domain.Accounts; + +[GenerateSerializer] +public class ExchangeInitializedStatus +{ + [Id(0)] public TradingExchanges Exchange { get; set; } + + [Id(1)] public bool IsInitialized { get; set; } +} \ No newline at end of file