Do not accept invalid units #982 (#986)

* Do not accept invalid units #982 * better using dimension factory to check if the unit exists
Open-Systems-Pharmacology · Apr 29, 2021 · 062aa03 · 062aa03
1 parent 4948aeb
commit 062aa03
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 3 deletions.
diff --git a/src/OSPSuite.Infrastructure.Import/Core/DataFormat/MixColumnsDataFormat.cs b/src/OSPSuite.Infrastructure.Import/Core/DataFormat/MixColumnsDataFormat.cs
@@ -1,6 +1,6 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
+using OSPSuite.Core.Domain.UnitSystem;
 using OSPSuite.Infrastructure.Import.Core.Extensions;
 using System.Text.RegularExpressions;
 using OSPSuite.Core.Import;
@@ -12,7 +12,12 @@ public class MixColumnsDataFormat : AbstractColumnsDataFormat
       private const string _name = "Mixin";
       private const string _description = "https://github.com/Open-Systems-Pharmacology/OSPSuite.Core/issues/639\rhttps://github.com/Open-Systems-Pharmacology/OSPSuite.Core/issues/797";
       public override string Name => _name;
+      private IDimensionFactory _dimensionFactory;
       public override string Description => _description;
+      public MixColumnsDataFormat(IDimensionFactory dimensionFactory)
+      {
+         _dimensionFactory = dimensionFactory;
+      }
       protected override string ExtractLloq(string description, IUnformattedData data, List<string> keys, ref double rank)
       {
          if (data.GetColumn(description).Any(element => element.Trim().StartsWith("<")))
@@ -39,6 +44,7 @@ protected override UnitDescription ExtractUnits(string description, IUnformatted
                .Substring(1, units.Length - 2) //remove the brackets
                .Trim()                         //remove whitespace
                .Split(',')                     //split comma separated list
+               .Where(unitName => _dimensionFactory.DimensionForUnit(unitName) != null) //only accepts valid units
                .FirstOrDefault() ?? UnitDescription.InvalidUnit;     //default = ?
             rank++;
             return new UnitDescription(unit);

diff --git a/tests/OSPSuite.Presentation.Tests/Importer/Services/ImporterSpecs.cs b/tests/OSPSuite.Presentation.Tests/Importer/Services/ImporterSpecs.cs
@@ -11,6 +11,8 @@
 using OSPSuite.Infrastructure.Import.Core.Mappers;
 using OSPSuite.Presentation.Importer.Core.DataFormat;
 using OSPSuite.Utility.Collections;
+using OSPSuite.Core.Domain.UnitSystem;
+using OSPSuite.Core.Import;
 
 namespace OSPSuite.Presentation.Importer.Services 
 {
@@ -229,7 +231,7 @@ public override void GlobalContext()
             new MetaDataCategory() {Name = "Route"}
          };
 
-         A.CallTo(() => _container.ResolveAll<IDataFormat>()).Returns(new List<IDataFormat>() { new DataFormatHeadersWithUnits(), new DataFormatNonmem(), new MixColumnsDataFormat() });
+         A.CallTo(() => _container.ResolveAll<IDataFormat>()).Returns(new List<IDataFormat>() { new DataFormatHeadersWithUnits(), new DataFormatNonmem(), new MixColumnsDataFormat(new DimensionFactory()) });
          _parser = A.Fake<IDataSourceFileParser>();
          _dataRepositoryMapper = A.Fake<IDataSetToDataRepositoryMapper>();
          A.CallTo(() => _container.Resolve<IDataSourceFileParser>()).Returns(_parser);
@@ -374,4 +376,45 @@ public void rank_mixin_highest_for_its_format()
          formats.First().ShouldBeAnInstanceOf(typeof(MixColumnsDataFormat));
       }
    }
+
+   public class When_listing_available_formats_on_mixin_format_with_invalid_unit : ConcernForImporter2
+   {
+      protected override void Because()
+      {
+         _basicFormat = new TestUnformattedData
+         (
+            new Cache<string, ColumnDescription>()
+            {
+               {
+                  "Time [invalidUnit]",
+                  new ColumnDescription(5, null,ColumnDescription.MeasurementLevel.Numeric )
+               },
+               {
+                  "Concentration",
+                  new ColumnDescription(6, null, ColumnDescription.MeasurementLevel.Numeric)
+               },
+               {
+                  "Concentration_unit",
+                  new ColumnDescription(5, new List<string>() { "pmol/l" }, ColumnDescription.MeasurementLevel.Discrete)
+               },
+               {
+                  "Error",
+                  new ColumnDescription(7, null, ColumnDescription.MeasurementLevel.Numeric)
+               },
+               {
+                  "Error_unit",
+                  new ColumnDescription(5, new List<string>() { "pmol/l" }, ColumnDescription.MeasurementLevel.Discrete)
+
+               }
+            }
+         );
+      }
+
+      [TestCase]
+      public void the_invalid_unit_is_detected()
+      {
+         var formats = sut.AvailableFormats(_basicFormat, _columnInfos, _metaDataCategories);
+         (formats.First().Parameters.First(parameter => parameter.ColumnName == "Time [invalidUnit]") as MappingDataFormatParameter).MappedColumn.Unit.SelectedUnit.ShouldBeEqualTo(UnitDescription.InvalidUnit);
+      }
+   }
 }