Merge pull request MoneyFox#3160 from NPadrutt/cleanup

Cleanup
NPadrutt · Jan 4, 2024 · 8565c99 · 8565c99
2 parents 6c0c7f7 + a7dce52
commit 8565c99
Show file tree

Hide file tree

Showing 39 changed files with 1,376 additions and 2,334 deletions.
diff --git a/Src/MoneyFox.Core/Common/Interfaces/IAppDbContext.cs b/Src/MoneyFox.Core/Common/Interfaces/IAppDbContext.cs
@@ -3,7 +3,6 @@ namespace MoneyFox.Core.Common.Interfaces;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Domain.Aggregates;
 using Domain.Aggregates.AccountAggregate;
 using Domain.Aggregates.BudgetAggregate;
 using Domain.Aggregates.CategoryAggregate;
@@ -17,8 +16,6 @@ public interface IAppDbContext : IDisposable
 
     DbSet<Payment> Payments { get; }
 
-    DbSet<RecurringPayment> RecurringPayments { get; }
-
     DbSet<RecurringTransaction> RecurringTransactions { get; }
 
     DbSet<Category> Categories { get; }

diff --git a/Src/MoneyFox.Domain.Tests/Aggregates/RecurringPaymentTests.cs b/Src/MoneyFox.Domain.Tests/Aggregates/RecurringPaymentTests.cs
diff --git a/Src/MoneyFox.Domain/Aggregates/AccountAggregate/Payment.cs b/Src/MoneyFox.Domain/Aggregates/AccountAggregate/Payment.cs
@@ -68,10 +68,13 @@ public int? CategoryId
 
     public virtual Account? TargetAccount { get; private set; }
 
-    [Obsolete("To be removed")]
-    public virtual RecurringPayment? RecurringPayment { get; } = null!;
+    public Guid? RecurringTransactionId
+    {
+        get;
 
-    public Guid? RecurringTransactionId { get; private set; }
+        [UsedImplicitly]
+        private set;
+    }
 
     public void UpdatePayment(
         DateTime date,