Merge branch 'main' into DNenchev/48

zdrawku · web-flow · commit 41af68f48889 · 2025-06-05T17:25:08.000+03:00
diff --git a/NorthwindCRUD/Controllers/ProductsController.cs b/NorthwindCRUD/Controllers/ProductsController.cs
@@ -268,7 +268,7 @@ public ActionResult<ProductDto> Create(ProductDto model)
             }
             catch (InvalidOperationException exception)
             {
-               return StatusCode(400, exception.Message);
+                return StatusCode(400, exception.Message);
             }
             catch (Exception error)
             {
diff --git a/NorthwindCRUD/Filters/EnumSchemaFilter.cs b/NorthwindCRUD/Filters/EnumSchemaFilter.cs
@@ -1,22 +1,21 @@
-﻿﻿using Microsoft.OpenApi.Any;
-﻿using Microsoft.OpenApi.Models;
-﻿using Swashbuckle.AspNetCore.SwaggerGen;
+﻿using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Models;
+using Swashbuckle.AspNetCore.SwaggerGen;
 
-﻿namespace NorthwindCRUD.Filters
+namespace NorthwindCRUD.Filters
 {
     public class EnumSchemaFilter : ISchemaFilter
     {
         public void Apply(OpenApiSchema schema, SchemaFilterContext context)
         {
             if (context.Type.IsEnum)
             {
-                var enumValues = Enum.GetValues(context.Type)
-                    .Cast<object>()
-                    .Select(e => new OpenApiString(e.ToString()))
+                schema.Type = "string";
+                schema.Enum = context.Type
+                    .GetEnumNames()
+                    .Select(name => new OpenApiString(name))
                     .ToList<IOpenApiAny>();
-
-                schema.Enum = enumValues;
             }
         }
     }
-}
+}
diff --git a/NorthwindCRUD/Helpers/Enums.cs b/NorthwindCRUD/Helpers/Enums.cs
diff --git a/NorthwindCRUD/Models/Contracts/IOrder.cs b/NorthwindCRUD/Models/Contracts/IOrder.cs
@@ -1,7 +1,7 @@
-﻿﻿using NorthwindCRUD.Models.Dtos;
-﻿using static NorthwindCRUD.Helpers.Enums;
+﻿using NorthwindCRUD.Models.Dtos;
+using NorthwindCRUD.Models.Enums;
 
-﻿namespace NorthwindCRUD.Models.Contracts
+namespace NorthwindCRUD.Models.Contracts
 {
     public interface IOrder
     {
diff --git a/NorthwindCRUD/Models/Dtos/AddressDto.cs b/NorthwindCRUD/Models/Dtos/AddressDto.cs
@@ -1,7 +1,7 @@
-﻿﻿using System.ComponentModel.DataAnnotations;
-﻿using NorthwindCRUD.Models.Contracts;
+﻿using System.ComponentModel.DataAnnotations;
+using NorthwindCRUD.Models.Contracts;
 
-﻿namespace NorthwindCRUD.Models.Dtos
+namespace NorthwindCRUD.Models.Dtos
 {
     public class AddressDto : IAddress
     {
@@ -24,4 +24,4 @@ public class AddressDto : IAddress
         [RegularExpression(@"^\+?[1-9]\d{1,14}$", ErrorMessage = "Phone number is not valid.")]
         public string? Phone { get; set; }
     }
-}
+}
diff --git a/NorthwindCRUD/Models/Dtos/CategoryDetailsDto.cs b/NorthwindCRUD/Models/Dtos/CategoryDetailsDto.cs
@@ -1,11 +1,11 @@
-﻿﻿using System.ComponentModel.DataAnnotations;
-﻿using NorthwindCRUD.Models.Contracts;
+﻿using System.ComponentModel.DataAnnotations;
+using NorthwindCRUD.Models.Contracts;
 
-﻿namespace NorthwindCRUD.Models.Dtos
+namespace NorthwindCRUD.Models.Dtos
 {
     public class CategoryDetailsDto : CategoryDto, ICategoryDetail
     {
         [RegularExpression(@"^(http[s]?://.*\.(?:jpg|jpeg|png|gif))$", ErrorMessage = "Picture URL must start with http/s and end with .jpg, .jpeg, .png, or .gif.")]
         public string Picture { get; set; }
     }
-}
+}
diff --git a/NorthwindCRUD/Models/Dtos/CategoryDto.cs b/NorthwindCRUD/Models/Dtos/CategoryDto.cs
@@ -1,7 +1,7 @@
-﻿﻿using System.ComponentModel.DataAnnotations;
-﻿using NorthwindCRUD.Models.Contracts;
+﻿using System.ComponentModel.DataAnnotations;
+using NorthwindCRUD.Models.Contracts;
 
-﻿namespace NorthwindCRUD.Models.Dtos
+namespace NorthwindCRUD.Models.Dtos
 {
     public class CategoryDto : ICategory
     {
@@ -14,4 +14,4 @@ public class CategoryDto : ICategory
         [StringLength(50, MinimumLength = 3, ErrorMessage = "Name must be between 3 and 50 characters.")]
         public string Name { get; set; }
     }
-}
+}
diff --git a/NorthwindCRUD/Models/Dtos/OrderDetailDto.cs b/NorthwindCRUD/Models/Dtos/OrderDetailDto.cs
@@ -1,6 +1,6 @@
-﻿﻿using System.ComponentModel.DataAnnotations;
+﻿using System.ComponentModel.DataAnnotations;
 
-﻿namespace NorthwindCRUD.Models.Dtos
+namespace NorthwindCRUD.Models.Dtos
 {
     public class OrderDetailDto
     {
@@ -17,4 +17,4 @@ public class OrderDetailDto
 
         public float Discount { get; set; }
     }
-}
+}
diff --git a/NorthwindCRUD/Models/Dtos/OrderDto.cs b/NorthwindCRUD/Models/Dtos/OrderDto.cs
@@ -1,6 +1,6 @@
 ﻿using System.ComponentModel.DataAnnotations;
 using NorthwindCRUD.Models.Contracts;
-using static NorthwindCRUD.Helpers.Enums;
+using NorthwindCRUD.Models.Enums;
 
 namespace NorthwindCRUD.Models.Dtos
 {
diff --git a/NorthwindCRUD/Models/Dtos/ProductDto.cs b/NorthwindCRUD/Models/Dtos/ProductDto.cs
@@ -7,6 +7,8 @@ public class ProductDto : IProduct
     {
         public int ProductId { get; private set; }
 
+        public string ProductName { get; set; }
+
         [Range(1, int.MaxValue, ErrorMessage = "SupplierId must be a valid supplier ID.")]
         public int? SupplierId { get; set; }
 
diff --git a/NorthwindCRUD/Program.cs b/NorthwindCRUD/Program.cs
@@ -2,15 +2,14 @@
 using AutoMapper;
 using GraphQL.AspNet.Configuration.Mvc;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.Data.Sqlite;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Diagnostics;
-using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
 using Microsoft.OpenApi.Models;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using NorthwindCRUD.Filters;
 using NorthwindCRUD.Helpers;
+using NorthwindCRUD.Middlewares;
+using NorthwindCRUD.Providers;
 using NorthwindCRUD.Services;
 
 namespace NorthwindCRUD
@@ -38,7 +37,8 @@ public static void Main(string[] args)
                 options.SuppressImplicitRequiredAttributeForNonNullableReferenceTypes = true;
             }).AddNewtonsoftJson(options =>
             {
-                options.SerializerSettings.ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore;
+                options.SerializerSettings.DateParseHandling = DateParseHandling.None;
+                options.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
                 options.SerializerSettings.Converters.Add(new StringEnumConverter());
             });
 
@@ -74,36 +74,10 @@ public static void Main(string[] args)
                                 });
             });
 
-            var dbProvider = builder.Configuration.GetConnectionString("Provider");
-
-            if (dbProvider == "SQLite")
-            {
-                // For SQLite in memory to be shared across multiple EF calls, we need to maintain a separate open connection.
-                // see post https://stackoverflow.com/questions/56319638/entityframeworkcore-sqlite-in-memory-db-tables-are-not-created
-                var keepAliveConnection = new SqliteConnection(builder.Configuration.GetConnectionString("SQLiteConnectionString"));
-                keepAliveConnection.Open();
-            }
-
-            builder.Services.AddDbContext<DataContext>(options =>
+            builder.Services.AddDbContext<DataContext>((serviceProvider, options) =>
             {
-                if (dbProvider == "SqlServer")
-                {
-                    options.UseSqlServer(builder.Configuration.GetConnectionString("SqlServerConnectionString"));
-                }
-                else if (dbProvider == "InMemory")
-                {
-                    options.ConfigureWarnings(warnOpts =>
-                    {
-                        // InMemory doesn't support transactions and we're ok with it
-                        warnOpts.Ignore(InMemoryEventId.TransactionIgnoredWarning);
-                    });
-
-                    options.UseInMemoryDatabase(databaseName: builder.Configuration.GetConnectionString("InMemoryDBConnectionString"));
-                }
-                else if (dbProvider == "SQLite")
-                {
-                    options.UseSqlite(builder.Configuration.GetConnectionString("SQLiteConnectionString"));
-                }
+                var configurationProvider = serviceProvider.GetRequiredService<DbContextConfigurationProvider>();
+                configurationProvider.ConfigureOptions(options);
             });
 
             var config = new MapperConfiguration(cfg =>
@@ -135,8 +109,10 @@ public static void Main(string[] args)
             });
 
             builder.Services.AddAuthorization();
-
+            builder.Services.AddHttpContextAccessor();
+            builder.Services.AddMemoryCache();
             builder.Services.AddScoped<DBSeeder>();
+            builder.Services.AddScoped<DbContextConfigurationProvider>();
             builder.Services.AddTransient<CategoryService>();
             builder.Services.AddTransient<CustomerService>();
             builder.Services.AddTransient<EmployeeTerritoryService>();
@@ -155,7 +131,7 @@ public static void Main(string[] args)
 
             // Necessary to detect if it's behind a load balancer, for example changing protocol, port or hostname
             app.UseForwardedHeaders();
-
+            app.UseMiddleware<TenantHeaderValidationMiddleware>();
             app.UseHttpsRedirection();
             app.UseDefaultFiles();
             app.UseStaticFiles();
@@ -186,4 +162,4 @@ public static void Main(string[] args)
             app.Run();
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ public ActionResult<ProductDto> Create(ProductDto model)`
`268`	`268`	`}`
`269`	`269`	`catch (InvalidOperationException exception)`
`270`	`270`	`{`
`271`		`- return StatusCode(400, exception.Message);`
	`271`	`+ return StatusCode(400, exception.Message);`
`272`	`272`	`}`
`273`	`273`	`catch (Exception error)`
`274`	`274`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,22 +1,21 @@`
`1`		`-using Microsoft.OpenApi.Any;`
`2`		`-using Microsoft.OpenApi.Models;`
`3`		`-using Swashbuckle.AspNetCore.SwaggerGen;`
	`1`	`+using Microsoft.OpenApi.Any;`
	`2`	`+using Microsoft.OpenApi.Models;`
	`3`	`+using Swashbuckle.AspNetCore.SwaggerGen;`
`4`	`4`
`5`		`-namespace NorthwindCRUD.Filters`
	`5`	`+namespace NorthwindCRUD.Filters`
`6`	`6`	`{`
`7`	`7`	`public class EnumSchemaFilter : ISchemaFilter`
`8`	`8`	`{`
`9`	`9`	`public void Apply(OpenApiSchema schema, SchemaFilterContext context)`
`10`	`10`	`{`
`11`	`11`	`if (context.Type.IsEnum)`
`12`	`12`	`{`
`13`		`- var enumValues = Enum.GetValues(context.Type)`
`14`		`- .Cast<object>()`
`15`		`- .Select(e => new OpenApiString(e.ToString()))`
	`13`	`+ schema.Type = "string";`
	`14`	`+ schema.Enum = context.Type`
	`15`	`+ .GetEnumNames()`
	`16`	`+ .Select(name => new OpenApiString(name))`
`16`	`17`	`.ToList<IOpenApiAny>();`
`17`		`-`
`18`		`- schema.Enum = enumValues;`
`19`	`18`	`}`
`20`	`19`	`}`
`21`	`20`	`}`
`22`		`-}`
	`21`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-using NorthwindCRUD.Models.Dtos;`
`2`		`-using static NorthwindCRUD.Helpers.Enums;`
	`1`	`+using NorthwindCRUD.Models.Dtos;`
	`2`	`+using NorthwindCRUD.Models.Enums;`
`3`	`3`
`4`		`-namespace NorthwindCRUD.Models.Contracts`
	`4`	`+namespace NorthwindCRUD.Models.Contracts`
`5`	`5`	`{`
`6`	`6`	`public interface IOrder`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-using System.ComponentModel.DataAnnotations;`
`2`		`-using NorthwindCRUD.Models.Contracts;`
	`1`	`+using System.ComponentModel.DataAnnotations;`
	`2`	`+using NorthwindCRUD.Models.Contracts;`
`3`	`3`
`4`		`-namespace NorthwindCRUD.Models.Dtos`
	`4`	`+namespace NorthwindCRUD.Models.Dtos`
`5`	`5`	`{`
`6`	`6`	`public class AddressDto : IAddress`
`7`	`7`	`{`
`@@ -24,4 +24,4 @@ public class AddressDto : IAddress`
`24`	`24`	`[RegularExpression(@"^\+?[1-9]\d{1,14}$", ErrorMessage = "Phone number is not valid.")]`
`25`	`25`	`public string? Phone { get; set; }`
`26`	`26`	`}`
`27`		`-}`
	`27`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`		`-using System.ComponentModel.DataAnnotations;`
`2`		`-using NorthwindCRUD.Models.Contracts;`
	`1`	`+using System.ComponentModel.DataAnnotations;`
	`2`	`+using NorthwindCRUD.Models.Contracts;`
`3`	`3`
`4`		`-namespace NorthwindCRUD.Models.Dtos`
	`4`	`+namespace NorthwindCRUD.Models.Dtos`
`5`	`5`	`{`
`6`	`6`	`public class CategoryDetailsDto : CategoryDto, ICategoryDetail`
`7`	`7`	`{`
`8`	`8`	`[RegularExpression(@"^(http[s]?://.*\.(?:jpg\|jpeg\|png\|gif))$", ErrorMessage = "Picture URL must start with http/s and end with .jpg, .jpeg, .png, or .gif.")]`
`9`	`9`	`public string Picture { get; set; }`
`10`	`10`	`}`
`11`		`-}`
	`11`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-using System.ComponentModel.DataAnnotations;`
	`1`	`+using System.ComponentModel.DataAnnotations;`
`2`	`2`
`3`		`-namespace NorthwindCRUD.Models.Dtos`
	`3`	`+namespace NorthwindCRUD.Models.Dtos`
`4`	`4`	`{`
`5`	`5`	`public class OrderDetailDto`
`6`	`6`	`{`
`@@ -17,4 +17,4 @@ public class OrderDetailDto`
`17`	`17`
`18`	`18`	`public float Discount { get; set; }`
`19`	`19`	`}`
`20`		`-}`
	`20`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System.ComponentModel.DataAnnotations;`
`2`	`2`	`using NorthwindCRUD.Models.Contracts;`
`3`		`-using static NorthwindCRUD.Helpers.Enums;`
	`3`	`+using NorthwindCRUD.Models.Enums;`
`4`	`4`
`5`	`5`	`namespace NorthwindCRUD.Models.Dtos`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ public class ProductDto : IProduct`
`7`	`7`	`{`
`8`	`8`	`public int ProductId { get; private set; }`
`9`	`9`
	`10`	`+ public string ProductName { get; set; }`
	`11`	`+`
`10`	`12`	`[Range(1, int.MaxValue, ErrorMessage = "SupplierId must be a valid supplier ID.")]`
`11`	`13`	`public int? SupplierId { get; set; }`
`12`	`14`