Added support for singular DBSet names

jp-seini · jp-seini · commit 0f6cddad902b · 2025-10-28T13:01:25.000+02:00
diff --git a/Modules/Intent.Modules.Application.DomainInteractions/DataAccessProviders/DbContextDataAccessProvider.cs b/Modules/Intent.Modules.Application.DomainInteractions/DataAccessProviders/DbContextDataAccessProvider.cs
@@ -1,14 +1,17 @@
-using System.Collections.Generic;
-using System.Linq;
 using Intent.Exceptions;
 using Intent.Metadata.Models;
 using Intent.Modelers.Domain.Api;
+using Intent.Modules.Common;
 using Intent.Modules.Common.CSharp.Builder;
 using Intent.Modules.Common.CSharp.Interactions;
 using Intent.Modules.Common.CSharp.Mapping;
 using Intent.Modules.Common.CSharp.Templates;
 using Intent.Modules.Common.Templates;
 using Intent.Modules.Constants;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using static Intent.Modules.Constants.TemplateRoles.Domain;
 
 namespace Intent.Modules.Application.DomainInteractions.DataAccessProviders;
 
@@ -32,7 +35,9 @@ public DbContextDataAccessProvider(
         _dbContextField = dbContextField;
         _template = template;
         _mappingManager = mappingManager;
-        _dbSetAccessor = new CSharpAccessMemberStatement(_dbContextField, entity.Name.ToPascalCase().Pluralize());
+
+        _dbSetAccessor = new CSharpAccessMemberStatement(_dbContextField, GetDbSetName(entity));
+
         var entityTemplate = _template.GetTemplate<ICSharpFileBuilderTemplate>(TemplateRoles.Domain.Entity.Primary, entity);
         _pks = entityTemplate.CSharpFile.Classes.First().GetPropertiesWithPrimaryKey();
         _isUsingProjections = queryContext?.ImplementWithProjections() == true;
@@ -294,4 +299,14 @@ public CSharpStatement FindAllAsync(IElementToElementMapping queryMapping, strin
         prerequisiteStatements = new List<CSharpStatement>();
         return new CSharpStatement("");
     }
+
+    public string GetDbSetName(ClassModel model)
+    {
+        if (_template.ExecutionContext.Settings.GetSetting("ac0a788e-d8b3-4eea-b56d-538608f1ded9", "6010e890-6e2d-4812-9969-ffbdb8f93d87")?.Value == "same-as-entity")
+        {
+            return model.Name.ToPascalCase();
+        }
+
+        return model.Name.ToPascalCase().Pluralize();
+    }
 }
diff --git a/Modules/Intent.Modules.Application.DomainInteractions/Intent.Application.DomainInteractions.imodspec b/Modules/Intent.Modules.Application.DomainInteractions/Intent.Application.DomainInteractions.imodspec
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package>
   <id>Intent.Application.DomainInteractions</id>
-  <version>1.1.7-pre.1</version>
+  <version>1.1.7-pre.2</version>
   <supportedClientVersions>[4.5.15-a,5.0.0)</supportedClientVersions>
   <summary>Provides interaction strategies to generate domain interaction implementations.</summary>
   <description>Provides interaction strategies to generate domain interaction implementations.</description>
diff --git a/Modules/Intent.Modules.Application.DomainInteractions/Intent.Modules.Application.DomainInteractions.csproj b/Modules/Intent.Modules.Application.DomainInteractions/Intent.Modules.Application.DomainInteractions.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <Version>1.1.7-pre.1</Version>
+    <Version>1.1.7-pre.2</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/Modules/Intent.Modules.Application.DomainInteractions/release-notes.md b/Modules/Intent.Modules.Application.DomainInteractions/release-notes.md
@@ -2,6 +2,7 @@
 
 - Improvement: Checking for installed mappers are more flexible.
 - Fixed: CRUD not explicitly calls SaveChanges for EF when modeling Auto-generated primary keys.
+- Improvement: Added support for singular DBSet names
 
 ### Version 1.1.6
 
diff --git a/Modules/Intent.Modules.AspNetCore.OData.EntityFramework/Intent.AspNetCore.OData.EntityFramework.imodspec b/Modules/Intent.Modules.AspNetCore.OData.EntityFramework/Intent.AspNetCore.OData.EntityFramework.imodspec
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <package>
   <id>Intent.AspNetCore.OData.EntityFramework</id>
-  <version>1.0.6</version>
+  <version>1.0.7-pre.0</version>
   <supportedClientVersions>[4.3.0-a,5.0.0)</supportedClientVersions>
   <summary>Provide the ability to expose OData endpoints for a Domain Model.</summary>
   <description>Enable the application to expose OData endpoints that operate directly over the Domain Model, allowing clients to query, filter, and manipulate domain entities using standard OData protocols.</description>
diff --git a/Modules/Intent.Modules.AspNetCore.OData.EntityFramework/Templates/ODataAggregateController/ODataAggregateControllerTemplatePartial.cs b/Modules/Intent.Modules.AspNetCore.OData.EntityFramework/Templates/ODataAggregateController/ODataAggregateControllerTemplatePartial.cs
@@ -7,6 +7,7 @@
 using Intent.Modules.Common;
 using Intent.Modules.Common.CSharp.Builder;
 using Intent.Modules.Common.CSharp.Templates;
+using Intent.Modules.Common.FileBuilders;
 using Intent.Modules.Common.Templates;
 using Intent.Modules.Constants;
 using Intent.Modules.EntityFrameworkCore.Templates;
@@ -55,13 +56,14 @@ public ODataAggregateControllerTemplate(IOutputTarget outputTarget, ClassModel m
                         return;
                     }
 
+                    var dbSetName = GetDbSetName(model);
+
                     if (stereotype.GetAll())
                     {
                         @class.AddMethod($"IQueryable<{GetTypeName(Model.InternalElement)}>", "Get", method =>
                         {
                             method.AddAttribute(new CSharpAttribute("[HttpGet]"));
-
-                            method.AddStatement($"return _context.{Model.Name.Pluralize().ToPascalCase()};");
+                            method.AddStatement($"return _context.{dbSetName};");
                         });
                     }
 
@@ -73,7 +75,7 @@ public ODataAggregateControllerTemplate(IOutputTarget outputTarget, ClassModel m
                             method.AddAttribute(new CSharpAttribute("[HttpGet]"));
 
                             var linqQuery = GeneratePrimaryKeyParameters(model, method, c => c.AddAttribute("[FromODataUri]"));
-                            method.AddStatement($"var {Model.Name.ToCamelCase()} = await _context.{Model.Name.Pluralize().ToPascalCase()}.FirstOrDefaultAsync({linqQuery});");
+                            method.AddStatement($"var {Model.Name.ToCamelCase()} = await _context.{dbSetName}.FirstOrDefaultAsync({linqQuery});");
                             method.AddStatement($"return {Model.Name.ToCamelCase()} == null ? NotFound() : Ok({Model.Name.ToCamelCase()});", s => s.SeparatedFromPrevious());
                         });
                     }
@@ -86,7 +88,7 @@ public ODataAggregateControllerTemplate(IOutputTarget outputTarget, ClassModel m
                             method.AddAttribute(new CSharpAttribute("[HttpPost]"));
 
                             method.AddParameter($"{GetTypeName(Model.InternalElement)}", $"{Model.Name.ToCamelCase()}", p => p.AddAttribute("[FromBody]"));
-                            method.AddStatement($"await _context.{Model.Name.Pluralize().ToPascalCase()}.AddAsync({Model.Name.ToCamelCase()});");
+                            method.AddStatement($"await _context.{dbSetName}.AddAsync({Model.Name.ToCamelCase()});");
                             method.AddStatement($"await _context.SaveChangesAsync();");
                             method.AddStatement($"return Created({Model.Name.ToCamelCase()});", s => s.SeparatedFromPrevious());
                         });
@@ -101,10 +103,10 @@ public ODataAggregateControllerTemplate(IOutputTarget outputTarget, ClassModel m
 
                             var linqQuery = GeneratePrimaryKeyParameters(model, method, c => c.AddAttribute("[FromODataUri]"));
 
-                            method.AddStatement($"var {Model.Name.ToCamelCase()} = await _context.{Model.Name.Pluralize().ToPascalCase()}.SingleOrDefaultAsync({linqQuery});");
+                            method.AddStatement($"var {Model.Name.ToCamelCase()} = await _context.{dbSetName}.SingleOrDefaultAsync({linqQuery});");
                             method.AddIfStatement($"{Model.Name.ToCamelCase()} is not null", ifStatement =>
                             {
-                                ifStatement.AddStatement($"_context.{Model.Name.Pluralize().ToPascalCase()}.Remove({Model.Name.ToCamelCase()});");
+                                ifStatement.AddStatement($"_context.{dbSetName}.Remove({Model.Name.ToCamelCase()});");
                             });
                             method.AddStatement("await _context.SaveChangesAsync();");
                             method.AddStatement("return NoContent();", s => s.SeparatedFromPrevious());
@@ -123,7 +125,7 @@ public ODataAggregateControllerTemplate(IOutputTarget outputTarget, ClassModel m
                                 parameter.AddAttribute("[FromBody]");
                             });
 
-                            method.AddStatement($"var {Model.Name.ToCamelCase()} = await _context.{Model.Name.Pluralize().ToPascalCase()}.SingleOrDefaultAsync({linqQuery});");
+                            method.AddStatement($"var {Model.Name.ToCamelCase()} = await _context.{dbSetName}.SingleOrDefaultAsync({linqQuery});");
                             method.AddIfStatement($"{Model.Name.ToCamelCase()} is null", ifStatement =>
                             {
                                 ifStatement.AddStatement($"return NotFound();");
@@ -148,7 +150,7 @@ public ODataAggregateControllerTemplate(IOutputTarget outputTarget, ClassModel m
                                 parameter.AddAttribute("[FromBody]");
                             });
 
-                            method.AddStatement($"var {Model.Name.ToCamelCase()} = await _context.{Model.Name.Pluralize().ToPascalCase()}.AsNoTracking().SingleOrDefaultAsync({linqQuery});");
+                            method.AddStatement($"var {Model.Name.ToCamelCase()} = await _context.{dbSetName}.AsNoTracking().SingleOrDefaultAsync({linqQuery});");
                             method.AddIfStatement($"{Model.Name.ToCamelCase()} is null", ifStatement =>
                             {
                                 ifStatement.AddStatement($"return NotFound();");
@@ -209,5 +211,15 @@ public override string TransformText()
         {
             return CSharpFile.ToString();
         }
+
+        private string GetDbSetName(ClassModel model)
+        {
+            if (this.ExecutionContext.Settings.GetSetting("ac0a788e-d8b3-4eea-b56d-538608f1ded9", "6010e890-6e2d-4812-9969-ffbdb8f93d87")?.Value == "same-as-entity")
+            {
+                return model.Name.ToPascalCase();
+            }
+
+            return model.Name.ToPascalCase().Pluralize();
+        }
     }
 }
diff --git a/Modules/Intent.Modules.AspNetCore.OData.EntityFramework/release-notes.md b/Modules/Intent.Modules.AspNetCore.OData.EntityFramework/release-notes.md
@@ -1,3 +1,7 @@
+### Version 1.0.7
+
+- Improvement: Added support for singular DBSet names
+
 ### Version 1.0.6
 
 - Improvement: Updated topic documentation format.
diff --git a/Modules/Intent.Modules.EntityFrameworkCore.DiffAudit/FactoryExtensions/EfCoreExtension.cs b/Modules/Intent.Modules.EntityFrameworkCore.DiffAudit/FactoryExtensions/EfCoreExtension.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using Intent.Engine;
 using Intent.Exceptions;
 using Intent.Modelers.Domain.Api;
@@ -14,6 +13,8 @@
 using Intent.Modules.EntityFrameworkCore.Shared;
 using Intent.Plugins.FactoryExtensions;
 using Intent.RoslynWeaver.Attributes;
+using Intent.Templates;
+using System.Linq;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
 [assembly: IntentTemplate("Intent.ModuleBuilder.Templates.FactoryExtension", Version = "1.0")]
@@ -209,8 +210,20 @@ private static void AddChangeAuditingMethod(ICSharpFileBuilderTemplate template,
                             .AddStatement("throw new ArgumentOutOfRangeException();")));
                 });
 
-                method.AddStatement($"{logEntityName.Pluralize()}.AddRange(auditEntries);");
+
+
+                method.AddStatement($"{GetDbSetName(template, logEntityName)}.AddRange(auditEntries);");
             });
         }
+
+        public static string GetDbSetName(ICSharpFileBuilderTemplate template, string logEntityName)
+        {
+            if (template.ExecutionContext.Settings.GetSetting("ac0a788e-d8b3-4eea-b56d-538608f1ded9", "6010e890-6e2d-4812-9969-ffbdb8f93d87")?.Value == "same-as-entity")
+            {
+                return logEntityName.ToPascalCase();
+            }
+
+            return logEntityName.Pluralize();
+        }
     }
 }
diff --git a/Modules/Intent.Modules.EntityFrameworkCore.DiffAudit/Intent.EntityFrameworkCore.DiffAudit.imodspec b/Modules/Intent.Modules.EntityFrameworkCore.DiffAudit/Intent.EntityFrameworkCore.DiffAudit.imodspec
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package>
   <id>Intent.EntityFrameworkCore.DiffAudit</id>
-  <version>1.0.1</version>
+  <version>1.0.2-pre.0</version>
   <supportedClientVersions>[4.3.0-a,5.0.0)</supportedClientVersions>
   <summary>Applies diff auditing to selected domain entities (i.e when an entity is created, modified or removed and by who).</summary>
   <description>Applies diff auditing to selected domain entities (i.e when an entity is created, modified or removed and by who). Will store all log entries in a Audit log table.</description>
diff --git a/Modules/Intent.Modules.EntityFrameworkCore.DiffAudit/release-notes.md b/Modules/Intent.Modules.EntityFrameworkCore.DiffAudit/release-notes.md
@@ -1,3 +1,7 @@
+### Version 1.0.2
+
+- Improvement: Added support for singular DBSet names
+
 ### Version 1.0.1
 
 - Improvement: Added stereotype descriptions in preperation for Intent Architect 4.5. 
diff --git a/Modules/Intent.Modules.EntityFrameworkCore/Intent.EntityFrameworkCore.imodspec b/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.0</version>
+  <version>5.0.32-pre.1</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>
@@ -168,6 +168,16 @@
             <option value="none" description="None" />
           </options>
         </setting>
+        <setting id="6010e890-6e2d-4812-9969-ffbdb8f93d87" title="DBSet naming convention" type="select">
+          <isRequired>false</isRequired>
+          <hint>Controls the naming convention of the DBSets created on the DBContext.</hint>
+          <defaultValue>pluralized</defaultValue>
+          <isRequiredFunction>return true;</isRequiredFunction>
+          <options>
+            <option value="pluralized" description="Pluralized" />
+            <option value="same-as-entity" description="Same as entity" />
+          </options>
+        </setting>
       </settings>
     </groupExtension>
   </moduleSettingsExtensions>
diff --git a/Modules/Intent.Modules.EntityFrameworkCore/Intent.Metadata/Module Builder/Intent.EntityFrameworkCore/Elements/Module Settings Extension/bc792686-00cd-43b2-97bf-d91127604c95.xml b/Modules/Intent.Modules.EntityFrameworkCore/Intent.Metadata/Module Builder/Intent.EntityFrameworkCore/Elements/Module Settings Extension/bc792686-00cd-43b2-97bf-d91127604c95.xml
@@ -477,5 +477,63 @@
         </childElement>
       </childElements>
     </childElement>
+    <childElement id="6010e890-6e2d-4812-9969-ffbdb8f93d87" type="Module Settings Field Configuration" typeId="88e29cab-1342-40c7-b052-5fcd68ffafec">
+      <name>DBSet naming convention</name>
+      <display>DBSet naming convention</display>
+      <isAbstract>false</isAbstract>
+      <sort-children>manually</sort-children>
+      <genericTypes />
+      <isMapped>false</isMapped>
+      <parentFolderId>bc792686-00cd-43b2-97bf-d91127604c95</parentFolderId>
+      <packageId>a9d2a398-04e4-4300-9fbb-768568c65f9e</packageId>
+      <packageName>Intent.EntityFrameworkCore</packageName>
+      <stereotypes>
+        <stereotype stereotypeDefinitionId="4805c791-5be3-4049-b929-6046d7be9944" name="Field Configuration">
+          <addedByDefault>true</addedByDefault>
+          <definitionPackageName>Intent.ModuleBuilder</definitionPackageName>
+          <definitionPackageId>9972b2a9-b749-4bba-b5c8-824bf694c6ef</definitionPackageId>
+          <properties>
+            <property name="e33ce4e3-a3c5-4a3c-a6b8-96418be03de0" display="Control Type" value="Select" isActive="true" />
+            <property name="7070a9ce-ff31-422e-9cff-d82876c5efdf" display="Is Required" value="false" isActive="false" />
+            <property name="01489021-8311-43d5-b41b-e7628a512c1d" display="Hint" value="Controls the naming convention of the DBSets created on the DBContext." isActive="true" />
+            <property name="653d889c-626f-45c5-a6e6-72b74a2f805c" display="Default Value" value="pluralized" isActive="true" />
+            <property name="c3456e79-0607-41a5-9b85-e0712f4f4834" display="Is Active Function" isActive="true" />
+            <property name="fa54329f-d4e5-48bc-8027-e17206e9fc89" display="Is Required Function" value="return true;" isActive="true" />
+            <property name="29696a13-bf1d-4fbd-bdf3-adb802430cb4" display="Order Priority" isActive="true" />
+          </properties>
+        </stereotype>
+      </stereotypes>
+      <metadata />
+      <childElements>
+        <childElement id="eaf24d02-3e47-454b-8740-cf20cedd6527" type="Module Settings Field Option" typeId="1592709a-89b1-4cb0-9801-ce9d3b94545a">
+          <name>Pluralized</name>
+          <display>Pluralized = pluralized</display>
+          <isAbstract>false</isAbstract>
+          <value>pluralized</value>
+          <genericTypes />
+          <isMapped>false</isMapped>
+          <parentFolderId>6010e890-6e2d-4812-9969-ffbdb8f93d87</parentFolderId>
+          <packageId>a9d2a398-04e4-4300-9fbb-768568c65f9e</packageId>
+          <packageName>Intent.EntityFrameworkCore</packageName>
+          <stereotypes />
+          <metadata />
+          <childElements />
+        </childElement>
+        <childElement id="59773c9e-2eca-42d5-a561-94958a43e5aa" type="Module Settings Field Option" typeId="1592709a-89b1-4cb0-9801-ce9d3b94545a">
+          <name>Same as entity</name>
+          <display>Same as entity = same-as-entity</display>
+          <isAbstract>false</isAbstract>
+          <value>same-as-entity</value>
+          <genericTypes />
+          <isMapped>false</isMapped>
+          <parentFolderId>6010e890-6e2d-4812-9969-ffbdb8f93d87</parentFolderId>
+          <packageId>a9d2a398-04e4-4300-9fbb-768568c65f9e</packageId>
+          <packageName>Intent.EntityFrameworkCore</packageName>
+          <stereotypes />
+          <metadata />
+          <childElements />
+        </childElement>
+      </childElements>
+    </childElement>
   </childElements>
 </class>
diff --git a/Modules/Intent.Modules.EntityFrameworkCore/Intent.Modules.EntityFrameworkCore.csproj b/Modules/Intent.Modules.EntityFrameworkCore/Intent.Modules.EntityFrameworkCore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <Version>5.0.31</Version>
+    <Version>5.0.32-pre.1</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>
diff --git a/Modules/Intent.Modules.EntityFrameworkCore/Settings/ModuleSettingsExtensions.cs b/Modules/Intent.Modules.EntityFrameworkCore/Settings/ModuleSettingsExtensions.cs
@@ -182,5 +182,43 @@ public enum PrimaryKeyValueProviderOptionsEnum
             Default,
             None,
         }
+
+        public static DBSetNamingConventionOptions DBSetNamingConvention(this DatabaseSettings groupSettings) => new DBSetNamingConventionOptions(groupSettings.GetSetting("6010e890-6e2d-4812-9969-ffbdb8f93d87")?.Value);
+
+        public class DBSetNamingConventionOptions
+        {
+            public readonly string Value;
+
+            public DBSetNamingConventionOptions(string value)
+            {
+                Value = value;
+            }
+
+            public DBSetNamingConventionOptionsEnum AsEnum()
+            {
+                return Value switch
+                {
+                    "pluralized" => DBSetNamingConventionOptionsEnum.Pluralized,
+                    "same-as-entity" => DBSetNamingConventionOptionsEnum.SameAsEntity,
+                    _ => throw new ArgumentOutOfRangeException(nameof(Value), $"{Value} is out of range")
+                };
+            }
+
+            public bool IsPluralized()
+            {
+                return Value == "pluralized";
+            }
+
+            public bool IsSameAsEntity()
+            {
+                return Value == "same-as-entity";
+            }
+        }
+
+        public enum DBSetNamingConventionOptionsEnum
+        {
+            Pluralized,
+            SameAsEntity,
+        }
     }
 }
diff --git a/Modules/Intent.Modules.EntityFrameworkCore/Templates/DbContext/DbContextTemplatePartial.cs b/Modules/Intent.Modules.EntityFrameworkCore/Templates/DbContext/DbContextTemplatePartial.cs
diff --git a/Modules/Intent.Modules.EntityFrameworkCore/release-notes.md b/Modules/Intent.Modules.EntityFrameworkCore/release-notes.md
