Fixes #1832 individual serialization (#1847)

* Fixes #1832 individual serialization

* PR feedback

src/OSPSuite.Core/Domain/Builder/IndividualBuildingBlock.cs

@@ -1,11 +1,7 @@
-using OSPSuite.Utility.Collections;
-
-namespace OSPSuite.Core.Domain.Builder
+namespace OSPSuite.Core.Domain.Builder
 {
    public class IndividualBuildingBlock : PathAndValueEntityBuildingBlockFromPKSim<IndividualParameter>
    {
-      public Cache<string, string> OriginData { set; get; } = new Cache<string, string>();
-      public ValueOrigin ValueOrigin { set; get; }
-      public CalculationMethodCache CalculationMethodCache { set; get; }
+      public OriginDataItems OriginData { get; } = new OriginDataItems();
    }
 }

src/OSPSuite.Core/Domain/Builder/OriginDataItem.cs

@@ -0,0 +1,11 @@
+namespace OSPSuite.Core.Domain.Builder
+{
+   public class OriginDataItem
+   {
+      public string Name { get; set; }
+      public string DisplayName { get; set; }
+      public string Description { get; set; }
+      public string Icon { get; set; }
+      public string Value { get; set; }
+   }
+}

src/OSPSuite.Core/Domain/Builder/OriginDataItems.cs

@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+using System.Linq;
+using OSPSuite.Utility.Collections;
+
+namespace OSPSuite.Core.Domain.Builder
+{
+   public class OriginDataItems
+   {
+      private readonly Cache<string, OriginDataItem> _cache = new Cache<string, OriginDataItem>(getKey: x => x.Name);
+
+      public IReadOnlyList<OriginDataItem> AllDataItems => _cache.ToList();
+
+      public ValueOrigin ValueOrigin { set; get; }
+
+      public void AddOriginDataItem(OriginDataItem originDataItem)
+      {
+         _cache[originDataItem.Name]= originDataItem;
+      }
+   }
+}

src/OSPSuite.Core/Serialization/Xml/BuildingBlockXmlSerializer.cs

@@ -98,7 +98,25 @@ public override void PerformMapping()
       }
    }
 
-   public class ExpressionProfileBuildingBlockXmlSerializer : BuildingBlockXmlSerializer<ExpressionProfileBuildingBlock, ExpressionParameter>
+   public class PathAndValueEntityBuildingBlockFromPKSimXmlSerializer<TBuildingBlock, TBuilder> : BuildingBlockXmlSerializer<TBuildingBlock, TBuilder> where TBuilder : PathAndValueEntity where TBuildingBlock : PathAndValueEntityBuildingBlockFromPKSim<TBuilder>
+   {
+      public override void PerformMapping()
+      {
+         base.PerformMapping();
+         Map(x => x.PKSimVersion);
+      }
+   }
+
+   public class IndividualBuildingBlockXmlSerializer : PathAndValueEntityBuildingBlockFromPKSimXmlSerializer<IndividualBuildingBlock, IndividualParameter>
+   {
+      public override void PerformMapping()
+      {
+         base.PerformMapping();
+         Map(x => x.OriginData);
+      }
+   }
+
+   public class ExpressionProfileBuildingBlockXmlSerializer : PathAndValueEntityBuildingBlockFromPKSimXmlSerializer<ExpressionProfileBuildingBlock, ExpressionParameter>
    {
       public override void PerformMapping()
       {

src/OSPSuite.Core/Serialization/Xml/ExpressionParameterXmlSerializer.cs

@@ -4,10 +4,5 @@ namespace OSPSuite.Core.Serialization.Xml
 {
    public class ExpressionParameterXmlSerializer : PathAndValueEntityXmlSerializer<ExpressionParameter>
    {
-      public override void PerformMapping()
-      {
-         base.PerformMapping();
-         Map(x => x.Value);
-      }
    }
 }

src/OSPSuite.Core/Serialization/Xml/IndividualParameterXmlSerializer.cs

@@ -0,0 +1,9 @@
+using OSPSuite.Core.Domain.Builder;
+
+namespace OSPSuite.Core.Serialization.Xml
+{
+   public class IndividualParameterXmlSerializer : PathAndValueEntityXmlSerializer<IndividualParameter>
+   {
+
+   }
+}

src/OSPSuite.Core/Serialization/Xml/OriginDataItemXmlSerializer.cs

@@ -0,0 +1,16 @@
+using OSPSuite.Core.Domain.Builder;
+
+namespace OSPSuite.Core.Serialization.Xml
+{
+   public class OriginDataItemXmlSerializer : OSPSuiteXmlSerializer<OriginDataItem>
+   {
+      public override void PerformMapping()
+      {
+         Map(x => x.Value);
+         Map(x => x.Description);
+         Map(x => x.Name);
+         Map(x => x.DisplayName);
+         Map(x => x.Icon);
+      }
+   }
+}

src/OSPSuite.Core/Serialization/Xml/OriginDataItemsXmlSerializer.cs

@@ -0,0 +1,22 @@
+using OSPSuite.Core.Domain.Builder;
+
+namespace OSPSuite.Core.Serialization.Xml
+{
+   public class OriginDataItemsXmlSerializer : OSPSuiteXmlSerializer<OriginDataItems>
+   {
+      protected OriginDataItemsXmlSerializer(string name)
+         : base(name)
+      {
+      }
+
+      protected OriginDataItemsXmlSerializer() 
+      {
+      }
+
+      public override void PerformMapping()
+      {
+         Map(x => x.ValueOrigin);
+         MapEnumerable(x => x.AllDataItems, x=> x.AddOriginDataItem);
+      }
+   }
+}

src/OSPSuite.Core/Serialization/Xml/PathAndValueEntityXmlSerializer.cs

@@ -10,6 +10,7 @@ public override void PerformMapping()
          Map(x => x.Dimension);
          Map(x => x.ContainerPath);
          MapReference(x => x.Formula);
+         Map(x => x.Value);
       }
    }
 }