Fix ConfigureComments method (#45)

Author: a-gubskiy

src/EntityFrameworkCore/BitzArt.XDoc.EntityFrameworkCore/Extensions/ModelBuilderExtensions.cs

@@ -1,5 +1,6 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
 
 namespace BitzArt.XDoc;
 
@@ -14,61 +15,82 @@ public static class ModelBuilderExtensions
     /// </summary>
     /// <param name="modelBuilder"></param>
     /// <param name="xDoc"></param>
-    public static void ConfigureComments(this ModelBuilder modelBuilder, XDoc xDoc)
+    public static ModelBuilder ConfigureComments(this ModelBuilder modelBuilder, XDoc xDoc)
     {
         var entityTypes = modelBuilder.Model.GetEntityTypes();
 
         foreach (var entityType in entityTypes)
         {
-            var typeDocumentation = xDoc.Get(entityType.ClrType);
+            ConfigureEntity(xDoc, entityType);
+        }
 
-            if (typeDocumentation is null)
-            {
-                continue;
-            }
+        return modelBuilder;
+    }
 
-            var entityComment = typeDocumentation.ToPlainText();
+    private static void ConfigureEntity(XDoc xDoc, IMutableEntityType entityType)
+    {
+        ConfigureEntityTypeComment(xDoc, entityType);
 
-            // For owned entities, we don't set the comment on the entity itself
-            // But we will set the comment on the properties
+        var properties = entityType.GetProperties();
 
-            var isOwned = entityType.IsOwned();
-            var tableName = entityType.GetTableName();
+        foreach (var property in properties)
+        {
+            ConfigureEntityPropertyComment(xDoc, entityType, property);
+        }
+    }
 
-            if (!isOwned && tableName is not null)
-            {
-                entityType.SetComment(entityComment);
-            }
+    private static void ConfigureEntityTypeComment(XDoc xDoc, IMutableEntityType entityType)
+    {
+        var typeDocumentation = xDoc.Get(entityType.ClrType);
 
-            var properties = entityType.GetProperties();
+        if (typeDocumentation is null) 
+        {
+            // No own xml-documentation
+            return;
+        }
+        
+        var isOwned = entityType.IsOwned();
+        var tableName = entityType.GetTableName();
 
-            foreach (var property in properties)
-            {
-                var isShadowProperty = property.IsShadowProperty();
+        if (isOwned || tableName is null)
+        {
+            // For owned entities, we don't set the comment on the entity itself
+            // But we will set the comment on the properties
+            
+            return;
+        }
+        
+        var entityComment = typeDocumentation.ToPlainText();
+            
+        entityType.SetComment(entityComment);
+    }
+    
+    private static void ConfigureEntityPropertyComment(XDoc xDoc, IMutableEntityType entityType, IMutableProperty property)
+    {
+        var isShadowProperty = property.IsShadowProperty();
 
-                if (isShadowProperty)
-                {
-                    continue;
-                }
+        if (isShadowProperty)
+        {
+            return;
+        }
 
-                var propertyInfo = entityType.ClrType.GetProperty(property.Name);
+        var propertyInfo = entityType.ClrType.GetProperty(property.Name);
 
-                if (propertyInfo is null)
-                {
-                    continue;
-                }
+        if (propertyInfo is null)
+        {
+            return;
+        }
 
-                var propertyDocumentation = xDoc.Get(propertyInfo);
+        var propertyDocumentation = xDoc.Get(propertyInfo);
 
-                if (propertyDocumentation is null)
-                {
-                    continue;
-                }
+        if (propertyDocumentation is null)
+        {
+            return;
+        }
 
-                var propertyComment = propertyDocumentation.ToPlainText();
+        var propertyComment = propertyDocumentation.ToPlainText();
 
-                property.SetComment(propertyComment);
-            }
-        }
+        property.SetComment(propertyComment);
     }
+    
 }