Fixed issue with DBset and table name discrepency

Author: jp-seini

Modules/Intent.Modules.EntityFrameworkCore/Intent.EntityFrameworkCore.imodspec

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package>
   <id>Intent.EntityFrameworkCore</id>
-  <version>5.0.32-pre.1</version>
+  <version>5.0.32-pre.2</version>
   <supportedClientVersions>[4.5.0-a, 5.0.0-a)</supportedClientVersions>
   <summary>Provides the Entity Framework Core, Object Relational Mapper framework</summary>
   <description>Provides the Entity Framework Core, Object Relational Mapper framework</description>

Modules/Intent.Modules.EntityFrameworkCore/Intent.Modules.EntityFrameworkCore.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <Version>5.0.32-pre.1</Version>
+    <Version>5.0.32-pre.2</Version>
     <Authors>Intent Architect</Authors>
     <Description>Base classes and helpers for building modules that output C# files for Intent Architect.</Description>
     <Copyright>Copyright 2022</Copyright>

Modules/Intent.Modules.EntityFrameworkCore/Templates/EntityTypeConfiguration/EntityTypeConfigurationTemplatePartial.cs

@@ -396,17 +396,28 @@ private bool IsTableInlined(ClassExtensionModel model)
 
         private bool RequiresToTableStatementForConvention(string className)
         {
-            switch (ExecutionContext.Settings.GetDatabaseSettings().TableNamingConvention().AsEnum())
+            var tableNamingConvention = ExecutionContext.Settings.GetDatabaseSettings().TableNamingConvention().AsEnum();
+            var dbSetNamingConvention = ExecutionContext.Settings.GetDatabaseSettings().DBSetNamingConvention().AsEnum();
+
+            // Compute the expected table name based on the table naming convention
+            string expectedTableName = tableNamingConvention switch
             {
-                case DatabaseSettingsExtensions.TableNamingConventionOptionsEnum.Singularized:
-                    return true;
-                case DatabaseSettingsExtensions.TableNamingConventionOptionsEnum.None:
-                    //Because DBSets are plural table names default to table, we need to add ToTables in the name is not pluralized
-                    return className != className.Pluralize();
-                case DatabaseSettingsExtensions.TableNamingConventionOptionsEnum.Pluralized:
-                default:
-                    return false;
-            }
+                DatabaseSettingsExtensions.TableNamingConventionOptionsEnum.Pluralized => className.Pluralize(),
+                DatabaseSettingsExtensions.TableNamingConventionOptionsEnum.Singularized => className.Singularize(),
+                DatabaseSettingsExtensions.TableNamingConventionOptionsEnum.None => className,
+                _ => className
+            };
+
+            // Compute the DbSet name based on the DBSet naming convention
+            string dbSetName = dbSetNamingConvention switch
+            {
+                DatabaseSettingsExtensions.DBSetNamingConventionOptionsEnum.Pluralized => className.Pluralize(),
+                DatabaseSettingsExtensions.DBSetNamingConventionOptionsEnum.SameAsEntity => className,
+                _ => className
+            };
+
+            // If the DbSet name does not match the expected table name, ToTable is required
+            return dbSetName != expectedTableName;
         }
 
         private string GetTableNameByConvention(string className)