alexandr/myoffice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
alexandr
2023-12-16 21:18:01 +02:00
parent 775146ee86
commit 2feaf50802
46 changed files with 641 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyOffice.Web/Controllers/AccountController.cs
+2 -9
View File
@@ -9,13 +9,13 @@ using Microsoft.Extensions.Logging;
using Models.Account;
using Models.Item;
using Models.Motion;
using MyOffice.Web.Infrastructure.Attributes;
using Services.Account;
using Services.Account.Domain;
using Services.Item;
[Authorize]
[ApiController]
[Route("api/[controller]")]
[DefaultFromBody]
public class AccountController : BaseApiController
{
private readonly ILogger<AccountController> _logger;
@@ -36,7 +36,6 @@ public class AccountController : BaseApiController
_itemService = itemService;
}
[HttpGet("~/api/accounts")]
public ObjectResult AccountsGet(string category)
{
var list = _accountService.GetByCategoryDetailed(UserId, category!.AsGuid());
@@ -44,7 +43,6 @@ public class AccountController : BaseApiController
return OkResponse(_mapper.Map<List<AccountDetailedViewModel>>(list.OrderBy(x => x.Account.Name).ToList()));
}
[HttpGet("~/api/accounts/{id}")]
public ObjectResult AccountGet(string id)
{
var exec = _accountService.GetByIdDetailed(UserId, id!.AsGuid());
@@ -63,7 +61,6 @@ public class AccountController : BaseApiController
}
}
[HttpGet("~/api/accounts/{id}/motions")]
public ObjectResult MotionsGet(string id, [FromQuery] MotionsGetRequest request)
{
var exec = _accountService.GetMotions(UserId, id!.AsGuid(), request.From.StartOfDay(), request.To.EndOfDay());
@@ -82,7 +79,6 @@ public class AccountController : BaseApiController
}
}
[HttpPost("~/api/accounts/{id}/motions")]
public object MotionsPost(string id, MotionRequest motion)
{
var exec = _accountService.MotionAdd(UserId, id.AsGuid(), _mapper.Map<MotionAddUpdate>(motion));
@@ -101,7 +97,6 @@ public class AccountController : BaseApiController
}
}
[HttpPut("~/api/accounts/{id}/motions/{motionId}")]
public ObjectResult MotionsPut(string id, string motionId, MotionRequest motion)
{
var exec = _accountService.MotionUpdate(UserId, id.AsGuid(), motionId.AsGuid(), _mapper.Map<MotionAddUpdate>(motion));
@@ -120,7 +115,6 @@ public class AccountController : BaseApiController
}
}
[HttpDelete("~/api/accounts/{id}/motions/{motionId}")]
public ObjectResult MotionsDelete(string id, string motionId)
{
var exec = _accountService.MotionRemove(UserId, id.AsGuid(), motionId.AsGuid());
@@ -139,7 +133,6 @@ public class AccountController : BaseApiController
}
}
[HttpGet("~/api/items")]
public ObjectResult FindItems(string term)
{
var itemsDto = _itemService.FindItems(UserId, term);
MyOffice.Web/Controllers/DashboardController.cs
+13 -12
View File
@@ -1,51 +1,52 @@
namespace MyOffice.Web.Controllers;
using AutoMapper;
using Core.Extensions;
using Infrastructure.Attributes;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using MyOffice.Web.Models.Dashboard;
using Services.Dashboard;
[Authorize]
[ApiController]
[Route("api/[controller]")]
[DefaultFromBody]
public class DashboardController : BaseApiController
{
private readonly ILogger<DashboardController> _logger;
private readonly DashboardService _dashboardService;
private readonly IMapper _mapper;
public DashboardController(
ILogger<DashboardController> logger,
DashboardService dashboardService
DashboardService dashboardService,
IMapper mapper
)
{
_logger = logger;
_dashboardService = dashboardService;
_mapper = mapper;
}
[HttpGet("~/api/dashboard")]
public object Index()
public ObjectResult Index()
{
var data = _dashboardService.GetDashboardRestData(UserId);
return data;
return OkResponse(_mapper.Map<DashboardViewModel>(data));
}
[HttpGet("~/api/dashboard/income")]
public object Income(DateTime from, DateTime to, [AsGuid(true)] string? category)
public ObjectResult Income(DateTime from, DateTime to, [AsGuid(true)] string? category)
{
var data = _dashboardService.GetDashboardIncomeData(UserId, from.StartOfDay(), to.EndOfDay(), category?.AsGuidNull());
return data;
return OkResponse(_mapper.Map<DashboardIncomeDataViewModel>(data));
}
[HttpGet("~/api/dashboard/outcome")]
public object Outcome(DateTime from, DateTime to, [AsGuid(true)] string? category)
public ObjectResult Outcome(DateTime from, DateTime to, [AsGuid(true)] string? category)
{
var data = _dashboardService.GetDashboardOutcomeData(UserId, from.StartOfDay(), to.EndOfDay(), category?.AsGuidNull());
return data;
return OkResponse(_mapper.Map<DashboardIncomeDataViewModel>(data));
}
}
MyOffice.Web/Controllers/SettingsAccountCategoryController.cs
+11 -17
View File
@@ -1,7 +1,6 @@
namespace MyOffice.Web.Controllers;
using AutoMapper;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Authorization;
using Core;
@@ -11,10 +10,10 @@ using Services.Account;
using Services.Account.Domain;
using Infrastructure.Attributes;
using Services.Identity;
using Microsoft.AspNetCore.Mvc;
[Authorize]
[ApiController]
[Route("api/[controller]")]
[DefaultFromBody]
public class SettingsAccountCategoryController : BaseApiController
{
private readonly ILogger<SettingsAccountController> _logger;
@@ -35,16 +34,14 @@ public class SettingsAccountCategoryController : BaseApiController
_contextProvider = contextProvider;
}
[HttpGet("~/api/settings/account-categories")]
public object AccountCategories()
public ObjectResult AccountCategories()
{
var list = _accountService.GetAllCategories(UserId);
return OkResponse(_mapper.Map<List<AccountCategoryViewModel>>(list).OrderBy(x => x.Name));
}
[HttpGet("~/api/settings/account-categories/{id}")]
public object AccountCategory([AsGuid] string id)
public ObjectResult AccountCategory([AsGuid] string id)
{
var exec = _accountService.GetCategory(UserId, id.AsGuid());
@@ -55,21 +52,20 @@ public class SettingsAccountCategoryController : BaseApiController
return ProblemBadResponse("Account category not found.");
case GeneralExecStatus.success:
return _mapper.Map<AccountCategoryViewModel>(exec.Result!);
return OkResponse(_mapper.Map<AccountCategoryViewModel>(exec.Result!));
default:
throw new NotSupportedException(exec.Status.ToString());
}
}
[HttpPost("~/api/settings/account-categories")]
public object AccountCategoriesAdd(AccountCategoryViewModel request)
public ObjectResult AccountCategoriesAdd(AccountCategoryViewModel request)
{
var exec = _accountService.CategoryAdd(UserId, new AccountCategoryDto { Name = request.Name! });
switch (exec.Status)
{
case GeneralExecStatus.success:
return exec.Result!;
return OkResponse(_mapper.Map<AccountCategoryViewModel>(exec.Result!));
case GeneralExecStatus.failure:
case GeneralExecStatus.not_found:
@@ -80,14 +76,13 @@ public class SettingsAccountCategoryController : BaseApiController
}
}
[HttpPut("~/api/settings/account-categories/{id}")]
public object AccountCategoriesEdit([AsGuid] string id, AccountCategoryViewModel request)
public ObjectResult AccountCategoriesUpdate([AsGuid] string id, AccountCategoryViewModel request)
{
var exec = _accountService.CategoryUpdate(UserId, id.AsGuid(), new AccountCategoryDto { Name = request.Name! });
switch (exec.Status)
{
case GeneralExecStatus.success:
return exec.Result!;
return OkResponse(_mapper.Map<AccountCategoryViewModel>(exec.Result!));
case GeneralExecStatus.failure:
case GeneralExecStatus.not_found:
@@ -98,14 +93,13 @@ public class SettingsAccountCategoryController : BaseApiController
}
}
[HttpDelete("~/api/settings/account-categories/{id}")]
public object AccountCategoriesDelete([AsGuid] string id)
public ObjectResult AccountCategoriesDelete([AsGuid] string id)
{
var exec = _accountService.CategoryRemove(UserId, id.AsGuid());
switch (exec.Status)
{
case AccountCategoryRemoveResult.success:
return exec.Result!;
return OkResponse(_mapper.Map<AccountCategoryViewModel>(exec.Result!));
case AccountCategoryRemoveResult.failure:
return ProblemBadResponse("Remove account category failed.");
MyOffice.Web/Controllers/SettingsAccountController.cs
+7 -18
View File
@@ -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());
MyOffice.Web/Controllers/CurrencyController.cs → MyOffice.Web/Controllers/SettingsCurrencyController.cs
+4 -4
View File
@@ -12,15 +12,15 @@ using Services.Currency.Domain;
[Authorize]
[DefaultFromBody]
public class CurrencyController : BaseApiController
public class SettingCurrencyController : BaseApiController
{
private readonly CurrencyService _currencyService;
private readonly ILogger<CurrencyController> _logger;
private readonly ILogger<SettingCurrencyController> _logger;
private readonly IMapper _mapper;
public CurrencyController(
public SettingCurrencyController(
CurrencyService currencyService,
ILogger<CurrencyController> logger,
ILogger<SettingCurrencyController> logger,
IMapper mapper
)
{
MyOffice.Web/Controllers/SettingsItemController.cs
+3 -11
View File
@@ -12,8 +12,7 @@ using Services.Item;
using Services.Item.Domain;
[Authorize]
[ApiController]
[Route("api/[controller]")]
[DefaultFromBody]
public class SettingsItemController : BaseApiController
{
private ILogger<SettingsItemController> _logger;
@@ -31,7 +30,6 @@ public class SettingsItemController : BaseApiController
_mapper = mapper;
}
[HttpGet("~/api/settings/item-categories")]
public ObjectResult ItemsCategories()
{
var list = _itemService.GetAllCategories(UserId);
@@ -41,7 +39,6 @@ public class SettingsItemController : BaseApiController
.ThenBy(x => x.Name));
}
[HttpPost("~/api/settings/item-categories")]
public ObjectResult ItemCategoriesAdd(ItemCategoryViewModel request)
{
var exec = _itemService.CategoryAdd(UserId, request.FromModel());
@@ -60,7 +57,6 @@ public class SettingsItemController : BaseApiController
}
}
[HttpPut("~/api/settings/item-categories/{id}")]
public ObjectResult ItemCategoriesUpdate([AsGuid] string id, ItemCategoryViewModel request)
{
var exec = _itemService.CategoryUpdate(UserId, id.AsGuid(), request.FromModel());
@@ -79,7 +75,6 @@ public class SettingsItemController : BaseApiController
}
}
[HttpDelete("~/api/settings/item-categories/{id}")]
public ObjectResult ItemCategoriesDelete([AsGuid] string id)
{
var exec = _itemService.CategoryRemove(UserId, id.AsGuid());
@@ -100,7 +95,6 @@ public class SettingsItemController : BaseApiController
}
}
[HttpGet("~/api/settings/items")]
public ObjectResult Items([AsGuid] string category)
{
var categoryId = category.AsGuid();
@@ -112,8 +106,7 @@ public class SettingsItemController : BaseApiController
return Ok(_mapper.Map<List<ItemViewModel>>(list.OrderBy(x => x.Name)));
}
[HttpPut("~/api/settings/items/{id}")]
public ObjectResult Items([AsGuid] string id, ItemEditModel request)
public ObjectResult ItemsUpdate([AsGuid] string id, ItemEditModel request)
{
var exec = _itemService.Update(UserId, id.AsGuid(), request.Category.AsGuid());
@@ -131,8 +124,7 @@ public class SettingsItemController : BaseApiController
}
}
[HttpPost("~/api/settings/items")]
public ObjectResult Items(ItemChangeCategoryModel request)
public ObjectResult ItemsPost(ItemChangeCategoryModel request)
{
var exec = _itemService.UpdateItemsCategory(UserId, request.category.AsGuid(), request.Items.Select(x => x.AsGuid()).ToList());
MyOffice.Web/Controllers/UserController.cs
+2 -7
View File
@@ -14,9 +14,9 @@ using Core;
using Services.Users;
using Services.Users.Domain;
using MyOffice.Data.Models.Currencies;
using MyOffice.Web.Infrastructure.Attributes;
[ApiController]
[Route("api/[controller]")]
[DefaultFromBody]
public class UserController : BaseApiController
{
private readonly UserManager<ApplicationUser<Guid>> _userManager;
@@ -34,7 +34,6 @@ public class UserController : BaseApiController
_externalProviderValidators = externalProviderValidators;
}
[HttpPost("~/api/user/register")]
public async Task<object> Register([FromBody] RegisterModel request)
{
var user = new ApplicationUser<Guid>
@@ -55,7 +54,6 @@ public class UserController : BaseApiController
}
[Authorize]
[HttpGet("~/api/user/profile")]
public async Task<object> ProfileGet()
{
var user = await _userManager.GetUserAsync(User);
@@ -64,7 +62,6 @@ public class UserController : BaseApiController
}
[Authorize]
[HttpPost("~/api/user/profile")]
public async Task<object> ProfileUpdate([FromBody] ProfileModel model)
{
var user = await _userManager.GetUserAsync(User);
@@ -80,7 +77,6 @@ public class UserController : BaseApiController
}
[Authorize]
[HttpPost("~/api/user/attach")]
public async Task<object> AttachProvider([FromBody] AttachModel model)
{
var validator = _externalProviderValidators.FirstOrDefault(x => x.Provider.EqualsIgnoreCase(model.Provider));
@@ -108,7 +104,6 @@ public class UserController : BaseApiController
}
[Authorize]
[HttpPost("~/api/user/deattach")]
public async Task<object> DeattachProvider([FromBody] DeattachModel model)
{
var exec = await _userService.RemoveUserExternal(UserId, model.Provider);