feat: Get reviews assigned to a reviewer (#110)

equinor · Oct 6, 2023 · b35de94 · b35de94
1 parent 0638c48
commit b35de94
Show file tree

Hide file tree

Showing 13 changed files with 79 additions and 10 deletions.
diff --git a/datasheetapi/Adapters/TagDataReviewAdapter.cs b/datasheetapi/Adapters/TagDataReviewAdapter.cs
@@ -20,6 +20,7 @@ private static TagDataReviewDto ToDto(this TagDataReview tagDataReview)
             CommentResponsible = tagDataReview.CommentResponsible,
             Approved = tagDataReview.Approved,
             TagDataVersion = tagDataReview.TagDataVersion,
+            Reviewer = tagDataReview.Reviewers.ToDto(),
         };
     }
 

diff --git a/datasheetapi/Controllers/TagDataReviewsController.cs b/datasheetapi/Controllers/TagDataReviewsController.cs
@@ -38,9 +38,9 @@ public TagDataReviewsController(ILoggerFactory loggerFactory,
     }
 
     [HttpGet(Name = "GetReviews")]
-    public async Task<ActionResult<List<TagDataReviewDto>>> GetReviews()
+    public async Task<ActionResult<List<TagDataReviewDto>>> GetReviews(Guid? reviewerId)
     {
-        var reviews = await _reviewService.GetTagDataReviews();
+        var reviews = await _reviewService.GetTagDataReviews(reviewerId);
         return reviews.ToDto();
     }
 
@@ -63,4 +63,16 @@ public async Task<ActionResult<List<TagDataReviewDto>>> GetReviews()
 
         return result.ToDto();
     }
+
+    [HttpPut("{reviewId}/reviewers/{reviewerId}", Name = "UpdateReview")]
+    public async Task<ActionResult<ReviewerDto?>> UpdateReview(
+    [NotEmptyGuid] Guid reviewId,
+    [NotEmptyGuid] Guid reviewerId,
+    [Required] UpdateReviewerDto updateReviewerDto)
+    {
+        var reviewStatus = updateReviewerDto.ReviewStatus.MapReviewStatusDtoToModel();
+        var result = await _reviewerService.UpdateReviewer(reviewId, reviewerId, Utils.GetAzureUniqueId(HttpContext.User), reviewStatus);
+
+        return result.ToDtoOrNull();
+    }
 }
diff --git a/datasheetapi/Dtos/TagDataReviewDto.cs b/datasheetapi/Dtos/TagDataReviewDto.cs
@@ -8,4 +8,5 @@ public record TagDataReviewDto : BaseEntityDto
     public Guid CommentResponsible { get; set; }
     public bool Approved { get; set; }
     public int TagDataVersion { get; init; }
+    public List<ReviewerDto> Reviewer { get; set; } = new List<ReviewerDto>();
 }
diff --git a/datasheetapi/Dtos/UpdateReviewerDto.cs b/datasheetapi/Dtos/UpdateReviewerDto.cs
@@ -0,0 +1,8 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace datasheetapi.Dtos;
+public record UpdateReviewerDto
+{
+    [Required]
+    public ReviewStatusDto ReviewStatus { get; set; }
+}
diff --git a/datasheetapi/Repositories/IReviewerRepository.cs b/datasheetapi/Repositories/IReviewerRepository.cs
@@ -3,5 +3,7 @@ namespace datasheetapi.Repositories
     public interface IReviewerRepository
     {
         Task<List<Reviewer>> CreateReviewers(List<Reviewer> review);
+        Task<Reviewer> UpdateReviewer(Reviewer reviewer);
+        Task<Reviewer?> GetReviewer(Guid reviewId, Guid reviewerId);
     }
 }
diff --git a/datasheetapi/Repositories/ITagDataReviewRepository.cs b/datasheetapi/Repositories/ITagDataReviewRepository.cs
@@ -4,7 +4,7 @@ public interface ITagDataReviewRepository
 {
     Task<TagDataReview?> GetTagDataReview(Guid id);
     Task<bool> AnyTagDataReview(Guid id);
-    Task<List<TagDataReview>> GetTagDataReviews();
+    Task<List<TagDataReview>> GetTagDataReviews(Guid? reviewerId);
     Task<List<TagDataReview>> GetTagDataReviewsForTag(string tagNo);
     Task<List<TagDataReview>> GetTagDataReviewsForTags(List<string> tagNos);
     Task<TagDataReview> AddTagDataReview(TagDataReview review);

diff --git a/datasheetapi/Repositories/ReviewerRepository.cs b/datasheetapi/Repositories/ReviewerRepository.cs
@@ -1,5 +1,7 @@
 using api.Database;
 
+using Microsoft.EntityFrameworkCore;
+
 namespace datasheetapi.Repositories;
 
 public class ReviewerRepository : IReviewerRepository
@@ -26,4 +28,21 @@ public async Task<List<Reviewer>> CreateReviewers(List<Reviewer> reviewers)
 
         return reviewers;
     }
+
+    public async Task<Reviewer?> GetReviewer(Guid reviewId, Guid reviewerId)
+    {
+        var reviewer = await _context.Reviewers.FirstOrDefaultAsync(r => r.TagDataReviewId == reviewId && r.ReviewerId == reviewerId);
+        return reviewer;
+    }
+
+    public async Task<Reviewer> UpdateReviewer(Reviewer reviewer)
+    {
+        reviewer.ModifiedDate = DateTime.UtcNow;
+
+        _context.Reviewers.Update(reviewer);
+
+        await _context.SaveChangesAsync();
+
+        return reviewer;
+    }
 }
diff --git a/datasheetapi/Repositories/TagDataReviewRepository.cs b/datasheetapi/Repositories/TagDataReviewRepository.cs
@@ -27,9 +27,19 @@ public async Task<bool> AnyTagDataReview(Guid id)
         return exists;
     }
 
-    public async Task<List<TagDataReview>> GetTagDataReviews()
+    public async Task<List<TagDataReview>> GetTagDataReviews(Guid? reviewerId)
     {
-        var reviews = await _context.TagDataReviews.ToListAsync();
+        if (reviewerId == null)
+        {
+            return await _context.TagDataReviews.ToListAsync();
+        }
+
+        var reviews = await _context.TagDataReviews
+            .Include(t => t.Reviewers)
+            .Where(t => t.Reviewers
+                .Any(x => x.ReviewerId == reviewerId))
+            .ToListAsync();
+
         return reviews;
     }
 

diff --git a/datasheetapi/Services/IReviewerService.cs b/datasheetapi/Services/IReviewerService.cs
@@ -3,5 +3,6 @@ namespace datasheetapi.Services
     public interface IReviewerService
     {
         Task<List<Reviewer>> CreateReviewers(Guid reviewId, List<Reviewer> reviewers);
+        Task<Reviewer> UpdateReviewer(Guid reviewId, Guid reviewerId, Guid userFromToken, ReviewStatusEnum reviewStatus);
     }
 }
diff --git a/datasheetapi/Services/ITagDataReviewService.cs b/datasheetapi/Services/ITagDataReviewService.cs
@@ -4,7 +4,7 @@ public interface ITagDataReviewService
 {
     Task<TagDataReview> GetTagDataReview(Guid id);
     Task<bool> AnyTagDataReview(Guid reviewId);
-    Task<List<TagDataReview>> GetTagDataReviews();
+    Task<List<TagDataReview>> GetTagDataReviews(Guid? reviewerId);
     Task<List<TagDataReview>> GetTagDataReviewsForTag(string tagNo);
     Task<List<TagDataReview>> GetTagDataReviewsForTags(List<string> tagNos);
     Task<TagDataReview> CreateTagDataReview(TagDataReview review, Guid azureUniqueId);

diff --git a/datasheetapi/Services/ReviewerService.cs b/datasheetapi/Services/ReviewerService.cs
@@ -27,4 +27,19 @@ public async Task<List<Reviewer>> CreateReviewers(Guid reviewId, List<Reviewer>
 
         return result;
     }
+
+    public async Task<Reviewer> UpdateReviewer(Guid reviewId, Guid reviewerId, Guid userFromToken, ReviewStatusEnum reviewStatus)
+    {
+        if (reviewerId != userFromToken) { throw new BadRequestException("Reviewer cannot update other people's review"); }
+
+        if (!await _reviewService.AnyTagDataReview(reviewId)) { throw new NotFoundException($"Invalid reviewId - {reviewId}."); }
+
+        var existingReviewer = await _reviewerRepository.GetReviewer(reviewId, reviewerId)
+            ?? throw new NotFoundException($"Reviewer with reviewId {reviewId} and reviewerId {reviewerId} not found");
+
+        existingReviewer.Status = reviewStatus;
+
+        var result = await _reviewerRepository.UpdateReviewer(existingReviewer);
+        return result;
+    }
 }
diff --git a/datasheetapi/Services/TagDataReviewService.cs b/datasheetapi/Services/TagDataReviewService.cs
@@ -30,9 +30,9 @@ public async Task<bool> AnyTagDataReview(Guid reviewId)
         return exists;
     }
 
-    public async Task<List<TagDataReview>> GetTagDataReviews()
+    public async Task<List<TagDataReview>> GetTagDataReviews(Guid? reviewerId)
     {
-        var reviews = await _reviewRepository.GetTagDataReviews();
+        var reviews = await _reviewRepository.GetTagDataReviews(reviewerId);
         return reviews;
     }
 

diff --git a/tests/Services/TagDataReviewServiceTests.cs b/tests/Services/TagDataReviewServiceTests.cs
@@ -56,10 +56,10 @@ public async Task GetTagDataReviews_ReturnsReviews()
     {
         // Arrange
         var reviews = new List<TagDataReview> { new TagDataReview(), new TagDataReview() };
-        _reviewRepositoryMock.Setup(x => x.GetTagDataReviews()).ReturnsAsync(reviews);
+        _reviewRepositoryMock.Setup(x => x.GetTagDataReviews(null)).ReturnsAsync(reviews);
 
         // Act
-        var result = await _tagDataReviewService.GetTagDataReviews();
+        var result = await _tagDataReviewService.GetTagDataReviews(null);
 
         // Assert
         Assert.NotNull(result);