Merge branch 'recim_release' of https://github.com/gordon-cs/gordon-3…

…60-api into recim_release
gordon-cs · Jul 21, 2023 · f1421bf · f1421bf
2 parents ac91161 + 0608f67
commit f1421bf
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/Gordon360/Controllers/RecIM/ActivitiesController.cs b/Gordon360/Controllers/RecIM/ActivitiesController.cs
@@ -31,7 +31,8 @@ public ActionResult<IEnumerable<ActivityExtendedViewModel>> GetActivities([FromQ
  { 
  if ( active is bool isActive)
  {
- var res = _activityService.GetActiveActivities(isActive);
+ bool completed = !isActive;
+ var res = _activityService.GetActivitiesByCompletion(completed);
  return Ok(res);
 
  }

diff --git a/Gordon360/Services/RecIM/ActivityService.cs b/Gordon360/Services/RecIM/ActivityService.cs
@@ -88,9 +88,9 @@ public IEnumerable<ActivityExtendedViewModel> GetActivities()
  });
  return activities;
  }
- public IEnumerable<ActivityExtendedViewModel> GetActiveActivities(bool isActive)
+ public IEnumerable<ActivityExtendedViewModel> GetActivitiesByCompletion(bool isCompleted)
  {
- return GetActivities().Where(a => !a.Completed == isActive);
+ return GetActivities().Where(a => a.Completed == isCompleted);
  }
 
  public ActivityExtendedViewModel? GetActivityByID(int activityID)

diff --git a/Gordon360/Services/RecIM/ParticipantService.cs b/Gordon360/Services/RecIM/ParticipantService.cs
@@ -275,10 +275,10 @@ public bool GetParticipantIsCustom(string username)
  public async Task<ParticipantExtendedViewModel> PostParticipantAsync(string username, int? statusID)
  {
  // Find gender
-
- var student = _context.Student.Where(s => s.AD_Username == username).FirstOrDefault();
- var facstaff = _context.FacStaff.Where(fs => fs.AD_Username == username).FirstOrDefault();
- string user_gender = student?.Gender ?? facstaff?.Gender ?? "U";
+ string user_gender = 
+  _context.Student.FirstOrDefault(s => s.AD_Username == username)?.Gender ?? 
+  _context.FacStaff.FirstOrDefault(fs => fs.AD_Username == username)?.Gender ?? 
+   "U";
 
  await _context.Participant.AddAsync(new Participant
  {

diff --git a/Gordon360/Services/ServiceInterfaces.cs b/Gordon360/Services/ServiceInterfaces.cs
@@ -326,7 +326,7 @@ public interface IActivityService
  IEnumerable<LookupViewModel>? GetActivityLookup(string type);
  IEnumerable<ActivityExtendedViewModel> GetActivities();
  ActivityExtendedViewModel? GetActivityByID(int activityID);
- IEnumerable<ActivityExtendedViewModel> GetActiveActivities(bool isActive);
+ IEnumerable<ActivityExtendedViewModel> GetActivitiesByCompletion(bool isActive);
  Task<RecIMActivityViewModel> UpdateActivityAsync(int activytID, ActivityPatchViewModel updatedActivity);
  Task<RecIMActivityViewModel> PostActivityAsync(ActivityUploadViewModel newActivity);
  Task<ParticipantActivityViewModel> AddParticipantActivityInvolvementAsync(string username, int activityID, int privTypeID, bool isFreeAgent);