Merge branch 'dev' of github.com:Team-Kaleidoscope/DevHive into unit_test_refactoring

2 files changed, 25 insertions, 5 deletions

diff --git a/src/Data/DevHive.Data/Repositories/PostRepository.cs b/src/Data/DevHive.Data/Repositories/PostRepository.cs
index b6c5e37..0a88cf2 100644
--- a/src/Data/DevHive.Data/Repositories/PostRepository.cs
+++ b/src/Data/DevHive.Data/Repositories/PostRepository.cs
@@ -36,7 +36,7 @@ namespace DevHive.Data.Repositories
 					.Include(x => x.Comments)
 					.Include(x => x.Creator)
 					.Include(x => x.Attachments)
-					// .Include(x => x.Rating)
+					.Include(x => x.Ratings)
 					.FirstOrDefaultAsync(x => x.Id == id);
 		}
 
diff --git a/src/Data/DevHive.Data/Repositories/RatingRepository.cs b/src/Data/DevHive.Data/Repositories/RatingRepository.cs
index b361693..9bb2368 100644
--- a/src/Data/DevHive.Data/Repositories/RatingRepository.cs
+++ b/src/Data/DevHive.Data/Repositories/RatingRepository.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using DevHive.Data.Interfaces;
@@ -19,17 +20,36 @@ namespace DevHive.Data.Repositories
 			this._postRepository = postRepository;
 		}
 
-		public async Task<Rating> GetRatingByPostId(Guid postId)
+		public override async Task<Rating> GetByIdAsync(Guid id)
 		{
 			return await this._context.Rating
-				.FirstOrDefaultAsync(x => x.Post.Id == postId);
+				.Include(x => x.User)
+				.Include(x => x.Post)
+				.FirstOrDefaultAsync(x => x.Id == id);
+		}
+		public async Task<List<Rating>> GetRatingsByPostId(Guid postId)
+		{
+			return await this._context.Rating
+				.Where(x => x.Post.Id == postId).ToListAsync();
 		}
-
 		public async Task<bool> UserRatedPost(Guid userId, Guid postId)
 		{
-			return await this._context.UserRate
+			return await this._context.Rating
 				.Where(x => x.Post.Id == postId)
 				.AnyAsync(x => x.User.Id == userId);
 		}
+		public async Task<Rating> GetRatingByUserAndPostId(Guid userId, Guid postId)
+		{
+			return await this._context.Rating
+				.FirstOrDefaultAsync(x => x.Post.Id == postId && x.User.Id == userId);
+		}
+
+		public async Task<bool> DoesRatingExist(Guid id)
+		{
+			return await this._context.Rating
+				.AsNoTracking()
+				.AnyAsync(r => r.Id == id);
+		}
 	}
 }
+