Index: NutriMatch/Controllers/AdminController.cs =================================================================== --- NutriMatch/Controllers/AdminController.cs (revision dbc791c2887a973c5681b5b5b3b220d4b07aa94d) +++ NutriMatch/Controllers/AdminController.cs (revision 43fd85228cd124d1d74530c2e0b5a9aae73adf35) @@ -94,5 +94,6 @@ string notes = request.TryGetProperty("notes", out var notesProp) ? notesProp.GetString() : "No notes provided."; - var recipe = await _context.Recipes.FindAsync(recipeId); + var recipe = await _context.Recipes.Include(r => r.RecipeIngredients) + .ThenInclude(ri => ri.Ingredient).FirstOrDefaultAsync(r => r.Id == recipeId); if (recipe == null) { Index: NutriMatch/Controllers/MealPlanController.cs =================================================================== --- NutriMatch/Controllers/MealPlanController.cs (revision dbc791c2887a973c5681b5b5b3b220d4b07aa94d) +++ NutriMatch/Controllers/MealPlanController.cs (revision 43fd85228cd124d1d74530c2e0b5a9aae73adf35) @@ -110,75 +110,5 @@ } - [HttpPost] - [ValidateAntiForgeryToken] - public async Task Regenerate([FromBody] MealPlanRequest request) - { - if (!ModelState.IsValid) - { - return BadRequest(ModelState); - } - - var user = await _userManager.GetUserAsync(User); - if (user == null) - { - return Unauthorized(); - } - - var result = await _mealPlanService.GenerateWeeklyMealPlanAsync(user.Id, request); - - if (result.Success) - { - return Json(new { success = true, message = "Meal plan regenerated successfully!", mealPlanId = result.WeeklyMealPlan.Id }); - } - else - { - return Json(new { success = false, message = result.ErrorMessage }); - } - } - - [HttpGet] - public async Task GetMealPlanJson(int id) - { - var user = await _userManager.GetUserAsync(User); - if (user == null) - { - return Unauthorized(); - } - - var mealPlan = await _mealPlanService.GetMealPlanByIdAsync(id, user.Id); - if (mealPlan == null) - { - return NotFound("Meal plan not found"); - } - - return Json(mealPlan); - } - - [HttpPost] - public async Task GenerateFromApi([FromBody] MealPlanRequest request) - { - var user = await _userManager.GetUserAsync(User); - if (user == null) - { - return Unauthorized("User not found"); - } - - var result = await _mealPlanService.GenerateWeeklyMealPlanAsync(user.Id, request); - - if (result.Success) - { - return Ok(new - { - success = true, - message = "Weekly meal plan generated successfully!", - mealPlan = result.WeeklyMealPlan, - dailyMacroTotals = result.DailyMacroTotals - }); - } - else - { - return BadRequest(new { success = false, message = result.ErrorMessage }); - } - } + } } Index: NutriMatch/Program.cs =================================================================== --- NutriMatch/Program.cs (revision dbc791c2887a973c5681b5b5b3b220d4b07aa94d) +++ NutriMatch/Program.cs (revision 43fd85228cd124d1d74530c2e0b5a9aae73adf35) @@ -4,10 +4,15 @@ using Microsoft.AspNetCore.Identity; using NutriMatch.Services; + var builder = WebApplication.CreateBuilder(args); + + builder.Services.AddControllersWithViews(); builder.Services.AddRazorPages(); builder.Services.AddScoped(); + builder.Services.AddDbContext(options => options.UseNpgsql(builder.Configuration.GetConnectionString("DefaultConnection"))); + builder.Services.AddDefaultIdentity(options => { @@ -16,5 +21,8 @@ .AddRoles() .AddEntityFrameworkStores(); + var app = builder.Build(); + + if (!app.Environment.IsDevelopment()) { @@ -22,14 +30,20 @@ app.UseHsts(); } + app.UseHttpsRedirection(); app.UseRouting(); app.UseAuthentication(); app.UseAuthorization(); + app.MapRazorPages(); + app.MapStaticAssets(); + app.MapControllerRoute( name: "default", pattern: "{controller=Home}/{action=Index}/{id?}") .WithStaticAssets(); + + using (var scope = app.Services.CreateScope()) { @@ -44,3 +58,4 @@ } } + app.Run(); Index: NutriMatch/Services/IMealPlanService.cs =================================================================== --- NutriMatch/Services/IMealPlanService.cs (revision dbc791c2887a973c5681b5b5b3b220d4b07aa94d) +++ NutriMatch/Services/IMealPlanService.cs (revision 43fd85228cd124d1d74530c2e0b5a9aae73adf35) @@ -6,5 +6,4 @@ { Task GenerateWeeklyMealPlanAsync(string userId, MealPlanRequest request); - Task> GetSuitableRestaurantMealsAsync(string mealType, DailyMacros targetMacros); Task GetMealPlanByIdAsync(int id, string userId); Task> GetUserMealPlansAsync(string userId); Index: NutriMatch/Services/MealPlanService.cs =================================================================== --- NutriMatch/Services/MealPlanService.cs (revision dbc791c2887a973c5681b5b5b3b220d4b07aa94d) +++ NutriMatch/Services/MealPlanService.cs (revision 43fd85228cd124d1d74530c2e0b5a9aae73adf35) @@ -2,4 +2,5 @@ using NutriMatch.Data; using NutriMatch.Models; + namespace NutriMatch.Services { @@ -9,8 +10,10 @@ private readonly Random _random; private readonly Dictionary _mealTypeDistribution; + public MealPlanService(AppDbContext context) { _context = context; _random = new Random(); + _mealTypeDistribution = new Dictionary { @@ -21,7 +24,9 @@ }; } + public async Task GenerateWeeklyMealPlanAsync(string userId, MealPlanRequest request) { var result = new MealPlanResult { Success = false }; + try { @@ -31,7 +36,10 @@ GeneratedAt = DateTime.UtcNow }; + var days = new[] { "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday" }; var mealTypes = new[] { "breakfast", "lunch", "dinner" }; + var restaurantMealSlots = DistributeRestaurantMeals(request.RestaurantMealsPerWeek, days, mealTypes); + foreach (var day in days) { @@ -43,4 +51,5 @@ Fat = request.DailyFat }; + foreach (var mealType in mealTypes) { @@ -50,6 +59,8 @@ MealType = mealType }; + var targetMacros = CalculateMealMacros(dailyMacros, mealType); var isRestaurantMeal = restaurantMealSlots.Contains($"{day}_{mealType}"); + if (isRestaurantMeal) { @@ -76,6 +87,8 @@ } } + weeklyPlan.MealSlots.Add(mealSlot); } + var remainingCalories = CalculateRemainingCalories(weeklyPlan.MealSlots.Where(ms => ms.Day == day).ToList(), dailyMacros.Calories); if (remainingCalories > 100) @@ -88,4 +101,5 @@ Fat = remainingCalories * 0.35f / 9 }; + var snackSlot = new MealSlot { @@ -93,4 +107,5 @@ MealType = "snack" }; + var snackRecipe = await SelectRecipeAsync("snack", snackMacros); if (snackRecipe != null) @@ -102,6 +117,8 @@ } } + _context.WeeklyMealPlans.Add(weeklyPlan); await _context.SaveChangesAsync(); + result.WeeklyMealPlan = weeklyPlan; result.DailyMacroTotals = CalculateDailyMacroTotals(weeklyPlan); @@ -112,6 +129,8 @@ result.ErrorMessage = $"Failed to generate meal plan: {ex.Message}"; } + return result; } + public async Task DeleteMealPlanAsync(int id, string userId) { @@ -121,10 +140,14 @@ .Include(wmp => wmp.MealSlots) .FirstOrDefaultAsync(wmp => wmp.Id == id && wmp.UserId == userId); + if (mealPlan == null) { return false; } + _context.MealSlots.RemoveRange(mealPlan.MealSlots); + _context.WeeklyMealPlans.Remove(mealPlan); + await _context.SaveChangesAsync(); return true; @@ -135,8 +158,10 @@ } } + private HashSet DistributeRestaurantMeals(int totalRestaurantMeals, string[] days, string[] mealTypes) { var restaurantSlots = new HashSet(); var availableSlots = new List(); + foreach (var day in days) { @@ -146,4 +171,5 @@ } } + for (int i = 0; i < Math.Min(totalRestaurantMeals, availableSlots.Count); i++) { @@ -156,9 +182,12 @@ } } + return restaurantSlots; } + private DailyMacros CalculateMealMacros(DailyMacros dailyMacros, string mealType) { var distribution = _mealTypeDistribution.GetValueOrDefault(mealType, 0.25f); + return new DailyMacros { @@ -169,4 +198,5 @@ }; } + private async Task SelectRecipeAsync(string mealType, DailyMacros targetMacros) { @@ -174,9 +204,12 @@ .Include(r => r.RecipeIngredients) .Where(r => r.RecipeStatus == "Accepted"); + if (!string.IsNullOrEmpty(mealType)) { query = query.Where(r => r.Type.Contains(mealType)); } + var recipes = await query.ToListAsync(); + if (!recipes.Any()) { @@ -185,5 +218,7 @@ .ToListAsync(); } + if (!recipes.Any()) return null; + var scoredRecipes = recipes.Select(recipe => new { @@ -194,16 +229,23 @@ .Take(10) .ToList(); + var selectedRecipe = scoredRecipes[_random.Next(Math.Min(3, scoredRecipes.Count))].Recipe; + return selectedRecipe; } + private async Task SelectRestaurantMealAsync(string mealType, DailyMacros targetMacros) { var query = _context.RestaurantMeals.AsQueryable(); + if (!string.IsNullOrEmpty(mealType)) { query = query.Where(rm => rm.Type.Contains(mealType)); } + var restaurantMeals = await query.ToListAsync(); + if (!restaurantMeals.Any()) return null; + var scoredMeals = restaurantMeals.Select(meal => new { @@ -214,6 +256,8 @@ .Take(5) .ToList(); + return scoredMeals[_random.Next(scoredMeals.Count)].Meal; } + private double CalculateMacroMatchScore(Recipe recipe, DailyMacros targetMacros) { @@ -222,6 +266,8 @@ var carbMatch = 1.0 - Math.Abs(recipe.Carbs - targetMacros.Carbs) / Math.Max(targetMacros.Carbs, 1); var fatMatch = 1.0 - Math.Abs(recipe.Fat - targetMacros.Fat) / Math.Max(targetMacros.Fat, 1); + return (calorieMatch * 0.4 + proteinMatch * 0.2 + carbMatch * 0.2 + fatMatch * 0.2) * 100; } + private double CalculateMacroMatchScore(RestaurantMeal meal, DailyMacros targetMacros) { @@ -230,19 +276,25 @@ var carbMatch = 1.0 - Math.Abs(meal.Carbs - targetMacros.Carbs) / Math.Max(targetMacros.Carbs, 1); var fatMatch = 1.0 - Math.Abs(meal.Fat - targetMacros.Fat) / Math.Max(targetMacros.Fat, 1); + return (calorieMatch * 0.4 + proteinMatch * 0.2 + carbMatch * 0.2 + fatMatch * 0.2) * 100; } + private float CalculateRemainingCalories(List dayMeals, float targetCalories) { var totalCalories = dayMeals.Sum(ms => ms.IsRestaurantMeal ? (ms.RestaurantMeal?.Calories ?? 0) : (ms.Recipe?.Calories ?? 0)); + return Math.Max(0, targetCalories - totalCalories); } + private Dictionary CalculateDailyMacroTotals(WeeklyMealPlan weeklyPlan) { var dailyTotals = new Dictionary(); var days = new[] { "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday" }; + foreach (var day in days) { var dayMeals = weeklyPlan.MealSlots.Where(ms => ms.Day == day).ToList(); + dailyTotals[day] = new DailyMacros { @@ -253,18 +305,11 @@ }; } + return dailyTotals; } - public async Task> GetSuitableRestaurantMealsAsync(string mealType, DailyMacros targetMacros) - { - var query = _context.RestaurantMeals.AsQueryable(); - if (!string.IsNullOrEmpty(mealType)) - { - query = query.Where(rm => rm.Type.Contains(mealType)); - } - return await query.ToListAsync(); - } + public async Task GetMealPlanByIdAsync(int id, string userId) { -#pragma warning disable CS8603 +#pragma warning disable CS8603 return await _context.WeeklyMealPlans .Include(wmp => wmp.MealSlots) @@ -276,4 +321,5 @@ .FirstOrDefaultAsync(wmp => wmp.Id == id && wmp.UserId == userId); } + public async Task> GetUserMealPlansAsync(string userId) { Index: NutriMatch/Views/Recipes/Index.cshtml =================================================================== --- NutriMatch/Views/Recipes/Index.cshtml (revision dbc791c2887a973c5681b5b5b3b220d4b07aa94d) +++ NutriMatch/Views/Recipes/Index.cshtml (revision 43fd85228cd124d1d74530c2e0b5a9aae73adf35) @@ -64,11 +64,11 @@
Carbs (g) - 0 - 150 + 0 - 200
- -
Index: NutriMatch/Views/Shared/_Layout.cshtml =================================================================== --- NutriMatch/Views/Shared/_Layout.cshtml (revision dbc791c2887a973c5681b5b5b3b220d4b07aa94d) +++ NutriMatch/Views/Shared/_Layout.cshtml (revision 43fd85228cd124d1d74530c2e0b5a9aae73adf35) @@ -75,50 +75,54 @@ - @await RenderSectionAsync("Scripts", required: false)