mirror of
https://github.com/wismna/ModernKeePass.git
synced 2025-10-03 15:40:18 -04:00
Most services are implemented as command/queries
Code cleanup
This commit is contained in:
@@ -2,7 +2,6 @@
|
||||
using AutoMapper;
|
||||
using MediatR;
|
||||
using ModernKeePass.Application.Common.Interfaces;
|
||||
using ModernKeePass.Application.Database.Queries.IsDatabaseOpen;
|
||||
using ModernKeePass.Application.Group.Models;
|
||||
using ModernKeePass.Domain.Dtos;
|
||||
using ModernKeePass.Domain.Exceptions;
|
||||
@@ -11,28 +10,35 @@ namespace ModernKeePass.Application.Database.Queries.OpenDatabase
|
||||
{
|
||||
public class OpenDatabaseQuery: IRequest<GroupVm>
|
||||
{
|
||||
public FileInfo FileInfo { get; set; }
|
||||
public Credentials Credentials { get; set; }
|
||||
public string FilePath { get; set; }
|
||||
public string Password { get; set; }
|
||||
public string KeyFilePath { get; set; }
|
||||
|
||||
public class OpenDatabaseQueryHandler : IAsyncRequestHandler<OpenDatabaseQuery, GroupVm>
|
||||
{
|
||||
private readonly IMapper _mapper;
|
||||
private readonly IMediator _mediator;
|
||||
private readonly IDatabaseProxy _databaseProxy;
|
||||
private readonly IDatabaseProxy _database;
|
||||
|
||||
public OpenDatabaseQueryHandler(IMapper mapper, IMediator mediator, IDatabaseProxy databaseProxy)
|
||||
public OpenDatabaseQueryHandler(IMapper mapper, IDatabaseProxy database)
|
||||
{
|
||||
_mapper = mapper;
|
||||
_mediator = mediator;
|
||||
_databaseProxy = databaseProxy;
|
||||
_database = database;
|
||||
}
|
||||
|
||||
public async Task<GroupVm> Handle(OpenDatabaseQuery request)
|
||||
{
|
||||
var isDatabaseOpen = await _mediator.Send(new IsDatabaseOpenQuery());
|
||||
if (isDatabaseOpen) throw new DatabaseOpenException();
|
||||
if (_database.IsOpen) throw new DatabaseOpenException();
|
||||
|
||||
var rootGroup = await _databaseProxy.Open(request.FileInfo, request.Credentials);
|
||||
var rootGroup = await _database.Open(
|
||||
new FileInfo
|
||||
{
|
||||
Path = request.FilePath
|
||||
},
|
||||
new Credentials
|
||||
{
|
||||
KeyFilePath = request.KeyFilePath,
|
||||
Password = request.Password
|
||||
});
|
||||
return _mapper.Map<GroupVm>(rootGroup);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user