From 3b0ea797487390ba80208fc3df23a36c58bbea70 Mon Sep 17 00:00:00 2001
From: Elias Jansson <elias.jansson@gmail.com>
Date: Mon, 2 Jun 2025 09:21:56 +0200
Subject: [PATCH] Merge

---
 Aberwyn/Controllers/AdminController.cs | 17 +++++++++++++----
 Aberwyn/Data/MenuService.cs            |  6 ++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Aberwyn/Controllers/AdminController.cs b/Aberwyn/Controllers/AdminController.cs
index 80774df..0be2d3d 100644
--- a/Aberwyn/Controllers/AdminController.cs
+++ b/Aberwyn/Controllers/AdminController.cs
@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Aberwyn.Models;
-
+using Aberwyn.Data;
 
 namespace Aberwyn.Controllers
 {
@@ -12,11 +12,22 @@ namespace Aberwyn.Controllers
     {
         private readonly UserManager<ApplicationUser> _userManager;
         private readonly RoleManager<IdentityRole> _roleManager;
+        private readonly IConfiguration _configuration;
+        private readonly IHostEnvironment _env;
+        private readonly ApplicationDbContext _context;
 
-        public AdminController(UserManager<ApplicationUser> userManager, RoleManager<IdentityRole> roleManager)
+        public AdminController(
+            UserManager<ApplicationUser> userManager,
+            RoleManager<IdentityRole> roleManager,
+            IConfiguration configuration,
+            IHostEnvironment env,
+            ApplicationDbContext context)
         {
             _userManager = userManager;
             _roleManager = roleManager;
+            _configuration = configuration;
+            _env = env;
+            _context = context;
         }
 
         public async Task<IActionResult> Index()
@@ -128,8 +139,6 @@ public IActionResult ImportMealsFromProd()
 }
 [HttpPost]
 [Authorize(Roles = "Admin")]
-[HttpPost]
-[Authorize(Roles = "Admin")]
 public IActionResult ImportMenusFromProd()
 {
     var prodService = MenuService.CreateWithConfig(_configuration, _env, useProdDb: true);
diff --git a/Aberwyn/Data/MenuService.cs b/Aberwyn/Data/MenuService.cs
index 2027ead..7b7edde 100644
--- a/Aberwyn/Data/MenuService.cs
+++ b/Aberwyn/Data/MenuService.cs
@@ -157,6 +157,12 @@ public List<WeeklyMenu> GetAllWeeklyMenus()
                 .OrderBy(m => m.Name)
                 .ToList();
         }
+        public List<WeeklyMenu> GetWeeklyMenu(int weekNumber, int year)
+        {
+            return _context.WeeklyMenus
+                .Where(m => m.WeekNumber == weekNumber && m.Year == year)
+                .ToList();
+        }
 
         public List<WeeklyMenu> GetMenuEntriesByDateRange(DateTime startDate, DateTime endDate)
         {