Moved most dto's to common folder

StudioStoy · Jun 8, 2023 · 10f2930 · 10f2930
1 parent 2b44e88
commit 10f2930
Show file tree

Hide file tree

Showing 23 changed files with 110 additions and 100 deletions.
diff --git a/GainsTracker.Common/GainsTracker.Common.csproj b/GainsTracker.Common/GainsTracker.Common.csproj
@@ -6,4 +6,8 @@
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
+    <ItemGroup>
+      <Folder Include="Models\Measurements\" />
+    </ItemGroup>
+
 </Project>
diff --git a/...odels/Measurements/Units/DistanceUnits.cs → ...odels/Measurements/Units/DistanceUnits.cs b/...odels/Measurements/Units/DistanceUnits.cs → ...odels/Measurements/Units/DistanceUnits.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace GainsTracker.CoreAPI.Components.Workouts.Models.Measurements.Units;
+namespace GainsTracker.Common.Models.Measurements.Units;
 
 [JsonConverter(typeof(JsonStringEnumConverter))]
 public enum DistanceUnits

diff --git a/...ts/Models/Measurements/Units/TimeUnits.cs → ...on/Models/Measurements/Units/TimeUnits.cs b/...ts/Models/Measurements/Units/TimeUnits.cs → ...on/Models/Measurements/Units/TimeUnits.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace GainsTracker.CoreAPI.Components.Workouts.Models.Measurements.Units;
+namespace GainsTracker.Common.Models.Measurements.Units;
 
 [JsonConverter(typeof(JsonStringEnumConverter))]
 public enum TimeUnits

diff --git a/.../Models/Measurements/Units/WeightUnits.cs → .../Models/Measurements/Units/WeightUnits.cs b/.../Models/Measurements/Units/WeightUnits.cs → .../Models/Measurements/Units/WeightUnits.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace GainsTracker.CoreAPI.Components.Workouts.Models.Measurements.Units;
+namespace GainsTracker.Common.Models.Measurements.Units;
 
 [JsonConverter(typeof(JsonStringEnumConverter))]
 public enum WeightUnits

diff --git a/GainsTracker.Common/Models/Workouts/Dto/CreateWorkoutDto.cs b/GainsTracker.Common/Models/Workouts/Dto/CreateWorkoutDto.cs
@@ -0,0 +1,7 @@
+namespace GainsTracker.Common.Models.Workouts.Dto;
+
+public class CreateWorkoutDto
+{
+    public string GainsAccountId { get; set; } = string.Empty;
+    public WorkoutType WorkoutType { get; set; }
+}
diff --git a/...s/Workouts/Services/Dto/MeasurementDto.cs → ...mon/Models/Workouts/Dto/MeasurementDto.cs b/...s/Workouts/Services/Dto/MeasurementDto.cs → ...mon/Models/Workouts/Dto/MeasurementDto.cs
@@ -1,8 +1,8 @@
 using System.Text.Json;
-using GainsTracker.CoreAPI.Components.Workouts.Models.Measurements.Units;
+using GainsTracker.Common.Models.Measurements.Units;
 using GainsTracker.CoreAPI.Components.Workouts.Models.Workouts;
 
-namespace GainsTracker.CoreAPI.Components.Workouts.Services.Dto;
+namespace GainsTracker.Common.Models.Workouts.Dto;
 
 public class MeasurementDto
 {

diff --git a/GainsTracker.Common/Models/Workouts/Dto/WorkoutDto.cs b/GainsTracker.Common/Models/Workouts/Dto/WorkoutDto.cs
@@ -0,0 +1,14 @@
+namespace GainsTracker.Common.Models.Workouts.Dto;
+
+public class WorkoutDto
+{
+    public WorkoutDto(string gainsAccountId)
+    {
+        GainsAccountId = gainsAccountId;
+    }
+
+    public string Id { get; set; } = "";
+    public string GainsAccountId { get; set; }
+    public WorkoutType WorkoutType { get; set; }
+    public MeasurementDto? PersonalBest { get; set; }
+}
diff --git a/GainsTracker.Common/Models/Workouts/Dto/WorkoutMeasurementsDto.cs b/GainsTracker.Common/Models/Workouts/Dto/WorkoutMeasurementsDto.cs
@@ -0,0 +1,9 @@
+namespace GainsTracker.Common.Models.Workouts.Dto;
+
+public class WorkoutMeasurementsDto
+{
+    public string Id { get; set; } = "";
+    public List<MeasurementDto> Measurements { get; set; } = new();
+
+
+}
diff --git a/...kouts/Models/Workouts/ExerciseCategory.cs → ...ommon/Models/Workouts/ExerciseCategory.cs b/...kouts/Models/Workouts/ExerciseCategory.cs → ...ommon/Models/Workouts/ExerciseCategory.cs
diff --git a/...s/Workouts/Models/Workouts/WorkoutType.cs → ...ker.Common/Models/Workouts/WorkoutType.cs b/...s/Workouts/Models/Workouts/WorkoutType.cs → ...ker.Common/Models/Workouts/WorkoutType.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace GainsTracker.CoreAPI.Components.Workouts.Models.Workouts;
+namespace GainsTracker.Common.Models.Workouts;
 
 [JsonConverter(typeof(JsonStringEnumConverter))]
 public enum WorkoutType

diff --git a/GainsTracker.CoreAPI/Components/Workouts/Controllers/Examples/GainsExampleController.cs b/GainsTracker.CoreAPI/Components/Workouts/Controllers/Examples/GainsExampleController.cs
@@ -1,6 +1,6 @@
 using System.Text.Json;
 using GainsTracker.Common.Models.Generic;
-using GainsTracker.CoreAPI.Components.Workouts.Services.Dto;
+using GainsTracker.Common.Models.Workouts.Dto;
 using Microsoft.AspNetCore.Mvc;
 
 namespace GainsTracker.CoreAPI.Components.Workouts.Controllers.Examples;

diff --git a/GainsTracker.CoreAPI/Components/Workouts/Controllers/GainsController.cs b/GainsTracker.CoreAPI/Components/Workouts/Controllers/GainsController.cs
@@ -1,6 +1,6 @@
+using GainsTracker.Common.Models.Workouts.Dto;
 using GainsTracker.CoreAPI.Components.Workouts.Models;
 using GainsTracker.CoreAPI.Components.Workouts.Services;
-using GainsTracker.CoreAPI.Components.Workouts.Services.Dto;
 using GainsTracker.CoreAPI.Shared;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

diff --git a/GainsTracker.CoreAPI/Components/Workouts/Controllers/WorkoutCatalogController.cs b/GainsTracker.CoreAPI/Components/Workouts/Controllers/WorkoutCatalogController.cs
@@ -1,4 +1,5 @@
 using GainsTracker.Common.DTO;
+using GainsTracker.Common.Models.Workouts;
 using GainsTracker.CoreAPI.Components.Workouts.Models.Workouts;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.OpenApi.Extensions;

diff --git a/GainsTracker.CoreAPI/Components/Workouts/Models/Measurements/Measurement.cs b/GainsTracker.CoreAPI/Components/Workouts/Models/Measurements/Measurement.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 using GainsTracker.Common.Models.Generic;
-using GainsTracker.CoreAPI.Components.Workouts.Models.Measurements.Units;
+using GainsTracker.Common.Models.Measurements.Units;
 using GainsTracker.CoreAPI.Components.Workouts.Models.Workouts;
 
 namespace GainsTracker.CoreAPI.Components.Workouts.Models.Measurements;

diff --git a/GainsTracker.CoreAPI/Components/Workouts/Models/Workouts/Workout.cs b/GainsTracker.CoreAPI/Components/Workouts/Models/Workouts/Workout.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
+using GainsTracker.Common.Models.Workouts;
 using GainsTracker.CoreAPI.Components.Workouts.Models.Measurements;
 
 namespace GainsTracker.CoreAPI.Components.Workouts.Models.Workouts;

diff --git a/GainsTracker.CoreAPI/Components/Workouts/Models/Workouts/WorkoutUtils.cs b/GainsTracker.CoreAPI/Components/Workouts/Models/Workouts/WorkoutUtils.cs
@@ -1,4 +1,6 @@
-namespace GainsTracker.CoreAPI.Components.Workouts.Models.Workouts;
+using GainsTracker.Common.Models.Workouts;
+
+namespace GainsTracker.CoreAPI.Components.Workouts.Models.Workouts;
 
 public static class WorkoutUtils
 {

diff --git a/GainsTracker.CoreAPI/Components/Workouts/Services/Dto/CreateWorkoutDto.cs b/GainsTracker.CoreAPI/Components/Workouts/Services/Dto/CreateWorkoutDto.cs
diff --git a/GainsTracker.CoreAPI/Components/Workouts/Services/Dto/WorkoutDto.cs b/GainsTracker.CoreAPI/Components/Workouts/Services/Dto/WorkoutDto.cs
diff --git a/GainsTracker.CoreAPI/Components/Workouts/Services/Dto/WorkoutMeasurementsDto.cs b/GainsTracker.CoreAPI/Components/Workouts/Services/Dto/WorkoutMeasurementsDto.cs
diff --git a/GainsTracker.CoreAPI/Components/Workouts/Services/GainsService.cs b/GainsTracker.CoreAPI/Components/Workouts/Services/GainsService.cs
@@ -1,8 +1,8 @@
-using GainsTracker.CoreAPI.Components.Workouts.Data;
+using GainsTracker.Common.Models.Workouts.Dto;
+using GainsTracker.CoreAPI.Components.Workouts.Data;
 using GainsTracker.CoreAPI.Components.Workouts.Models;
 using GainsTracker.CoreAPI.Components.Workouts.Models.Measurements;
 using GainsTracker.CoreAPI.Components.Workouts.Models.Workouts;
-using GainsTracker.CoreAPI.Components.Workouts.Services.Dto;
 
 namespace GainsTracker.CoreAPI.Components.Workouts.Services;
 
@@ -26,7 +26,7 @@ public async Task<List<WorkoutDto>> GetWorkoutsByUsername(string username)
     {
         string id = _bigBrain.GetGainsIdByUsername(username);
         return (await _bigBrain.GetWorkoutsByGainsId(id))
-            .Select(WorkoutDto.FromWorkout)
+            .Select(w => w.ToDto())
             .ToList();
     }
 
@@ -42,7 +42,7 @@ public void AddWorkoutToGainsAccount(string username, CreateWorkoutDto workoutDt
     public WorkoutMeasurementsDto GetWorkoutMeasurementsById(string workoutId)
     {
         Workout workout = _bigBrain.GetWorkoutWithMeasurementsById(workoutId);
-        return WorkoutMeasurementsDto.FromWorkout(workout);
+        return workout.ToMeasurementsListDto();
     }
 
     public void AddMeasurementToWorkout(string workoutId, MeasurementDto dto)

diff --git a/GainsTracker.CoreAPI/Components/Workouts/Services/IGainsService.cs b/GainsTracker.CoreAPI/Components/Workouts/Services/IGainsService.cs
@@ -1,5 +1,5 @@
-using GainsTracker.CoreAPI.Components.Workouts.Models;
-using GainsTracker.CoreAPI.Components.Workouts.Services.Dto;
+using GainsTracker.Common.Models.Workouts.Dto;
+using GainsTracker.CoreAPI.Components.Workouts.Models;
 
 namespace GainsTracker.CoreAPI.Components.Workouts.Services;
 

diff --git a/GainsTracker.CoreAPI/Components/Workouts/WorkoutExtensions.cs b/GainsTracker.CoreAPI/Components/Workouts/WorkoutExtensions.cs
@@ -0,0 +1,45 @@
+using GainsTracker.Common.Models.Workouts.Dto;
+using GainsTracker.CoreAPI.Components.Workouts.Models.Measurements;
+using GainsTracker.CoreAPI.Components.Workouts.Models.Workouts;
+
+namespace GainsTracker.CoreAPI.Components.Workouts;
+
+public static class WorkoutExtensions
+{
+    public static WorkoutDto ToDto(this Workout workout)
+    {
+        MeasurementDto? bestMeasurement = null;
+
+        if (workout.PersonalBest != null)
+            bestMeasurement = new MeasurementDto
+            {
+                WorkoutId = workout.PersonalBest.WorkoutId,
+                TimeOfRecord = workout.PersonalBest.TimeOfRecord,
+                Category = workout.PersonalBest.Category,
+                Data = MeasurementFactory.SerializeMeasurementToJson(workout.PersonalBest)
+            };
+
+        return new WorkoutDto(workout.GainsAccountId)
+        {
+            Id = workout.Id,
+            WorkoutType = workout.WorkoutType,
+            PersonalBest = bestMeasurement
+        };
+    }
+
+    public static WorkoutMeasurementsDto ToMeasurementsListDto(this Workout workout)
+    {
+        return new WorkoutMeasurementsDto
+        {
+            Id = workout.Id,
+            Measurements = workout.Measurements
+                .Select(m => new MeasurementDto
+                {
+                    WorkoutId = m.WorkoutId,
+                    Category = m.Category,
+                    TimeOfRecord = m.TimeOfRecord,
+                    Data = MeasurementFactory.SerializeMeasurementToJson(m)
+                }).ToList()
+        };
+    }
+}
diff --git a/GainsTracker.CoreAPI/GainsTracker.CoreAPI.csproj b/GainsTracker.CoreAPI/GainsTracker.CoreAPI.csproj
@@ -7,27 +7,27 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="AutoMapper" Version="12.0.1"/>
-        <PackageReference Include="EFCore.NamingConventions" Version="7.0.2"/>
-        <PackageReference Include="EntityFramework" Version="6.4.4"/>
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.15"/>
-        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.15"/>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.4"/>
+        <PackageReference Include="AutoMapper" Version="12.0.1" />
+        <PackageReference Include="EFCore.NamingConventions" Version="7.0.2" />
+        <PackageReference Include="EntityFramework" Version="6.4.4" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.15" />
+        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.15" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.4" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.4">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.4"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.4" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.4">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.12"/>
-        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.3"/>
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3"/>
+        <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.12" />
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.3" />
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\GainsTracker.Common\GainsTracker.Common.csproj"/>
+        <ProjectReference Include="..\GainsTracker.Common\GainsTracker.Common.csproj" />
     </ItemGroup>
 </Project>