Release: Enrollment Check-in SMS Opt-in, RecIM Player Hall

Gordon360/Controllers/AcademicCheckInController.cs

@@ -39,22 +39,19 @@ public async Task<ActionResult<EmergencyContactViewModel>> PutEmergencyContactAs
 
  }
 
-
-
  /// <summary> Sets the students cell phone number</summary>
  /// <param name="data"> The phone number object to be added to the database </param>
- /// <returns> The data stored </returns>
  [HttpPut]
  [Route("cellphone")]
- public async Task<ActionResult<AcademicCheckInViewModel>> PutCellPhoneAsync([FromBody] AcademicCheckInViewModel data)
+ public async Task<ActionResult> PutCellPhoneAsync([FromBody] MobilePhoneUpdateViewModel data)
  {
  var username = AuthUtils.GetUsername(User);
  var id = accountService.GetAccountByUsername(username).GordonID;
 
  try
  {
- var result = await academicCheckInService.PutCellPhoneAsync(id, data);
- return Ok(result);
+ await academicCheckInService.PutCellPhoneAsync(id, data);
+ return Ok();
  }
  catch (System.Exception e)
  {
@@ -91,22 +88,21 @@ public async Task<ActionResult<AcademicCheckInViewModel>> PutDemographicAsync([F
  /// <returns> The user's stored holds </returns>
  [HttpGet]
  [Route("holds")]
- public async Task<ActionResult<AcademicCheckInViewModel>> GetHoldsAsync()
+ public async Task<ActionResult<EnrollmentCheckinHolds>> GetHoldsAsync()
  {
  var username = AuthUtils.GetUsername(User);
  var id = accountService.GetAccountByUsername(username).GordonID;
 
  try
  {
- var result = (await academicCheckInService.GetHoldsAsync(id)).First();
- return Ok(result);
+ EnrollmentCheckinHolds holds = await academicCheckInService.GetHoldsAsync(id);
+ return Ok(holds);
  }
  catch (System.Exception e)
  {
  System.Diagnostics.Debug.WriteLine(e.Message);
  return NotFound();
  }
-
  }
 
  /// <summary> Sets the user as having completed Academic Checkin </summary>

Gordon360/Controllers/RecIM/TeamsController.cs

@@ -34,7 +34,12 @@ public ActionResult<TeamExtendedViewModel> GetTeams([FromQuery] bool active)
  [Route("{teamID}")]
  public ActionResult<TeamExtendedViewModel> GetTeamByID(int teamID)
  {
- var team = teamService.GetTeamByID(teamID);
+
+ var viewerUsername = AuthUtils.GetUsername(User);
+ var viewerParticipation = participantService.GetParticipantByUsername(viewerUsername);
+ var isAdmin = viewerParticipation?.IsAdmin == true || AuthUtils.UserIsInGroup(User, Enums.AuthGroup.RecIMSuperAdmin);
+
+ var team = teamService.GetTeamByID(teamID, isAdmin);
 
  if (team == null)
  {

Gordon360/Models/CCT/Context/CCTContext.cs

@@ -317,6 +317,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
  entity.Property(e => e.JOB_NAME).IsFixedLength();
  entity.Property(e => e.PART_CDE).IsFixedLength();
  entity.Property(e => e.SESS_CDE).IsFixedLength();
+ entity.Property(e => e.USER_NAME).IsFixedLength();
  });
 
  modelBuilder.Entity<Mailboxes>(entity =>
@@ -468,6 +469,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
  {
  entity.ToView("ParticipantView", "RecIM");
 
+ entity.Property(e => e.Hall).IsFixedLength();
  entity.Property(e => e.SpecifiedGender).IsFixedLength();
  });
 
@@ -611,7 +613,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
  });
  modelBuilder.HasSequence("Information_Change_Request_Seq");
 
- OnModelCreatingGeneratedProcedures(modelBuilder);
  OnModelCreatingPartial(modelBuilder);
  }