diff --git a/Tsi1.Api/Tsi1.Api/Controllers/ActivityController.cs b/Tsi1.Api/Tsi1.Api/Controllers/ActivityController.cs
new file mode 100644
index 0000000000000000000000000000000000000000..d8593231480eb1fd0522e128aaf581bd75f34cd9
--- /dev/null
+++ b/Tsi1.Api/Tsi1.Api/Controllers/ActivityController.cs
@@ -0,0 +1,84 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Tsi1.BusinessLayer.Dtos;
+using Tsi1.BusinessLayer.Helpers;
+using Tsi1.BusinessLayer.Interfaces;
+
+namespace Tsi1.Api.Controllers
+{
+ [Route("api/[controller]")]
+ [ApiController]
+ public class ActivityController : ControllerBase
+ {
+ private readonly IActivityService _activityService;
+
+ public ActivityController(IActivityService activityService)
+ {
+ _activityService = activityService;
+ }
+
+ [Authorize(Roles = UserTypes.FacultyAdmin + ", " + UserTypes.Professor + ", " + UserTypes.Student)]
+ [HttpGet("GetAll/{courseId}")]
+ public async Task<IActionResult> GetAll(int courseId)
+ {
+ var result = await _activityService.GetAll(courseId);
+
+ if (result.HasError)
+ {
+ return BadRequest(result.Message);
+ }
+
+ return Ok(result.Data);
+ }
+
+ [Authorize(Roles = UserTypes.FacultyAdmin + ", " + UserTypes.Professor)]
+ [HttpPost("Create")]
+ public async Task<IActionResult> Create(ActivityCreateDto newActivity)
+ {
+ var userId = int.Parse(HttpContext.User.Claims.FirstOrDefault(x => x.Type == "Id").Value);
+ var result = await _activityService.Create(newActivity, userId);
+
+ if (result.HasError)
+ {
+ return BadRequest(result.Message);
+ }
+
+ return Ok(result.Data);
+ }
+
+ [Authorize(Roles = UserTypes.FacultyAdmin + ", " + UserTypes.Professor)]
+ [HttpPut("Modify/{activityId}")]
+ public async Task<IActionResult> Modify(int activityId, ActivityModifyDto activityDto)
+ {
+ var userId = int.Parse(HttpContext.User.Claims.FirstOrDefault(x => x.Type == "Id").Value);
+ var result = await _activityService.Modify(activityId, activityDto, userId);
+
+ if (result.HasError)
+ {
+ return BadRequest(result.Message);
+ }
+
+ return Ok();
+ }
+
+ [Authorize(Roles = UserTypes.FacultyAdmin + ", " + UserTypes.Professor)]
+ [HttpDelete("Delete/{activityId}")]
+ public async Task<IActionResult> Delete(int activityId)
+ {
+ var userId = int.Parse(HttpContext.User.Claims.FirstOrDefault(x => x.Type == "Id").Value);
+ var result = await _activityService.Delete(activityId, userId);
+
+ if (result.HasError)
+ {
+ return BadRequest(result.Message);
+ }
+
+ return Ok();
+ }
+ }
+}
diff --git a/Tsi1.Api/Tsi1.Api/Controllers/TenantController.cs b/Tsi1.Api/Tsi1.Api/Controllers/TenantController.cs
index 12046260b0b893041955a44bd2388bf916f083ad..9ffbc2b3037b88c37929ffa00ef8036999aafa3a 100644
--- a/Tsi1.Api/Tsi1.Api/Controllers/TenantController.cs
+++ b/Tsi1.Api/Tsi1.Api/Controllers/TenantController.cs
@@ -106,7 +106,7 @@ namespace Tsi1.Api.Controllers
[HttpGet("AllCourseStudentQuantity")]
public async Task<IActionResult> AllCourseStudentQuantity()
{
- var result = await _tenantService.CourseStudentQuantity();
+ var result = await _tenantService.AllCourseStudentQuantity();
if (result.HasError)
{
@@ -145,5 +145,21 @@ namespace Tsi1.Api.Controllers
return Ok(result.Data);
}
+
+ [Authorize(Roles = UserTypes.FacultyAdmin)]
+ [HttpGet("CourseAttendance")]
+ public async Task<IActionResult> CourseAttendance()
+ {
+ var tenantId = int.Parse(HttpContext.User.Claims.FirstOrDefault(x => x.Type == "TenantId").Value);
+
+ var result = await _tenantService.CourseAttendance(tenantId);
+
+ if (result.HasError)
+ {
+ return BadRequest(result.Message);
+ }
+
+ return Ok(result.Data);
+ }
}
}
diff --git a/Tsi1.Api/Tsi1.Api/SignalR/VideoHub.cs b/Tsi1.Api/Tsi1.Api/SignalR/VideoHub.cs
index f0c0eeeb4f242aea7a4343fac04136bc42c982fa..4744e3c5304f6f3e848bc92fbd163c60d84a93e7 100644
--- a/Tsi1.Api/Tsi1.Api/SignalR/VideoHub.cs
+++ b/Tsi1.Api/Tsi1.Api/SignalR/VideoHub.cs
@@ -5,12 +5,20 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Tsi1.BusinessLayer.Helpers;
+using Tsi1.BusinessLayer.Interfaces;
namespace Tsi1.Api.SignalR
{
[Authorize]
public class VideoHub : Hub
{
+ private readonly IActivityService _activityService;
+
+ public VideoHub(IActivityService activityService)
+ {
+ _activityService = activityService;
+ }
+
public override async Task OnConnectedAsync()
{
await Groups.AddToGroupAsync(Context.ConnectionId, Context.ConnectionId);
@@ -19,18 +27,34 @@ namespace Tsi1.Api.SignalR
}
[Authorize(Roles = UserTypes.Professor)]
- public async Task CreateRoom(string roomName)
+ public async Task CreateRoom(int activityId)
{
- await Groups.AddToGroupAsync(Context.ConnectionId, roomName);
+ var result = await _activityService.ActivityValidation(activityId);
+
+ if (result.HasError)
+ {
+ throw new HubException(result.Message);
+ }
- await Clients.Caller.SendAsync("CreateRoom", roomName);
+ await Groups.AddToGroupAsync(Context.ConnectionId, activityId.ToString());
+
+ await Clients.Caller.SendAsync("CreateRoom", activityId);
}
- public async Task Join(string roomName, string offer)
+ public async Task Join(int activityId, string offer)
{
- await Clients.Group(roomName).SendAsync("Join", Context.ConnectionId, offer);
+ var userId = int.Parse(Context.User.Claims.FirstOrDefault(x => x.Type == "Id").Value);
+
+ var result = await _activityService.AttendVirtualClass(activityId, userId);
+
+ if (result.HasError)
+ {
+ throw new HubException(result.Message);
+ }
+
+ await Clients.Group(activityId.ToString()).SendAsync("Join", Context.ConnectionId, offer);
- await Groups.AddToGroupAsync(Context.ConnectionId, roomName);
+ await Groups.AddToGroupAsync(Context.ConnectionId, activityId.ToString());
}
public async Task Leave(string roomName)
diff --git a/Tsi1.Api/Tsi1.Api/Startup.cs b/Tsi1.Api/Tsi1.Api/Startup.cs
index 90bca24e58e0280359f8a1a93b2ecf7f173109cb..d27fa6ae2007f1b94d51e98e5f22d00c440ed32d 100644
--- a/Tsi1.Api/Tsi1.Api/Startup.cs
+++ b/Tsi1.Api/Tsi1.Api/Startup.cs
@@ -95,6 +95,7 @@ namespace Tsi1.Api
services.AddScoped<ISurveyService, SurveyService>();
services.AddScoped<ICommunicationService, CommunicationService>();
services.AddScoped<IChatService, ChatService>();
+ services.AddScoped<IActivityService, ActivityService>();
services.AddSingleton<PresenceTracker>();
diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Dtos/ActivityCreateDto.cs b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/ActivityCreateDto.cs
new file mode 100644
index 0000000000000000000000000000000000000000..c320b4602d2b2bdfe628999a22f53a36eb728650
--- /dev/null
+++ b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/ActivityCreateDto.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Tsi1.BusinessLayer.Dtos
+{
+ public class ActivityCreateDto
+ {
+ public string Name { get; set; }
+
+ public bool IsVideoConference { get; set; }
+
+ public int CourseId { get; set; }
+ }
+}
diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Dtos/ActivityDto.cs b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/ActivityDto.cs
new file mode 100644
index 0000000000000000000000000000000000000000..ce33fcc5be89071ca759f3085112e5743c3a444b
--- /dev/null
+++ b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/ActivityDto.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Tsi1.BusinessLayer.Dtos
+{
+ public class ActivityDto
+ {
+ public int Id { get; set; }
+
+ public string Name { get; set; }
+
+ public bool IsVideoConference { get; set; }
+ }
+}
diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Dtos/ActivityModifyDto.cs b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/ActivityModifyDto.cs
new file mode 100644
index 0000000000000000000000000000000000000000..084adde789d42cc7542cd6585e793690323a13d3
--- /dev/null
+++ b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/ActivityModifyDto.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Tsi1.BusinessLayer.Dtos
+{
+ public class ActivityModifyDto
+ {
+ public string Name { get; set; }
+
+ public bool IsVideoConference { get; set; }
+ }
+}
diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Dtos/CourseAttendanceDto.cs b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/CourseAttendanceDto.cs
new file mode 100644
index 0000000000000000000000000000000000000000..608b1cdc3c112e139f2789ee499bfd3ba54f7ae0
--- /dev/null
+++ b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/CourseAttendanceDto.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Tsi1.BusinessLayer.Dtos
+{
+ public class CourseAttendanceDto
+ {
+ public int Id { get; set; }
+
+ public string Name { get; set; }
+
+ public List<UserAttendanceDto> Users { get; set; }
+ }
+}
diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Dtos/UserAttendanceDto.cs b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/UserAttendanceDto.cs
new file mode 100644
index 0000000000000000000000000000000000000000..f46bfda426217a11e19cabbe96ace8f802e3b369
--- /dev/null
+++ b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/UserAttendanceDto.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Tsi1.BusinessLayer.Dtos
+{
+ public class UserAttendanceDto
+ {
+ public string FirstName { get; set; }
+
+ public string LastName { get; set; }
+
+ public string Email { get; set; }
+
+ public int Quantity { get; set; }
+ }
+}
diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Helpers/ErrorMessages.cs b/Tsi1.Api/Tsi1.BusinessLayer/Helpers/ErrorMessages.cs
index b049c0244d6ec63c379544c1c0da7f90a475a6ad..1cffd0551686cd30f851493c7d64788b98fe0b2a 100644
--- a/Tsi1.Api/Tsi1.BusinessLayer/Helpers/ErrorMessages.cs
+++ b/Tsi1.Api/Tsi1.BusinessLayer/Helpers/ErrorMessages.cs
@@ -12,7 +12,7 @@ namespace Tsi1.BusinessLayer.Helpers
public const string StudentDoesNotExist = "El estudiante con Id de usuario: '{0}' no existe";
public const string StudentCourseDoesNotExists = "El estudiante '{0}' no se encuentra matriculado en el curso '{1}'";
public const string StudentCourseAlreadyExists = "El estudiante '{0}' ya se encuentra matriculado en el curso '{1}'";
- public const string ProffesorDoesNotExist = "El profesor con Id de usuario: '{0}' no existe";
+ public const string ProfessorDoesNotExist = "El profesor con Id de usuario: '{0}' no existe";
public const string ProfessorCourseAlreadyExists = "El profesor '{0}' ya es docente del curso '{1}'";
public const string ProfessorCourseDoesNotExists = "El profesor '{0}' no es docente del curso '{1}'";
public const string InvalidUsername = "El nombre de usuario debe ser de la forma: 'usuario@facultad'";
@@ -64,5 +64,7 @@ namespace Tsi1.BusinessLayer.Helpers
public const string CommunicationDoesNotExist = "La comunicación con id '{0}' no existe";
public const string InvalidTenant = "El usuario no pertenece a la facultad con id '{0}'";
+
+ public const string ActivityDoesNotExist = "La actividad con id '{0}' no existe";
}
}
diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Helpers/MappingProfile.cs b/Tsi1.Api/Tsi1.BusinessLayer/Helpers/MappingProfile.cs
index a72d596c8c6f48de65abdf53c03fd9c2fee4e78a..8116ab99f8b1205330ca9a3e615ea49ff68fb9c3 100644
--- a/Tsi1.Api/Tsi1.BusinessLayer/Helpers/MappingProfile.cs
+++ b/Tsi1.Api/Tsi1.BusinessLayer/Helpers/MappingProfile.cs
@@ -54,6 +54,9 @@ namespace Tsi1.BusinessLayer.Helpers
CreateMap<AnswerOption, AnswerOptionDetailDto>();
CreateMap<Tenant, RegistrationDto>();
CreateMap<Course, RegistrationDto>();
+ CreateMap<Activity, ActivityCreateDto>();
+ CreateMap<Activity, ActivityModifyDto>();
+ CreateMap<Activity, ActivityDto>();
CreateMap<ForumCreateDto, Forum>();
CreateMap<ForumPreviewDto, Forum>();
@@ -97,6 +100,9 @@ namespace Tsi1.BusinessLayer.Helpers
CreateMap<AnswerOptionDetailDto, AnswerOption>();
CreateMap<RegistrationDto, Tenant>();
CreateMap<RegistrationDto, Course>();
+ CreateMap<ActivityCreateDto, Activity>();
+ CreateMap<ActivityModifyDto, Activity>();
+ CreateMap<ActivityDto, Activity>();
}
}
}
diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IActivityService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IActivityService.cs
new file mode 100644
index 0000000000000000000000000000000000000000..4b0e88ad468dc25357ddc96aef56ce4b4143ead4
--- /dev/null
+++ b/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IActivityService.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using Tsi1.BusinessLayer.Dtos;
+using Tsi1.BusinessLayer.Helpers;
+
+namespace Tsi1.BusinessLayer.Interfaces
+{
+ public interface IActivityService
+ {
+ Task<ServiceResult<bool>> AttendVirtualClass(int activityId, int userId);
+ Task<ServiceResult<List<ActivityDto>>> GetAll(int courseId);
+ Task<ServiceResult<int>> Create(ActivityCreateDto newActivity, int userId);
+ Task<ServiceResult<int>> Modify(int activityId, ActivityModifyDto activityDto, int userId);
+ Task<ServiceResult<int>> Delete(int activityId, int userId);
+
+ Task<ServiceResult<int>> ActivityValidation(int activityId);
+ }
+}
diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/ITenantService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/ITenantService.cs
index fb19c6e5f9572ae47fdf81b69074e699ada0828a..4390132671345531ee26f7a02b93ccda724d30f4 100644
--- a/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/ITenantService.cs
+++ b/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/ITenantService.cs
@@ -23,10 +23,11 @@ namespace Tsi1.BusinessLayer.Interfaces
Task<ServiceResult<List<TenantPreviewDto>>> FacultyList();
- Task<ServiceResult<List<TenantCourseDto>>> CourseStudentQuantity();
+ Task<ServiceResult<List<TenantCourseDto>>> AllCourseStudentQuantity();
Task<ServiceResult<List<RegistrationDto>>> FacultyRegistrations();
Task<ServiceResult<List<RegistrationDto>>> CourseStudentQuantity(int tenantId);
+ Task<ServiceResult<List<CourseAttendanceDto>>> CourseAttendance(int tenantId);
}
}
diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Services/ActivityService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Services/ActivityService.cs
new file mode 100644
index 0000000000000000000000000000000000000000..9ab568e205b73ebae1f82ae0844478cb6f772fc7
--- /dev/null
+++ b/Tsi1.Api/Tsi1.BusinessLayer/Services/ActivityService.cs
@@ -0,0 +1,227 @@
+using AutoMapper;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tsi1.BusinessLayer.Dtos;
+using Tsi1.BusinessLayer.Helpers;
+using Tsi1.BusinessLayer.Interfaces;
+using Tsi1.DataLayer;
+using Tsi1.DataLayer.Entities;
+
+namespace Tsi1.BusinessLayer.Services
+{
+ public class ActivityService : IActivityService
+ {
+ private readonly Tsi1Context _context;
+ private readonly IMapper _mapper;
+
+ public ActivityService(Tsi1Context context, IMapper mapper)
+ {
+ _context = context;
+ _mapper = mapper;
+ }
+
+ public async Task<ServiceResult<bool>> AttendVirtualClass(int activityId, int userId)
+ {
+ var result = new ServiceResult<bool>();
+
+ var activity = await _context.Activities.FirstOrDefaultAsync(x => x.Id == activityId);
+
+ if (activity == null)
+ {
+ result.HasError = true;
+ result.AddMessage(string.Format(ErrorMessages.ActivityDoesNotExist, activityId));
+ }
+
+ var attendance = await _context.Attendances
+ .FirstOrDefaultAsync(x => x.ActivityId == activityId && x.UserId == userId);
+
+ if (attendance == null)
+ {
+ attendance = new Attendance
+ {
+ Activity = activity,
+ UserId = userId,
+ Date = DateTime.Now,
+ };
+ }
+
+ return result;
+ }
+
+ public async Task<ServiceResult<int>> ActivityValidation(int activityId)
+ {
+ var result = new ServiceResult<int>();
+
+ var activity = await _context.Activities.AsNoTracking().FirstOrDefaultAsync(x => x.Id == activityId);
+
+ if (activity == null)
+ {
+ result.HasError = true;
+ result.AddMessage(string.Format(ErrorMessages.ActivityDoesNotExist, activityId));
+ }
+
+ return result;
+ }
+
+ private async Task<ServiceResult<bool>> UserTypeValidation(int courseId, int userId)
+ {
+ var result = new ServiceResult<bool>();
+
+ var user = await _context.Users.AsNoTracking()
+ .Include(x => x.UserType)
+ .FirstOrDefaultAsync(x => x.Id == userId);
+
+ if (user == null)
+ {
+ result.HasError = true;
+ result.AddMessage(string.Format(ErrorMessages.UserDoesNotExist, userId));
+ return result;
+ }
+
+ if (user.UserType.Name == UserTypes.Professor)
+ {
+ var isProfessorCourse = await _context.ProfessorCourses
+ .AsNoTracking()
+ .AnyAsync(x => x.ProfessorId == user.ProfessorId && x.CourseId == courseId);
+
+ if (!isProfessorCourse)
+ {
+ result.HasError = true;
+ result.AddMessage(string.Format(ErrorMessages.ProfessorCourseDoesNotExists, user.Id, courseId));
+
+ }
+ }
+
+ return result;
+ }
+
+ private async Task<ServiceResult<bool>> CourseValidation(int courseId)
+ {
+ var result = new ServiceResult<bool>();
+
+ var course = await _context.Courses.AsNoTracking().FirstOrDefaultAsync(x => x.Id == courseId);
+
+ if (course == null)
+ {
+ result.HasError = true;
+ result.AddMessage(string.Format(ErrorMessages.CourseDoesNotExist, courseId));
+ }
+
+ return result;
+ }
+
+ public async Task<ServiceResult<List<ActivityDto>>> GetAll(int courseId)
+ {
+ var result = new ServiceResult<List<ActivityDto>>();
+
+ var validation = await this.CourseValidation(courseId);
+
+ if (validation.HasError)
+ {
+ result.HasError = true;
+ result.AddMessage(validation.Message);
+ return result;
+ }
+
+ var activities = await _context.Activities.AsNoTracking().Where(x => x.CourseId == courseId).ToListAsync();
+
+ result.Data = _mapper.Map<List<ActivityDto>>(activities);
+ return result;
+ }
+
+ public async Task<ServiceResult<int>> Create(ActivityCreateDto newActivity, int userId)
+ {
+ var result = new ServiceResult<int>();
+
+ var courseValidation = await this.CourseValidation(newActivity.CourseId);
+
+ if (courseValidation.HasError)
+ {
+ result.HasError = true;
+ result.AddMessage(courseValidation.Message);
+ return result;
+ }
+
+ var userTypeValidation = await this.UserTypeValidation(newActivity.CourseId, userId);
+
+ if (userTypeValidation.HasError)
+ {
+ result.HasError = true;
+ result.AddMessage(userTypeValidation.Message);
+ return result;
+ }
+
+ var activity = _mapper.Map<Activity>(newActivity);
+ _context.Activities.Add(activity);
+
+ await _context.SaveChangesAsync();
+
+ result.Data = activity.Id;
+ return result;
+ }
+
+ public async Task<ServiceResult<int>> Modify(int activityId, ActivityModifyDto activityDto, int userId)
+ {
+ var result = new ServiceResult<int>();
+
+ var activity = await _context.Activities.FirstOrDefaultAsync(x => x.Id == activityId);
+
+ if (activity == null)
+ {
+ result.HasError = true;
+ result.AddMessage(string.Format(ErrorMessages.ActivityDoesNotExist, activityId));
+ return result;
+ }
+
+ var userTypeValidation = await this.UserTypeValidation(activity.CourseId, userId);
+
+ if (userTypeValidation.HasError)
+ {
+ result.HasError = true;
+ result.AddMessage(userTypeValidation.Message);
+ return result;
+ }
+
+ _mapper.Map(activityDto, activity);
+
+ await _context.SaveChangesAsync();
+
+ result.Data = activity.Id;
+ return result;
+ }
+
+ public async Task<ServiceResult<int>> Delete(int activityId, int userId)
+ {
+ var result = new ServiceResult<int>();
+
+ var activity = await _context.Activities.FirstOrDefaultAsync(x => x.Id == activityId);
+
+ if (activity == null)
+ {
+ result.HasError = true;
+ result.AddMessage(string.Format(ErrorMessages.ActivityDoesNotExist, activityId));
+ return result;
+ }
+
+ var userTypeValidation = await this.UserTypeValidation(activity.CourseId, userId);
+
+ if (userTypeValidation.HasError)
+ {
+ result.HasError = true;
+ result.AddMessage(userTypeValidation.Message);
+ return result;
+ }
+
+ _context.Activities.Remove(activity);
+
+ await _context.SaveChangesAsync();
+
+ result.Data = activity.Id;
+ return result;
+ }
+ }
+}
diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Services/TenantService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Services/TenantService.cs
index e38b78b8b60391907877802ec9f7b4f3da6e4e81..2a41d0d352248bc47e19f1a1430a644396a11f83 100644
--- a/Tsi1.Api/Tsi1.BusinessLayer/Services/TenantService.cs
+++ b/Tsi1.Api/Tsi1.BusinessLayer/Services/TenantService.cs
@@ -158,7 +158,7 @@ namespace Tsi1.BusinessLayer.Services
return result;
}
- public async Task<ServiceResult<List<TenantCourseDto>>> CourseStudentQuantity()
+ public async Task<ServiceResult<List<TenantCourseDto>>> AllCourseStudentQuantity()
{
var result = new ServiceResult<List<TenantCourseDto>>();
@@ -238,5 +238,69 @@ namespace Tsi1.BusinessLayer.Services
return result;
}
+
+ public async Task<ServiceResult<List<CourseAttendanceDto>>> CourseAttendance(int tenantId)
+ {
+ var result = new ServiceResult<List<CourseAttendanceDto>>();
+
+ var tenant = await _context.Tenants.FirstOrDefaultAsync(x => x.Id == tenantId && x.Name != TenantAdmin.Name);
+
+ if (tenant == null)
+ {
+ result.HasError = true;
+ result.AddMessage(string.Format(ErrorMessages.TenantDoesNotExist, tenantId));
+ return result;
+ }
+
+ var courses = await _context.Courses
+ .AsNoTracking()
+ .Include(x => x.StudentCourses)
+ .Where(x => x.TenantId == tenantId && !x.IsTemplate)
+ .ToListAsync();
+
+ var attendances = await _context.Attendances
+ .AsNoTracking()
+ .Include(x => x.Activity)
+ .Where(x => x.User.TenantId == tenantId)
+ .ToListAsync();
+
+ var courseAttendanceDtos = new List<CourseAttendanceDto>();
+ foreach (var course in courses)
+ {
+ var courseAttendanceDto = new CourseAttendanceDto
+ {
+ Id = course.Id,
+ Name = course.Name,
+ Users = new List<UserAttendanceDto>(),
+ };
+
+ var studentIds = course.StudentCourses.Select(x => x.StudentId).ToList();
+
+ var users = await _context.Users
+ .AsNoTracking()
+ .Where(x => x.TenantId == tenantId && studentIds.Contains((int)x.StudentId))
+ .ToListAsync();
+
+ foreach (var user in users)
+ {
+ var attendanceQuantity = attendances.Where(x => x.UserId == user.Id && x.Activity.CourseId == course.Id).Count();
+
+ var userAttendanceDto = new UserAttendanceDto
+ {
+ Email = user.Email,
+ FirstName = user.FirstName,
+ LastName = user.LastName,
+ Quantity = attendanceQuantity
+ };
+
+ courseAttendanceDto.Users.Add(userAttendanceDto);
+ }
+
+ courseAttendanceDtos.Add(courseAttendanceDto);
+ }
+
+ result.Data = courseAttendanceDtos;
+ return result;
+ }
}
}
diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Services/UserService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Services/UserService.cs
index ca09556ce683038f99c0841051b99a58b7e6cb49..1536b9635bc33adbf87e259503498e3eec976906 100644
--- a/Tsi1.Api/Tsi1.BusinessLayer/Services/UserService.cs
+++ b/Tsi1.Api/Tsi1.BusinessLayer/Services/UserService.cs
@@ -178,7 +178,7 @@ namespace Tsi1.BusinessLayer.Services
else if(userType == UserTypes.Professor && user.Professor == null)
{
result.HasError = true;
- result.Message = string.Format(ErrorMessages.ProffesorDoesNotExist, userId);
+ result.Message = string.Format(ErrorMessages.ProfessorDoesNotExist, userId);
return result;
}
@@ -219,7 +219,7 @@ namespace Tsi1.BusinessLayer.Services
else if (userType == UserTypes.Professor && user.Professor == null)
{
result.HasError = true;
- result.Message = string.Format(ErrorMessages.ProffesorDoesNotExist, username);
+ result.Message = string.Format(ErrorMessages.ProfessorDoesNotExist, username);
return result;
}