Storyelement

AuthoringTool/Mapping/CachingMapper.cs

@@ -157,12 +157,22 @@ private void MapInternal(LearningWorld learningWorldEntity, ILearningWorldViewMo
                 .Where(kvP =>
                     learningWorldVm.LearningSpaces.First(s => s.Id == learningSpaceEntity.Id).ContainedLearningElements
                         .All(l => kvP.Value.Id != l.Id));
+            var newStoryElementsInSpaceEntity = learningSpaceEntity.LearningSpaceLayout.StoryElements
+                .Where(kvP =>
+                    learningWorldVm.LearningSpaces.First(s => s.Id == learningSpaceEntity.Id).LearningSpaceLayout
+                        .StoryElements.All(l => kvP.Value.Id != l.Value.Id));
             //for all elements in entity that are not in view model, check cache and insert to view model
             foreach (var e in newLearningElementsInSpaceEntity.Where(e => _cache.ContainsKey(e.Value.Id)))
             {
                 learningWorldVm.LearningSpaces.First(s => s.Id == learningSpaceEntity.Id).LearningSpaceLayout
                     .PutElement(e.Key, Get<LearningElementViewModel>(e.Value.Id));
             }
+
+            foreach (var e in newStoryElementsInSpaceEntity.Where(e => _cache.ContainsKey(e.Value.Id)))
+            {
+                learningWorldVm.LearningSpaces.First(s => s.Id == learningSpaceEntity.Id).LearningSpaceLayout
+                    .PutStoryElement(e.Key, Get<LearningElementViewModel>(e.Value.Id));
+            }
         }
 
         _mapper.Map(learningWorldEntity, learningWorldVm);

AuthoringTool/Mapping/EntityPersistEntityMappingProfile.cs

@@ -8,10 +8,12 @@
 using BusinessLogic.Entities.LearningContent.Adaptivity.Trigger;
 using BusinessLogic.Entities.LearningContent.FileContent;
 using BusinessLogic.Entities.LearningContent.LinkContent;
+using BusinessLogic.Entities.LearningContent.Story;
 using PersistEntities;
 using PersistEntities.LearningContent;
 using PersistEntities.LearningContent.Action;
 using PersistEntities.LearningContent.Question;
+using PersistEntities.LearningContent.Story;
 using PersistEntities.LearningContent.Trigger;
 
 namespace AuthoringTool.Mapping;
@@ -145,14 +147,23 @@ private void CreateLearningContentMap()
             .ReverseMap();
         CreateMap<LinkContent, LinkContentPe>()
             .ReverseMap();
+        CreateMap<StoryContent, StoryContentPe>()
+            .ReverseMap();
+
         CreateMap<FileContent, ILearningContentPe>()
             .As<FileContentPe>();
         CreateMap<LinkContent, ILearningContentPe>()
             .As<LinkContentPe>();
+        CreateMap<StoryContent, ILearningContentPe>()
+            .As<StoryContentPe>();
+
         CreateMap<FileContentPe, ILearningContent>()
             .As<FileContent>();
         CreateMap<LinkContentPe, ILearningContent>()
             .As<LinkContent>();
+        CreateMap<StoryContentPe, ILearningContent>()
+            .As<StoryContent>();
+
         CreateMap<ILearningContent, ILearningContentPe>()
             .IncludeAllDerived()
             .ReverseMap()

AuthoringTool/Mapping/FormModelEntityMappingProfile.cs

@@ -1,8 +1,11 @@
 using AutoMapper;
 using BusinessLogic.Entities;
+using BusinessLogic.Entities.LearningContent;
 using BusinessLogic.Entities.LearningContent.Adaptivity;
 using BusinessLogic.Entities.LearningContent.Adaptivity.Question;
+using BusinessLogic.Entities.LearningContent.FileContent;
 using BusinessLogic.Entities.LearningContent.LinkContent;
+using BusinessLogic.Entities.LearningContent.Story;
 using Presentation.Components.Adaptivity.Dialogues;
 using Presentation.Components.Adaptivity.Forms.Models;
 using Presentation.Components.Forms.Models;
@@ -30,7 +33,21 @@ private FormModelEntityMappingProfile()
     private void CreateContentMap()
     {
         CreateMap<LinkContentFormModel, LinkContent>();
+        CreateMap<FileContentFormModel, FileContent>();
         CreateMap<AdaptivityContentFormModel, AdaptivityContent>();
+        CreateMap<StoryContentFormModel, StoryContent>();
+
+        CreateMap<ILearningContentFormModel, ILearningContent>()
+            .IncludeAllDerived();
+
+        CreateMap<LinkContentFormModel, ILearningContent>()
+            .As<LinkContent>();
+        CreateMap<FileContentFormModel, ILearningContent>()
+            .As<FileContent>();
+        CreateMap<AdaptivityContentFormModel, ILearningContent>()
+            .As<AdaptivityContent>();
+        CreateMap<StoryContentFormModel, ILearningContent>()
+            .As<StoryContent>();
     }
 
     private void CreateElementMap()

AuthoringTool/Mapping/ViewModelEntityMappingProfile.cs

@@ -9,6 +9,7 @@
 using BusinessLogic.Entities.LearningContent.Adaptivity.Trigger;
 using BusinessLogic.Entities.LearningContent.FileContent;
 using BusinessLogic.Entities.LearningContent.LinkContent;
+using BusinessLogic.Entities.LearningContent.Story;
 using Presentation.PresentationLogic;
 using Presentation.PresentationLogic.AuthoringToolWorkspace;
 using Presentation.PresentationLogic.LearningContent;
@@ -18,6 +19,7 @@
 using Presentation.PresentationLogic.LearningContent.AdaptivityContent.Trigger;
 using Presentation.PresentationLogic.LearningContent.FileContent;
 using Presentation.PresentationLogic.LearningContent.LinkContent;
+using Presentation.PresentationLogic.LearningContent.Story;
 using Presentation.PresentationLogic.LearningElement;
 using Presentation.PresentationLogic.LearningPathway;
 using Presentation.PresentationLogic.LearningSpace;
@@ -68,7 +70,9 @@ private void CreateLearningSpaceLayoutMap()
             .ForMember(x => x.UsedIndices, opt => opt.Ignore())
             .ForMember(x => x.ContainedLearningElements, opt => opt.Ignore())
             .ForMember(x => x.LearningElements, opt => opt.Ignore())
-            .AfterMap(MapSpaceLayoutElements);
+            .ForMember(x => x.StoryElements, opt => opt.Ignore())
+            .AfterMap(MapSpaceLayoutElements)
+            .AfterMap(MapSpaceLayoutStoryElements);
         CreateMap<ILearningSpaceLayoutViewModel, LearningSpaceLayout>()
             .ForMember(x => x.ContainedLearningElements, opt => opt.Ignore());
 
@@ -107,25 +111,65 @@ private static void MapSpaceLayoutElements(ILearningSpaceLayout source, Learning
             .Union(destination.LearningElements)
             .ToDictionary(tup => tup.Key, tup => tup.Value);
     }
+
+    private static void MapSpaceLayoutStoryElements(ILearningSpaceLayout source, LearningSpaceLayoutViewModel destination,
+        ResolutionContext ctx)
+    {
+        //gather view models for all elements that are in source but not in destination
+        var sourceNewElementsViewModels = source.StoryElements
+            .Where(x => !SameIdAtSameIndexStory(destination, x))
+            .Select(tup =>
+                new KeyValuePair<int, ILearningElementViewModel>(tup.Key,
+                    ctx.Mapper.Map<LearningElementViewModel>(tup.Value)));
+
+        //remove all elements from destination that are not in source
+        foreach (var (key, _) in destination.StoryElements.Where(x =>
+                     !source.StoryElements.Any(y => y.Key == x.Key && y.Value.Id == x.Value.Id)))
+        {
+            destination.StoryElements.Remove(key);
+        }
+
+        //map all elements that are in source and destination already into the respective destination element
+        foreach (var (key, value) in destination.StoryElements)
+        {
+            var entity = source.StoryElements
+                .First(x => x.Key == key && x.Value.Id == value.Id);
+            ctx.Mapper.Map(entity.Value, value);
+        }
+
+        destination.StoryElements = sourceNewElementsViewModels
+            .Union(destination.StoryElements)
+            .ToDictionary(tup => tup.Key, tup => tup.Value);
+    }
 
     private static bool SameIdAtSameIndex(ILearningSpaceLayoutViewModel destination,
         KeyValuePair<int, ILearningElement> kvp) =>
         destination.LearningElements.Any(y => y.Key == kvp.Key && y.Value.Id == kvp.Value.Id);
+
+    private static bool SameIdAtSameIndexStory(ILearningSpaceLayoutViewModel destination,
+        KeyValuePair<int, ILearningElement> kvp) =>
+        destination.StoryElements.Any(y => y.Key == kvp.Key && y.Value.Id == kvp.Value.Id);
 
     private void CreateLearningContentMap()
     {
         CreateMap<FileContent, FileContentViewModel>()
             .ReverseMap();
         CreateMap<LinkContent, LinkContentViewModel>()
             .ReverseMap();
+        CreateMap<StoryContent, StoryContentViewModel>()
+            .ReverseMap();
         CreateMap<FileContent, ILearningContentViewModel>()
             .As<FileContentViewModel>();
         CreateMap<LinkContent, ILearningContentViewModel>()
             .As<LinkContentViewModel>();
+        CreateMap<StoryContent, ILearningContentViewModel>()
+            .As<StoryContentViewModel>();
         CreateMap<FileContentViewModel, ILearningContent>()
             .As<FileContent>();
         CreateMap<LinkContentViewModel, ILearningContent>()
             .As<LinkContent>();
+        CreateMap<StoryContentViewModel, ILearningContent>()
+            .As<StoryContent>();
         CreateMap<ILearningContent, ILearningContentViewModel>()
             .IncludeAllDerived()
             .ReverseMap()
@@ -246,10 +290,16 @@ private void CreateLearningSpaceMap()
             .EqualityComparison((x, y) => x.Id == y.Id)
             .AfterMap((_, d) =>
             {
+                //set mapped parent object for learning element
                 foreach (var element in d.ContainedLearningElements)
                 {
                     element.Parent = d;
                 }
+                //analogous for story
+                foreach (var (_, se) in d.LearningSpaceLayout.StoryElements)
+                {
+                    se.Parent = d;
+                }
             })
             .ReverseMap()
             .EqualityComparison((x, y) => x.Id == y.Id)
@@ -262,6 +312,11 @@ private void CreateLearningSpaceMap()
                 {
                     element.Parent = d;
                 }
+
+                foreach (var (_, se) in d.LearningSpaceLayout.StoryElements)
+                {
+                    se.Parent = d;
+                }
             });
         CreateMap<ILearningSpaceViewModel, LearningSpace>()
             .IncludeBase<IObjectInPathWayViewModel, IObjectInPathWay>()
@@ -276,6 +331,11 @@ private void CreateLearningSpaceMap()
                 {
                     element.Parent = d;
                 }
+
+                foreach (var (_, se) in d.LearningSpaceLayout.StoryElements)
+                {
+                    se.Parent = d;
+                }
             });
         CreateMap<ILearningSpace, LearningSpaceViewModel>()
             .ForMember(x => x.InBoundObjects, opt => opt.Ignore())
@@ -291,6 +351,11 @@ private void CreateLearningSpaceMap()
                 {
                     element.Parent = d;
                 }
+
+                foreach (var (_, se) in d.LearningSpaceLayout.StoryElements)
+                {
+                    se.Parent = d;
+                }
             });
     }
 

AuthoringTool/Mapping/ViewModelFormModelMappingProfile.cs

@@ -2,9 +2,12 @@
 using Presentation.Components.Adaptivity.Dialogues;
 using Presentation.Components.Adaptivity.Forms.Models;
 using Presentation.Components.Forms.Models;
+using Presentation.PresentationLogic.LearningContent;
 using Presentation.PresentationLogic.LearningContent.AdaptivityContent;
 using Presentation.PresentationLogic.LearningContent.AdaptivityContent.Question;
+using Presentation.PresentationLogic.LearningContent.FileContent;
 using Presentation.PresentationLogic.LearningContent.LinkContent;
+using Presentation.PresentationLogic.LearningContent.Story;
 using Presentation.PresentationLogic.LearningElement;
 using Presentation.PresentationLogic.LearningSpace;
 using Presentation.PresentationLogic.LearningWorld;
@@ -33,13 +36,50 @@ private void CreateContentMap()
     {
         CreateMap<LinkContentViewModel, LinkContentFormModel>()
             .ReverseMap();
-        CreateMap<AdaptivityContentViewModel, AdaptivityContentFormModel>();
+        CreateMap<AdaptivityContentViewModel, AdaptivityContentFormModel>()
+            .ReverseMap();
+        CreateMap<FileContentViewModel, FileContentFormModel>()
+            .ReverseMap();
+        CreateMap<StoryContentViewModel, StoryContentFormModel>()
+            .ReverseMap();
+
+        CreateMap<ILearningContentViewModel, ILearningContentFormModel>()
+            .IncludeAllDerived()
+            .ReverseMap()
+            .IncludeAllDerived();
+
+        CreateMap<LinkContentViewModel, ILearningContentFormModel>()
+            .As<LinkContentFormModel>();
+        CreateMap<FileContentViewModel, ILearningContentFormModel>()
+            .As<FileContentFormModel>();
+        CreateMap<AdaptivityContentViewModel, ILearningContentFormModel>()
+            .As<AdaptivityContentFormModel>();
+        CreateMap<StoryContentViewModel, ILearningContentFormModel>()
+            .As<StoryContentFormModel>();
+
+        CreateMap<LinkContentFormModel, ILearningContentViewModel>()
+            .As<LinkContentViewModel>();
+        CreateMap<FileContentFormModel, ILearningContentViewModel>()
+            .As<FileContentViewModel>();
+        CreateMap<AdaptivityContentFormModel, ILearningContentViewModel>()
+            .As<AdaptivityContentViewModel>();
+        CreateMap<StoryContentFormModel, ILearningContentViewModel>()
+            .As<StoryContentViewModel>();
     }
 
     private void CreateElementMap()
     {
         CreateMap<LearningElementViewModel, LearningElementFormModel>()
+            .ForMember(x => x.LearningContent, opt => opt.Ignore())
+            .AfterMap(MapContent)
             .ReverseMap();
+        return;
+
+        void MapContent(LearningElementViewModel source, LearningElementFormModel dest, ResolutionContext ctx)
+        {
+            dest.LearningContent =
+                ctx.Mapper.Map<ILearningContentFormModel>(source.LearningContent);
+        }
     }
 
     private void CreateSpaceMap()

AuthoringToolTest/AuthoringToolTest.csproj

@@ -8,6 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="AgileObjects.ReadableExpressions" Version="4.1.1" />
         <PackageReference Include="AutoMapper" Version="11.0.1" />
         <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
         <PackageReference Include="bunit" Version="1.23.9" />

AuthoringToolTest/Mapping/EntityPersistEntityMappingProfileUt.cs

@@ -151,7 +151,8 @@ public void MapLearningSpaceAndLearningSpacePersistEntity_WithLearningElement_Te
     {
         var systemUnderTest = CreateTestableMapper();
         var source = new LearningSpace(Name, Description, Goals, RequiredPoints, Theme.Campus,
-            new LearningSpaceLayout(new Dictionary<int, ILearningElement>(), FloorPlanEnum.R_20X30_8L),
+            new LearningSpaceLayout(new Dictionary<int, ILearningElement>(), new Dictionary<int, ILearningElement>(),
+                FloorPlanEnum.R_20X30_8L),
             positionX: PositionX, positionY: PositionY, inBoundSpaces: new List<IObjectInPathWay>(),
             outBoundSpaces: new List<IObjectInPathWay>());
         source.LearningSpaceLayout.LearningElements[0] = GetTestableElementWithParent(source);
@@ -520,7 +521,8 @@ private static LearningElementPe GetTestableElementPersistEntity()
     private static LearningSpace GetTestableSpace()
     {
         var space = new LearningSpace(Name, Description, Goals, RequiredPoints, Theme.Campus,
-            new LearningSpaceLayout(new Dictionary<int, ILearningElement>(), FloorPlanEnum.R_20X30_8L),
+            new LearningSpaceLayout(new Dictionary<int, ILearningElement>(), new Dictionary<int, ILearningElement>(),
+                FloorPlanEnum.R_20X30_8L),
             positionX: PositionX, positionY: PositionY);
         var element = GetTestableElementWithParent(space);
         space.LearningSpaceLayout.LearningElements[0] = element;
@@ -538,6 +540,7 @@ private static LearningSpacePe GetTestableNewSpacePersistEntity()
                         GetTestableElementPersistEntity()
                     }
                 },
+                new Dictionary<int, ILearningElementPe>(),
                 FloorPlanEnum.R_20X30_8L), positionX: NewPositionX, positionY: NewPositionY);
     }
 

AuthoringToolTest/Mapping/FormModelEntityMappingProfileUt.cs

@@ -1,8 +1,12 @@
+using AgileObjects.ReadableExpressions;
 using AuthoringTool.Mapping;
 using AutoMapper;
+using BusinessLogic.Entities;
 using BusinessLogic.Entities.LearningContent.Adaptivity.Question;
 using NUnit.Framework;
+using Presentation.Components.Forms.Models;
 using Presentation.PresentationLogic.LearningContent.AdaptivityContent.Question;
+using Presentation.PresentationLogic.LearningElement;
 using TestHelpers;
 
 namespace AuthoringToolTest.Mapping;
@@ -13,6 +17,32 @@ public class FormModelEntityMappingProfileUt
     private const string QuestionText = "questionText";
     private const int ExpectedCompletionTime = 10;
 
+    // [Test]
+    // public void Constructor_TestConfigurationisValid()
+    // {
+    //     var mapper = new MapperConfiguration(cfg =>
+    //     {
+    //         FormModelEntityMappingProfile.Configure(cfg);
+    //         cfg.AddCollectionMappersOnce();
+    //     });
+    //     
+    //     Assert.That(() => mapper.AssertConfigurationIsValid(), Throws.Nothing);
+    // }
+
+    [Test]
+    public void Debug()
+    {
+        var mapper = new MapperConfiguration(cfg =>
+        {
+            FormModelEntityMappingProfile.Configure(cfg);
+            ViewModelFormModelMappingProfile.Configure(cfg);
+            cfg.AddCollectionMappersOnce();
+        });
+
+        var executionPlan = mapper.BuildExecutionPlan(typeof(LearningElementFormModel), typeof(LearningElement));
+        var plan = executionPlan.ToReadableString();
+    }
+
     [Test]
     public void MultipleChoiceQuestion_SingleResponse_TestMappingIsValid()
     {