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

merge from develop

parents 576b1c23 03fb7bd5
No related branches found
No related tags found
2 merge requests!26Develop,!25Feature/communications
Hide whitespace changes
Inline Side-by-side
Showing
with 356 additions and 281 deletions
Tsi1.Api/Tsi1.Api/Controllers/SurveyController.cs
+ 9
− 0
View file @ 5c738726
......@@ -132,5 +132,14 @@ namespace Tsi1.Api.Controllers
return Ok(result.Data);
}
[Authorize(Roles = UserTypes.FacultyAdmin + ", " + UserTypes.UdelarAdmin + ", " + UserTypes.Professor + ", " + UserTypes.Student)]
[HttpGet("GetAnswerOptions")]
public async Task<IActionResult> GetAnswerOptions()
{
var result = await _surveyService.GetAnswerOptions();
return Ok(result.Data);
}
}
}
Tsi1.Api/Tsi1.Api/SignalR/ChatHub.cs
+ 6
− 27
View file @ 5c738726
......@@ -66,6 +66,8 @@ namespace Tsi1.Api.SignalR
var userId = int.Parse(Context.User.Claims.FirstOrDefault(x => x.Type == "Id").Value);
var tenantId = int.Parse(Context.User.Claims.FirstOrDefault(x => x.Type == "TenantId").Value);
newMessage.TenantId = tenantId;
if (userId == newMessage.ReceiverId)
throw new HubException("You cannot send messages to yourself");
......@@ -93,41 +95,18 @@ namespace Tsi1.Api.SignalR
await Clients.Group(groupName).SendAsync("NewMessage", messageDto);
}
private async Task<Group> AddToGroup(string groupName)
private async Task<bool> AddToGroup(string groupName)
{
var group = await _chatService.GetGroupByName(groupName);
if (group == null)
{
throw new HubException($"No existe el grupo {groupName}");
}
var userId = int.Parse(Context.User.Claims.FirstOrDefault(x => x.Type == "Id").Value);
var connection = new Connection
{
ConnectionId = Context.ConnectionId,
UserId = userId,
};
if (group == null)
{
group = new Group
{
Name = groupName,
};
}
group.Connections.Add(connection);
var result = await _chatService.CreateGroup(group);
var result = await _chatService.CreateGroup(groupName, Context.ConnectionId, userId);
if (result.HasError)
{
throw new HubException($"Error al crear el grupo {group}");
throw new HubException($"Error al crear el grupo {groupName}");
}
return group;
return true;
}
private async Task<bool> RemoveFromGroup()
......
Tsi1.Api/Tsi1.Api/Startup.cs
+ 3
− 0
View file @ 5c738726
......@@ -93,6 +93,9 @@ namespace Tsi1.Api
services.AddScoped<IDataLoad, DataLoad>();
services.AddScoped<ISurveyService, SurveyService>();
services.AddScoped<ICommunicationService, CommunicationService>();
services.AddScoped<IChatService, ChatService>();
services.AddSingleton<PresenceTracker>();
services.Configure<MailSettings>(Configuration.GetSection("MailSettings"));
services.AddScoped<IEmailService, EmailService>();
......
Tsi1.Api/Tsi1.BusinessLayer/DataLoad/DataLoad.cs
+ 282
− 250
View file @ 5c738726
......@@ -36,256 +36,288 @@ namespace Tsi1.BusinessLayer.DataLoad
public async Task LoadDataAsync()
{
//// TENANTS
//var adminTenant = new TenantCreateDto
//{
// Name = TenantAdmin.Name,
//};
//var adminTenantId = await _tenantService.Create(adminTenant);
//var fingTenant = new TenantCreateDto
//{
// Name = "fing",
//};
//var fingTenantId = await _tenantService.Create(fingTenant);
//// USER TYPES
//var udelarAdminUserType = new UserType
//{
// Name = UserTypes.UdelarAdmin,
//};
//_context.Add(udelarAdminUserType);
//var facultyAdminUserType = new UserType
//{
// Name = UserTypes.FacultyAdmin,
//};
//_context.Add(facultyAdminUserType);
//var professorUserType = new UserType
//{
// Name = UserTypes.Professor,
//};
//_context.Add(professorUserType);
//var studentUserType = new UserType
//{
// Name = UserTypes.Student,
//};
//_context.Add(studentUserType);
//await _context.SaveChangesAsync();
//// USERS
//var userAdminUdelar = new UserRegisterDto
//{
// UserTypeId = udelarAdminUserType.Id,
// Username = "admin",
// Password = "admin",
// FirstName = "admin",
// LastName = "admin",
// Email = "admin@mail.com",
// IdentityCard = "12345678-9",
// Age = 44
//};
//await _userService.Create(userAdminUdelar, udelarAdminUserType.Name, adminTenantId.Data.Id);
//var userStudent1 = new UserRegisterDto
//{
// UserTypeId = studentUserType.Id,
// Username = "enzo",
// Password = "enzo",
// FirstName = "Enzo",
// LastName = "Santangelo",
// Email = "enzo@mail.com",
// IdentityCard = "13242344-5",
// Age = 25
//};
//await _userService.Create(userStudent1, studentUserType.Name, fingTenantId.Data.Id);
//var userStudent2 = new UserRegisterDto
//{
// UserTypeId = studentUserType.Id,
// Username = "mathias",
// Password = "mathias",
// FirstName = "Mathias",
// LastName = "Martinez",
// Email = "mathias@mail.com",
// IdentityCard = "3782346-5",
// Age = 26
//};
//await _userService.Create(userStudent2, studentUserType.Name, fingTenantId.Data.Id);
//var userProfessor = new UserRegisterDto
//{
// UserTypeId = professorUserType.Id,
// Username = "prof1",
// Password = "prof1",
// FirstName = "Juan",
// LastName = "Perez",
// Email = "jp@mail.com",
// IdentityCard = "98754342-5",
// Age = 34
//};
//await _userService.Create(userProfessor, professorUserType.Name, fingTenantId.Data.Id);
//var userFingAdmin = new UserRegisterDto
//{
// UserTypeId = facultyAdminUserType.Id,
// Username = "fing",
// Password = "fing",
// FirstName = "fing",
// LastName = "fing",
// Email = "fing@mail.com",
// IdentityCard = "89547821-5",
// Age = 45
//};
//await _userService.Create(userFingAdmin, facultyAdminUserType.Name, fingTenantId.Data.Id);
//// SECTION ITEM TYPES
//var sectionItemTypeFile = new SectionItemType
//{
// Name = SectionItemTypes.File,
//};
//_context.SectionItemTypes.Add(sectionItemTypeFile);
//var sectionItemTypeForum = new SectionItemType
//{
// Name = SectionItemTypes.Forum,
//};
//_context.SectionItemTypes.Add(sectionItemTypeForum);
//var sectionItemTypeSurvey = new SectionItemType
//{
// Name = SectionItemTypes.Survey,
//};
//_context.SectionItemTypes.Add(sectionItemTypeSurvey);
//await _context.SaveChangesAsync();
//// COURSES
//var course1Dto = new CourseCreateDto
//{
// Name = "Calculo 1",
// TenantId = fingTenantId.Data.Id
//};
//var course1 = await _courseService.Create(course1Dto);
//var course2Dto = new CourseCreateDto
//{
// Name = "GAL 1",
// TenantId = fingTenantId.Data.Id
//};
//var course2 = await _courseService.Create(course2Dto);
//var course3Dto = new CourseCreateDto
//{
// Name = "Fisica 1",
// TenantId = fingTenantId.Data.Id
//};
//await _courseService.Create(course3Dto);
//// SECTIONS
//var section1 = new SectionCreateDto
//{
// CourseId = course1.Data.Id,
// Name = "General",
// Order = 1
//};
//var section1Id = await _sectionService.Create(section1);
//var section2 = new SectionCreateDto
//{
// CourseId = course2.Data.Id,
// Name = "General",
// Order = 1
//};
//var section2Id = await _sectionService.Create(section2);
//var section3 = new SectionCreateDto
//{
// CourseId = course1.Data.Id,
// Name = "Tema 1",
// Order = 2
//};
//var section3Id = await _sectionService.Create(section3);
//// SECTION ITEMS
//var sectionItem1 = new SectionItemCreateDto
//{
// SectionId = section1Id.Data,
// Order = 1,
// SectionItemTypeId = sectionItemTypeForum.Id,
// Forum = new ForumCreateDto
// {
// Name = "Novedades"
// }
//};
//await _sectionItemService.Create(sectionItem1);
//var sectionItem2 = new SectionItemCreateDto
//{
// SectionId = section2Id.Data,
// Order = 1,
// SectionItemTypeId = sectionItemTypeForum.Id,
// Forum = new ForumCreateDto
// {
// Name = "Novedades"
// }
//};
//await _sectionItemService.Create(sectionItem2);
//var sectionItem3 = new SectionItemCreateDto
//{
// SectionId = section1Id.Data,
// Order = 2,
// SectionItemTypeId = sectionItemTypeForum.Id,
// Forum = new ForumCreateDto
// {
// Name = "General"
// }
//};
//await _sectionItemService.Create(sectionItem3);
//var sectionItem4 = new SectionItemCreateDto
//{
// SectionId = section3Id.Data,
// Order = 1,
// SectionItemTypeId = sectionItemTypeForum.Id,
// Forum = new ForumCreateDto
// {
// Name = "Tema 1"
// }
//};
//await _sectionItemService.Create(sectionItem4);
//// ANSWER OPTIONS
//var answerOptions = new List<AnswerOption>
//{
// new AnswerOption
// {
// Name = "Excelente"
// },
// new AnswerOption
// {
// Name = "Conforme"
// },
// new AnswerOption
// {
// Name = "Neutro"
// },
// new AnswerOption
// {
// Name = "No Conforme"
// },
// new AnswerOption
// {
// Name = "Mal"
// },
//};
//_context.AnswerOptions.AddRange(answerOptions);
//await _context.SaveChangesAsync();
// TENANTS
var tenants = new List<Tenant>
{
new Tenant
{
Name = TenantAdmin.Name,
},
new Tenant
{
Name = "fing",
},
};
_context.Tenants.AddRange(tenants);
await _context.SaveChangesAsync();
// USER TYPES
var udelarAdminUserType = new UserType
{
Name = UserTypes.UdelarAdmin,
};
_context.Add(udelarAdminUserType);
var facultyAdminUserType = new UserType
{
Name = UserTypes.FacultyAdmin,
};
_context.Add(facultyAdminUserType);
var professorUserType = new UserType
{
Name = UserTypes.Professor,
};
_context.Add(professorUserType);
var studentUserType = new UserType
{
Name = UserTypes.Student,
};
_context.Add(studentUserType);
await _context.SaveChangesAsync();
// USERS
var users = new List<User>
{
new User
{
UserTypeId = udelarAdminUserType.Id,
Username = "admin",
Password = "admin",
FirstName = "admin",
LastName = "admin",
Email = "admin@mail.com",
TenantId = 1,
},
new User
{
UserTypeId = studentUserType.Id,
Username = "enzo",
Password = "enzo",
FirstName = "Enzo",
LastName = "Santangelo",
Email = "enzo@mail.com",
Student = new Student
{
TenantId = 2,
IdentityCard = "13242344-5",
Age = 25
},
TenantId = 2,
},
new User
{
UserTypeId = studentUserType.Id,
Username = "mathias",
Password = "mathias",
FirstName = "Mathias",
LastName = "Martinez",
Email = "mathias@mail.com",
Student = new Student
{
IdentityCard = "3782346-5",
TenantId = 2,
Age = 26
},
TenantId = 2,
},
new User
{
UserTypeId = professorUserType.Id,
Username = "prof1",
Password = "prof1",
FirstName = "Juan",
LastName = "Perez",
Email = "jp@mail.com",
Professor = new Professor
{
TenantId = 2,
IdentityCard = "98754342-5",
},
TenantId = 2,
},
new User
{
UserTypeId = facultyAdminUserType.Id,
Username = "fing",
Password = "fing",
FirstName = "fing",
LastName = "fing",
Email = "fing@mail.com",
TenantId = 2,
},
};
_context.Users.AddRange(users);
try
{
await _context.SaveChangesAsync();
}
catch (Exception ex)
{
Console.WriteLine(ex.Message);
}
// SECTION ITEM TYPES
var sectionItemTypeFile = new SectionItemType
{
Name = SectionItemTypes.File,
};
_context.SectionItemTypes.Add(sectionItemTypeFile);
var sectionItemTypeForum = new SectionItemType
{
Name = SectionItemTypes.Forum,
};
_context.SectionItemTypes.Add(sectionItemTypeForum);
var sectionItemTypeSurvey = new SectionItemType
{
Name = SectionItemTypes.Survey,
};
_context.SectionItemTypes.Add(sectionItemTypeSurvey);
await _context.SaveChangesAsync();
// COURSES
var courses = new List<Course>
{
new Course
{
Id = 1,
Name = "Calculo 1",
TenantId = 2
},
new Course
{
Id = 2,
Name = "GAL 1",
TenantId = 2
},
new Course
{
Id = 3,
Name = "Fisica 1",
TenantId = 2
}
};
_context.Courses.AddRange(courses);
await _context.SaveChangesAsync();
// SECTIONS
var section1 = new Section
{
CourseId = 1,
Name = "General",
Order = 1,
SectionItems = new List<SectionItem>
{
new SectionItem
{
Order = 1,
SectionItemTypeId = sectionItemTypeForum.Id,
Forum = new Forum
{
Name = "Novedades"
}
},
new SectionItem
{
Order = 2,
SectionItemTypeId = sectionItemTypeForum.Id,
Forum = new Forum
{
Name = "General"
}
},
}
};
_context.Sections.Add(section1);
var section2 = new Section
{
CourseId = 2,
Name = "General",
Order = 1,
SectionItems = new List<SectionItem>
{
new SectionItem
{
Order = 1,
SectionItemTypeId = sectionItemTypeForum.Id,
Forum = new Forum
{
Name = "Novedades"
}
}
}
};
_context.Sections.Add(section2);
var section3 = new Section
{
CourseId = 1,
Name = "Tema 1",
Order = 2,
SectionItems = new List<SectionItem>
{
new SectionItem
{
Order = 1,
SectionItemTypeId = sectionItemTypeForum.Id,
Forum = new Forum
{
Name = "Tema 1"
}
}
}
};
_context.Sections.Add(section3);
await _context.SaveChangesAsync();
// ANSWER OPTIONS
var answerOptions = new List<AnswerOption>
{
new AnswerOption
{
Name = "Excelente"
},
new AnswerOption
{
Name = "Conforme"
},
new AnswerOption
{
Name = "Neutro"
},
new AnswerOption
{
Name = "No Conforme"
},
new AnswerOption
{
Name = "Mal"
},
};
_context.AnswerOptions.AddRange(answerOptions);
await _context.SaveChangesAsync();
}
}
......
Tsi1.Api/Tsi1.BusinessLayer/Dtos/AnswerOptionDetailDto.cs 0 → 100644
+ 12
− 0
View file @ 5c738726
using System;
using System.Collections.Generic;
using System.Text;
namespace Tsi1.BusinessLayer.Dtos
{
public class AnswerOptionDetailDto
{
public int Id { get; set; }
public string Name { get; set; }
}
}
Tsi1.Api/Tsi1.BusinessLayer/Helpers/MappingProfile.cs
+ 2
− 0
View file @ 5c738726
......@@ -51,6 +51,7 @@ namespace Tsi1.BusinessLayer.Helpers
CreateMap<SurveyAnswer, SurveyAnswerCreateDto>();
CreateMap<Communication, CommunicationCreateDto>();
CreateMap<Communication, CommunicationPreviewDto>();
CreateMap<AnswerOption, AnswerOptionDetailDto>();
CreateMap<ForumCreateDto, Forum>();
CreateMap<ForumPreviewDto, Forum>();
......@@ -91,6 +92,7 @@ namespace Tsi1.BusinessLayer.Helpers
CreateMap<SurveyAnswerCreateDto, SurveyAnswer>();
CreateMap<CommunicationCreateDto, Communication>();
CreateMap<CommunicationPreviewDto, Communication>();
CreateMap<AnswerOptionDetailDto, AnswerOption>();
}
}
}
Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IChatService.cs
+ 1
− 1
View file @ 5c738726
......@@ -11,7 +11,7 @@ namespace Tsi1.BusinessLayer.Interfaces
{
Task<Group> GetGroupByName(string groupName);
Task<ServiceResult<Group>> CreateGroup(Group group);
Task<ServiceResult<bool>> CreateGroup(string groupName, string connectionId, int userId);
Task<bool> RemoveConnectionFromGroup(string connectionId);
}
......
Tsi1.Api/Tsi1.BusinessLayer/Interfaces/ISurveyService.cs
+ 1
− 0
View file @ 5c738726
......@@ -15,5 +15,6 @@ namespace Tsi1.BusinessLayer.Interfaces
Task<ServiceResult<SurveyDetailDto>> GetMySurvey(int surveyId, int userId);
Task<ServiceResult<bool>> Complete(SurveyResponseCreateDto surveyResponse);
Task<ServiceResult<List<SurveyResponseDetailDto>>> GetAllResponses(int surveyId, string userType, int tenantId);
Task<ServiceResult<List<AnswerOptionDetailDto>>> GetAnswerOptions();
}
}
Tsi1.Api/Tsi1.BusinessLayer/Services/ChatService.cs
+ 29
− 3
View file @ 5c738726
......@@ -18,11 +18,35 @@ namespace Tsi1.BusinessLayer.Services
{
_tsi1Context = tsi1Context;
}
public async Task<ServiceResult<Group>> CreateGroup(Group group)
public async Task<ServiceResult<bool>> CreateGroup(string groupName, string connectionId, int userId)
{
var result = new ServiceResult<Group>();
var result = new ServiceResult<bool>();
var existingGroup = true;
var group = await this.GetGroupByName(groupName);
if (group == null)
{
existingGroup = false;
group = new Group
{
Name = groupName,
};
}
_tsi1Context.Groups.Add(group);
var connection = new Connection
{
ConnectionId = connectionId,
UserId = userId,
};
group.Connections.Add(connection);
if (!existingGroup)
{
_tsi1Context.Groups.Add(group);
}
try
{
await _tsi1Context.SaveChangesAsync();
......@@ -51,6 +75,8 @@ namespace Tsi1.BusinessLayer.Services
if (connection != null)
{
connection.Group = null;
_tsi1Context.Connections.Remove(connection);
await _tsi1Context.SaveChangesAsync();
}
......
Tsi1.Api/Tsi1.BusinessLayer/Services/SurveyService.cs
+ 11
− 0
View file @ 5c738726
......@@ -206,5 +206,16 @@ namespace Tsi1.BusinessLayer.Services
return result;
}
public async Task<ServiceResult<List<AnswerOptionDetailDto>>> GetAnswerOptions()
{
var result = new ServiceResult<List<AnswerOptionDetailDto>>();
var answerOptions = await _context.AnswerOptions.AsNoTracking().ToListAsync();
result.Data = _mapper.Map<List<AnswerOptionDetailDto>>(answerOptions);
return result;
}
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment