Merge pull request #1212 from gordon-cs/s25-finalExam-schedule

s25 implementations to get final exam data by username from 25Live

Author: russtuck

Gordon360/Controllers/AcademicTermController.cs

@@ -2,6 +2,7 @@
 using Gordon360.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using System;
 using System.Threading.Tasks;
 
 
@@ -33,5 +34,24 @@ public async Task<ActionResult<DaysLeftViewModel>> GetDaysLeft()
             var result = await service.GetDaysLeftAsync();
             return Ok(result);
         }
+
+        /// <summary>
+        /// Gets the most recent academic term that is either Spring or Fall
+        /// </summary>
+        /// <returns>The current term used to fetch final exams</returns>
+        [HttpGet]
+        [Route("currentFinalExamTerm")]
+        [AllowAnonymous]
+        [Obsolete]
+        public async Task<IActionResult> GetCurrentTermForFinalExams()
+        {
+            var currentFinalTerm = await service.GetCurrentTermForFinalExamsAsync();
+            if (currentFinalTerm == null)
+            {
+                return NotFound();
+            }
+
+            return Ok(currentFinalTerm);
+        }
     }
 }

Gordon360/Controllers/EventsController.cs

@@ -1,12 +1,18 @@
 using Gordon360.Authorization;
+using Gordon360.Enums;
 using Gordon360.Models.CCT.Context;
 using Gordon360.Models.ViewModels;
 using Gordon360.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Graph;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using static System.Runtime.CompilerServices.RuntimeHelpers;
+using System.Linq;
+using Gordon360.Extensions.System;
 
 namespace Gordon360.Controllers;
 
@@ -79,5 +85,28 @@ public ActionResult<IEnumerable<EventViewModel>> GetAllPublicEvents()
         return Ok(result);
     }
 
+    [HttpGet]
+    [Route("finalexams/{username}")]
+    public async Task<ActionResult<IEnumerable<EventViewModel>>> GetFinalExamsForUserByTermAsync(
+        string username,
+        [FromQuery] DateTime termStart,
+        [FromQuery] DateTime termEnd,
+        [FromQuery] string yearCode,
+        [FromQuery] string termCode)
+    {
+        var groups = AuthUtils.GetGroups(User);
+        var authenticatedUsername = AuthUtils.GetUsername(User);
+
+        IEnumerable<EventViewModel> result;
+        if (authenticatedUsername.EqualsIgnoreCase(username) || groups.Contains(AuthGroup.FacStaff))
+        {
+            result = await eventService.GetFinalExamsForUserByTermAsync(username, termStart, termEnd, yearCode, termCode);
+        }
+        else
+        {
+            result = await eventService.GetFinalExamsForInstructorByTermAsync(username, termStart, termEnd, yearCode, termCode);
+        }
+        return Ok(result);
+    }
 }
 

Gordon360/Controllers/ScheduleController.cs

@@ -44,7 +44,6 @@ public async Task<ActionResult<CoursesBySessionViewModel>> GetAllCourses(string
     /// <returns>A IEnumerable of term objects as well as the schedules</returns>
     [HttpGet]
     [Route("{username}/allcourses-by-term")]
-    [StateYourBusiness(operation = Operation.READ_ONE, resource = Resource.STUDENT_SCHEDULE)]
     public async Task<ActionResult<IEnumerable<CoursesByTermViewModel>>> GetAllCoursesByTerm(string username)
     {
         var groups = AuthUtils.GetGroups(User);

Gordon360/Controllers/SessionsController.cs

@@ -3,6 +3,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
+using System;
 
 namespace Gordon360.Controllers;
 
@@ -61,6 +62,26 @@ public ActionResult<SessionViewModel> GetCurrentSession()
         return Ok(currentSession);
     }
 
+    /// <summary>
+    /// Gets the most recent academic session that is either Spring or Fall
+    /// </summary>
+    /// <returns>The current session used to fetch final exams</returns>
+    [HttpGet]
+    [Route("currentFinals")]
+    [AllowAnonymous]
+    [Obsolete]
+    public ActionResult<SessionViewModel> GetCurrentSessionForFinalExams()
+    {
+        var currentFinalSession = sessionService.GetCurrentSessionForFinalExams();
+        if (currentFinalSession == null)
+        {
+            return NotFound();
+        }
+
+        return Ok(currentFinalSession);
+    }
+
+
     /// <summary>
     /// Gets the days left in the current session
     /// </summary>

Gordon360/Documentation/Gordon360.xml

@@ -93,15 +93,23 @@
     );
 
     builder.Services.Add360Services();
+  
     builder.Services.AddHostedService<EventCacheRefreshService>();
     builder.Services.AddHostedService<MarketplaceCleanupService>();
     builder.Services.AddHostedService<PosterCleanupService>();
+
     builder.Services.AddScoped<ServerUtils, ServerUtils>();
 
     builder.Services.AddMemoryCache();
+    builder.Services.AddHttpClient<IEventService, EventService>(client =>
+    {
+        client.Timeout = TimeSpan.FromSeconds(200);
+        client.DefaultRequestHeaders.Add("User-Agent", "Gordon360/1.0.0");
+    });
+    builder.Services.AddHostedService<EventCacheRefreshService>();
 
     var app = builder.Build();
-
+    
     // Configure the HTTP request pipeline.
 
     app.UseSwagger();

Gordon360/Program.cs

@@ -116,4 +116,18 @@ public async Task<DaysLeftViewModel> GetDaysLeftAsync()
             TermLabel = "Break"
         };
     }
+
+    public async Task<YearTermTableViewModel?> GetCurrentTermForFinalExamsAsync()
+    {
+        var currentDate = DateTime.Now;
+
+        var finalExamTerm = await context.YearTermTable
+            .Where(t =>
+                currentDate > t.TRM_BEGIN_DTE &&
+                (t.TRM_CDE == "SP" || t.TRM_CDE == "FA"))
+            .OrderByDescending(t => t.TRM_BEGIN_DTE)
+            .FirstOrDefaultAsync();
+
+        return finalExamTerm != null ? new YearTermTableViewModel(finalExamTerm) : null;
+    }
 }

Gordon360/Services/AcademicTermService.cs

@@ -1,18 +1,20 @@
-using Gordon360.Static_Classes;
+using Gordon360.Models.ViewModels;
+using Gordon360.Static_Classes;
 using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using System.Threading.Tasks;
-using System.Threading;
 using System;
-using System.Diagnostics;
-using Gordon360.Models.ViewModels;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace Gordon360.Services;
 
-public sealed class EventCacheRefreshService(IMemoryCache cache) : IHostedService, IDisposable
+public sealed class EventCacheRefreshService(IServiceScopeFactory scopeFactory) : IHostedService, IDisposable
 {
     private Timer? _timer = null;
+    private readonly IServiceScopeFactory _scopeFactory = scopeFactory;
 
     public Task StartAsync(CancellationToken stoppingToken)
     {
@@ -24,18 +26,24 @@ public Task StartAsync(CancellationToken stoppingToken)
 
     private async void UpdateEventsCacheAsync(object? state)
     {
-        IEnumerable<EventViewModel>? events = null;
         try
         {
-            events = await EventService.FetchEventsAsync();
+            using var scope = _scopeFactory.CreateScope();
+
+            var eventService = scope.ServiceProvider.GetRequiredService<IEventService>();
+            var cache = scope.ServiceProvider.GetRequiredService<IMemoryCache>();
+
+            var events = await eventService.FetchEventsAsync();
+            cache.Set(CacheKeys.Events, events);
+
         }
         catch (Exception ex)
         {
-            Debug.WriteLine(ex.Message);
+            Debug.WriteLine("UpdateEventsCacheAsync error: " + ex.Message);
         }
-        cache.Set(CacheKeys.Events, events);
     }
 
+
     public Task StopAsync(CancellationToken stoppingToken)
     {
         _timer?.Change(Timeout.Infinite, 0);