Fix: Moved name to BaseFinancial because it's used in all models, Exp…

…ense, ExpenseItem and Income.

EasyFinance.Common.Tests/Financial/BaseFinancialBuilder.cs

@@ -15,6 +15,12 @@ protected BaseFinancialBuilder(TEntity baseFinancial)
             this.entity = baseFinancial;
         }
 
+        public BaseFinancialBuilder<TEntity> AddName(string name)
+        {
+            this.entity.Name = name;
+            return this;
+        }
+
         public BaseFinancialBuilder<TEntity> AddDate(DateTime date)
         {
             this.entity.Date = date;

EasyFinance.Common.Tests/Financial/ExpenseBuilder.cs

@@ -8,12 +8,6 @@ public ExpenseBuilder() : base(new Expense())
         {
         }
 
-        public ExpenseBuilder AddName(string name)
-        {
-            this.entity.Name = name;
-            return this;
-        }
-
         public ExpenseBuilder AddGoal(decimal goal)
         {
             this.entity.Goal = goal;

EasyFinance.Common.Tests/Financial/ExpenseItemBuilder.cs

@@ -0,0 +1,11 @@
+using EasyFinance.Domain.Models.Financial;
+
+namespace EasyFinance.Common.Tests.Financial
+{
+    public class ExpenseItemBuilder : BaseExpenseBuilder<ExpenseItem>
+    {
+        public ExpenseItemBuilder() : base(new ExpenseItem())
+        {
+        }
+    }
+}

EasyFinance.Common.Tests/Financial/IncomeBuilder.cs

@@ -7,11 +7,5 @@ public class IncomeBuilder : BaseFinancialBuilder<Income>
         public IncomeBuilder() : base(new Income())
         {
         }
-
-        public IncomeBuilder AddTitle(string title)
-        {
-            this.entity.Title = title;
-            return this;
-        }
     }
 }

EasyFinance.Domain.Tests/FinancialProject/ProjectTests.cs

@@ -11,12 +11,20 @@ public class ProjectTests
         public void CreateAProjectAndValidateProperties()
         {
             var income = new IncomeBuilder()
-                .AddTitle("Income Name")
+                .AddAmount(200)
+                .AddName("Income Name")
+                .Build();
+
+            var expenseItem = new ExpenseItemBuilder()
+                .AddAmount(20)
+                .AddName("Expense Item Name")
                 .Build();
 
             var expense = new ExpenseBuilder()
-                .AddName("Expense Name")
                 .AddGoal(50)
+                .AddItems(new List<ExpenseItem> { expenseItem })
+                .AddAmount(20)
+                .AddName("Expense Name")
                 .Build();
 
             var category = new CategoryBuilder()
@@ -39,8 +47,13 @@ public void CreateAProjectAndValidateProperties()
             project.Categories.First().Expenses.First().Should().NotBeNull();
             project.Categories.First().Expenses.First().Name.Should().Be("Expense Name");
             project.Categories.First().Expenses.First().Goal.Should().Be(50);
+            project.Categories.First().Expenses.First().Amount.Should().Be(20);
+            project.Categories.First().Expenses.First().Items.First().Should().NotBeNull();
+            project.Categories.First().Expenses.First().Items.First().Name.Should().Be("Expense Item Name");
+            project.Categories.First().Expenses.First().Items.First().Amount.Should().Be(20);
             project.Incomes.First().Should().NotBeNull();
-            project.Incomes.First().Title.Should().Be("Income Name");
+            project.Incomes.First().Name.Should().Be("Income Name");
+            project.Incomes.First().Amount.Should().Be(200);
         }
     }
 }

EasyFinance.Domain/Financial/BaseFinancial.cs

@@ -6,6 +6,7 @@ namespace EasyFinance.Domain.Models.Financial
 {
     public abstract class BaseFinancial : BaseEntity
     {
+        public string Name { get; set; } = string.Empty;
         public DateTime Date { get; set; }
         public decimal Amount { get; set; }
         public User CreatedBy { get; set; } = new User();

EasyFinance.Domain/Financial/Expense.cs

@@ -2,7 +2,6 @@
 {
     public class Expense : BaseExpense
     {
-        public string Name { get; set; } = string.Empty;
         public decimal Goal { get; set; }
     }
 }

EasyFinance.Domain/Financial/Income.cs

@@ -2,6 +2,5 @@
 {
     public class Income : BaseFinancial
     {
-        public string Title { get; set; } = string.Empty;
     }
 }