Merge pull request #5 from Calabonga/oreder-index-for-both-pipeline

Oreder index for both pipeline

Author: Calabonga

README.md

@@ -4,6 +4,12 @@
 
 ## Что нового
 
+### Версия 2.4.2
+
+* Для ConfgureApplication() и для ConfigureServices() теперь есть свой собственный индекс сортировки.
+* Переработана информация при логировании в ILogger.
+* Исправлены некоторые синтаксические ошибки, а также добавлены новые. :)
+
 ### Версия 2.4.1
 
 * Nuget-пакеты обновлены для использования `NET8`

src/Calabonga.AspNetCore.AppDefinitions/AppDefinition.cs

@@ -22,7 +22,12 @@ public virtual void ConfigureApplication(WebApplication app) { }
     /// <summary>
     /// Order index for including into pipeline. Default value is 0 for, that's why order index can be undefined.
     /// </summary>
-    public virtual int OrderIndex => 0;
+    public virtual int ServiceOrderIndex => 0;
+
+    /// <summary>
+    /// Order index for including into pipeline for ConfigureApplication() . Default value is 0 for, that's why order index can be undefined.
+    /// </summary>
+    public int ApplicationOrderIndex => 0;
 
     /// <summary>
     /// Enable or disable to register into pipeline for the current application Definition.

src/Calabonga.AspNetCore.AppDefinitions/AppDefinitionCollection.cs

@@ -37,7 +37,7 @@ internal void AddInfo(AppDefinitionItem definition)
     internal IEnumerable<AppDefinitionItem> GetEnabled()
         => Items
             .Where(x => x.Definition.Enabled)
-            .OrderBy(x => x.Definition.OrderIndex);
+            .OrderBy(x => x.Definition.ServiceOrderIndex);
 
     /// <summary>
     /// 

src/Calabonga.AspNetCore.AppDefinitions/AppDefinitionExtensions.cs

@@ -110,7 +110,7 @@ public static void AddDefinitions(this WebApplicationBuilder builder, params Typ
                 definitionCollection.AddEntryPoint(entryPoint.Name);
 
                 var types = entryPoint.Assembly.ExportedTypes.Where(Predicate);
-                var instances = types.Select(Activator.CreateInstance).Cast<IAppDefinition>().Where(x => x.Enabled).OrderBy(x => x.OrderIndex).ToList();
+                var instances = types.Select(Activator.CreateInstance).Cast<IAppDefinition>().Where(x => x.Enabled).OrderBy(x => x.ServiceOrderIndex).ToList();
 
                 foreach (var definition in instances)
                 {
@@ -129,11 +129,12 @@ public static void AddDefinitions(this WebApplicationBuilder builder, params Typ
             {
                 if (logger.IsEnabled(LogLevel.Debug))
                 {
-                    logger.LogDebug("[AppDefinitions for ConfigureServices]: {@AssemblyName}:{@AppDefinitionName} is {EnabledOrDisabled} {ExportEnabled}",
+                    logger.LogDebug("[AppDefinitions ConfigureServices with order index {@ServiceOrderIndex}]: {@AssemblyName}:{@AppDefinitionName} is {EnabledOrDisabled} {ExportEnabled}",
+                        item.Definition.ServiceOrderIndex,
                         item.AssemblyName,
                         item.Definition.GetType().Name,
                         item.Enabled ? "enabled" : "disabled",
-                        item.Exported ? "(exported)" : "export disabled");
+                        item.Exported ? "(exportable)" : string.Empty);
                 }
 
                 item.Definition.ConfigureServices(builder);
@@ -152,10 +153,10 @@ public static void AddDefinitions(this WebApplicationBuilder builder, params Typ
                 return;
             }
 
-            logger.LogWarning("[AppDefinitions skipped for ConfigureServices: {Count}", skipped.Count);
+            logger.LogWarning("[AppDefinitions skipped ConfigureServices: {Count}", skipped.Count);
             foreach (var item in skipped)
             {
-                logger.LogWarning("[AppDefinitions skipped for ConfigureServices]: {@AssemblyName}:{@AppDefinitionName} is {EnabledOrDisabled}",
+                logger.LogWarning("[AppDefinitions skipped ConfigureServices]: {@AssemblyName}:{@AppDefinitionName} is {EnabledOrDisabled}",
                     item.AssemblyName,
                     item.Definition.GetType().Name,
                     item.Enabled ? "enabled" : "disabled");
@@ -181,13 +182,14 @@ public static void UseDefinitions(this WebApplication source)
         var logger = source.Services.GetRequiredService<ILogger<AppDefinition>>();
         var definitionCollection = source.Services.GetRequiredService<AppDefinitionCollection>();
 
-        var items = definitionCollection.GetDistinct().ToList();
+        var items = definitionCollection.GetDistinct().OrderBy(x => x.Definition.ApplicationOrderIndex).ToList();
 
         foreach (var item in items)
         {
             if (logger.IsEnabled(LogLevel.Debug))
             {
-                logger.LogDebug("[AppDefinitions for ConfigureApplication]: {@AssemblyName}:{@AppDefinitionName} is {EnabledOrDisabled}",
+                logger.LogDebug("[AppDefinitions ConfigureApplication with order index {@ApplicationOrderIndex}]: {@AssemblyName}:{@AppDefinitionName} is {EnabledOrDisabled}",
+                    item.Definition.ApplicationOrderIndex,
                     item.AssemblyName,
                     item.Definition.GetType().Name,
                     item.Enabled
@@ -214,14 +216,14 @@ public static void UseDefinitions(this WebApplication source)
             return;
         }
 
-        logger.LogWarning("[AppDefinitions skipped for ConfigureApplication: {Count}", skipped.Count);
+        logger.LogWarning("[AppDefinitions skipped ConfigureApplication: {Count}", skipped.Count);
         foreach (var item in skipped)
         {
-            logger.LogWarning("[AppDefinitions skipped for ConfigureApplication]: {@AssemblyName}:{@AppDefinitionName} is {EnabledOrDisabled} {ExportEnabled}",
+            logger.LogWarning("[AppDefinitions skipped ConfigureApplication]: {@AssemblyName}:{@AppDefinitionName} is {EnabledOrDisabled} {ExportEnabled}",
                 item.AssemblyName,
                 item.Definition.GetType().Name,
                 item.Enabled ? "enabled" : "disabled",
-                item.Exported ? "(exported)" : "export disabled");
+                item.Exported ? "(exportable)" : string.Empty);
         }
 
         logger.LogInformation("[AppDefinitions applied: {Count} of {Total}", items.Count, definitionCollection.GetEnabled().Count());

src/Calabonga.AspNetCore.AppDefinitions/Calabonga.AspNetCore.AppDefinitions.csproj

@@ -6,7 +6,7 @@
 		<Nullable>enable</Nullable>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<Title>Calabonga.AspNetCore.AppDefinitions</Title>
-		<Version>2.4.1</Version>
+		<Version>2.4.2</Version>
 		<Authors>Calabonga</Authors>
 		<Company>Calabonga Soft</Company>
 		<Product>Calabonga.AspNetCore.AppDefinitions</Product>
@@ -18,7 +18,7 @@
 		<RepositoryUrl>https://github.com/Calabonga/Calabonga.AspNetCore.AppDefinitions</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 		<PackageTags>calabonga;architecture;application;definitions;minimal-api;nimble-framework</PackageTags>
-		<PackageReleaseNotes>Additional information added for DEBUG logging. Some errors catching added.</PackageReleaseNotes>
+		<PackageReleaseNotes>Split order index fot Services and for Application definitions.</PackageReleaseNotes>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<IncludeSymbols>true</IncludeSymbols>
 		<IncludeSource>true</IncludeSource>

src/Calabonga.AspNetCore.AppDefinitions/IAppDefinition.cs

@@ -20,9 +20,14 @@ public interface IAppDefinition
     void ConfigureApplication(WebApplication app);
 
     /// <summary>
-    /// Order index for including into pipeline. Default value is 0 for, that's why order index can be undefined.
+    /// Order index for including into pipeline for ConfigureServices(). Default value is 0 for, that's why order index can be undefined.
     /// </summary>
-    int OrderIndex { get; }
+    int ServiceOrderIndex { get; }
+
+    /// <summary>
+    /// Order index for including into pipeline for ConfigureApplication() . Default value is 0 for, that's why order index can be undefined.
+    /// </summary>
+    int ApplicationOrderIndex { get; }
 
     /// <summary>
     /// Enable or disable to register into pipeline for the current application Definition.