Skip to content
Snippets Groups Projects

Feature/survey

Merged Enzo Santangelo Dodera requested to merge feature/survey into develop
13 files
+ 916
33
Compare changes
  • Side-by-side
  • Inline
Files
13
@@ -33,11 +33,9 @@ namespace Tsi1.Api.Controllers
@@ -33,11 +33,9 @@ namespace Tsi1.Api.Controllers
{
{
tenantId = int.Parse(HttpContext.User.Claims.FirstOrDefault(x => x.Type == "TenantId").Value);
tenantId = int.Parse(HttpContext.User.Claims.FirstOrDefault(x => x.Type == "TenantId").Value);
}
}
newSurvey.TenantId = tenantId;
newSurvey.IsGlobal = true;
newSurvey.IsGlobal = true;
var result = await _surveyService.CreateGlobalSurvey(newSurvey);
var result = await _surveyService.CreateGlobalSurvey(newSurvey, tenantId);
if (result.HasError)
if (result.HasError)
{
{
@@ -65,8 +63,8 @@ namespace Tsi1.Api.Controllers
@@ -65,8 +63,8 @@ namespace Tsi1.Api.Controllers
}
}
[Authorize(Roles = UserTypes.FacultyAdmin + ", " + UserTypes.UdelarAdmin)]
[Authorize(Roles = UserTypes.FacultyAdmin + ", " + UserTypes.UdelarAdmin)]
[HttpGet("GetAll")]
[HttpGet("GetAllGlobalSurvey")]
public async Task<IActionResult> GetAll(int tenantId)
public async Task<IActionResult> GetAllGlobalSurvey(int tenantId)
{
{
var userType = HttpContext.User.Claims.FirstOrDefault(x => x.Type == ClaimTypes.Role).Value;
var userType = HttpContext.User.Claims.FirstOrDefault(x => x.Type == ClaimTypes.Role).Value;
if (userType == UserTypes.FacultyAdmin)
if (userType == UserTypes.FacultyAdmin)
@@ -84,13 +82,13 @@ namespace Tsi1.Api.Controllers
@@ -84,13 +82,13 @@ namespace Tsi1.Api.Controllers
return Ok(result.Data);
return Ok(result.Data);
}
}
[Authorize(Roles = UserTypes.FacultyAdmin + ", " + UserTypes.UdelarAdmin + ", " + UserTypes.Student)]
[Authorize(Roles = UserTypes.FacultyAdmin + ", " + UserTypes.UdelarAdmin + ", " + UserTypes.Professor + ", " + UserTypes.Student)]
[HttpGet("Get/{surveyId}")]
[HttpGet("GetMySurvey/{surveyId}")]
public async Task<IActionResult> Get(int surveyId)
public async Task<IActionResult> GetMySurvey(int surveyId)
{
{
var userId = int.Parse(HttpContext.User.Claims.FirstOrDefault(x => x.Type == "Id").Value);
var userId = int.Parse(HttpContext.User.Claims.FirstOrDefault(x => x.Type == "Id").Value);
var result = await _surveyService.Get(surveyId, userId);
var result = await _surveyService.GetMySurvey(surveyId, userId);
if (result.HasError)
if (result.HasError)
{
{
@@ -117,7 +115,22 @@ namespace Tsi1.Api.Controllers
@@ -117,7 +115,22 @@ namespace Tsi1.Api.Controllers
return Ok(result.Data);
return Ok(result.Data);
}
}
 
[Authorize(Roles = UserTypes.FacultyAdmin + ", " + UserTypes.UdelarAdmin + ", " + UserTypes.Professor)]
 
[HttpGet("GetAllResponses/{surveyId}")]
 
public async Task<IActionResult> GetAllResponses(int surveyId)
 
{
 
var userType = HttpContext.User.Claims.FirstOrDefault(x => x.Type == ClaimTypes.Role).Value;
 
var tenantId = int.Parse(HttpContext.User.Claims.FirstOrDefault(x => x.Type == "TenantId").Value);
 
 
var result = await _surveyService.GetAllResponses(surveyId, userType, tenantId);
 
if (result.HasError)
 
{
 
return NotFound(result.Message);
 
}
 
 
return Ok(result.Data);
 
}
}
}
}
}
Loading