fix code from review

gordon-cs · Jul 21, 2023 · 1c5a783 · 1c5a783
1 parent 1366e8b
commit 1c5a783
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/Gordon360/Models/ViewModels/UserCoursesViewModel.cs b/Gordon360/Models/ViewModels/UserCoursesViewModel.cs
@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Graph;
 using System;
+using System.Linq;
 using System.Runtime.Serialization.Formatters;
 
 namespace Gordon360.Models.ViewModels
@@ -26,15 +27,18 @@ public class UserCoursesViewModel
  public static implicit operator UserCoursesViewModel(UserCourses course)
  {
  var code = course.YR_CDE;
- if(course.TRM_CDE == "FA")
- {
- code += "09";
- } else if (course.TRM_CDE == "SP")
- {
- code += "01";
- } else
+
+ switch (course.TRM_CDE)
  {
- code += "05";
+ case "FA":
+ code += "09";
+ break;
+ case "SP":
+ code = (Int32.Parse(code) + 1).ToString() + "01";
+ break;
+ default:
+ code = (Int32.Parse(code) + 1).ToString() + "05";
+ break;
  }
 
  UserCoursesViewModel vm = new UserCoursesViewModel

diff --git a/Gordon360/Services/ScheduleService.cs b/Gordon360/Services/ScheduleService.cs
@@ -7,7 +7,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
 
 namespace Gordon360.Services
 {
@@ -113,7 +112,7 @@ public async Task<IEnumerable<SessionCoursesViewModel>> GetAllCourses(string use
  var allSchedule = _context.UserCourses
  .Where(s => s.UserID == account.gordon_id) 
  .Select(s => (UserCoursesViewModel)s)
- .ToList()  
+ .AsEnumerable() 
  .OrderByDescending(course => course.SessionCode); 
 
  foreach (SessionViewModel vm in allSessions)