diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Dtos/PostMessagePreviewDto.cs b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/PostMessagePreviewDto.cs index cad57d7938a6e616a89e7d82e5a9d85909364296..fbcdee717c05215942abef9c045b159cba4a5c04 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Dtos/PostMessagePreviewDto.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/PostMessagePreviewDto.cs @@ -16,5 +16,7 @@ namespace Tsi1.BusinessLayer.Dtos public int PostId { get; set; } + public string CompleteName { get; set; } + } } diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Dtos/PostPreviewDto.cs b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/PostPreviewDto.cs index 526ca193b0a22f3474086050ffa6c428a4035f46..a513520e56da38b4229a693819c3d087e182ffae 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Dtos/PostPreviewDto.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/PostPreviewDto.cs @@ -16,5 +16,7 @@ namespace Tsi1.BusinessLayer.Dtos public int UserId { get; set; } + public string CompleteName { get; set; } + } } diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Services/PostMessageService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Services/PostMessageService.cs index 5385c44c7f4934315f71647f334d1f15b64ae58a..626f981915d68af45e78b62141d9d09d8c0fb9ce 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Services/PostMessageService.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Services/PostMessageService.cs @@ -72,6 +72,16 @@ namespace Tsi1.BusinessLayer.Services var postMessageDtos = _mapper.Map<List<PostMessagePreviewDto>>(postMessages); + var userIds = postMessageDtos.Select(x => x.UserId); + + var users = await _context.Users.Where(x => userIds.Contains(x.Id)).ToListAsync(); + + foreach (var postMessageDto in postMessageDtos) + { + var user = users.FirstOrDefault(x => x.Id == postMessageDto.UserId); + postMessageDto.CompleteName = user.FirstName + " " + user.LastName; + } + result.Data = postMessageDtos; return result; diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Services/PostService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Services/PostService.cs index 795c771027536c269c733ada645ac9c430eb9249..d039f7e5e640ded9d4a06352b8dc061fa7ce7212 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Services/PostService.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Services/PostService.cs @@ -72,6 +72,16 @@ namespace Tsi1.BusinessLayer.Services var postDtos = _mapper.Map<List<PostPreviewDto>>(posts); + var userIds = postDtos.Select(x => x.UserId); + + var users = await _context.Users.Where(x => userIds.Contains(x.Id)).ToListAsync(); + + foreach (var postDto in postDtos) + { + var user = users.FirstOrDefault(x => x.Id == postDto.UserId); + postDto.CompleteName = user.FirstName + " " + user.LastName; + } + result.Data = postDtos; return result;