fix

MyOffice.Web/Controllers/SettingsAccountController.cs

@@ -13,8 +13,7 @@ using Infrastructure.Attributes;
 using Services.Identity;
 
 [Authorize]
-[ApiController]
-[Route("api/[controller]")]
+[DefaultFromBody]
 public class SettingsAccountController : BaseApiController
 {
 	private readonly ILogger<SettingsAccountController> _logger;
@@ -35,17 +34,15 @@ public class SettingsAccountController : BaseApiController
 		_contextProvider = contextProvider;
 	}
 
-	[HttpGet("~/api/settings/accounts")]
 	public ObjectResult AccountsGet([AsGuid(true)] string? category)
 	{
 		var list = category.IsPresent()
 			? _accountService.GetByCategory(UserId, category!.AsGuid())
 			: _accountService.GetAllAccounts(UserId);
 
-		return OkResponse(list.ToViewModel(_mapper));
+		return OkResponse(_mapper.Map<List<AccountViewModel>>(list.OrderBy(x => x.Name)));
 	}
 
-	//[HttpPost("~/api/settings/accounts")]
 	public object AccountsAdd(AccountViewModel request)
 	{
 		var exec = _accountService.AccountAdd(UserId, new AccountAdd
@@ -73,8 +70,7 @@ public class SettingsAccountController : BaseApiController
 	}
 
 
-	[HttpPut("~/api/settings/accounts/{id}")]
-	public object AccountsAdd([AsGuid] string id, AccountEditRequestModel request)
+	public object AccountsUpdate([AsGuid] string id, AccountEditRequestModel request)
 	{
 		var exec = _accountService.AccountUpdate(UserId, id.AsGuid(), new AccountEdit
 		{
@@ -103,7 +99,6 @@ public class SettingsAccountController : BaseApiController
 		}
 	}
 
-	[HttpDelete("~/api/settings/accounts/{id}")]
 	public object AccountsDelete([AsGuid] string id)
 	{
 		var exec = _accountService.AccountDelete(UserId, id);
@@ -119,8 +114,7 @@ public class SettingsAccountController : BaseApiController
 		}
 	}
 
-	[HttpDelete("~/api/settings/accounts/{id}/category/{categoryId}")]
-	public object AccountsCategoryRemove([AsGuid] string id, [AsGuid] string categoryId)
+	public object AccountsCategoryDelete([AsGuid] string id, [AsGuid] string categoryId)
 	{
 		var exec = _accountService.AccountCategoryRemove(UserId, id.AsGuid(), categoryId.AsGuid());
 
@@ -138,8 +132,7 @@ public class SettingsAccountController : BaseApiController
 		}
 	}
 
-	[HttpPost("~/api/settings/accounts/{id}/access")]
-	public object AccountsAdd([AsGuid] string id, AccountAccessViewModel request)
+	public object AccountsAccessAdd([AsGuid] string id, AccountAccessViewModel request)
 	{
 		var model = _mapper.Map<List<AccountAccessDto>>(request.Accesses);
 
@@ -180,8 +173,7 @@ public class SettingsAccountController : BaseApiController
 		}
 	}
 
-	[HttpDelete("~/api/settings/accounts/{id}/access/{userId}")]
-	public object AccountsAdd([AsGuid] string id, [AsGuid] string userId)
+	public object AccountsAccessDelete([AsGuid] string id, [AsGuid] string userId)
 	{
 		var exec = _accountService.AccessDelete(UserId, id.AsGuid(), userId.AsGuid());
 
@@ -199,7 +191,6 @@ public class SettingsAccountController : BaseApiController
 		}
 	}
 
-	[HttpGet("~/api/settings/accounts/invites")]
 	public List<AccountAccessInviteViewModel> AccountInvites()
 	{
 		var invites = _accountService.InvitesGet(_contextProvider.User.Email);
@@ -207,8 +198,7 @@ public class SettingsAccountController : BaseApiController
 		return _mapper.Map<List<AccountAccessInviteViewModel>>(invites);
 	}
 
-	[HttpPost("~/api/settings/accounts/invites/{id}/accept")]
-	public object AccountInviteAccept([AsGuid]string id, AccountInviteAcceptRequest request)
+	public object AccountInviteAccept([AsGuid] string id, AccountInviteAcceptRequest request)
 	{
 		var exec = _accountService.InviteAccept(UserId, id.AsGuid(), request.Name);
 
@@ -228,7 +218,6 @@ public class SettingsAccountController : BaseApiController
 		}
 	}
 
-	[HttpPost("~/api/settings/accounts/invites/{id}/reject")]
 	public object AccountInviteReject([AsGuid] string id)
 	{
 		var exec = _accountService.InviteReject(id.AsGuid());