Fix booking import view to hide inactive accounts (#363)

Co-authored-by: Lukas Grützmacher <44983012+lg2de@users.noreply.github.com>

Author: shaig-mahmudov

src/SimpleAccounting/Model/AccountingData.Extensions.cs

@@ -117,11 +117,10 @@ internal AccountingDataJournal CloseYear(
         ulong bookingId = 1;
 
         // Asset Accounts (Bestandskonten), Credit and Debit Accounts
-        var accounts = this.AllAccounts.Where(
-            a =>
-                a.Type == AccountDefinitionType.Asset
-                || a.Type == AccountDefinitionType.Credit
-                || a.Type == AccountDefinitionType.Debit);
+        var accounts = this.AllAccounts.Where(a =>
+            a.Type == AccountDefinitionType.Asset
+            || a.Type == AccountDefinitionType.Credit
+            || a.Type == AccountDefinitionType.Debit);
         foreach (var account in accounts)
         {
             if (currentModelJournal.Booking == null)
@@ -289,6 +288,11 @@ public partial class AccountDefinitionImportMapping
     /// </summary>
     public bool IsValid()
     {
+        if (this.Columns == null)
+        {
+            return false;
+        }
+
         return
             this.Columns.Exists(x => x.Target == AccountDefinitionImportMappingColumnTarget.Date)
             && this.Columns.Exists(x => x.Target == AccountDefinitionImportMappingColumnTarget.Value);

src/SimpleAccounting/Presentation/ImportBookingsViewModel.cs

@@ -41,7 +41,7 @@ public ImportBookingsViewModel(
         this.dialogs = dialogs;
         this.fileSystem = fileSystem;
         this.ProjectData = projectData;
-        this.accounts = projectData.Storage.AllAccounts.ToList();
+        this.accounts = projectData.Storage.AllAccounts.Where(a => a.Active).ToList();
         this.FirstBookingNumber = projectData.MaxBookIdent + 1;
 
         this.RangeMin = this.ProjectData.CurrentYear.DateStart.ToDateTime();
@@ -57,7 +57,6 @@ public ImportBookingsViewModel(
     /// </summary>
     public IEnumerable<AccountDefinition> ImportAccounts => this.accounts
         .Where(a => a.ImportMapping != null && a.ImportMapping.IsValid());
-
     /// <summary>
     ///     Gets a value indicating whether importing is currently possible.
     /// </summary>
@@ -221,7 +220,7 @@ ImportEntryViewModel ToViewModel(AccountingDataJournalBooking entry)
             // remote account may be null in case of split booking
             var remoteAccount = this.accounts.Find(x => x.ID == remoteIdentifier);
 
-            return new ImportEntryViewModel(this.accounts)
+            return new ImportEntryViewModel(this.accounts.Where(x => x.ID != this.SelectedAccountNumber))
             {
                 IsExisting = true,
                 Identifier = entry.ID,

tests/SimpleAccounting.UnitTests/Presentation/ImportBookingsViewModelTests.cs

@@ -7,6 +7,7 @@ namespace lg2de.SimpleAccounting.UnitTests.Presentation;
 using System;
 using System.Globalization;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using lg2de.SimpleAccounting.Abstractions;
@@ -32,6 +33,32 @@ public void Ctor_SampleData_AccountsFiltered()
         sut.ImportAccounts.Should().BeEquivalentTo([new { Name = "Bank account" }]);
     }
 
+    [Fact]
+    public void Ctor_InactiveAccountWithMapping_Excluded()
+    {
+        var clock = Substitute.For<IClock>();
+        var projectData = new ProjectData(new Settings(), null!, null!, null!, clock, null!);
+        var activeAccount = new AccountDefinition
+        {
+            ID = 101, Name = "Bank (Active)", Active = true, ImportMapping = Samples.SimpleImportConfiguration
+        };
+        var inactiveAccount = new AccountDefinition
+        {
+            ID = 102,
+            Name = "Old Bank (Inactive)",
+            Active = false,
+            ImportMapping = Samples.SimpleImportConfiguration
+        };
+        projectData.Storage.Accounts =
+        [
+            new AccountingDataAccountGroup { Account = [activeAccount, inactiveAccount] }
+        ];
+
+        var sut = new ImportBookingsViewModel(null!, null!, projectData);
+
+        sut.ImportAccounts.Should().BeEquivalentTo([new { Name = "Bank (Active)" }]);
+    }
+    
     [Fact]
     public void ImportStatus_NoImportAccount()
     {
@@ -194,6 +221,49 @@ public void LoadDataCommand_LastImportFolder_LastUsedAndNewStored()
         dialogs.Received(1).ShowOpenFileDialog(Arg.Any<string>(), Arg.Is<string>(x => x == "E:\\MySelectedFolder"));
     }
 
+    [CulturedFact(["de"])]
+    public void LoadDataCommand_RemoteAccountList_ContainsOnlyActiveAccounts()
+    {
+        var clock = Substitute.For<IClock>();
+        var projectData = new ProjectData(new Settings(), null!, null!, null!, clock, null!);
+        var bankAccount = new AccountDefinition
+        {
+            ID = 100, Name = "My Bank", Active = true, ImportMapping = Samples.SimpleImportConfiguration
+        };
+        var activeRemote = new AccountDefinition
+        {
+            ID = 601, Name = "New Shoes (Active)", Active = true, ImportMapping = Samples.SimpleImportConfiguration
+        };
+        var inactiveRemote = new AccountDefinition
+        {
+            ID = 600,
+            Name = "Old Shoes (Inactive)",
+            Active = false,
+            ImportMapping = Samples.SimpleImportConfiguration
+        };
+        projectData.Storage.Accounts =
+        [
+            new AccountingDataAccountGroup { Account = [bankAccount, activeRemote, inactiveRemote] }
+        ];
+        var dialogs = Substitute.For<IDialogs>();
+        dialogs.ShowOpenFileDialog(Arg.Any<string>(), Arg.Any<string>())
+            .Returns((DialogResult.OK, "test.csv"));
+        var fileSystem = Substitute.For<IFileSystem>();
+        var sut = new ImportBookingsViewModel(dialogs, fileSystem, projectData)
+        {
+            SelectedAccount = bankAccount, SelectedAccountNumber = bankAccount.ID
+        };
+        var validDate = sut.RangeMin.AddDays(5).ToString("dd.MM.yyyy", CultureInfo.CurrentUICulture);
+        var csvContent = $"Datum;Text;Betrag\n{validDate};Test Booking;-100,00";
+        fileSystem.ReadAllBytesFromFile(Arg.Any<string>())
+            .Returns(Encoding.UTF8.GetBytes(csvContent));
+
+        sut.LoadDataCommand.Execute(null);
+
+        sut.LoadedData.Should().ContainSingle()
+            .Which.Accounts.Should().BeEquivalentTo([new { ID = 601, Name = "New Shoes (Active)" }]);
+    }
+    
     [Fact]
     public void SetRemoteAccountsCommand_EntryNotMapped_CanExecute()
     {
@@ -264,8 +334,7 @@ public void SetRemoteAccountsCommand_EntryNotMapped_AccountsSelected()
             .BeEquivalentTo(
                 new object[]
                 {
-                    new { RemoteAccount = new { Name = "Bank account" } },
-                    new { RemoteAccount = (object)null },
+                    new { RemoteAccount = new { Name = "Bank account" } }, new { RemoteAccount = (object)null },
                     new { RemoteAccount = new { Name = "Shoes" } },
                     new { RemoteAccount = new { Name = "Friends debit" } }
                 });