On the good ways

src/Dto/AthleteDto.cs

@@ -19,7 +19,7 @@ public class UserDto
     public DateTime DateOfBirth { get; set; }
     public string ProfilePicture { get; set; } = "https://davidalmeida.site/assets/me_avatar.f77af006.png";
 
-    public LargeImageDto Image { get; set; }
+    public LargeImageDto Image { get; set; } = null!;
 
     public bool IsCoach { get; set; }
 }

src/Model2Entities/ActivityRepository.cs

@@ -27,9 +27,7 @@ public partial class DbDataManager : IDataManager
             _logger.LogInformation($"GetActivities with criteria {criteria} and descending {descending}", criteria, descending);
             
             var activities = _dataManager.DbContext.ActivitiesSet
-                .Include(a => a.HeartRates)
+                .IncludeStandardProperties().GetItemsWithFilterAndOrdering(b => true, index, count, criteria, descending).ToModels();
-                .Include(a=>a.Athlete)
-                .Include(a=> a.DataSource).GetItemsWithFilterAndOrdering(b => true, index, count, criteria, descending).ToModels();
             
             _logger.LogInformation($"Retrieved {activities.Count()} activities");
             return await Task.FromResult(activities);
@@ -39,7 +37,7 @@ public partial class DbDataManager : IDataManager
         {
             _logger.LogInformation($"GetActivityByIdAsync with id {id}", id);
 
-            var activity = _dataManager.DbContext.ActivitiesSet.GetItemsWithFilterAndOrdering(b => b.IdActivity == id, 0, 1, ActivityOrderCriteria.None, false).First().ToModel();
+            var activity = _dataManager.DbContext.ActivitiesSet.IncludeStandardProperties().GetItemsWithFilterAndOrdering(b => b.IdActivity == id, 0, 1, ActivityOrderCriteria.None, false).First().ToModel();
 
             if (activity != null)
                 _logger.LogInformation($"Retrieved activity with ID {id}");
@@ -147,8 +145,7 @@ public partial class DbDataManager : IDataManager
             try {
                 _logger.LogInformation($"Getting activities for user with ID {userId}");
                 var activities = _dataManager.DbContext.ActivitiesSet
-                    .Include(a => a.DataSource)
+                    .IncludeStandardProperties().GetItemsWithFilterAndOrdering(b => b.AthleteId == userId, index, count, criteria, descending).ToModels();
-                    .GetItemsWithFilterAndOrdering(b => b.AthleteId == userId, index, count, criteria, descending).ToModels();
                 _logger.LogInformation($"Retrieved {activities.Count()} activities for user with ID {userId}");
                 return Task.FromResult(activities);
             }

src/Model2Entities/Extension.cs

@@ -93,6 +93,12 @@ public static class Extensions
         }
         return query;
     }
+    public static IQueryable<ActivityEntity> IncludeStandardProperties(this IQueryable<ActivityEntity> query)
+    {
+        return query.Include(a => a.HeartRates)
+            .Include(a => a.Athlete)
+            .Include(a => a.DataSource);
+    }
     // public static Activity ToModel(this ActivityEntity entity)
     // {
     //     return new Activity (