Development

Controllers/UserController.cs

@@ -4,6 +4,7 @@
 using olympo_webapi.Models;
 using olympo_webapi.Services;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.EntityFrameworkCore;
 
 namespace olympo_webapi.Controllers
 {
@@ -48,22 +49,35 @@ public async Task<ActionResult<User>> GetById(int id)
             return Ok(user);
         }
 
-        [HttpGet("{userId}/exercises")]
-        public async Task<ActionResult<IEnumerable<Exercise>>> GetExercisesByUserId(int userId)
-        {
-            var user = await _userRepository.GetByIdAsync(userId);
-            if (user == null)
-            {
-                return NotFound($"User with ID {userId} not found.");
-            }
+		[HttpGet("{userId}/exercises")]
+		public async Task<ActionResult<IEnumerable<Exercise>>> GetExercisesByUserId(int userId)
+		{
+			var user = await _userRepository.GetByIdAsync(userId);
+			if (user == null)
+			{
+				return NotFound($"User with ID {userId} not found.");
+			}
 
-            var exercises = await _exerciseRepository.GetAsync();
-            var userExercises = exercises.Where(e => e.UserId == userId).ToList();
+			var exercises = await _exerciseRepository
+				.GetAsync(e => e.UserId == userId); 
+
+			if (!exercises.Any())
+			{
+				return NotFound($"No exercises found for user with ID {userId}.");
+			}
+
+			foreach (var exercise in exercises)
+			{
+				await _context.Entry(exercise)
+					.Collection(e => e.Sessions) 
+					.LoadAsync();
+			}
+
+			return Ok(exercises);
+		}
 
-            return Ok(userExercises);
-        }
 
-        [HttpGet("type")]
+		[HttpGet("type")]
         public async Task<ActionResult<IEnumerable<User>>> GetUserType(int type)
         {
             var users = await _userRepository.GetAsync();
@@ -113,6 +127,7 @@ public async Task<IActionResult> Post([FromBody] User input)
                 {
                     CPF = input.CPF,
                     Name = input.Name,
+                    Type = input.Type,
                     Email = input.Email,
                     ImagePath = imagePath,
                     Password = HashService.HashPassword(input.Password),

Models/Exercise.cs

@@ -12,14 +12,14 @@ public class Exercise
         public string? Description { get; set; }
         public string? ImagePath { get; set; }
         public string? VideoPath { get; set; }
-        public int? Day { get; set; }
         public int UserId { get; set; }
 
-        [JsonIgnore]
+		[ForeignKey("UserId")]
+        public User? User { get; set; }
+
         public List<Session>? Sessions { get; set; } = new List<Session>();
+		public List<ExerciseDay>? ExerciseDays { get; set; } = new List<ExerciseDay>();
 
-        [ForeignKey("UserId")]
-        public User? User { get; set; }
 
         [NotMapped]
         public IFormFile? Image { get; set; }

Models/ExerciseDay.cs

@@ -0,0 +1,17 @@
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+
+namespace olympo_webapi.Models
+{
+	public class ExerciseDay
+	{
+		[Key]
+		public int Id { get; set; }
+
+		public int ExerciseId { get; set; }
+		public int DayOfWeek { get; set; } 
+
+		[ForeignKey("ExerciseId")]
+		public Exercise? Exercise { get; set; }
+	}
+}

Models/IExerciseRepository.cs

@@ -1,4 +1,5 @@
-namespace olympo_webapi.Models
+
+namespace olympo_webapi.Models
 {
 	public interface IExerciseRepository
 	{
@@ -8,5 +9,6 @@ public interface IExerciseRepository
 		Task UpdateAsync(Exercise exercise);
 		Task DeleteAsync(int id);
 		Task<bool> ExistsAsync(int id);
+		Task<IEnumerable<object>> GetAsync(Func<object, bool> value);
 	}
 }

Models/User.cs

@@ -20,7 +20,7 @@ public class User
 		public UserType Type { get; set; }
 		public string? ImagePath { get; set; }
 		public string? Password { get; set; }
-		public List<Exercise>? Exercise { get; set; } = new List<Exercise>();
+		public List<Exercise>? Exercises { get; set; } = new List<Exercise>();
 
 		[NotMapped]
 		public IFormFile? Image { get; set; }