Merge branch 'main' into jcoitino/query-builder-poc

jcoitino · jcoitino · commit cd8718893eff · 2024-11-07T00:47:03.000-03:00
diff --git a/NorthwindCRUD/.ebextensions/cloudwatch.config b/NorthwindCRUD/.ebextensions/cloudwatch.config
@@ -0,0 +1,55 @@
+# https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/customize-containers-cw.html
+
+files:
+  "/opt/aws/amazon-cloudwatch-agent/bin/config.json":
+    mode: "000600"
+    owner: root
+    group: root
+    content: |
+      {
+        "agent":{
+           "metrics_collection_interval":60,
+           "logfile":"/opt/aws/amazon-cloudwatch-agent/logs/amazon-cloudwatch-agent.log",
+           "run_as_user":"cwagent"
+        },
+        "metrics":{
+          "namespace":"CWAgent/AppBuilderData",
+          "append_dimensions":{
+            "InstanceId":"${aws:InstanceId}",
+            "InstanceType":"${aws:InstanceType}",
+            "AutoScalingGroupName":"${aws:AutoScalingGroupName}"
+          },
+          "aggregation_dimensions":[
+            [ "AutoScalingGroupName", "InstanceId" ],
+            [ ]
+          ],
+          "metrics_collected":{
+            "cpu":{
+              "resources":[
+                "*"
+              ],
+              "measurement":[
+                "time_idle",
+                "time_iowait",
+                "time_system",
+                "time_user",
+                "usage_steal",
+                "usage_system",
+                "usage_user",
+                "usage_iowait"
+              ]
+            },
+            "mem":{
+              "measurement":[
+                "used_percent",
+                "total",
+                "available_percent"
+              ]
+            }
+          }
+        }
+      }
+
+container_commands:
+  start_cloudwatch_agent:
+    command: /opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl -a append-config -m ec2 -s -c file:/opt/aws/amazon-cloudwatch-agent/bin/config.json
diff --git a/NorthwindCRUD/Controllers/EmployeesController.cs b/NorthwindCRUD/Controllers/EmployeesController.cs
@@ -44,6 +44,22 @@ public ActionResult<EmployeeDto[]> GetAll()
             }
         }
 
+        [HttpGet("GetAllAuthorized")]
+        [Authorize]
+        public ActionResult<OrderDto[]> GetAllAuthorized()
+        {
+            try
+            {
+                var employees = this.employeeService.GetAll();
+                return Ok(this.mapper.Map<EmployeeDb[], EmployeeDto[]>(employees));
+            }
+            catch (Exception error)
+            {
+                logger.LogError(error.Message);
+                return StatusCode(500);
+            }
+        }
+
         /// <summary>
         /// Fetches all employees or a page of employees based on the provided parameters.
         /// </summary>
@@ -123,6 +139,26 @@ public ActionResult<CountResultDto> GetEmployeesCount()
             }
         }
 
+        /// <summary>
+        /// Retrieves the total number of employees.
+        /// </summary>
+        /// <returns>Total count of employees as an integer.</returns>
+        [HttpGet("GetEmployeesCountAuthorized")]
+        [Authorize]
+        public ActionResult<CountResultDto> GetEmployeesCountAuthorized()
+        {
+            try
+            {
+                var count = employeeService.GetAllAsQueryable().Count();
+                return new CountResultDto() { Count = count };
+            }
+            catch (Exception error)
+            {
+                logger.LogError(error.Message);
+                return StatusCode(500);
+            }
+        }
+
         [HttpGet("{id}")]
         public ActionResult<EmployeeDto> GetById(int id)
         {
diff --git a/NorthwindCRUD/Controllers/ProductsController.cs b/NorthwindCRUD/Controllers/ProductsController.cs
@@ -46,6 +46,22 @@ public ActionResult<ProductDto[]> GetAll()
             }
         }
 
+        [HttpGet("GetAllAuthorized")]
+        [Authorize]
+        public ActionResult<OrderDto[]> GetAllAuthorized()
+        {
+            try
+            {
+                var products = this.productService.GetAll();
+                return Ok(this.mapper.Map<ProductDb[], ProductDto[]>(products));
+            }
+            catch (Exception error)
+            {
+                logger.LogError(error.Message);
+                return StatusCode(500);
+            }
+        }
+
         /// <summary>
         /// Fetches all products or a page of products based on the provided parameters.
         /// </summary>
@@ -125,6 +141,25 @@ public ActionResult<CountResultDto> GetProductsCount()
             }
         }
 
+        /// <summary>
+        /// Retrieves the total number of products.
+        /// </summary>
+        /// <returns>Total count of products as an integer.</returns>
+        [HttpGet("GetProductsCountAuthorized")]
+        public ActionResult<CountResultDto> GetProductsCountAuthorized()
+        {
+            try
+            {
+                var count = productService.GetAllAsQueryable().Count();
+                return new CountResultDto() { Count = count };
+            }
+            catch (Exception error)
+            {
+                logger.LogError(error.Message);
+                return StatusCode(500);
+            }
+        }
+
         [HttpGet("{id}")]
         public ActionResult<ProductDto> GetById(int id)
         {
diff --git a/NorthwindCRUD/Middlewares/TenantHeaderValidationMiddleware.cs b/NorthwindCRUD/Middlewares/TenantHeaderValidationMiddleware.cs
@@ -0,0 +1,35 @@
+﻿using System.Text.RegularExpressions;
+
+namespace NorthwindCRUD.Middlewares
+{
+    public class TenantHeaderValidationMiddleware
+    {
+        private const string TenantHeaderKey = "X-Tenant-ID";
+
+        private readonly RequestDelegate next;
+
+        public TenantHeaderValidationMiddleware(RequestDelegate next)
+        {
+            this.next = next;
+        }
+
+        public async Task InvokeAsync(HttpContext context)
+        {
+            var tenantHeader = context.Request.Headers[TenantHeaderKey].FirstOrDefault();
+
+            if (tenantHeader != null && !IsTenantValid(tenantHeader))
+            {
+                context.Response.StatusCode = StatusCodes.Status400BadRequest;
+                await context.Response.WriteAsync($"Invalid format for Header {TenantHeaderKey}");
+                return;
+            }
+
+            await next(context);
+        }
+
+        private bool IsTenantValid(string tenantId)
+        {
+            return Regex.IsMatch(tenantId, "^[A-Za-z0-9-_]{0,40}$");
+        }
+    }
+}
diff --git a/NorthwindCRUD/Models/Dtos/AddressDto.cs b/NorthwindCRUD/Models/Dtos/AddressDto.cs
@@ -21,7 +21,7 @@ public class AddressDto : IAddress
         [StringLength(50, ErrorMessage = "Country cannot exceed 50 characters.")]
         public string Country { get; set; }
 
-        [RegularExpression(@"^\+?[1-9]\d{1,14}$", ErrorMessage = "Phone number is not valid.")]
+        [RegularExpression(@"^\+?\(?\d{1,5}\)?[-.\s]?\(?\d{1,5}\)?[-.\s]?\d{1,4}[-.\s]?\d{1,4}[-.\s]?\d{1,10}$", ErrorMessage = "Phone number is not valid.")]
         public string? Phone { get; set; }
     }
 }
diff --git a/NorthwindCRUD/Models/Dtos/ShipperDto.cs b/NorthwindCRUD/Models/Dtos/ShipperDto.cs
@@ -11,7 +11,7 @@ public class ShipperDto : IShipper
         [StringLength(100, ErrorMessage = "Company Name cannot exceed 100 characters.")]
         public string CompanyName { get; set; }
 
-        [RegularExpression(@"^\+?[1-9]\d{1,14}$", ErrorMessage = "Phone number is not valid.")]
+        [RegularExpression(@"^\+?\(?\d{1,5}\)?[-.\s]?\(?\d{1,5}\)?[-.\s]?\d{1,4}[-.\s]?\d{1,4}[-.\s]?\d{1,10}$", ErrorMessage = "Phone number is not valid.")]
         public string Phone { get; set; }
     }
 }
diff --git a/NorthwindCRUD/Models/Dtos/SupplierDto.cs b/NorthwindCRUD/Models/Dtos/SupplierDto.cs
@@ -32,10 +32,10 @@ public class SupplierDto : ISupplier
         [StringLength(50, ErrorMessage = "Country cannot exceed 50 characters.")]
         public string? Country { get; set; }
 
-        [RegularExpression(@"^\+?[1-9]\d{1,14}$", ErrorMessage = "Phone number is not valid.")]
+        [RegularExpression(@"^\+?\(?\d{1,5}\)?[-.\s]?\(?\d{1,5}\)?[-.\s]?\d{1,4}[-.\s]?\d{1,4}[-.\s]?\d{1,10}$", ErrorMessage = "Phone number is not valid.")]
         public string? Phone { get; set; }
 
-        [RegularExpression(@"^\+?[1-9]\d{1,14}$", ErrorMessage = "Fax number is not valid.")]
+        [RegularExpression(@"^\+?\(?\d{1,5}\)?[-.\s]?\(?\d{1,5}\)?[-.\s]?\d{1,4}[-.\s]?\d{1,4}[-.\s]?\d{1,10}$", ErrorMessage = "Fax number is not valid.")]
         public string? Fax { get; set; }
 
         [RegularExpression(@"^https?:\/\/[^\s$.?#].[^\s]*$", ErrorMessage = "Home Page URL is not valid.")]
diff --git a/NorthwindCRUD/NorthwindCRUD.csproj b/NorthwindCRUD/NorthwindCRUD.csproj
@@ -47,4 +47,9 @@
         <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
     </ItemGroup>
 
+    <ItemGroup>
+        <None Include=".ebextensions/**/*">
+            <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+        </None>
+    </ItemGroup>
 </Project>
diff --git a/NorthwindCRUD/Program.cs b/NorthwindCRUD/Program.cs
@@ -11,6 +11,8 @@
 using Newtonsoft.Json.Converters;
 using NorthwindCRUD.Filters;
 using NorthwindCRUD.Helpers;
+using NorthwindCRUD.Middlewares;
+using NorthwindCRUD.Providers;
 using NorthwindCRUD.Services;
 using QueryBuilder;
 
@@ -78,36 +80,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 =>
@@ -139,8 +115,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>();
@@ -159,7 +137,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();
diff --git a/NorthwindCRUD/Providers/DbContextConfigurationProvider.cs b/NorthwindCRUD/Providers/DbContextConfigurationProvider.cs
@@ -0,0 +1,97 @@
+﻿using System.Globalization;
+using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Caching.Memory;
+using NorthwindCRUD.Helpers;
+
+namespace NorthwindCRUD.Providers
+{
+    public class DbContextConfigurationProvider
+    {
+        private const string DefaultTenantId = "default-tenant";
+        private const string TenantHeaderKey = "X-Tenant-ID";
+        private const string DatabaseConnectionCacheKey = "Data-Connection-{0}";
+
+        private readonly IHttpContextAccessor context;
+        private readonly IMemoryCache memoryCache;
+        private readonly IConfiguration configuration;
+
+        public DbContextConfigurationProvider(IHttpContextAccessor context, IMemoryCache memoryCache, IConfiguration configuration)
+        {
+            this.context = context;
+            this.memoryCache = memoryCache;
+            this.configuration = configuration;
+        }
+
+        public void ConfigureOptions(DbContextOptionsBuilder options)
+        {
+            var dbProvider = configuration.GetConnectionString("Provider");
+
+            if (dbProvider == "SqlServer")
+            {
+                options.UseSqlServer(configuration.GetConnectionString("SqlServerConnectionString"));
+            }
+            else if (dbProvider == "SQLite")
+            {
+                var tenantId = GetTenantId();
+
+                var cacheKey = string.Format(CultureInfo.InvariantCulture, DatabaseConnectionCacheKey, tenantId);
+
+                if (!memoryCache.TryGetValue(cacheKey, out SqliteConnection connection))
+                {
+                    var connectionString = this.GetSqlLiteConnectionString(tenantId);
+                    connection = new SqliteConnection(connectionString);
+                    memoryCache.Set(cacheKey, connection, GetCacheConnectionEntryOptions());
+                }
+
+                // 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
+                connection.Open();
+
+                options.UseSqlite(connection).EnableSensitiveDataLogging();
+
+                SeedDb(options);
+            }
+        }
+
+        private static void SeedDb(DbContextOptionsBuilder optionsBuilder)
+        {
+            using var dataContext = new DataContext(optionsBuilder.Options);
+            DBSeeder.Seed(dataContext);
+        }
+
+        private static void CloseConnection(object key, object value, EvictionReason reason, object state)
+        {
+            //Used to clear datasource from memory.
+            (value as SqliteConnection)?.Close();
+        }
+
+        private MemoryCacheEntryOptions GetCacheConnectionEntryOptions()
+        {
+            var defaultAbsoluteCacheExpirationInHours = this.configuration.GetValue<int>("DefaultAbsoluteCacheExpirationInHours");
+            var cacheEntryOptions = new MemoryCacheEntryOptions
+            {
+                AbsoluteExpirationRelativeToNow = TimeSpan.FromHours(defaultAbsoluteCacheExpirationInHours),
+            };
+
+            cacheEntryOptions.RegisterPostEvictionCallback(CloseConnection);
+
+            return cacheEntryOptions;
+        }
+
+        private string GetSqlLiteConnectionString(string tenantId)
+        {
+            var connectionStringTemplate = configuration.GetConnectionString("SQLiteConnectionString");
+            var unsanitizedConntectionString = string.Format(CultureInfo.InvariantCulture, connectionStringTemplate, tenantId);
+            var connectionStringBuilder = new SqliteConnectionStringBuilder(unsanitizedConntectionString);
+            var sanitizedConntectionString = connectionStringBuilder.ToString();
+
+            return sanitizedConntectionString;
+        }
+
+        private string GetTenantId()
+        {
+            return context.HttpContext?.Request.Headers[TenantHeaderKey].FirstOrDefault() ?? DefaultTenantId;
+        }
+    }
+}
diff --git a/NorthwindCRUD/appsettings.json b/NorthwindCRUD/appsettings.json

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public class AddressDto : IAddress`
`21`	`21`	`[StringLength(50, ErrorMessage = "Country cannot exceed 50 characters.")]`
`22`	`22`	`public string Country { get; set; }`
`23`	`23`
`24`		`- [RegularExpression(@"^\+?[1-9]\d{1,14}$", ErrorMessage = "Phone number is not valid.")]`
	`24`	`+ [RegularExpression(@"^\+?\(?\d{1,5}\)?[-.\s]?\(?\d{1,5}\)?[-.\s]?\d{1,4}[-.\s]?\d{1,4}[-.\s]?\d{1,10}$", 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
`@@ -11,7 +11,7 @@ public class ShipperDto : IShipper`
`11`	`11`	`[StringLength(100, ErrorMessage = "Company Name cannot exceed 100 characters.")]`
`12`	`12`	`public string CompanyName { get; set; }`
`13`	`13`
`14`		`- [RegularExpression(@"^\+?[1-9]\d{1,14}$", ErrorMessage = "Phone number is not valid.")]`
	`14`	`+ [RegularExpression(@"^\+?\(?\d{1,5}\)?[-.\s]?\(?\d{1,5}\)?[-.\s]?\d{1,4}[-.\s]?\d{1,4}[-.\s]?\d{1,10}$", ErrorMessage = "Phone number is not valid.")]`
`15`	`15`	`public string Phone { get; set; }`
`16`	`16`	`}`
`17`	`17`	`}`