Merge branch 'main' of https://github.com/jburditt/GamifyWorkout

Author: jburditt

api/.editorconfig

@@ -45,7 +45,7 @@ dotnet_style_require_accessibility_modifiers = for_non_interface_members
 dotnet_style_coalesce_expression = true
 dotnet_style_collection_initializer = true
 dotnet_style_explicit_tuple_names = true
-dotnet_style_namespace_match_folder = true
+dotnet_style_namespace_match_folder = false
 dotnet_style_null_propagation = true
 dotnet_style_object_initializer = true
 dotnet_style_operator_placement_when_wrapping = beginning_of_line
@@ -111,7 +111,7 @@ csharp_style_prefer_readonly_struct_member = true
 # Code-block preferences
 csharp_prefer_braces = true:silent
 csharp_prefer_simple_using_statement = true:suggestion
-csharp_style_namespace_declarations = block_scoped:silent
+csharp_style_namespace_declarations = file_scoped:silent
 csharp_style_prefer_method_group_conversion = true:silent
 csharp_style_prefer_primary_constructors = true:suggestion
 csharp_style_prefer_top_level_statements = true:silent

api/Api/AppSettings.cs

@@ -0,0 +1,39 @@
+using Core;
+
+namespace Api;
+
+public class AppSettings : Settings
+{
+    public DatabaseSettings Database { get; private set; }
+    //public IConfiguration Configuration { get; private set; }
+    //public IHostEnvironment Environment { get; private set; }
+    //public bool IsProduction => Environment.IsProduction();
+    //public bool IsDevelopment => Environment.IsDevelopment();
+
+    public AppSettings(IConfiguration configuration, IHostEnvironment environment)
+    {
+        configuration.GetConnectionString("DefaultConnection").ThrowIfNull();
+
+        //Configuration = configuration;
+        //Environment = environment;
+        Database = new DatabaseSettings(configuration["Database:AccountName"]?.ToString(), configuration.GetConnectionString("DefaultConnection"));
+    }
+}
+
+public static class AppSettingsExtensions
+{
+    public static AppSettings AddAppSettings(this IServiceCollection services, IWebHostEnvironment environment)
+    {
+        var configuration = new ConfigurationBuilder()
+            .AddJsonFile("appsettings.json")
+            .AddJsonFile($"appsettings.{environment.EnvironmentName}.json", optional: true)
+            .AddUserSecrets<Program>()
+            .AddEnvironmentVariables()
+            .Build();
+        services.AddSingleton<IConfiguration>(configuration);
+
+        var appSettings = new AppSettings(configuration, environment);
+        services.AddSingleton<Settings>(appSettings);
+        return appSettings;
+    }
+}

api/Api/Program.cs

@@ -23,6 +23,7 @@
     });
 
 var corsPolicyName = "MyAllowedCorsOrigins";
+builder.Services.AddAppSettings(builder.Environment);
 builder.Services.AddCorsPolicy(corsPolicyName);
 builder.Services.RegisterServices(builder.Configuration);
 builder.Services.ConfigureAuth(builder.Configuration);
@@ -55,7 +56,11 @@
 using (var scope = app.Services.CreateScope())
 {
     var services = scope.ServiceProvider;
-    var context = services.GetRequiredService<EfDbContext>();
+    DbContext context;
+    if (app.Environment.IsDevelopment())
+        context = services.GetRequiredService<EfDbContext>();
+    else
+        context = services.GetRequiredService<CosmosDbContext>();
     context.Database.Migrate();
 }
 

api/Api/appsettings.Production.json

@@ -0,0 +1,14 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "Database": {
+    "AccountName": "cosno-account"
+  },
+  "ConnectionStrings": {
+    "DefaultConnection": "Data Source=localhost;Initial Catalog=GamifyWorkout;TrustServerCertificate=true;Integrated Security=true;"
+  }
+}

api/Core/ArgumentExtensions.cs

@@ -0,0 +1,37 @@
+using System.Net;
+
+namespace Core;
+
+public static class ArgumentExtensions
+{
+    public static T ThrowIfNull<T>(this T obj, string message = null)
+    {
+        if (obj == null)
+        {
+            throw new ArgumentNullException(message ?? $"Argument was null.");
+        }
+        return obj;
+    }
+
+    public static string ThrowIfNullOrEmpty(this string str, string message = null)
+    {
+        if (string.IsNullOrEmpty(str))
+        {
+            throw new ArgumentNullException(message ?? $"Argument was null or empty.");
+        }
+        return str;
+    }
+
+    public static async Task ThrowIfNotSuccessful(this Task<HttpStatusCode> statusCode)
+    {
+        if (await statusCode != HttpStatusCode.OK)
+            throw new HttpRequestException($"Request failed with status code: {statusCode}");
+    }
+
+    public static string ThrowIfNotMinLength(this string str, int length)
+    {
+        if (string.IsNullOrEmpty(str) || str.Length < length)
+            throw new ArgumentException($"String length must be at least {length} characters.");
+        return str;
+    }
+}

api/Core/Settings.cs

@@ -0,0 +1,22 @@
+
+//using Microsoft.Extensions.Configuration;
+
+using System.Xml.Linq;
+
+namespace Core;
+
+public interface Settings
+{
+    public DatabaseSettings Database { get; }
+    //public IConfiguration Configuration { get; }
+    //public IHostEnvironment Environment { get; }
+    //public bool IsProduction { get; }
+    //public bool IsDevelopment { get; }
+}
+
+public struct DatabaseSettings(string? accountName, string connectionString)
+{
+    public string? AccountName { get; } = accountName;
+    public string ConnectionString { get; } = connectionString;
+}
+

api/Database/Database.csproj

@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Cosmos" Version="9.0.9" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.9" />
   </ItemGroup>
 

api/Database/EntityFramework/CosmosDbContext.cs

@@ -0,0 +1,22 @@
+using Core;
+using Microsoft.EntityFrameworkCore;
+
+namespace Database;
+
+public class CosmosDbContext : EfDbContext
+{
+    private readonly Settings _settings;
+
+    public CosmosDbContext(Settings appSettings, DbContextOptions<EfDbContext> options) : base(options) 
+    { 
+        _settings = appSettings;
+    }
+
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+    {
+        optionsBuilder.UseCosmos(_settings.Database.ConnectionString, _settings.Database.AccountName);
+
+        base.OnConfiguring(optionsBuilder);
+    }
+}
+

api/Database/EntityFramework/EfDbContext.cs

@@ -1,50 +1,50 @@
 using Core;
 using Microsoft.EntityFrameworkCore;
 
-namespace Database
+namespace Database;
+
+public class EfDbContext : DbContext
 {
-    public class EfDbContext : DbContext
-    {
-        public DbSet<User> Users { get; set; }
-        public DbSet<Gym> Gyms { get; set; }
-        public DbSet<GymEquipment> GymEquipment { get; set; }
-        public DbSet<Equipment> Equipment { get; set; }
-        public DbSet<WorkoutLog> WorkoutLog { get; set; }
-        public DbSet<Schedule> Schedule { get; set; }
+    public DbSet<User> Users { get; set; }
+    public DbSet<Gym> Gyms { get; set; }
+    public DbSet<GymEquipment> GymEquipment { get; set; }
+    public DbSet<Equipment> Equipment { get; set; }
+    public DbSet<WorkoutLog> WorkoutLog { get; set; }
+    public DbSet<Schedule> Schedule { get; set; }
 
-        public EfDbContext(DbContextOptions<EfDbContext> options) : base(options) { }
+    public EfDbContext(DbContextOptions<EfDbContext> options) : base(options) { }
 
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            modelBuilder.Entity<WorkoutLog>().HasKey(wl => new { wl.ScheduleId, wl.ExerciseId, wl.Date });
-        }
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        modelBuilder.Entity<WorkoutLog>().HasKey(wl => new { wl.ScheduleId, wl.ExerciseId, wl.Date });
+    }
 
-        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+    {
+        optionsBuilder.UseSeeding((context, _) =>
         {
-            optionsBuilder.UseSeeding((context, _) =>
-            {
-                context.Set<User>().ExecuteDelete();
-                var userId = context.Set<User>().Add(new User { Email = "jburditt@mailinator.com", FirstName = "Jebb", LastName = "Burditt", Username = "jburditt" }).Entity.Id;
-
-                context.Set<Equipment>().ExecuteDelete();
-                var equipmentId = new Guid[4];
-                equipmentId[0] = context.Set<Equipment>().Add(new Equipment { Icon = "dumbbells", Name = "Dumbbells" }).Entity.Id;
-                equipmentId[1] = context.Set<Equipment>().Add(new Equipment { Icon = "bench", Name = "Bench" }).Entity.Id;
-                equipmentId[2] = context.Set<Equipment>().Add(new Equipment { Icon = "resistbands", Name = "Resistance Bands" }).Entity.Id;
-                equipmentId[3] = context.Set<Equipment>().Add(new Equipment { Icon = "stabilityball", Name = "Stability Ball" }).Entity.Id;
-
-                context.Set<Gym>().ExecuteDelete();
-                var gymId = context.Set<Gym>().Add(new Gym { Name = "Home", UserId = userId.Value }).Entity.Id;
-                context.Set<Gym>().Add(new Gym { Name = "Globe Fitness", UserId = userId.Value });
-
-                context.Set<GymEquipment>().ExecuteDelete();
-                context.Set<GymEquipment>().Add(new Core.GymEquipment { EquipmentId = equipmentId[0], GymId = gymId });
-                context.Set<GymEquipment>().Add(new Core.GymEquipment { EquipmentId = equipmentId[1], GymId = gymId });
-                context.Set<GymEquipment>().Add(new Core.GymEquipment { EquipmentId = equipmentId[2], GymId = gymId });
-                context.Set<GymEquipment>().Add(new Core.GymEquipment { EquipmentId = equipmentId[3], GymId = gymId });
-
-                context.SaveChanges();
-            });
-        }
+            context.Set<User>().ExecuteDelete();
+            var userId = context.Set<User>().Add(new User { Email = "jburditt@mailinator.com", FirstName = "Jebb", LastName = "Burditt", Username = "jburditt" }).Entity.Id;
+
+            context.Set<Equipment>().ExecuteDelete();
+            var equipmentId = new Guid[4];
+            equipmentId[0] = context.Set<Equipment>().Add(new Equipment { Icon = "dumbbells", Name = "Dumbbells" }).Entity.Id;
+            equipmentId[1] = context.Set<Equipment>().Add(new Equipment { Icon = "bench", Name = "Bench" }).Entity.Id;
+            equipmentId[2] = context.Set<Equipment>().Add(new Equipment { Icon = "resistbands", Name = "Resistance Bands" }).Entity.Id;
+            equipmentId[3] = context.Set<Equipment>().Add(new Equipment { Icon = "stabilityball", Name = "Stability Ball" }).Entity.Id;
+
+            context.Set<Gym>().ExecuteDelete();
+            var gymId = context.Set<Gym>().Add(new Gym { Name = "Home", UserId = userId.Value }).Entity.Id;
+            context.Set<Gym>().Add(new Gym { Name = "Globe Fitness", UserId = userId.Value });
+
+            context.Set<GymEquipment>().ExecuteDelete();
+            context.Set<GymEquipment>().Add(new Core.GymEquipment { EquipmentId = equipmentId[0], GymId = gymId });
+            context.Set<GymEquipment>().Add(new Core.GymEquipment { EquipmentId = equipmentId[1], GymId = gymId });
+            context.Set<GymEquipment>().Add(new Core.GymEquipment { EquipmentId = equipmentId[2], GymId = gymId });
+            context.Set<GymEquipment>().Add(new Core.GymEquipment { EquipmentId = equipmentId[3], GymId = gymId });
+
+            context.SaveChanges();
+        });
     }
 }
+