Skip to content
Snippets Groups Projects
Commit c83a1b17 authored by esantangelo's avatar esantangelo
Browse files

fix survey

parent 9a0c9943
No related branches found
No related tags found
No related merge requests found
Pipeline #10661 passed
...@@ -183,7 +183,7 @@ namespace Tsi1.BusinessLayer.Services ...@@ -183,7 +183,7 @@ namespace Tsi1.BusinessLayer.Services
{ {
var result = new ServiceResult<List<SurveyResponseDetailDto>>(); var result = new ServiceResult<List<SurveyResponseDetailDto>>();
var tenant = await _context.Tenants.FirstOrDefaultAsync(x => x.Id == tenantId); var tenant = await _context.Tenants.AsNoTracking().FirstOrDefaultAsync(x => x.Id == tenantId);
if (tenant == null) if (tenant == null)
{ {
...@@ -192,7 +192,13 @@ namespace Tsi1.BusinessLayer.Services ...@@ -192,7 +192,13 @@ namespace Tsi1.BusinessLayer.Services
return result; return result;
} }
var survey = await _context.Surveys.FirstOrDefaultAsync(x => x.Id == surveyId); var survey = await _context.Surveys
.AsNoTracking()
.Include(x => x.Tenant)
.Include(x => x.SectionItem)
.ThenInclude(x => x.Section)
.ThenInclude(x => x.Course)
.FirstOrDefaultAsync(x => x.Id == surveyId);
if (survey == null) if (survey == null)
{ {
...@@ -201,7 +207,9 @@ namespace Tsi1.BusinessLayer.Services ...@@ -201,7 +207,9 @@ namespace Tsi1.BusinessLayer.Services
return result; return result;
} }
if (userType == UserTypes.Professor) var surveyTenant = survey.IsGlobal ? survey.Tenant.Id : survey.SectionItem.Section.Course.TenantId;
if ((userType == UserTypes.Professor || userType == UserTypes.FacultyAdmin) && tenantId != surveyTenant)
{ {
result.HasError = true; result.HasError = true;
result.AddMessage(string.Format(ErrorMessages.InvalidSurvey, surveyId)); result.AddMessage(string.Format(ErrorMessages.InvalidSurvey, surveyId));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment