Ok everything good now 🔥🔥

src/Dto/ActivityDto.cs

@@ -16,4 +16,12 @@ public class ActivityDto
     public int Minimum { get; set; }
     public float AverageTemperature { get; set; }
     public bool HasAutoPause { get; set; }
+    
+    public int AthleteId { get; set; }
+    
+    public int DataSourceId { get; set; }
+    
+    public int? TrainingId { get; set; }
+    
+    public IEnumerable<HeartRateDto> HeartRates { get; set; } // = new List<HeartRateDto>();
 }

src/Dto/HeartRateDto.cs

@@ -0,0 +1,13 @@
+public class HeartRateDto
+{
+    public DateTime Timestamp { get; set; }
+    public double? Latitude { get; set; }
+    public double? Longitude { get; set; }
+    public double? Altitude { get; set; }
+    public int HeartRate { get; set; }
+    public int? Cadence { get; set; }
+    public double? Distance { get; set; }
+    public double? Speed { get; set; }
+    public int? Power { get; set; }
+    public double? Temperature { get; set; }
+}

src/HeartTrackAPI/AppBootstrap.cs

@@ -14,8 +14,207 @@ using Microsoft.OpenApi.Models;
 using Model.Manager;
 using Model2Entities;
 using StubAPI;
+using StubbedContextLib;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
 
 namespace HeartTrackAPI;
 
+public class AppBootstrap(IConfiguration configuration)
+{
+    private IConfiguration Configuration { get; } = configuration;
+
+    public void ConfigureServices(IServiceCollection services)
+    {
+        services.AddControllers();
+        services.AddEndpointsApiExplorer();
+        AddSwagger(services);
+        AddHeartTrackContextServices(services);
+        AddModelService(services);
+        AddIdentityServices(services);
+        AddApiVersioning(services);
+        services.AddHealthChecks();
+
+    }
+
+    private void AddHeartTrackContextServices(IServiceCollection services)
+    {
+        string connectionString; 
+
+        switch (Environment.GetEnvironmentVariable("TYPE"))
+        {
+            case "BDD":
+                var HOST = System.Environment.GetEnvironmentVariable("HOST");
+                var PORT = System.Environment.GetEnvironmentVariable("PORTDB");
+                var DATABASE = System.Environment.GetEnvironmentVariable("DATABASE");
+                var USERNAME = System.Environment.GetEnvironmentVariable("USERNAME");
+                var PASSWORD = System.Environment.GetEnvironmentVariable("PASSWORD");
+
+                connectionString = $"Server={HOST};port={PORT};database={DATABASE};user={USERNAME};password={PASSWORD}";
+                Console.WriteLine("========RUNNING USING THE MYSQL SERVER==============");
+                Console.WriteLine(connectionString);
+                Console.WriteLine(connectionString);
+                Console.WriteLine("======================");
+                // with auth when it was working was'nt here
+                services.AddDbContext<AuthDbContext>(options => options.UseInMemoryDatabase("AuthDb"));
+                services.AddDbContext<HeartTrackContext>(options =>
+                    options.UseMySql($"{connectionString}", new MySqlServerVersion(new Version(10, 11, 1)))
+                        , ServiceLifetime.Singleton);
+                break;
+            default:
+                Console.WriteLine("====== RUNNING USING THE IN SQLLITE DATABASE ======");
+                connectionString = Configuration.GetConnectionString("HeartTrackAuthConnection");
+                if (!string.IsNullOrWhiteSpace(connectionString))
+                {
+                    services.AddDbContext<AuthDbContext>(options => options.UseInMemoryDatabase("AuthDb"));
+                    services.AddDbContext<TrainingStubbedContext>(options =>
+                        options.UseSqlite(connectionString), ServiceLifetime.Singleton);
+                }
+                else
+                {
+                    services.AddDbContext<AuthDbContext>(options => options.UseInMemoryDatabase("AuthDb"));
+                    services.AddDbContext<TrainingStubbedContext>();
+                }
+                break;
+                
+        }
+    }
+    
+    private void AddModelService(IServiceCollection services)
+    {
+        switch (Environment.GetEnvironmentVariable("TYPE"))
+        {
+            case "BDD":
+                services.AddSingleton<IDataManager>(provider => new DbDataManager(provider.GetRequiredService<HeartTrackContext>()));
+                break;
+            case "STUB":
+                services.AddSingleton<IDataManager, StubData>();
+                break;
+            default:
+                services.AddSingleton<IDataManager>(provider =>
+                {
+                    provider.GetRequiredService<TrainingStubbedContext>().Database.EnsureCreated();
+                    return new DbDataManager(provider.GetRequiredService<TrainingStubbedContext>());
+                });
+                break;
+        }
+        
+        //services.AddTransient<IActivityManager, ActivityManager>();
+    }
+
+    private void AddIdentityServices(IServiceCollection services)
+    {
+//        services.AddTransient<IEmailSender<AthleteEntity>, EmailSender>();
+        services.AddAuthorization();
+
+        services.AddIdentityApiEndpoints<IdentityUser>()
+            .AddEntityFrameworkStores<AuthDbContext>();
+        //services.AddIdentity<AthleteEntity, IdentityRole>()
+          //  .AddEntityFrameworkStores<AuthDbContext>().AddDefaultTokenProviders();
+    }
+    
+    private void AddApiVersioning(IServiceCollection services)
+    {
+        
+        services.AddApiVersioning(opt =>
+        {
+            opt.ReportApiVersions = true;
+            opt.AssumeDefaultVersionWhenUnspecified = true;
+            opt.DefaultApiVersion = new Microsoft.AspNetCore.Mvc.ApiVersion(1, 0);
+//            options.ApiVersionReader = new HeaderApiVersionReader("api-version");
+
+            opt.ApiVersionReader = ApiVersionReader.Combine(new UrlSegmentApiVersionReader(),
+                new HeaderApiVersionReader("x-api-version"),
+                new MediaTypeApiVersionReader("x-api-version"));
+        });
+       
+    }
+    private void AddSwagger(IServiceCollection services)
+    {
+        services.AddSwaggerGen(options =>
+        {
+            options.OperationFilter<SwaggerDefaultValues>();
+
+            var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
+            var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
+            options.IncludeXmlComments(xmlPath);
+            
+            options.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
+            {
+                Description =
+                    "JWT Authorization header using the Bearer scheme. Example: \"Authorization: Bearer {token}\"",
+                Name = "Authorization",
+                In = ParameterLocation.Header,
+                Type = SecuritySchemeType.ApiKey
+            });
+            var scheme = new OpenApiSecurityRequirement
+            {
+                {
+                    new OpenApiSecurityScheme
+                    {
+                        Reference = new OpenApiReference
+                        {
+                            Type = ReferenceType.SecurityScheme,
+                            Id = "Bearer"
+                        },
+                        Scheme = "oauth2",
+                        Name = "Bearer",
+                        In = ParameterLocation.Header,
+                    },
+                    new List<string>()
+                }
+            };
+            options.AddSecurityRequirement(scheme);
+        });
+        services.AddTransient<IConfigureOptions<SwaggerGenOptions>, SwaggerOptions>();
+        services.AddSwaggerGen(options =>
+        {
+            options.OperationFilter<SwaggerDefaultValues>();
+        });
+       /* services.AddSwaggerGen(options =>
+        {
+            options.SwaggerDoc("v1", new OpenApiInfo { Title = "HeartTrackAPI", Version = "v1" });
+            options.SwaggerDoc("v2", new OpenApiInfo { Title = "HeartTrackAPI", Version = "v2" });
+        });*/
+
+        services.AddVersionedApiExplorer(setup =>
+        {
+            setup.GroupNameFormat = "'v'VVV";
+            setup.SubstituteApiVersionInUrl = true;
+        });
+        
+    }
+
+    public void Configure(WebApplication app, IWebHostEnvironment env)
+    {
+        app.UseHttpsRedirection();
+        app.MapIdentityApi<IdentityUser>();
+
+        app.MapControllers();
+        app.UseAuthorization();
+
+        app.MapHealthChecks("/health");
+        
+        // Configure the HTTP request pipeline.
+        if (true)
+        {
+            var apiVersionDescriptionProvider = app.Services.GetRequiredService<IApiVersionDescriptionProvider>();
+            app.UseSwagger();
+            app.UseSwaggerUI();
+            app.MapSwagger();
+            app.UseSwaggerUI(options =>
+            {
+                foreach (var description in apiVersionDescriptionProvider.ApiVersionDescriptions)
+
+                //foreach (var description in apiVersionDescriptionProvider)
+                {
+                    options.SwaggerEndpoint($"/swagger/{description.GroupName}/swagger.json",
+                        description.GroupName.ToUpperInvariant());
+                }
+            });
+
+        }
+
+        
+    }
+}

src/HeartTrackAPI/Controllers/ActivityController.cs

@@ -52,12 +52,20 @@ public class ActivityController : Controller
             return StatusCode(500);
         }
     }
-    /*
+    
     [HttpPost]
-    [ProducesResponseType(StatusCodes.Status201Created)]
+    public async Task<IActionResult> PostActivity(ActivityDto activityDto)
-    [ProducesResponseType(StatusCodes.Status415UnsupportedMediaType)]
+    {
-    [MultipartFormData]
+        var activity = activityDto.ToModel();
-    [DisableFormValueModelBinding]
+        var result = await _activityService.AddActivity(activity);
+        if (result == null)
+        {
+            return BadRequest();
+        }
+        return CreatedAtAction(nameof(GetActivity), new { id = result.Id }, result.ToDto());
+    }
+    
+    /*
     public async Task<IActionResult> PostFitFile( Stream file, string contentType) // [FromForm]
     {
         if (!MultipartRequestHelper.IsMultipartContentType(Request.ContentType))

src/HeartTrackAPI/Program.cs

@@ -1,174 +1,23 @@
-using System.Reflection;
 using DbContextLib;
-using DbContextLib.Identity;
 using HeartTrackAPI;
-using HeartTrackAPI.Utils;
+using StubbedContextLib;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Mvc.ApiExplorer;
-using Microsoft.AspNetCore.Mvc.Versioning;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Options;
-using Microsoft.OpenApi.Models;
-using Model.Manager;
-using Model2Entities;
-using Swashbuckle.AspNetCore.SwaggerGen;
 
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Logging.AddConsole();
-builder.WebHost.ConfigureKestrel(serverOptions => { serverOptions.Limits.MaxRequestBodySize = long.MaxValue; });
+builder.WebHost.ConfigureKestrel(serverOptions =>
-
-
-builder.Services.AddControllers();
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen(options =>
-{
-    options.OperationFilter<SwaggerDefaultValues>();
-
-    var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
-    var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    options.IncludeXmlComments(xmlPath);
-
-    options.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
-    {
-        Description =
-            "JWT Authorization header using the Bearer scheme. Example: \"Authorization: Bearer {token}\"",
-        Name = "Authorization",
-        In = ParameterLocation.Header,
-        Type = SecuritySchemeType.ApiKey
-    });
-    var scheme = new OpenApiSecurityRequirement
-    {
-        {
-            new OpenApiSecurityScheme
-            {
-                Reference = new OpenApiReference
-                {
-                    Type = ReferenceType.SecurityScheme,
-                    Id = "Bearer"
-                },
-                Scheme = "oauth2",
-                Name = "Bearer",
-                In = ParameterLocation.Header,
-            },
-            new List<string>()
-        }
-    };
-    options.AddSecurityRequirement(scheme);
-});
-builder.Services.AddTransient<IConfigureOptions<SwaggerGenOptions>, SwaggerOptions>();
-builder.Services.AddSwaggerGen(options => { options.OperationFilter<SwaggerDefaultValues>(); });
-/* services.AddSwaggerGen(options =>
- {
-     options.SwaggerDoc("v1", new OpenApiInfo { Title = "HeartTrackAPI", Version = "v1" });
-     options.SwaggerDoc("v2", new OpenApiInfo { Title = "HeartTrackAPI", Version = "v2" });
- });*/
-
-builder.Services.AddVersionedApiExplorer(setup =>
 {
-    setup.GroupNameFormat = "'v'VVV";
+    serverOptions.Limits.MaxRequestBodySize = long.MaxValue;
-    setup.SubstituteApiVersionInUrl = true;
 });
 
-string connectionString;
+var init = new AppBootstrap(builder.Configuration);
-
-switch (Environment.GetEnvironmentVariable("TYPE"))
-{
-    case "BDD":
-        var HOST = System.Environment.GetEnvironmentVariable("HOST");
-        var PORT = System.Environment.GetEnvironmentVariable("PORTDB");
-        var DATABASE = System.Environment.GetEnvironmentVariable("DATABASE");
-        var USERNAME = System.Environment.GetEnvironmentVariable("USERNAME");
-        var PASSWORD = System.Environment.GetEnvironmentVariable("PASSWORD");
-
-        connectionString = $"Server={HOST};port={PORT};database={DATABASE};user={USERNAME};password={PASSWORD}";
-        Console.WriteLine("========RUNNING USING THE MYSQL SERVER==============");
-        Console.WriteLine(connectionString);
-        Console.WriteLine(connectionString);
-        Console.WriteLine("======================");
-        // with auth when it was working was'nt here
-        builder.Services.AddDbContext<AuthDbContext>(options => options.UseInMemoryDatabase("AuthDb"));
-        builder.Services.AddDbContext<HeartTrackContext>(options =>
-                options.UseMySql($"{connectionString}", new MySqlServerVersion(new Version(10, 11, 1)))
-            , ServiceLifetime.Singleton);
-        break;
-    default:
-        Console.WriteLine("====== RUNNING USING THE IN SQLLITE DATABASE ======");
-        connectionString = builder.Configuration.GetConnectionString("HeartTrackAuthConnection");
-        if (!string.IsNullOrWhiteSpace(connectionString))
-        {
-            builder.Services.AddDbContext<AuthDbContext>(options => options.UseInMemoryDatabase("AuthDb"));
-            Console.WriteLine(connectionString);
-            Console.WriteLine("======================");
-            //options => options.UseSqlite(connectionString)
-            //services.AddDbContext<HeartTrackContext>();
-            builder.Services.AddDbContext<HeartTrackContext>(options =>
-                options.UseSqlite(connectionString), ServiceLifetime.Singleton);
-        }
-        else
-        {
-            builder.Services.AddDbContext<AuthDbContext>(options => options.UseInMemoryDatabase("AuthDb"));
-            builder.Services.AddDbContext<HeartTrackContext>(options => options.UseInMemoryDatabase("HeartTrackDb"));
-        }
-
-        break;
-}
-
-// app.Services.GetService<HeartTrackContext>()!.Database.EnsureCreated();
-
-builder.Services.AddSingleton<IDataManager>(provider =>
-{
-    provider.GetRequiredService<HeartTrackContext>().Database.EnsureCreated();
-    return new DbDataManager(provider.GetRequiredService<HeartTrackContext>());
-});
-builder.Services.AddAuthorization();
-
-builder.Services.AddIdentityApiEndpoints<IdentityUser>()
-    .AddEntityFrameworkStores<AuthDbContext>();
-
-builder.Services.AddApiVersioning(opt =>
-{
-    opt.ReportApiVersions = true;
-    opt.AssumeDefaultVersionWhenUnspecified = true;
-    opt.DefaultApiVersion = new Microsoft.AspNetCore.Mvc.ApiVersion(1, 0);
-//            options.ApiVersionReader = new HeaderApiVersionReader("api-version");
-
-    opt.ApiVersionReader = ApiVersionReader.Combine(new UrlSegmentApiVersionReader(),
-        new HeaderApiVersionReader("x-api-version"),
-        new MediaTypeApiVersionReader("x-api-version"));
-});
-
-builder.Services.AddHealthChecks();
 
+init.ConfigureServices(builder.Services);
 
 var app = builder.Build();
 
-app.UseHttpsRedirection();
+init.Configure(app, app.Environment);
-app.MapIdentityApi<IdentityUser>();
-
-app.MapControllers();
-app.UseAuthorization();
-
-app.MapHealthChecks("/health");
-
-// Configure the HTTP request pipeline.
-if (true)
-{
-    var apiVersionDescriptionProvider = app.Services.GetRequiredService<IApiVersionDescriptionProvider>();
-    app.UseSwagger();
-    app.UseSwaggerUI();
-    app.MapSwagger();
-    app.UseSwaggerUI(options =>
-    {
-        foreach (var description in apiVersionDescriptionProvider.ApiVersionDescriptions)
-
-            //foreach (var description in apiVersionDescriptionProvider)
-        {
-            options.SwaggerEndpoint($"/swagger/{description.GroupName}/swagger.json",
-                description.GroupName.ToUpperInvariant());
-        }
-    });
-}
-
 
+var context = app.Services.GetService<HeartTrackContext>() ?? app.Services.GetService<TrainingStubbedContext>();
+context!.Database.EnsureCreated();
 app.Run();