Skip to content

Commit b7ab2f4

Browse files
rprouserprouse
committed
Collapse all namespaces
1 parent 63127fb commit b7ab2f4

36 files changed

+1586
-1632
lines changed

‎src/todo.application/Commands/AddPriorityCommand.cs

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,40 +5,39 @@
55
using Alteridem.Todo.Domain.Interfaces;
66
using MediatR;
77

8-
namespace Alteridem.Todo.Application.Commands
8+
namespace Alteridem.Todo.Application.Commands;
9+
10+
public class AddPriorityCommand : IRequest<TaskItem>
911
{
10-
public class AddPriorityCommand : IRequest<TaskItem>
11-
{
12-
public int ItemNumber { get; set; }
12+
public int ItemNumber { get; set; }
1313

14-
public char Priority { get; set; }
15-
}
14+
public char Priority { get; set; }
15+
}
1616

17-
public class AddPriorityCommandHandler : IRequestHandler<AddPriorityCommand, TaskItem>
18-
{
19-
private readonly ITaskFile _taskFile;
20-
private readonly ITaskConfiguration _config;
17+
public class AddPriorityCommandHandler : IRequestHandler<AddPriorityCommand, TaskItem>
18+
{
19+
private readonly ITaskFile _taskFile;
20+
private readonly ITaskConfiguration _config;
2121

22-
public AddPriorityCommandHandler(ITaskFile taskFile, ITaskConfiguration config)
23-
{
24-
_taskFile = taskFile;
25-
_config = config;
26-
}
22+
public AddPriorityCommandHandler(ITaskFile taskFile, ITaskConfiguration config)
23+
{
24+
_taskFile = taskFile;
25+
_config = config;
26+
}
2727

28-
public Task<TaskItem> Handle(AddPriorityCommand request, CancellationToken cancellationToken)
28+
public Task<TaskItem> Handle(AddPriorityCommand request, CancellationToken cancellationToken)
29+
{
30+
var tasks = _taskFile.LoadTasks(_config.TodoFile);
31+
var task = tasks.FirstOrDefault(t => t.LineNumber == request.ItemNumber);
32+
if (task != null)
2933
{
30-
var tasks = _taskFile.LoadTasks(_config.TodoFile);
31-
var task = tasks.FirstOrDefault(t => t.LineNumber == request.ItemNumber);
32-
if (task != null)
34+
task.Priority = request.Priority;
35+
_taskFile.Clear(_config.TodoFile);
36+
foreach (var t in tasks.OrderBy(t => t.LineNumber))
3337
{
34-
task.Priority = request.Priority;
35-
_taskFile.Clear(_config.TodoFile);
36-
foreach (var t in tasks.OrderBy(t => t.LineNumber))
37-
{
38-
_taskFile.AppendTo(_config.TodoFile, t.ToString());
39-
}
38+
_taskFile.AppendTo(_config.TodoFile, t.ToString());
4039
}
41-
return Task.FromResult(task);
4240
}
41+
return Task.FromResult(task);
4342
}
4443
}

‎src/todo.application/Commands/AddTaskCommand.cs

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,36 @@
55
using Alteridem.Todo.Domain.Interfaces;
66
using MediatR;
77

8-
namespace Alteridem.Todo.Application.Commands
8+
namespace Alteridem.Todo.Application.Commands;
9+
10+
public sealed class AddTaskCommand : IRequest<TaskItem>
911
{
10-
public sealed class AddTaskCommand : IRequest<TaskItem>
11-
{
12-
public string Filename { get; set; }
12+
public string Filename { get; set; }
1313

14-
public string Task { get; set; }
14+
public string Task { get; set; }
1515

16-
public bool AddCreationDate { get; set; }
17-
}
16+
public bool AddCreationDate { get; set; }
17+
}
1818

19-
public sealed class AddTaskCommandHandler : IRequestHandler<AddTaskCommand, TaskItem>
20-
{
21-
private readonly ITaskFile _taskFile;
19+
public sealed class AddTaskCommandHandler : IRequestHandler<AddTaskCommand, TaskItem>
20+
{
21+
private readonly ITaskFile _taskFile;
2222

23-
public AddTaskCommandHandler(ITaskFile taskFile)
24-
{
25-
_taskFile = taskFile;
26-
}
23+
public AddTaskCommandHandler(ITaskFile taskFile)
24+
{
25+
_taskFile = taskFile;
26+
}
2727

28-
public Task<TaskItem> Handle(AddTaskCommand request, CancellationToken cancellationToken)
29-
{
30-
var task = new TaskItem(request.Task);
31-
if (request.AddCreationDate) task.CreationDate = DateTime.Now.Date;
32-
var taskStr = task.ToString();
28+
public Task<TaskItem> Handle(AddTaskCommand request, CancellationToken cancellationToken)
29+
{
30+
var task = new TaskItem(request.Task);
31+
if (request.AddCreationDate) task.CreationDate = DateTime.Now.Date;
32+
var taskStr = task.ToString();
3333

34-
_taskFile.AppendTo(request.Filename, taskStr);
34+
_taskFile.AppendTo(request.Filename, taskStr);
3535

36-
task.LineNumber = _taskFile.LoadTasks(request.Filename).Count;
36+
task.LineNumber = _taskFile.LoadTasks(request.Filename).Count;
3737

38-
return Task.FromResult(task);
39-
}
38+
return Task.FromResult(task);
4039
}
4140
}

‎src/todo.application/Commands/AppendCommand.cs

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,38 @@
55
using Alteridem.Todo.Domain.Interfaces;
66
using MediatR;
77

8-
namespace Alteridem.Todo.Application.Commands
8+
namespace Alteridem.Todo.Application.Commands;
9+
10+
public sealed class AppendCommand : IRequest<TaskItem>
911
{
10-
public sealed class AppendCommand : IRequest<TaskItem>
12+
public int ItemNumber { get; set; }
13+
public string Text { get; set; }
14+
}
15+
16+
public sealed class AppendCommandHandler : IRequestHandler<AppendCommand, TaskItem>
17+
{
18+
private readonly ITaskFile _taskFile;
19+
private readonly ITaskConfiguration _config;
20+
21+
public AppendCommandHandler(ITaskFile taskFile, ITaskConfiguration config)
1122
{
12-
public int ItemNumber { get; set; }
13-
public string Text { get; set; }
23+
_taskFile = taskFile;
24+
_config = config;
1425
}
1526

16-
public sealed class AppendCommandHandler : IRequestHandler<AppendCommand, TaskItem>
27+
public Task<TaskItem> Handle(AppendCommand request, CancellationToken cancellationToken)
1728
{
18-
private readonly ITaskFile _taskFile;
19-
private readonly ITaskConfiguration _config;
20-
21-
public AppendCommandHandler(ITaskFile taskFile, ITaskConfiguration config)
22-
{
23-
_taskFile = taskFile;
24-
_config = config;
25-
}
26-
27-
public Task<TaskItem> Handle(AppendCommand request, CancellationToken cancellationToken)
29+
var tasks = _taskFile.LoadTasks(_config.TodoFile);
30+
var task = tasks.FirstOrDefault(t => t.LineNumber == request.ItemNumber);
31+
if (task != null)
2832
{
29-
var tasks = _taskFile.LoadTasks(_config.TodoFile);
30-
var task = tasks.FirstOrDefault(t => t.LineNumber == request.ItemNumber);
31-
if (task != null)
33+
task.Description = task.Description + $" {request.Text.Trim()}";
34+
_taskFile.Clear(_config.TodoFile);
35+
foreach (var t in tasks.OrderBy(t => t.LineNumber))
3236
{
33-
task.Description = task.Description + $" {request.Text.Trim()}";
34-
_taskFile.Clear(_config.TodoFile);
35-
foreach (var t in tasks.OrderBy(t => t.LineNumber))
36-
{
37-
_taskFile.AppendTo(_config.TodoFile, t.ToString());
38-
}
37+
_taskFile.AppendTo(_config.TodoFile, t.ToString());
3938
}
40-
return Task.FromResult(task);
4139
}
40+
return Task.FromResult(task);
4241
}
4342
}

‎src/todo.application/Commands/ArchiveTasksCommand.cs

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,44 @@
11
using System.Collections.Generic;
22
using System.Threading;
33
using System.Threading.Tasks;
4-
using Alteridem.Todo.Domain.Common;
54
using Alteridem.Todo.Domain.Entities;
65
using Alteridem.Todo.Domain.Interfaces;
76
using MediatR;
87

9-
namespace Alteridem.Todo.Application.Commands
8+
namespace Alteridem.Todo.Application.Commands;
9+
10+
public sealed class ArchiveTasksCommand : IRequest<IList<TaskItem>>
11+
{
12+
}
13+
14+
public sealed class ArchiveTasksCommandHandler : IRequestHandler<ArchiveTasksCommand, IList<TaskItem>>
1015
{
11-
public sealed class ArchiveTasksCommand : IRequest<IList<TaskItem>>
16+
private readonly ITaskFile _taskFile;
17+
private readonly ITaskConfiguration _config;
18+
19+
public ArchiveTasksCommandHandler(ITaskFile taskFile, ITaskConfiguration config)
1220
{
21+
_taskFile = taskFile;
22+
_config = config;
1323
}
1424

15-
public sealed class ArchiveTasksCommandHandler : IRequestHandler<ArchiveTasksCommand, IList<TaskItem>>
25+
public Task<IList<TaskItem>> Handle(ArchiveTasksCommand request, CancellationToken cancellationToken)
1626
{
17-
private readonly ITaskFile _taskFile;
18-
private readonly ITaskConfiguration _config;
19-
20-
public ArchiveTasksCommandHandler(ITaskFile taskFile, ITaskConfiguration config)
27+
IList<TaskItem> completed = new List<TaskItem>();
28+
var tasks = _taskFile.LoadTasks(_config.TodoFile);
29+
_taskFile.Clear(_config.TodoFile);
30+
foreach (var task in tasks)
2131
{
22-
_taskFile = taskFile;
23-
_config = config;
24-
}
25-
26-
public Task<IList<TaskItem>> Handle(ArchiveTasksCommand request, CancellationToken cancellationToken)
27-
{
28-
IList<TaskItem> completed = new List<TaskItem>();
29-
var tasks = _taskFile.LoadTasks(_config.TodoFile);
30-
_taskFile.Clear(_config.TodoFile);
31-
foreach (var task in tasks)
32+
if (task.Completed)
33+
{
34+
_taskFile.AppendTo(_config.DoneFile, task.ToString());
35+
completed.Add(task);
36+
}
37+
else
3238
{
33-
if (task.Completed)
34-
{
35-
_taskFile.AppendTo(_config.DoneFile, task.ToString());
36-
completed.Add(task);
37-
}
38-
else
39-
{
40-
_taskFile.AppendTo(_config.TodoFile, task.ToString());
41-
}
39+
_taskFile.AppendTo(_config.TodoFile, task.ToString());
4240
}
43-
return Task.FromResult(completed);
4441
}
42+
return Task.FromResult(completed);
4543
}
4644
}

‎src/todo.application/Commands/DeleteTaskCommand.cs

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,41 @@
1-
using System.Collections.Generic;
21
using System.Linq;
32
using System.Threading;
43
using System.Threading.Tasks;
5-
using Alteridem.Todo.Domain.Common;
6-
using Alteridem.Todo.Domain.Entities;
74
using Alteridem.Todo.Domain.Interfaces;
85
using MediatR;
96

10-
namespace Alteridem.Todo.Application.Commands
7+
namespace Alteridem.Todo.Application.Commands;
8+
9+
public class DeleteTaskCommand : IRequest<int>
10+
{
11+
public int ItemNumber { get; set; }
12+
}
13+
14+
public class DeleteTaskCommandHandler : IRequestHandler<DeleteTaskCommand, int>
1115
{
12-
public class DeleteTaskCommand : IRequest<int>
16+
private readonly ITaskFile _taskFile;
17+
private readonly ITaskConfiguration _config;
18+
19+
public DeleteTaskCommandHandler(ITaskFile taskFile, ITaskConfiguration config)
1320
{
14-
public int ItemNumber { get; set; }
21+
_taskFile = taskFile;
22+
_config = config;
1523
}
1624

17-
public class DeleteTaskCommandHandler : IRequestHandler<DeleteTaskCommand, int>
25+
public Task<int> Handle(DeleteTaskCommand request, CancellationToken cancellationToken)
1826
{
19-
private readonly ITaskFile _taskFile;
20-
private readonly ITaskConfiguration _config;
21-
22-
public DeleteTaskCommandHandler(ITaskFile taskFile, ITaskConfiguration config)
27+
var tasks = _taskFile.LoadTasks(_config.TodoFile);
28+
var delTask = tasks.FirstOrDefault(t => t.LineNumber == request.ItemNumber);
29+
if (delTask is null)
2330
{
24-
_taskFile = taskFile;
25-
_config = config;
31+
return Task.FromResult(0);
2632
}
27-
28-
public Task<int> Handle(DeleteTaskCommand request, CancellationToken cancellationToken)
33+
tasks.Remove(delTask);
34+
_taskFile.Clear(_config.TodoFile);
35+
foreach (var task in tasks.OrderBy(t => t.LineNumber))
2936
{
30-
var tasks = _taskFile.LoadTasks(_config.TodoFile);
31-
var delTask = tasks.FirstOrDefault(t => t.LineNumber == request.ItemNumber);
32-
if (delTask is null)
33-
{
34-
return Task.FromResult(0);
35-
}
36-
tasks.Remove(delTask);
37-
_taskFile.Clear(_config.TodoFile);
38-
foreach (var task in tasks.OrderBy(t => t.LineNumber))
39-
{
40-
_taskFile.AppendTo(_config.TodoFile, task.ToString());
41-
}
42-
return Task.FromResult(delTask.LineNumber);
37+
_taskFile.AppendTo(_config.TodoFile, task.ToString());
4338
}
39+
return Task.FromResult(delTask.LineNumber);
4440
}
4541
}

0 commit comments

Comments
 (0)