diff --git a/Tsi1.Api/Tsi1.Api/Controllers/CommunicationController.cs b/Tsi1.Api/Tsi1.Api/Controllers/CommunicationController.cs index 479c0d74e20a76720ea17a96e8177f3534a6b611..41247aec688acead0e9269d377ed0bcdb73335cb 100644 --- a/Tsi1.Api/Tsi1.Api/Controllers/CommunicationController.cs +++ b/Tsi1.Api/Tsi1.Api/Controllers/CommunicationController.cs @@ -42,7 +42,7 @@ namespace Tsi1.Api.Controllers return BadRequest(result.Message); } - return Ok(); + return Ok(result.Data); } [Authorize(Roles = UserTypes.FacultyAdmin + ", " + UserTypes.UdelarAdmin)] @@ -63,7 +63,7 @@ namespace Tsi1.Api.Controllers return BadRequest(result.Message); } - return Ok(); + return Ok(result.Data); } [Authorize(Roles = UserTypes.FacultyAdmin)] diff --git a/Tsi1.Api/Tsi1.Api/Controllers/CourseController.cs b/Tsi1.Api/Tsi1.Api/Controllers/CourseController.cs index 9097c5709a495950674f9eecd7ff4690e419aa4f..3778365e1fe2c75f2b53f505f789767a2e7cfac3 100644 --- a/Tsi1.Api/Tsi1.Api/Controllers/CourseController.cs +++ b/Tsi1.Api/Tsi1.Api/Controllers/CourseController.cs @@ -51,7 +51,7 @@ namespace Tsi1.Api.Controllers return BadRequest(result.Message); } - return Ok(); + return Ok(result.Data); } diff --git a/Tsi1.Api/Tsi1.Api/Controllers/ForumController.cs b/Tsi1.Api/Tsi1.Api/Controllers/ForumController.cs index 83a96c4131d8d15ce2ab53da366c9b0c59477bef..09b35e9a2c88a1dc8e8c8070162b1fcfbc63fae9 100644 --- a/Tsi1.Api/Tsi1.Api/Controllers/ForumController.cs +++ b/Tsi1.Api/Tsi1.Api/Controllers/ForumController.cs @@ -47,7 +47,7 @@ namespace Tsi1.Api.Controllers return BadRequest(result.Message); } - return Ok(); + return Ok(result.Data); } [Authorize(Roles = UserTypes.Professor)] diff --git a/Tsi1.Api/Tsi1.Api/Controllers/PostController.cs b/Tsi1.Api/Tsi1.Api/Controllers/PostController.cs index 720f6cd24c31a93d53794c8ced7b77703d3461be..a20d5fcfe873a5bebc1a5633e88dca3e1b3643d1 100644 --- a/Tsi1.Api/Tsi1.Api/Controllers/PostController.cs +++ b/Tsi1.Api/Tsi1.Api/Controllers/PostController.cs @@ -71,7 +71,7 @@ namespace Tsi1.Api.Controllers } } - return Ok(result.Data.Id); + return Ok(result.Data); } [Authorize(Roles = UserTypes.Student + ", " + UserTypes.Professor)] diff --git a/Tsi1.Api/Tsi1.Api/Controllers/PostMessageController.cs b/Tsi1.Api/Tsi1.Api/Controllers/PostMessageController.cs index cf2cbb93fc1d54a5af16c361bd62d3d9f17425b2..0812fdc5fefac035e281711fbab580c8c24c15d0 100644 --- a/Tsi1.Api/Tsi1.Api/Controllers/PostMessageController.cs +++ b/Tsi1.Api/Tsi1.Api/Controllers/PostMessageController.cs @@ -51,7 +51,7 @@ namespace Tsi1.Api.Controllers return BadRequest(result.Message); } - return Ok(); + return Ok(result.Data); } [Authorize(Roles = UserTypes.Student + ", " + UserTypes.Professor)] diff --git a/Tsi1.Api/Tsi1.Api/Controllers/SectionController.cs b/Tsi1.Api/Tsi1.Api/Controllers/SectionController.cs index 81946f2c304d9d9862e5a186937fee95d0ca7f32..487e4653bb9edd3cb495722e9b5c1ad40a8c435d 100644 --- a/Tsi1.Api/Tsi1.Api/Controllers/SectionController.cs +++ b/Tsi1.Api/Tsi1.Api/Controllers/SectionController.cs @@ -29,7 +29,7 @@ namespace Tsi1.Api.Controllers return BadRequest(result.Message); } - return Ok(); + return Ok(result.Data); } [HttpPut("Modify/{sectionId}")] diff --git a/Tsi1.Api/Tsi1.Api/Controllers/SectionItemController.cs b/Tsi1.Api/Tsi1.Api/Controllers/SectionItemController.cs index 04e043b2a7b0bfd9a91f819e5b309596bde1ad32..42ec2039f6c563e8ddabd9f42fbdd4989fda42c3 100644 --- a/Tsi1.Api/Tsi1.Api/Controllers/SectionItemController.cs +++ b/Tsi1.Api/Tsi1.Api/Controllers/SectionItemController.cs @@ -34,7 +34,7 @@ namespace Tsi1.Api.Controllers return BadRequest(result.Message); } - return Ok(); + return Ok(result.Data); } [HttpDelete("Delete/{sectionItemId}")] diff --git a/Tsi1.Api/Tsi1.Api/Controllers/SurveyController.cs b/Tsi1.Api/Tsi1.Api/Controllers/SurveyController.cs index 990851a82ad18d1753b8c68371fe7a3a2dc20041..3914c15873a6fa7587ee56df99c8a3382a3917df 100644 --- a/Tsi1.Api/Tsi1.Api/Controllers/SurveyController.cs +++ b/Tsi1.Api/Tsi1.Api/Controllers/SurveyController.cs @@ -42,7 +42,7 @@ namespace Tsi1.Api.Controllers return BadRequest(result.Message); } - return Ok(); + return Ok(result.Data); } [Authorize(Roles = UserTypes.FacultyAdmin + ", " + UserTypes.UdelarAdmin)] diff --git a/Tsi1.Api/Tsi1.Api/Controllers/UserController.cs b/Tsi1.Api/Tsi1.Api/Controllers/UserController.cs index e0ffd0bdcf77ca13a2325f737c369a4cc7785740..eee69b7d8e8cfc3befd7859d8a37eb0ef9dfbc3b 100644 --- a/Tsi1.Api/Tsi1.Api/Controllers/UserController.cs +++ b/Tsi1.Api/Tsi1.Api/Controllers/UserController.cs @@ -159,7 +159,7 @@ namespace Tsi1.Api.Controllers BadRequest(userServiceResult.Message); } - return Ok(); + return Ok(userServiceResult.Data); } [Authorize(Roles = UserTypes.FacultyAdmin + ", " + UserTypes.UdelarAdmin)] diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/ICommunicationService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/ICommunicationService.cs index 0c14aaefe1db024539fdf603a024f578f48dd247..d4a6245f5722b2bd0c404cce8476a3df1efb3bf8 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/ICommunicationService.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/ICommunicationService.cs @@ -9,7 +9,7 @@ namespace Tsi1.BusinessLayer.Interfaces { public interface ICommunicationService { - Task<ServiceResult<bool>> Create(CommunicationCreateDto newCommunication, int id); + Task<ServiceResult<int>> Create(CommunicationCreateDto newCommunication, int id); Task<ServiceResult<bool>> Delete(int communicationId); diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IForumService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IForumService.cs index db95e50fb7187731b47a02cff78439a8ce5ee37a..2e4e4c84d8151c731712f139dc03ffcf9011dbf3 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IForumService.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IForumService.cs @@ -12,7 +12,7 @@ namespace Tsi1.BusinessLayer.Interfaces { Task<ServiceResult<List<ForumPreviewDto>>> GetForums(int sectionId); - Task<ServiceResult<Forum>> Create(ForumCreateDto newForum); + Task<ServiceResult<int>> Create(ForumCreateDto newForum); Task<ServiceResult<Forum>> Delete(int forumId); diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IPostMessageService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IPostMessageService.cs index a1b34f403dc64bc82c1609eaf85f4a7656640308..6d3ddcc011e7af42d17a1ef2b5b1d589830b6bd3 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IPostMessageService.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IPostMessageService.cs @@ -12,7 +12,7 @@ namespace Tsi1.BusinessLayer.Interfaces { Task<ServiceResult<List<PostMessagePreviewDto>>> GetPostMessages(int postId); - Task<ServiceResult<PostMessage>> Create(PostMessageCreateDto newPostMessage); + Task<ServiceResult<int>> Create(PostMessageCreateDto newPostMessage); Task<ServiceResult<PostMessage>> Delete(int postMessageId); } diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IPostService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IPostService.cs index 40dbc56c173fcd990aa3c43ae8c6c5d8dac8d5ea..d73acc25a683584650164dd4d4f82a6f2ec050eb 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IPostService.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IPostService.cs @@ -12,7 +12,7 @@ namespace Tsi1.BusinessLayer.Interfaces { Task<ServiceResult<List<PostPreviewDto>>> GetPosts(int forumId); - Task<ServiceResult<Post>> Create(PostCreateDto newPost); + Task<ServiceResult<int>> Create(PostCreateDto newPost); Task<ServiceResult<Post>> Delete(int postId); } diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/ISurveyService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/ISurveyService.cs index b521e5ae22ecb73203a5adfbaf5b3b7fb0570c4a..6ec00d5ca09c97b8e7afdc174cfb6a9bfdea0324 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/ISurveyService.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/ISurveyService.cs @@ -9,7 +9,7 @@ namespace Tsi1.BusinessLayer.Interfaces { public interface ISurveyService { - Task<ServiceResult<bool>> CreateGlobalSurvey(SurveyCreateDto newSurvey, int tenantId); + Task<ServiceResult<int>> CreateGlobalSurvey(SurveyCreateDto newSurvey, int tenantId); Task<ServiceResult<bool>> DeleteGlobalSurvey(int surveyId, string userType, int tenantId); Task<ServiceResult<List<SurveyPreviewDto>>> GetAllGlobalSurveys(int tenantId, string userType); Task<ServiceResult<SurveyDetailDto>> GetMySurvey(int surveyId, int userId); diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IUserService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IUserService.cs index d503323a5aee281cb5fa54a7307829d7d90dcd6d..1fa99023a8a11832ee567ce57fa10bbdfcf9286a 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IUserService.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IUserService.cs @@ -12,7 +12,7 @@ namespace Tsi1.BusinessLayer.Interfaces { Task<ServiceResult<User>> Authenticate(string username, string password, int tenantId); - Task<ServiceResult<User>> Create(UserRegisterDto dto, string type, int tenantId); + Task<ServiceResult<int>> Create(UserRegisterDto dto, string type, int tenantId); Task<ServiceResult<List<UserDetailDto>>> GetAll(int tenantId); diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Services/CommunicationService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Services/CommunicationService.cs index ffcd09d10628cbefbaea410626dcaccb7727aa64..1a608b151e62d9cf584138825681f10b0a10f265 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Services/CommunicationService.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Services/CommunicationService.cs @@ -24,9 +24,9 @@ namespace Tsi1.BusinessLayer.Services _mapper = mapper; } - public async Task<ServiceResult<bool>> Create(CommunicationCreateDto newCommunication, int id) + public async Task<ServiceResult<int>> Create(CommunicationCreateDto newCommunication, int id) { - var result = new ServiceResult<bool>(); + var result = new ServiceResult<int>(); var isGlobal = newCommunication.IsGlobal; var commmunication = _mapper.Map<Communication>(newCommunication); @@ -38,9 +38,9 @@ namespace Tsi1.BusinessLayer.Services } _context.Communications.Add(commmunication); - await _context.SaveChangesAsync(); + result.Data = commmunication.Id; return result; } @@ -206,9 +206,9 @@ namespace Tsi1.BusinessLayer.Services return result; } - private async Task<ServiceResult<bool>> CreateValidation(int id, bool isGlobal, Communication commmunication) + private async Task<ServiceResult<int>> CreateValidation(int id, bool isGlobal, Communication commmunication) { - var result = new ServiceResult<bool>(); + var result = new ServiceResult<int>(); if (isGlobal) { diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Services/CourseService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Services/CourseService.cs index cd9387af0662f7b09ffaab906c33620f35d0ad03..bc1eeb80251a6193d27ca9a855965baeccd44026 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Services/CourseService.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Services/CourseService.cs @@ -52,6 +52,7 @@ namespace Tsi1.BusinessLayer.Services _context.Courses.Add(course); await _context.SaveChangesAsync(); + result.Data = course.Id; return result; } diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Services/ForumService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Services/ForumService.cs index 6418cd586192711626386adcf25d8285a9bd63d0..71c5bde7fe0dedf349ab8e5c94578f409cd9a74e 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Services/ForumService.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Services/ForumService.cs @@ -26,15 +26,15 @@ namespace Tsi1.BusinessLayer.Services _mapper = mapper; } - public async Task<ServiceResult<Forum>> Create(ForumCreateDto newForum) + public async Task<ServiceResult<int>> Create(ForumCreateDto newForum) { - var result = new ServiceResult<Forum>(); + var result = new ServiceResult<int>(); var forum = _mapper.Map<Forum>(newForum); _context.Forums.Add(forum); await _context.SaveChangesAsync(); - result.Data = forum; + result.Data = forum.Id; return result; } diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Services/PostMessageService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Services/PostMessageService.cs index 7d7431ffdec334c55948163b4d7b99cf956344a9..1868f2e83c545aadf6982f43636ad0e568512959 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Services/PostMessageService.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Services/PostMessageService.cs @@ -25,9 +25,9 @@ namespace Tsi1.BusinessLayer.Services _mapper = mapper; } - public async Task<ServiceResult<PostMessage>> Create(PostMessageCreateDto newPostMessage) + public async Task<ServiceResult<int>> Create(PostMessageCreateDto newPostMessage) { - var result = new ServiceResult<PostMessage>(); + var result = new ServiceResult<int>(); var postMessage = _mapper.Map<PostMessage>(newPostMessage); @@ -36,7 +36,7 @@ namespace Tsi1.BusinessLayer.Services _context.PostMessages.Add(postMessage); await _context.SaveChangesAsync(); - result.Data = postMessage; + result.Data = postMessage.Id; return result; } diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Services/PostService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Services/PostService.cs index 5c52e399ce5fc8678b7e11d10af01495a2abeb78..5472f256093e34e2cb15e13d82e58a21ae46e403 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Services/PostService.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Services/PostService.cs @@ -25,9 +25,9 @@ namespace Tsi1.BusinessLayer.Services _mapper = mapper; } - public async Task<ServiceResult<Post>> Create(PostCreateDto newPost) + public async Task<ServiceResult<int>> Create(PostCreateDto newPost) { - var result = new ServiceResult<Post>(); + var result = new ServiceResult<int>(); var post = _mapper.Map<Post>(newPost); @@ -36,8 +36,7 @@ namespace Tsi1.BusinessLayer.Services _context.Posts.Add(post); await _context.SaveChangesAsync(); - result.Data = post; - + result.Data = post.Id; return result; } diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Services/SectionItemService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Services/SectionItemService.cs index 56cab256819ac1bea56eb5d31a1fd07aeaac3054..b4294b08ca70a3b8f617d4b462cce44cffea69d1 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Services/SectionItemService.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Services/SectionItemService.cs @@ -39,6 +39,7 @@ namespace Tsi1.BusinessLayer.Services _context.SectionItems.Add(sectionItem); await _context.SaveChangesAsync(); + result.Data = sectionItem.Id; return result; } diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Services/SurveyService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Services/SurveyService.cs index 88f08b21443dc80e01e1decf4cd7feaf2080950f..c27512f8a380a2c17bb04c268568b1196cbf7797 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Services/SurveyService.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Services/SurveyService.cs @@ -24,9 +24,9 @@ namespace Tsi1.BusinessLayer.Services _mapper = mapper; } - public async Task<ServiceResult<bool>> CreateGlobalSurvey(SurveyCreateDto newSurvey, int tenantId) + public async Task<ServiceResult<int>> CreateGlobalSurvey(SurveyCreateDto newSurvey, int tenantId) { - var result = new ServiceResult<bool>(); + var result = new ServiceResult<int>(); var tenant = await _context.Tenants.FirstOrDefaultAsync(x => x.Id == tenantId); @@ -47,10 +47,10 @@ namespace Tsi1.BusinessLayer.Services } survey.Tenant = tenant; - _context.Surveys.Add(survey); - + _context.Surveys.Add(survey); await _context.SaveChangesAsync(); + result.Data = survey.Id; return result; } diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Services/UserService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Services/UserService.cs index 1e8f2b1174c63264ef9ac92bc91a87fc09400475..ca09556ce683038f99c0841051b99a58b7e6cb49 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Services/UserService.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Services/UserService.cs @@ -52,9 +52,9 @@ namespace Tsi1.BusinessLayer.Services return result; } - public async Task<ServiceResult<User>> Create(UserRegisterDto dto, string type, int tenantId) + public async Task<ServiceResult<int>> Create(UserRegisterDto dto, string type, int tenantId) { - var result = new ServiceResult<User>(); + var result = new ServiceResult<int>(); var user = _mapper.Map<User>(dto); @@ -81,8 +81,8 @@ namespace Tsi1.BusinessLayer.Services _context.Users.Add(user); await _context.SaveChangesAsync(); - result.Data = user; + result.Data = user.Id; return result; }