From 77daf9d0b1122034712f6b3b2413519e84746e4c Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sun, 31 Jan 2021 09:45:10 +0200 Subject: Fixed getting of feed posts --- src/DevHive.Data/Repositories/FeedRepository.cs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src/DevHive.Data') diff --git a/src/DevHive.Data/Repositories/FeedRepository.cs b/src/DevHive.Data/Repositories/FeedRepository.cs index d8170d0..304697d 100644 --- a/src/DevHive.Data/Repositories/FeedRepository.cs +++ b/src/DevHive.Data/Repositories/FeedRepository.cs @@ -25,14 +25,16 @@ namespace DevHive.Data.Repositories List posts = await this._context.Posts .Where(post => post.TimeCreated < firstRequestIssued) .Where(p => friendsIds.Contains(p.Creator.Id)) - .Skip((pageNumber - 1) * pageSize) - .Take(pageSize) .ToListAsync(); // Ordering by descending can't happen in query, because it doesn't order it // completely correctly (example: in query these two times are ordered // like this: 2021-01-30T11:49:45, 2021-01-28T21:37:40.701244) - posts = posts.OrderByDescending(x => x.TimeCreated.ToFileTime()).ToList(); + posts = posts + .OrderByDescending(x => x.TimeCreated.ToFileTime()) + .Skip((pageNumber - 1) * pageSize) + .Take(pageSize) + .ToList(); return posts; } @@ -41,12 +43,14 @@ namespace DevHive.Data.Repositories List posts = await this._context.Posts .Where(post => post.TimeCreated < firstRequestIssued) .Where(p => p.Creator.Id == user.Id) - .Skip((pageNumber - 1) * pageSize) - .Take(pageSize) .ToListAsync(); // Look at GetFriendsPosts on why this is done like this - posts = posts.OrderByDescending(x => x.TimeCreated.ToFileTime()).ToList(); + posts = posts + .OrderByDescending(x => x.TimeCreated.ToFileTime()) + .Skip((pageNumber - 1) * pageSize) + .Take(pageSize) + .ToList(); return posts; } } -- cgit v1.2.3