Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

♻️ Refactored Domain to use a feature based approach #141

Merged
merged 1 commit into from
Jul 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Application/Common/Interfaces/IApplicationDbContext.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Microsoft.EntityFrameworkCore;
using SSW.CleanArchitecture.Domain.Entities;
using SSW.CleanArchitecture.Domain.TodoItems;

namespace SSW.CleanArchitecture.Application.Common.Interfaces;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using SSW.CleanArchitecture.Application.Common.Interfaces;
using SSW.CleanArchitecture.Domain.Entities;
using SSW.CleanArchitecture.Domain.TodoItems;

namespace SSW.CleanArchitecture.Application.Features.TodoItems.Commands.CreateTodoItem;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Microsoft.Extensions.Logging;
using SSW.CleanArchitecture.Domain.Events;
using SSW.CleanArchitecture.Domain.TodoItems;

namespace SSW.CleanArchitecture.Application.Features.TodoItems.EventHandlers;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using SSW.CleanArchitecture.Domain.Entities;
using SSW.CleanArchitecture.Domain.TodoItems;

namespace SSW.CleanArchitecture.Application.Features.TodoItems.Queries.GetAllTodoItems;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Ardalis.Specification;
using SSW.CleanArchitecture.Domain.Entities;
using SSW.CleanArchitecture.Domain.TodoItems;

namespace SSW.CleanArchitecture.Application.Features.TodoItems.Specifications;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Ardalis.Specification;
using SSW.CleanArchitecture.Domain.Entities;
using SSW.CleanArchitecture.Domain.TodoItems;

namespace SSW.CleanArchitecture.Application.Features.TodoItems.Specifications;

Expand Down
2 changes: 0 additions & 2 deletions src/Domain/GlobalUsing.cs

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace SSW.CleanArchitecture.Domain.Enum;
namespace SSW.CleanArchitecture.Domain.TodoItems;

public enum PriorityLevel
{
Expand Down
101 changes: 50 additions & 51 deletions src/Domain/Entities/TodoItem.cs → src/Domain/TodoItems/TodoItem.cs
Original file line number Diff line number Diff line change
@@ -1,52 +1,51 @@
using SSW.CleanArchitecture.Domain.Common.Base;
using SSW.CleanArchitecture.Domain.Events;

namespace SSW.CleanArchitecture.Domain.Entities;

public record TodoItemId(Guid Value);

public class TodoItem : BaseEntity<TodoItemId>
{
// NOTE: private setters for behavior we want to encapsulate, and public setters for properties that don't have behavior

public string? Title { get; private set; }
public string? Note { get; set; }
public PriorityLevel Priority { get; set; }
public DateTime Reminder { get; set; }
public bool Done { get; private set; }

private TodoItem() { }

public static TodoItem Create(string title)
{
ArgumentException.ThrowIfNullOrEmpty(title, nameof(title));

var todoItem = new TodoItem
{
Title = title,
Priority = PriorityLevel.None,
Done = false
};

todoItem.AddDomainEvent(new TodoItemCreatedEvent(todoItem));

return todoItem;
}

public static TodoItem Create(string title, string note, PriorityLevel priority, DateTime reminder)
{
var todoItem = Create(title);
todoItem.Note = note;
todoItem.Priority = priority;
todoItem.Reminder = reminder;

return todoItem;
}

public void Complete()
{
Done = true;

AddDomainEvent(new TodoItemCompletedEvent(this));
}
using SSW.CleanArchitecture.Domain.Common.Base;

namespace SSW.CleanArchitecture.Domain.TodoItems;

public record TodoItemId(Guid Value);

public class TodoItem : BaseEntity<TodoItemId>
{
// NOTE: private setters for behavior we want to encapsulate, and public setters for properties that don't have behavior

public string? Title { get; private set; }
public string? Note { get; set; }
public PriorityLevel Priority { get; set; }
public DateTime Reminder { get; set; }
public bool Done { get; private set; }

private TodoItem() { }

public static TodoItem Create(string title)
{
ArgumentException.ThrowIfNullOrEmpty(title, nameof(title));

var todoItem = new TodoItem
{
Title = title,
Priority = PriorityLevel.None,
Done = false
};

todoItem.AddDomainEvent(new TodoItemCreatedEvent(todoItem));

return todoItem;
}

public static TodoItem Create(string title, string note, PriorityLevel priority, DateTime reminder)
{
var todoItem = Create(title);
todoItem.Note = note;
todoItem.Priority = priority;
todoItem.Reminder = reminder;

return todoItem;
}

public void Complete()
{
Done = true;

AddDomainEvent(new TodoItemCompletedEvent(this));
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using SSW.CleanArchitecture.Domain.Common.Base;
using SSW.CleanArchitecture.Domain.Entities;

namespace SSW.CleanArchitecture.Domain.Events;
namespace SSW.CleanArchitecture.Domain.TodoItems;

public record TodoItemCompletedEvent(TodoItem Item) : DomainEvent;
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using SSW.CleanArchitecture.Domain.Common.Base;
using SSW.CleanArchitecture.Domain.Entities;

namespace SSW.CleanArchitecture.Domain.Events;
namespace SSW.CleanArchitecture.Domain.TodoItems;

public record TodoItemCreatedEvent(TodoItem Item) : DomainEvent;
2 changes: 1 addition & 1 deletion src/Infrastructure/Persistence/ApplicationDbContext.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.EntityFrameworkCore;
using SSW.CleanArchitecture.Application.Common.Interfaces;
using SSW.CleanArchitecture.Domain.Entities;
using SSW.CleanArchitecture.Domain.TodoItems;
using SSW.CleanArchitecture.Infrastructure.Persistence.Interceptors;
using System.Reflection;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
using SSW.CleanArchitecture.Domain.Entities;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using SSW.CleanArchitecture.Domain.Enum;
using FluentValidation.Validators;
using SSW.CleanArchitecture.Domain.TodoItems;

namespace SSW.CleanArchitecture.Infrastructure.Persistence;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
using SSW.CleanArchitecture.Domain.Entities;
using SSW.CleanArchitecture.Domain.TodoItems;

namespace SSW.CleanArchitecture.Infrastructure.Persistence.Configuration;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using SSW.CleanArchitecture.Application.Common.Exceptions;
using SSW.CleanArchitecture.Application.Features.TodoItems.Commands.CreateTodoItem;
using SSW.CleanArchitecture.Application.IntegrationTests.TestHelpers;
using SSW.CleanArchitecture.Domain.Entities;
using SSW.CleanArchitecture.Domain.TodoItems;

namespace SSW.CleanArchitecture.Application.IntegrationTests.Features.TodoItems.Commands.CreateTodoItem;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Bogus;
using SSW.CleanArchitecture.Application.Features.TodoItems.Queries.GetAllTodoItems;
using SSW.CleanArchitecture.Application.IntegrationTests.TestHelpers;
using SSW.CleanArchitecture.Domain.Entities;
using SSW.CleanArchitecture.Domain.TodoItems;

namespace SSW.CleanArchitecture.Application.IntegrationTests.Features.TodoItems.Queries.GetAllTodoItems;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Bogus;
using SSW.CleanArchitecture.Application.Features.TodoItems.Specifications;
using SSW.CleanArchitecture.Domain.Entities;
using SSW.CleanArchitecture.Domain.TodoItems;

namespace SSW.CleanArchitecture.Application.UnitTests.Features.TodoItems.Specifications;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using SSW.CleanArchitecture.Application.Features.TodoItems.Specifications;
using SSW.CleanArchitecture.Domain.Entities;
using SSW.CleanArchitecture.Domain.TodoItems;

namespace SSW.CleanArchitecture.Application.UnitTests.Features.TodoItems.Specifications;

Expand Down
5 changes: 2 additions & 3 deletions tests/Domain.UnitTests/Entities/TodoItemTests.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using SSW.CleanArchitecture.Domain.Entities;
using SSW.CleanArchitecture.Domain.Events;
using SSW.CleanArchitecture.Domain.TodoItems;

namespace SSW.CleanArchitecture.Domain.UnitTests.Entities;

Expand All @@ -17,7 +16,7 @@ public void Create_Should_Succeed_When_Title_Valid()
// Assert
todoItem.Should().NotBeNull();
todoItem.Title.Should().Be(title);
todoItem.Priority.Should().Be(Enum.PriorityLevel.None);
todoItem.Priority.Should().Be(PriorityLevel.None);
}

[Fact]
Expand Down