Add parent currency, modified, timestamp to Expense

Author: mateanticevic

src/ProjectIvy.BL/Handlers/Expense/ExpenseHandler.cs

@@ -85,6 +85,7 @@ public View.Expense Get(string expenseId)
             {
                 var result = context.Expenses.Include(x => x.ExpenseType)
                                              .Include(x => x.Currency)
+                                             .Include(x => x.ParentCurrency)
                                              .Include(x => x.Poi)
                                              .Include(x => x.Vendor)
                                              .Include(x => x.PaymentType)

src/ProjectIvy.DL/DbContexts/MainContext.cs

@@ -168,6 +168,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.Entity<Expense>()
                         .HasOne(x => x.Currency);
 
+            modelBuilder.Entity<Expense>()
+                        .HasOne(x => x.ParentCurrency);
+
             modelBuilder.Entity<Expense>()
                         .HasOne(x => x.Poi);
 

src/ProjectIvy.Model/Database/Main/Finance/Expense.cs

@@ -11,6 +11,7 @@ public class Expense : UserEntity, IHasValueId
         public Expense()
         {
             Modified = DateTime.Now;
+            Timestamp = DateTime.Now;
         }
 
         [Key]
@@ -23,13 +24,19 @@ public Expense()
         public string Comment { get; set; }
 
         public int CurrencyId { get; set; }
-        
+
+        public int? ParentCurrencyId { get; set; }
+
+        public decimal? ParentCurrencyExchangeRate { get; set; }
+
         public DateTime Date { get; set; }
 
         public int ExpenseTypeId { get; set; }
 
         public DateTime? Modified { get; set; }
 
+        public DateTime? Timestamp { get; set; }
+
         public int? PoiId { get; set; }
 
         public int? VendorId { get; set; }
@@ -40,6 +47,8 @@ public Expense()
 
         public Currency Currency { get; set; }
 
+        public Currency ParentCurrency { get; set; }
+
         public Card Card { get; set; }
 
         public ExpenseType ExpenseType { get; set; }

src/ProjectIvy.Model/View/Expense/Expense.cs

@@ -12,24 +12,36 @@ public Expense(DatabaseModel.Finance.Expense x)
             Card = x.Card.ConvertTo(y => new Card.Card(y));
             Comment = x.Comment;
             Currency = x.Currency.ConvertTo(y => new Currency.Currency(y));
+            ParentCurrency = x.ParentCurrency?.ConvertTo(y => new Currency.Currency(y));
             Date = x.Date;
             ExpenseType = x.ExpenseType.ConvertTo(y => new ExpenseType.ExpenseType(y));
             Id = x.ValueId;
             PaymentType = x.PaymentType.ConvertTo(y => new PaymentType.PaymentType(y));
             Poi = x.Poi.ConvertTo(y => new Poi.Poi(y));
             Vendor = x.Vendor.ConvertTo(y => new Vendor.Vendor(y));
+            ParentCurrencyExchangeRate = x.ParentCurrencyExchangeRate;
+            Modified = x.Modified;
+            Timestamp = x.Timestamp;
         }
 
         public decimal Amount { get; set; }
 
+        public decimal? ParentCurrencyExchangeRate { get; set; }
+
         public string Comment { get; set; }
 
         public Card.Card Card { get; set; }
 
         public Currency.Currency Currency { get; set; }
 
+        public Currency.Currency ParentCurrency { get; set; }
+
         public DateTime Date { get; set; }
 
+        public DateTime? Modified { get; set; }
+
+        public DateTime? Timestamp { get; set; }
+
         public ExpenseType.ExpenseType ExpenseType { get; set; }
 
         public Poi.Poi Poi { get; set; }