Merge pull request #124 from Tech-Fabric/feature/2027-machineName-in-…

…categorypath Feature/2027 machine name in categorypath
Tech-Fabric · Sep 6, 2023 · a655a0c · a655a0c
2 parents 7bbff18 + 437d2ac
commit a655a0c
Show file tree

Hide file tree

Showing 41 changed files with 2,315 additions and 1,724 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ on:
     branches: [ "main" ]
 
 env:
-  PACKAGE_VERSION: 1.2.13
+  PACKAGE_VERSION: 1.3.0
 
 jobs:
 

diff --git a/CloudFabric.EAV.Domain/CloudFabric.EAV.Domain.LocalEventSourcingPackages.csproj b/CloudFabric.EAV.Domain/CloudFabric.EAV.Domain.LocalEventSourcingPackages.csproj
@@ -21,7 +21,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
         <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
         <PackageReference Include="System.Text.Json" Version="6.0.2" />
     </ItemGroup>

diff --git a/CloudFabric.EAV.Domain/CloudFabric.EAV.Domain.csproj b/CloudFabric.EAV.Domain/CloudFabric.EAV.Domain.csproj
@@ -12,8 +12,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="CloudFabric.EventSourcing.Domain" Version="0.1.2" />
-        <PackageReference Include="CloudFabric.Projections" Version="0.1.2" />
+        <PackageReference Include="CloudFabric.EventSourcing.Domain" Version="0.2.0" />
+        <PackageReference Include="CloudFabric.Projections" Version="0.2.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
         <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
         <PackageReference Include="System.Text.Json" Version="7.0.2" />

diff --git a/CloudFabric.EAV.Domain/Events/Instance/CategoryCreated.cs b/CloudFabric.EAV.Domain/Events/Instance/CategoryCreated.cs
@@ -0,0 +1,30 @@
+using CloudFabric.EventSourcing.EventStore;
+
+namespace CloudFabric.EAV.Domain.Models;
+
+public record CategoryCreated : Event
+{
+    public CategoryCreated()
+    {
+
+    }
+
+    public CategoryCreated(Guid id,
+        string machineName,
+        Guid entityConfigurationId,
+        List<AttributeInstance> attributes,
+        Guid? tenantId)
+    {
+        TenantId = tenantId;
+        Attributes = attributes;
+        EntityConfigurationId = entityConfigurationId;
+        AggregateId = id;
+        MachineName = machineName;
+    }
+
+    public Guid EntityConfigurationId { get; set; }
+    public List<AttributeInstance> Attributes { get; set; }
+    public Guid? TenantId { get; set; }
+    public string MachineName { get; set; }
+
+}
diff --git a/CloudFabric.EAV.Domain/Events/Instance/Entity/EntityCategoryPathChanged.cs b/CloudFabric.EAV.Domain/Events/Instance/Entity/EntityCategoryPathChanged.cs
@@ -10,16 +10,24 @@ public EntityCategoryPathChanged()
     {
     }
 
-    public EntityCategoryPathChanged(Guid id, Guid entityConfigurationId, Guid categoryTreeId, string categoryPath)
+    public EntityCategoryPathChanged(Guid id,
+        Guid entityConfigurationId,
+        Guid categoryTreeId,
+        string categoryPath,
+        Guid? parentId)
     {
         AggregateId = id;
         EntityConfigurationId = entityConfigurationId;
         CategoryPath = categoryPath;
         CategoryTreeId = categoryTreeId;
+        ParentId = parentId;
+        ParentMachineName = string.IsNullOrEmpty(categoryPath) ? "" : categoryPath.Split('/').Last(x => !string.IsNullOrEmpty(x));
     }
 
     public string CategoryPath { get; set; }
     public Guid EntityConfigurationId { get; set; }
 
     public Guid CategoryTreeId { get; set; }
+    public Guid? ParentId { get; set; }
+    public string ParentMachineName { get; set; }
 }
diff --git a/CloudFabric.EAV.Domain/Models/Attributes/ValueFromListOptionConfiguration.cs b/CloudFabric.EAV.Domain/Models/Attributes/ValueFromListOptionConfiguration.cs
@@ -1,5 +1,7 @@
 using System.Text.RegularExpressions;
 
+using CloudFabric.EAV.Domain.Utilities.Extensions;
+
 namespace CloudFabric.EAV.Domain.Models.Attributes;
 
 public class ValueFromListOptionConfiguration
@@ -11,9 +13,7 @@ public ValueFromListOptionConfiguration(string name, string? machineName)
 
         if (string.IsNullOrEmpty(machineName))
         {
-            machineName = name.Replace(" ", "_");
-            var specSymbolsRegex = new Regex("[^\\d\\w_]*", RegexOptions.None, TimeSpan.FromMilliseconds(100));
-            machineName = specSymbolsRegex.Replace(machineName, "").ToLower();
+            machineName = name.SanitizeForMachineName();
         }
 
         MachineName = machineName;

diff --git a/CloudFabric.EAV.Domain/Models/Category.cs b/CloudFabric.EAV.Domain/Models/Category.cs
@@ -5,24 +5,42 @@ namespace CloudFabric.EAV.Domain.Models;
 
 public class Category : EntityInstanceBase
 {
+    public string MachineName { get; set; }
     public Category(IEnumerable<IEvent> events) : base(events)
     {
     }
 
-    public Category(Guid id, Guid entityConfigurationId, List<AttributeInstance> attributes, Guid? tenantId)
-        : base(id, entityConfigurationId, attributes, tenantId)
+    public Category(Guid id,
+        string machineName,
+        Guid entityConfigurationId,
+        List<AttributeInstance> attributes,
+        Guid? tenantId)
     {
+        Apply(new CategoryCreated(id, machineName, entityConfigurationId, attributes, tenantId));
+
     }
 
     public Category(
         Guid id,
+        string machineName,
         Guid entityConfigurationId,
         List<AttributeInstance> attributes,
         Guid? tenantId,
         string categoryPath,
+        Guid? parentId,
         Guid categoryTreeId
-    ) : base(id, entityConfigurationId, attributes, tenantId)
+    ) : this(id, machineName, entityConfigurationId, attributes, tenantId)
+    {
+        Apply(new EntityCategoryPathChanged(id, EntityConfigurationId, categoryTreeId, categoryPath, parentId));
+    }
+
+    public void On(CategoryCreated @event)
     {
-        Apply(new EntityCategoryPathChanged(id, EntityConfigurationId, categoryTreeId, categoryPath));
+        Id = @event.AggregateId;
+        EntityConfigurationId = @event.EntityConfigurationId;
+        Attributes = new List<AttributeInstance>(@event.Attributes).AsReadOnly();
+        TenantId = @event.TenantId;
+        CategoryPaths = new List<CategoryPath>();
+        MachineName = @event.MachineName;
     }
 }
diff --git a/CloudFabric.EAV.Domain/Models/CategoryPath.cs b/CloudFabric.EAV.Domain/Models/CategoryPath.cs
@@ -4,4 +4,6 @@ public class CategoryPath
 {
     public Guid TreeId { get; set; }
     public string Path { get; set; }
+    public Guid? ParentId { get; set; }
+    public string ParentMachineName { get; set; }
 }
diff --git a/CloudFabric.EAV.Domain/Models/EntityInstanceBase.cs b/CloudFabric.EAV.Domain/Models/EntityInstanceBase.cs
@@ -9,7 +9,7 @@ namespace CloudFabric.EAV.Domain.Models;
 
 public class EntityInstanceBase : AggregateBase
 {
-    public EntityInstanceBase(IEnumerable<IEvent> events) : base(events)
+        public EntityInstanceBase(IEnumerable<IEvent> events) : base(events)
     {
     }
 
@@ -19,6 +19,10 @@ public EntityInstanceBase(Guid id, Guid entityConfigurationId, List<AttributeIns
         Apply(new EntityInstanceCreated(id, entityConfigurationId, attributes, tenantId));
     }
 
+    protected EntityInstanceBase()
+    {
+    }
+
     public override string PartitionKey => EntityConfigurationId.ToString();
     public List<CategoryPath> CategoryPaths { get; protected set; }
 
@@ -54,21 +58,27 @@ public void On(EntityInstanceCreated @event)
         CategoryPaths = new List<CategoryPath>();
     }
 
-    public void ChangeCategoryPath(Guid treeId, string categoryPath)
+    public void ChangeCategoryPath(Guid treeId, string categoryPath, Guid parentId)
     {
-        Apply(new EntityCategoryPathChanged(Id, EntityConfigurationId, treeId, categoryPath));
+        Apply(new EntityCategoryPathChanged(Id, EntityConfigurationId, treeId, categoryPath, parentId));
     }
 
     public void On(EntityCategoryPathChanged @event)
     {
         CategoryPath? categoryPath = CategoryPaths.FirstOrDefault(x => x.TreeId == @event.CategoryTreeId);
         if (categoryPath == null)
         {
-            CategoryPaths.Add(new CategoryPath { TreeId = @event.CategoryTreeId, Path = @event.CategoryPath });
+            CategoryPaths.Add(new CategoryPath { TreeId = @event.CategoryTreeId,
+                Path = @event.CategoryPath,
+                ParentId = @event.ParentId,
+                ParentMachineName = @event.ParentMachineName
+            });
         }
         else
         {
             categoryPath.Path = @event.CategoryPath;
+            categoryPath.ParentMachineName = @event.ParentMachineName;
+            categoryPath.ParentId = @event.ParentId;
         }
     }
 

diff --git a/...n/Projections/AttributeConfigurationProjection/AttributeConfigurationProjectionBuilder.cs b/...n/Projections/AttributeConfigurationProjection/AttributeConfigurationProjectionBuilder.cs
@@ -26,8 +26,9 @@ public class AttributeConfigurationProjectionBuilder : ProjectionBuilder<Attribu
     IHandleEvent<EntityConfigurationAttributeRemoved>
 {
     public AttributeConfigurationProjectionBuilder(
-        ProjectionRepositoryFactory projectionRepositoryFactory, AggregateRepositoryFactory _
-    ) : base(projectionRepositoryFactory)
+        ProjectionRepositoryFactory projectionRepositoryFactory,
+        ProjectionOperationIndexSelector indexSelector
+    ) : base(projectionRepositoryFactory, indexSelector)
     {
     }
 

diff --git a/....Domain/Projections/EntityConfigurationProjection/EntityConfigurationProjectionBuilder.cs b/....Domain/Projections/EntityConfigurationProjection/EntityConfigurationProjectionBuilder.cs
@@ -15,8 +15,9 @@ public class EntityConfigurationProjectionBuilder : ProjectionBuilder<EntityConf
     IHandleEvent<AggregateUpdatedEvent<EntityConfiguration>>
 {
     public EntityConfigurationProjectionBuilder(
-        ProjectionRepositoryFactory projectionRepositoryFactory, AggregateRepositoryFactory _
-    ) : base(projectionRepositoryFactory)
+        ProjectionRepositoryFactory projectionRepositoryFactory,
+        ProjectionOperationIndexSelector indexSelector
+    ) : base(projectionRepositoryFactory, indexSelector)
     {
     }
 

diff --git a/...Fabric.EAV.Domain/Projections/EntityInstanceProjection/EntityInstanceProjectionBuilder.cs b/...Fabric.EAV.Domain/Projections/EntityInstanceProjection/EntityInstanceProjectionBuilder.cs
@@ -31,7 +31,8 @@ namespace CloudFabric.EAV.Domain.Projections.EntityInstanceProjection;
 /// </summary>
 public class EntityInstanceProjectionBuilder : ProjectionBuilder,
     IHandleEvent<EntityInstanceCreated>,
-    // IHandleEvent<AttributeInstanceAdded>,
+    IHandleEvent<CategoryCreated>,
+// IHandleEvent<AttributeInstanceAdded>,
     IHandleEvent<AttributeInstanceUpdated>,
     // IHandleEvent<AttributeInstanceRemoved>,
     IHandleEvent<EntityCategoryPathChanged>,
@@ -41,8 +42,9 @@ public class EntityInstanceProjectionBuilder : ProjectionBuilder,
 
     public EntityInstanceProjectionBuilder(
         ProjectionRepositoryFactory projectionRepositoryFactory,
-        AggregateRepositoryFactory aggregateRepositoryFactory
-    ) : base(projectionRepositoryFactory)
+        AggregateRepositoryFactory aggregateRepositoryFactory,
+        ProjectionOperationIndexSelector indexSelector
+    ) : base(projectionRepositoryFactory, indexSelector)
     {
         _aggregateRepositoryFactory = aggregateRepositoryFactory;
     }
@@ -134,14 +136,20 @@ await UpdateDocument(
                 List<CategoryPath> categoryPaths =
                     categoryPathsObj as List<CategoryPath> ?? new List<CategoryPath>();
                 CategoryPath? categoryPath = categoryPaths.FirstOrDefault(x => x.TreeId == @event.CategoryTreeId);
+
                 if (categoryPath == null)
                 {
-                    categoryPaths.Add(new CategoryPath { Path = @event.CategoryPath, TreeId = @event.CategoryTreeId }
-                    );
+                    categoryPaths.Add(new CategoryPath { TreeId = @event.CategoryTreeId,
+                        Path = @event.CategoryPath,
+                        ParentId = @event.ParentId,
+                        ParentMachineName = @event.ParentMachineName
+                    });
                 }
                 else
                 {
                     categoryPath.Path = @event.CategoryPath;
+                    categoryPath.ParentMachineName = @event.ParentMachineName;
+                    categoryPath.ParentId = @event.ParentId;
                 }
 
                 document["CategoryPaths"] = categoryPaths;
@@ -177,6 +185,35 @@ await UpsertDocument(
         );
     }
 
+    public async Task On(CategoryCreated @event)
+    {
+        ProjectionDocumentSchema projectionDocumentSchema =
+            await BuildProjectionDocumentSchemaForEntityConfigurationIdAsync(
+                @event.EntityConfigurationId
+            ).ConfigureAwait(false);
+
+        var document = new Dictionary<string, object?>
+        {
+            { "Id", @event.AggregateId },
+            { "EntityConfigurationId", @event.EntityConfigurationId },
+            { "TenantId", @event.TenantId },
+            { "CategoryPaths", new List<CategoryPath>() },
+            { "MachineName", @event.MachineName},
+        };
+
+        foreach (AttributeInstance attribute in @event.Attributes)
+        {
+            document.Add(attribute.ConfigurationAttributeMachineName, attribute.GetValue());
+        }
+
+        await UpsertDocument(
+            projectionDocumentSchema,
+            document,
+            @event.PartitionKey,
+            @event.Timestamp
+        );
+    }
+
     private async Task<ProjectionDocumentSchema> BuildProjectionDocumentSchemaForEntityConfigurationIdAsync(
         Guid entityConfigurationId
     )

diff --git a/...bric.EAV.Domain/Projections/EntityInstanceProjection/ProjectionAttributesSchemaFactory.cs b/...bric.EAV.Domain/Projections/EntityInstanceProjection/ProjectionAttributesSchemaFactory.cs
@@ -240,6 +240,7 @@ public static ProjectionDocumentPropertySchema GetArrayAttributeSchema(
             EavAttributeType.HtmlText => null,
             EavAttributeType.EntityReference => null,
             EavAttributeType.ValueFromList => null,
+            EavAttributeType.Money => null,
             EavAttributeType.LocalizedText => GetLocalizedTextAttributeNestedProperties(),
             EavAttributeType.DateRange => GetDateAttributeNestedProperties(),
             EavAttributeType.Image => GetImageAttributeNestedProperties(),
@@ -441,6 +442,22 @@ private static List<ProjectionDocumentPropertySchema> GetCategoryPathsNestedProp
                 IsRetrievable = true,
                 IsFilterable = true,
                 IsSortable = true
+            },
+            new ()
+            {
+                PropertyName = "ParentMachineName",
+                PropertyType = TypeCode.String,
+                IsRetrievable = true,
+                IsFilterable = true,
+                IsSortable = true
+            },
+            new ()
+            {
+                PropertyName = "ParentId",
+                PropertyType = TypeCode.Object,
+                IsRetrievable = true,
+                IsFilterable = true,
+                IsSortable = true
             }
         };
     }

diff --git a/...Fabric.EAV.Domain/Projections/EntityInstanceProjection/ProjectionDocumentSchemaFactory.cs b/...Fabric.EAV.Domain/Projections/EntityInstanceProjection/ProjectionDocumentSchemaFactory.cs
@@ -44,10 +44,25 @@ List<AttributeConfiguration> attributeConfigurations
             }
         );
 
+        schema.Properties.Add(
+            new ProjectionDocumentPropertySchema
+            {
+                PropertyName = "MachineName",
+                PropertyType = TypeCode.String,
+                IsKey = false,
+                IsSearchable = true,
+                IsRetrievable = true,
+                IsFilterable = true,
+                IsSortable = false,
+                IsFacetable = false
+            }
+        );
+
         schema.Properties.Add(
             ProjectionAttributesSchemaFactory.GetCategoryPathsAttributeSchema()
         );
 
+
         schema.Properties.Add(
             new ProjectionDocumentPropertySchema
             {

diff --git a/CloudFabric.EAV.Domain/Utilities/Extensions/StringExtensions.cs b/CloudFabric.EAV.Domain/Utilities/Extensions/StringExtensions.cs
@@ -0,0 +1,12 @@
+using System.Text.RegularExpressions;
+
+namespace CloudFabric.EAV.Domain.Utilities.Extensions;
+
+public static class StringExtensions
+{
+    public static string SanitizeForMachineName(this string str)
+    {
+        var specSymbolsRegex = new Regex("[^\\d\\w_]*", RegexOptions.None, TimeSpan.FromMilliseconds(100));
+        return specSymbolsRegex.Replace(str.Replace(" ", "_"), "").ToLower();
+    }
+}
diff --git a/CloudFabric.EAV.Models/CloudFabric.EAV.Models.LocalEventSourcingPackages.csproj b/CloudFabric.EAV.Models/CloudFabric.EAV.Models.LocalEventSourcingPackages.csproj
@@ -20,7 +20,7 @@
     <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
         <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
         <PackageReference Include="System.Text.Json" Version="6.0.2" />
     </ItemGroup>