From 108d7e67bb66e737a965f3af29a1638777242398 Mon Sep 17 00:00:00 2001
From: Lucca Santangelo <luccasant95@gmail.com>
Date: Sun, 29 Nov 2020 16:56:29 -0300
Subject: [PATCH] bedelia
---
.../Tsi1.Api/Controllers/CourseController.cs | 43 ++++++++++++-
Tsi1.Api/Tsi1.Api/Startup.cs | 10 +++
Tsi1.Api/Tsi1.Api/appsettings.json | 2 +
.../Tsi1.BusinessLayer/Dtos/CloseRecordDto.cs | 12 ++++
.../Tsi1.BusinessLayer/Dtos/UserGradeDto.cs | 12 ++++
.../Helpers/ErrorMessages.cs | 1 +
.../Interfaces/IBedeliaService.cs | 16 +++++
.../Interfaces/IUserService.cs | 2 +
.../Services/BedeliaService.cs | 61 +++++++++++++++++++
.../Services/UserService.cs | 26 ++++++++
.../Tsi1.BusinessLayer.csproj | 1 +
11 files changed, 183 insertions(+), 3 deletions(-)
create mode 100644 Tsi1.Api/Tsi1.BusinessLayer/Dtos/CloseRecordDto.cs
create mode 100644 Tsi1.Api/Tsi1.BusinessLayer/Dtos/UserGradeDto.cs
create mode 100644 Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IBedeliaService.cs
create mode 100644 Tsi1.Api/Tsi1.BusinessLayer/Services/BedeliaService.cs
diff --git a/Tsi1.Api/Tsi1.Api/Controllers/CourseController.cs b/Tsi1.Api/Tsi1.Api/Controllers/CourseController.cs
index 3778365..dd4de59 100644
--- a/Tsi1.Api/Tsi1.Api/Controllers/CourseController.cs
+++ b/Tsi1.Api/Tsi1.Api/Controllers/CourseController.cs
@@ -16,10 +16,14 @@ namespace Tsi1.Api.Controllers
public class CourseController : ControllerBase
{
private readonly ICourseService _courseService;
+ private readonly IUserService _userService;
+ private readonly IBedeliaService _bedeliaService;
- public CourseController(ICourseService courseService)
+ public CourseController(ICourseService courseService, IUserService userService, IBedeliaService bedeliaService)
{
_courseService = courseService;
+ _userService = userService;
+ _bedeliaService = bedeliaService;
}
[Authorize(Roles = UserTypes.Student + ", " + UserTypes.Professor)]
@@ -54,15 +58,20 @@ namespace Tsi1.Api.Controllers
return Ok(result.Data);
}
-
[Authorize(Roles = UserTypes.Student)]
[HttpPost("Matriculate/{courseId}")]
public async Task<IActionResult> Matriculate(int courseId)
{
var userId = int.Parse(HttpContext.User.Claims.FirstOrDefault(x => x.Type == "Id").Value);
+ var user = await _userService.GetById(userId);
+
+ var response = await _bedeliaService.IsValidUser(user.Data.Student.IdentityCard);
+ if (response.HasError)
+ {
+ return BadRequest(response.Message);
+ }
var result = await _courseService.Matriculate(userId, courseId);
-
if (result.HasError)
{
return BadRequest(result.Message);
@@ -245,5 +254,33 @@ namespace Tsi1.Api.Controllers
return Ok(result.Data);
}
+
+ [Authorize(Roles = UserTypes.Professor)]
+ [HttpPost("CloseRecord/{courseId}")]
+ public async Task<IActionResult> CloseRecord(int courseId)
+ {
+ var courseResult = await _courseService.GetById(courseId);
+ if (courseResult.HasError)
+ {
+ return BadRequest(courseResult.Message);
+ }
+
+ var userResult = await _userService.GetUserGrades(courseId);
+ if (userResult.HasError)
+ {
+ return BadRequest(userResult.Message);
+ }
+
+ var courseName = courseResult.Data.Name;
+ var userGrades = userResult.Data;
+
+ var result = await _bedeliaService.CloseRecord(courseName, userGrades);
+ if (result.HasError)
+ {
+ return BadRequest(result.Message);
+ }
+
+ return Ok();
+ }
}
}
diff --git a/Tsi1.Api/Tsi1.Api/Startup.cs b/Tsi1.Api/Tsi1.Api/Startup.cs
index 90bca24..b1f0216 100644
--- a/Tsi1.Api/Tsi1.Api/Startup.cs
+++ b/Tsi1.Api/Tsi1.Api/Startup.cs
@@ -46,17 +46,27 @@ namespace Tsi1.Api
{
string postgreSqlSection;
string mongoDbSection;
+ string bedeliaBaseUrlSection;
+
if (_env.IsProduction())
{
postgreSqlSection = "PostgreSqlCloud";
mongoDbSection = "Tsi1DatabaseSettingsCloud";
+ bedeliaBaseUrlSection = "BedeliaBaseUrlCloud";
}
else
{
postgreSqlSection = "PostgreSql";
mongoDbSection = "Tsi1DatabaseSettings";
+ bedeliaBaseUrlSection = "BedeliaBaseUrl";
}
+ var bedeliaBaseUrl = Configuration.GetSection(bedeliaBaseUrlSection).Value;
+ services.AddHttpClient<IBedeliaService, BedeliaService>(configureClient =>
+ {
+ configureClient.BaseAddress = new Uri(bedeliaBaseUrl);
+ });
+
services.AddControllers();
services.AddSignalR();
diff --git a/Tsi1.Api/Tsi1.Api/appsettings.json b/Tsi1.Api/Tsi1.Api/appsettings.json
index aeffabd..d77c42f 100644
--- a/Tsi1.Api/Tsi1.Api/appsettings.json
+++ b/Tsi1.Api/Tsi1.Api/appsettings.json
@@ -28,6 +28,8 @@
"Host": "smtp.gmail.com",
"Port": 587
},
+ "BedeliaBaseUrl": "http://localhost:55438/",
+ "BedeliaBaseUrlCloud": "http://tsi-bedelia.web.elasticloud.uy/",
"Logging": {
"LogLevel": {
"Default": "Information",
diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Dtos/CloseRecordDto.cs b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/CloseRecordDto.cs
new file mode 100644
index 0000000..f0964b6
--- /dev/null
+++ b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/CloseRecordDto.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Tsi1.BusinessLayer.Dtos
+{
+ public class CloseRecordDto
+ {
+ public string CourseName { get; set; }
+ public List<UserGradeDto> UserGrades { get; set; }
+ }
+}
diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Dtos/UserGradeDto.cs b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/UserGradeDto.cs
new file mode 100644
index 0000000..8018e60
--- /dev/null
+++ b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/UserGradeDto.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Tsi1.BusinessLayer.Dtos
+{
+ public class UserGradeDto
+ {
+ public string IdentityCard { get; set; }
+ public int Grade { get; set; }
+ }
+}
diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Helpers/ErrorMessages.cs b/Tsi1.Api/Tsi1.BusinessLayer/Helpers/ErrorMessages.cs
index b049c02..5f59d5b 100644
--- a/Tsi1.Api/Tsi1.BusinessLayer/Helpers/ErrorMessages.cs
+++ b/Tsi1.Api/Tsi1.BusinessLayer/Helpers/ErrorMessages.cs
@@ -34,6 +34,7 @@ namespace Tsi1.BusinessLayer.Helpers
public const string CourseDoesNotExist = "El curso con id '{0}' no existe";
public const string DuplicateCourseName = "Ya existe un curso con nombre '{0}'";
public const string CourseIsTemplate = "El curso con id '{0}' es un template";
+ public const string CourseHasNoStudents = "El curso con id '{0}' no tiene estudiantes";
public const string TenantDoesNotExist = "La Facultad '{0}' no existe";
public const string DuplicateTenantName = "Ya existe una Facultad con nombre '{0}'";
diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IBedeliaService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IBedeliaService.cs
new file mode 100644
index 0000000..88a6f29
--- /dev/null
+++ b/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IBedeliaService.cs
@@ -0,0 +1,16 @@
+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 IBedeliaService
+ {
+ Task<ServiceResult<bool>> IsValidUser(string identityCard);
+
+ Task<ServiceResult<bool>> CloseRecord(string courseName, List<UserGradeDto> userGrades);
+ }
+}
diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IUserService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IUserService.cs
index 1fa9902..e3a8920 100644
--- a/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IUserService.cs
+++ b/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IUserService.cs
@@ -34,5 +34,7 @@ namespace Tsi1.BusinessLayer.Interfaces
Task<ServiceResult<List<UserPreviewDto>>> GetProfessors(int tenantId);
Task<ServiceResult<List<UserPreviewDto>>> GetAdmins(int tenantId, string userType);
+
+ Task<ServiceResult<List<UserGradeDto>>> GetUserGrades(int courseId);
}
}
diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Services/BedeliaService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Services/BedeliaService.cs
new file mode 100644
index 0000000..cd7a08a
--- /dev/null
+++ b/Tsi1.Api/Tsi1.BusinessLayer/Services/BedeliaService.cs
@@ -0,0 +1,61 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using Tsi1.BusinessLayer.Dtos;
+using Tsi1.BusinessLayer.Helpers;
+using Tsi1.BusinessLayer.Interfaces;
+
+namespace Tsi1.BusinessLayer.Services
+{
+ public class BedeliaService : IBedeliaService
+ {
+ private readonly HttpClient _httpClient;
+
+ public BedeliaService(HttpClient httpClient)
+ {
+ _httpClient = httpClient;
+ }
+
+ public async Task<ServiceResult<bool>> IsValidUser(string identityCard)
+ {
+ var result = new ServiceResult<bool>();
+
+ var response = await _httpClient.GetAsync($"api/Users/{identityCard}");
+ if (response.StatusCode != HttpStatusCode.OK)
+ {
+ result.HasError = true;
+ var errorMessage = await response.Content.ReadAsStringAsync();
+ result.AddMessage(errorMessage);
+ }
+
+ return result;
+ }
+
+ public async Task<ServiceResult<bool>> CloseRecord(string courseName, List<UserGradeDto> userGrades)
+ {
+ var result = new ServiceResult<bool>();
+ var closeRecord = new CloseRecordDto()
+ {
+ CourseName = courseName,
+ UserGrades = userGrades
+ };
+
+ var jsonInString = JsonConvert.SerializeObject(closeRecord);
+ var model = new StringContent(jsonInString, Encoding.UTF8, "application/json");
+
+ var response = await _httpClient.PostAsync("api/Courses/closeRecord", model);
+ if (response.StatusCode != HttpStatusCode.OK)
+ {
+ result.HasError = true;
+ var errorMessage = await response.Content.ReadAsStringAsync();
+ result.AddMessage(errorMessage);
+ }
+
+ return result;
+ }
+ }
+}
diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Services/UserService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Services/UserService.cs
index ca09556..445386e 100644
--- a/Tsi1.Api/Tsi1.BusinessLayer/Services/UserService.cs
+++ b/Tsi1.Api/Tsi1.BusinessLayer/Services/UserService.cs
@@ -358,5 +358,31 @@ namespace Tsi1.BusinessLayer.Services
return result;
}
+
+ public async Task<ServiceResult<List<UserGradeDto>>> GetUserGrades(int courseId)
+ {
+ var result = new ServiceResult<List<UserGradeDto>>();
+
+ var course = await _context.Courses
+ .Include(x => x.StudentCourses)
+ .ThenInclude(x => x.Student)
+ .FirstOrDefaultAsync(x => x.Id == courseId);
+
+ if (!course.StudentCourses.Any())
+ {
+ result.HasError = true;
+ result.AddMessage(string.Format(ErrorMessages.CourseHasNoStudents, courseId));
+ return result;
+ }
+
+ // TODO: obtain the grade from StudentCourses
+ result.Data = course.StudentCourses.Select(x => new UserGradeDto()
+ {
+ Grade = 10,
+ IdentityCard = x.Student.IdentityCard
+ }).ToList();
+
+ return result;
+ }
}
}
diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Tsi1.BusinessLayer.csproj b/Tsi1.Api/Tsi1.BusinessLayer/Tsi1.BusinessLayer.csproj
index a18735e..d2c88df 100644
--- a/Tsi1.Api/Tsi1.BusinessLayer/Tsi1.BusinessLayer.csproj
+++ b/Tsi1.Api/Tsi1.BusinessLayer/Tsi1.BusinessLayer.csproj
@@ -11,6 +11,7 @@
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="3.1.9" />
<PackageReference Include="MimeKit" Version="2.9.2" />
+ <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup>
<ItemGroup>
--
GitLab