add attribute support to templates

sample/Tracker/Tracker.Core/Data/Mapping/StatusMap.cs

@@ -45,7 +45,7 @@ public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityType
             .IsRequired()
             .HasColumnName("DisplayOrder")
             .HasColumnType("int")
-            .HasDefaultValueSql("((0))");
+            .HasDefaultValue(0);
 
         builder.Property(t => t.IsActive)
             .IsRequired()

sample/Tracker/Tracker.Core/Data/Mapping/UserMap.cs

@@ -64,7 +64,7 @@ public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityType
             .IsRequired()
             .HasColumnName("AccessFailedCount")
             .HasColumnType("int")
-            .HasDefaultValueSql("((0))");
+            .HasDefaultValue(0);
 
         builder.Property(t => t.LockoutEnabled)
             .IsRequired()

sample/Tracker/Tracker.Core/Data/Queries/AuditExtensions.cs

@@ -34,6 +34,7 @@ public static partial class AuditExtensions
     /// </summary>
     /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
     /// <param name="id">The value to filter by.</param>
+    /// <param name="cancellationToken">A <see cref="System.Threading.CancellationToken" /> to observe while waiting for the task to complete.</param>
     /// <returns>An instance of <see cref="T:Tracker.Core.Data.Entities.Audit"/> or null if not found.</returns>
     public static async System.Threading.Tasks.ValueTask<Tracker.Core.Data.Entities.Audit?> GetByKeyAsync(this System.Linq.IQueryable<Tracker.Core.Data.Entities.Audit> queryable, Guid id, System.Threading.CancellationToken cancellationToken = default)
     {

sample/Tracker/Tracker.Core/Data/Queries/PriorityExtensions.cs

@@ -34,6 +34,7 @@ public static partial class PriorityExtensions
     /// </summary>
     /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
     /// <param name="id">The value to filter by.</param>
+    /// <param name="cancellationToken">A <see cref="System.Threading.CancellationToken" /> to observe while waiting for the task to complete.</param>
     /// <returns>An instance of <see cref="T:Tracker.Core.Data.Entities.Priority"/> or null if not found.</returns>
     public static async System.Threading.Tasks.ValueTask<Tracker.Core.Data.Entities.Priority?> GetByKeyAsync(this System.Linq.IQueryable<Tracker.Core.Data.Entities.Priority> queryable, Guid id, System.Threading.CancellationToken cancellationToken = default)
     {

sample/Tracker/Tracker.Core/Data/Queries/RoleExtensions.cs

@@ -34,6 +34,7 @@ public static partial class RoleExtensions
     /// </summary>
     /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
     /// <param name="id">The value to filter by.</param>
+    /// <param name="cancellationToken">A <see cref="System.Threading.CancellationToken" /> to observe while waiting for the task to complete.</param>
     /// <returns>An instance of <see cref="T:Tracker.Core.Data.Entities.Role"/> or null if not found.</returns>
     public static async System.Threading.Tasks.ValueTask<Tracker.Core.Data.Entities.Role?> GetByKeyAsync(this System.Linq.IQueryable<Tracker.Core.Data.Entities.Role> queryable, Guid id, System.Threading.CancellationToken cancellationToken = default)
     {
@@ -65,6 +66,7 @@ public static partial class RoleExtensions
     /// </summary>
     /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
     /// <param name="name">The value to filter by.</param>
+    /// <param name="cancellationToken">A <see cref="System.Threading.CancellationToken" /> to observe while waiting for the task to complete.</param>
     /// <returns>An instance of <see cref="T:Tracker.Core.Data.Entities.Role"/> or null if not found.</returns>
     public static async System.Threading.Tasks.Task<Tracker.Core.Data.Entities.Role?> GetByNameAsync(this System.Linq.IQueryable<Tracker.Core.Data.Entities.Role> queryable, string name, System.Threading.CancellationToken cancellationToken = default)
     {

sample/Tracker/Tracker.Core/Data/Queries/StatusExtensions.cs

@@ -34,6 +34,7 @@ public static partial class StatusExtensions
     /// </summary>
     /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
     /// <param name="id">The value to filter by.</param>
+    /// <param name="cancellationToken">A <see cref="System.Threading.CancellationToken" /> to observe while waiting for the task to complete.</param>
     /// <returns>An instance of <see cref="T:Tracker.Core.Data.Entities.Status"/> or null if not found.</returns>
     public static async System.Threading.Tasks.ValueTask<Tracker.Core.Data.Entities.Status?> GetByKeyAsync(this System.Linq.IQueryable<Tracker.Core.Data.Entities.Status> queryable, Guid id, System.Threading.CancellationToken cancellationToken = default)
     {

sample/Tracker/Tracker.Core/Data/Queries/TaskExtendedExtensions.cs

@@ -34,6 +34,7 @@ public static partial class TaskExtendedExtensions
     /// </summary>
     /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
     /// <param name="taskId">The value to filter by.</param>
+    /// <param name="cancellationToken">A <see cref="System.Threading.CancellationToken" /> to observe while waiting for the task to complete.</param>
     /// <returns>An instance of <see cref="T:Tracker.Core.Data.Entities.TaskExtended"/> or null if not found.</returns>
     public static async System.Threading.Tasks.ValueTask<Tracker.Core.Data.Entities.TaskExtended?> GetByKeyAsync(this System.Linq.IQueryable<Tracker.Core.Data.Entities.TaskExtended> queryable, Guid taskId, System.Threading.CancellationToken cancellationToken = default)
     {

sample/Tracker/Tracker.Core/Data/Queries/TaskExtensions.cs

@@ -48,6 +48,7 @@ public static partial class TaskExtensions
     /// </summary>
     /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
     /// <param name="id">The value to filter by.</param>
+    /// <param name="cancellationToken">A <see cref="System.Threading.CancellationToken" /> to observe while waiting for the task to complete.</param>
     /// <returns>An instance of <see cref="T:Tracker.Core.Data.Entities.Task"/> or null if not found.</returns>
     public static async System.Threading.Tasks.ValueTask<Tracker.Core.Data.Entities.Task?> GetByKeyAsync(this System.Linq.IQueryable<Tracker.Core.Data.Entities.Task> queryable, Guid id, System.Threading.CancellationToken cancellationToken = default)
     {

sample/Tracker/Tracker.Core/Data/Queries/TenantExtensions.cs

@@ -34,6 +34,7 @@ public static partial class TenantExtensions
     /// </summary>
     /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
     /// <param name="id">The value to filter by.</param>
+    /// <param name="cancellationToken">A <see cref="System.Threading.CancellationToken" /> to observe while waiting for the task to complete.</param>
     /// <returns>An instance of <see cref="T:Tracker.Core.Data.Entities.Tenant"/> or null if not found.</returns>
     public static async System.Threading.Tasks.ValueTask<Tracker.Core.Data.Entities.Tenant?> GetByKeyAsync(this System.Linq.IQueryable<Tracker.Core.Data.Entities.Tenant> queryable, Guid id, System.Threading.CancellationToken cancellationToken = default)
     {

sample/Tracker/Tracker.Core/Data/Queries/UserExtensions.cs

@@ -31,6 +31,7 @@ public static partial class UserExtensions
     /// </summary>
     /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
     /// <param name="emailAddress">The value to filter by.</param>
+    /// <param name="cancellationToken">A <see cref="System.Threading.CancellationToken" /> to observe while waiting for the task to complete.</param>
     /// <returns>An instance of <see cref="T:Tracker.Core.Data.Entities.User"/> or null if not found.</returns>
     public static async System.Threading.Tasks.Task<Tracker.Core.Data.Entities.User?> GetByEmailAddressAsync(this System.Linq.IQueryable<Tracker.Core.Data.Entities.User> queryable, string emailAddress, System.Threading.CancellationToken cancellationToken = default)
     {
@@ -62,6 +63,7 @@ public static partial class UserExtensions
     /// </summary>
     /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
     /// <param name="id">The value to filter by.</param>
+    /// <param name="cancellationToken">A <see cref="System.Threading.CancellationToken" /> to observe while waiting for the task to complete.</param>
     /// <returns>An instance of <see cref="T:Tracker.Core.Data.Entities.User"/> or null if not found.</returns>
     public static async System.Threading.Tasks.ValueTask<Tracker.Core.Data.Entities.User?> GetByKeyAsync(this System.Linq.IQueryable<Tracker.Core.Data.Entities.User> queryable, Guid id, System.Threading.CancellationToken cancellationToken = default)
     {

sample/Tracker/Tracker.Core/Data/Queries/UserLoginExtensions.cs

@@ -48,6 +48,7 @@ public static partial class UserLoginExtensions
     /// </summary>
     /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
     /// <param name="id">The value to filter by.</param>
+    /// <param name="cancellationToken">A <see cref="System.Threading.CancellationToken" /> to observe while waiting for the task to complete.</param>
     /// <returns>An instance of <see cref="T:Tracker.Core.Data.Entities.UserLogin"/> or null if not found.</returns>
     public static async System.Threading.Tasks.ValueTask<Tracker.Core.Data.Entities.UserLogin?> GetByKeyAsync(this System.Linq.IQueryable<Tracker.Core.Data.Entities.UserLogin> queryable, Guid id, System.Threading.CancellationToken cancellationToken = default)
     {

sample/Tracker/Tracker.Core/Data/Queries/UserRoleExtensions.cs

@@ -64,6 +64,7 @@ public static partial class UserRoleExtensions
     /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
     /// <param name="userId">The value to filter by.</param>
     /// <param name="roleId">The value to filter by.</param>
+    /// <param name="cancellationToken">A <see cref="System.Threading.CancellationToken" /> to observe while waiting for the task to complete.</param>
     /// <returns>An instance of <see cref="T:Tracker.Core.Data.Entities.UserRole"/> or null if not found.</returns>
     public static async System.Threading.Tasks.ValueTask<Tracker.Core.Data.Entities.UserRole?> GetByKeyAsync(this System.Linq.IQueryable<Tracker.Core.Data.Entities.UserRole> queryable, Guid userId, Guid roleId, System.Threading.CancellationToken cancellationToken = default)
     {

sample/Tracker/Tracker.Core/Domain/Audit/Validation/AuditCreateModelValidator.cs

@@ -1,13 +1,14 @@
 using System;
 using FluentValidation;
+
 using Tracker.Core.Domain.Models;
 
-// ReSharper disable once CheckNamespace
 namespace Tracker.Core.Domain.Validation;
 
 /// <summary>
 /// Validator class for <see cref="AuditCreateModel"/> .
 /// </summary>
+[RegisterSingleton<IValidator<AuditCreateModel>>]
 public partial class AuditCreateModelValidator
     : AbstractValidator<AuditCreateModel>
 {

sample/Tracker/Tracker.Core/Domain/Audit/Validation/AuditUpdateModelValidator.cs

@@ -2,12 +2,12 @@
 using FluentValidation;
 using Tracker.Core.Domain.Models;
 
-// ReSharper disable once CheckNamespace
 namespace Tracker.Core.Domain.Validation;
 
 /// <summary>
 /// Validator class for <see cref="AuditUpdateModel"/> .
 /// </summary>
+[RegisterSingleton<IValidator<AuditUpdateModel>>]
 public partial class AuditUpdateModelValidator
     : AbstractValidator<AuditUpdateModel>
 {

sample/Tracker/Tracker.Core/Tracker.Core.csproj

@@ -9,11 +9,12 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="13.0.1" />
     <PackageReference Include="FluentValidation" Version="11.9.0" />
+    <PackageReference Include="Injectio" Version="3.1.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.2" />
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Data\Mapping\" />
+    <Using Include="Injectio.Attributes" />
   </ItemGroup>
 
 </Project>

sample/Tracker/Tracker.Core/generation.yml

@@ -79,4 +79,5 @@ model:
     baseClass: 'AbstractValidator<{Model.Name}>'
     namespace: '{Project.Namespace}.Domain.Validation'
     directory: '{Project.Directory}\Domain\{Entity.Name}\Validation'
+    attributes: '[RegisterSingleton<IValidator<{Model.Name}>>]'
     document: true

src/EntityFrameworkCore.Generator.Core/EntityFrameworkCore.Generator.Core.csproj

@@ -12,7 +12,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.2" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
     <PackageReference Include="Oracle.EntityFrameworkCore" Version="8.21.121" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0" />
     <PackageReference Include="YamlDotNet" Version="15.1.1" />

src/EntityFrameworkCore.Generator.Core/Metadata/Generation/Model.cs

@@ -1,4 +1,4 @@
-namespace EntityFrameworkCore.Generator.Metadata.Generation;
+namespace EntityFrameworkCore.Generator.Metadata.Generation;
 
 public class Model : ModelBase, IOptionVariable
 {
@@ -17,6 +17,8 @@ public Model()
 
     public string ModelBaseClass { get; set; }
 
+    public string ModelAttributes { get; set; }
+
 
     public string ValidatorNamespace { get; set; }
 
@@ -27,7 +29,6 @@ public Model()
 
     public PropertyCollection Properties { get; set; }
 
-
     void IOptionVariable.Set(VariableDictionary variableDictionary)
     {
         variableDictionary.Set(VariableConstants.ModelName, ModelClass);
@@ -37,4 +38,4 @@ void IOptionVariable.Remove(VariableDictionary variableDictionary)
     {
         variableDictionary.Remove(VariableConstants.ModelName);
     }
-}
+}

src/EntityFrameworkCore.Generator.Core/ModelGenerator.cs

@@ -16,8 +16,6 @@
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.Extensions.Logging;
 
-using static Npgsql.Replication.PgOutput.Messages.RelationMessage;
-
 using Model = EntityFrameworkCore.Generator.Metadata.Generation.Model;
 using Property = EntityFrameworkCore.Generator.Metadata.Generation.Property;
 using PropertyCollection = EntityFrameworkCore.Generator.Metadata.Generation.PropertyCollection;
@@ -537,7 +535,8 @@ private void CreateModel<TOption>(Entity entity, TOption options, ModelType mode
             ModelType = modelType,
             ModelBaseClass = options.BaseClass,
             ModelNamespace = modelNamespace,
-            ModelClass = modelClass
+            ModelClass = modelClass,
+            ModelAttributes = options.Attributes,
         };
 
         foreach (var property in entity.Properties)

src/EntityFrameworkCore.Generator.Core/OptionMapper.cs

@@ -1,9 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 
 using EntityFrameworkCore.Generator.Options;
 using EntityFrameworkCore.Generator.Serialization;
 
+using Microsoft.CodeAnalysis.Options;
+
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
+
 namespace EntityFrameworkCore.Generator;
 
 public static class OptionMapper
@@ -58,68 +63,54 @@ private static void MapModel(ModelOptions option, ViewModel model)
         MapValidator(option.Validator, model.Validator);
     }
 
+    private static void MapClassBase(ClassOptionsBase option, ClassBase classBase)
+    {
+        option.Namespace = classBase.Namespace;
+        option.Directory = classBase.Directory;
+        option.Document = classBase.Document;
+        option.Name = classBase.Name;
+        option.BaseClass = classBase.BaseClass;
+        option.Attributes = classBase.Attributes;
+    }
+
+    private static void MapModelBase(ModelOptionsBase option, ModelBase modelBase)
+    {
+        MapClassBase(option, modelBase);
+
+        option.Generate = modelBase.Generate;
+
+        MapSelection(option.Include, modelBase.Include);
+        MapSelection(option.Exclude, modelBase.Exclude);
+
+    }
+
     private static void MapValidator(ValidatorClassOptions option, ValidatorClass validator)
     {
-        option.Namespace = validator.Namespace;
-        option.Directory = validator.Directory;
-        option.Document = validator.Document;
+        MapClassBase(option, validator);
 
         option.Generate = validator.Generate;
-        option.Name = validator.Name;
-        option.BaseClass = validator.BaseClass;
     }
 
     private static void MapMapper(MapperClassOptions option, MapperClass mapper)
     {
-        option.Namespace = mapper.Namespace;
-        option.Directory = mapper.Directory;
-        option.Document = mapper.Document;
+        MapClassBase(option, mapper);
 
         option.Generate = mapper.Generate;
-        option.Name = mapper.Name;
-        option.BaseClass = mapper.BaseClass;
     }
 
     private static void MapUpdate(UpdateModelOptions option, UpdateModel update)
     {
-        option.Namespace = update.Namespace;
-        option.Directory = update.Directory;
-        option.Document = update.Document;
-
-        option.Generate = update.Generate;
-        option.Name = update.Name;
-        option.BaseClass = update.BaseClass;
-
-        MapSelection(option.Include, update.Include);
-        MapSelection(option.Exclude, update.Exclude);
+        MapModelBase(option, update);
     }
 
     private static void MapCreate(CreateModelOptions option, CreateModel create)
     {
-        option.Namespace = create.Namespace;
-        option.Directory = create.Directory;
-        option.Document = create.Document;
-
-        option.Generate = create.Generate;
-        option.Name = create.Name;
-        option.BaseClass = create.BaseClass;
-
-        MapSelection(option.Include, create.Include);
-        MapSelection(option.Exclude, create.Exclude);
+        MapModelBase(option, create);
     }
 
     private static void MapRead(ReadModelOptions option, ReadModel read)
     {
-        option.Namespace = read.Namespace;
-        option.Directory = read.Directory;
-        option.Document = read.Document;
-
-        option.Generate = read.Generate;
-        option.Name = read.Name;
-        option.BaseClass = read.BaseClass;
-
-        MapSelection(option.Include, read.Include);
-        MapSelection(option.Exclude, read.Exclude);
+        MapModelBase(option, read);
     }
 
     private static void MapShared(SharedModelOptions option, SharedModel shared)
@@ -141,9 +132,7 @@ private static void MapData(DataOptions option, DataModel data)
 
     private static void MapQuery(QueryExtensionOptions option, QueryExtension query)
     {
-        option.Namespace = query.Namespace;
-        option.Directory = query.Directory;
-        option.Document = query.Document;
+        MapClassBase(option, query);
 
         option.Generate = query.Generate;
         option.IndexPrefix = query.IndexPrefix;
@@ -152,21 +141,16 @@ private static void MapQuery(QueryExtensionOptions option, QueryExtension query)
 
     private static void MapMapping(MappingClassOptions option, MappingClass mapping)
     {
-        option.Namespace = mapping.Namespace;
-        option.Directory = mapping.Directory;
-        option.Document = mapping.Document;
+        MapClassBase(option, mapping);
+
         option.Temporal = mapping.Temporal;
         option.RowVersion = mapping.RowVersion;
     }
 
     private static void MapEntity(EntityClassOptions option, EntityClass entity)
     {
-        option.Namespace = entity.Namespace;
-        option.Directory = entity.Directory;
-        option.Document = entity.Document;
+        MapClassBase(option, entity);
 
-        option.Name = entity.Name;
-        option.BaseClass = entity.BaseClass;
         option.EntityNaming = entity.EntityNaming;
         option.RelationshipNaming = entity.RelationshipNaming;
         option.PrefixWithSchemaName = entity.PrefixWithSchemaName;
@@ -194,12 +178,8 @@ private static void MapSelection(SelectionOptions option, SelectionModel selecti
 
     private static void MapContext(ContextClassOptions option, ContextClass context)
     {
-        option.Namespace = context.Namespace;
-        option.Directory = context.Directory;
-        option.Document = context.Document;
+        MapClassBase(option, context);
 
-        option.Name = context.Name;
-        option.BaseClass = context.BaseClass;
         option.PropertyNaming = context.PropertyNaming;
     }