This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit e8310eab authored by Eduard Frankford's avatar Eduard Frankford
Browse files

fixing tests

parent cc2f1a91
Branches
3 merge requests!188Merging Peer Reviewing et. al to Master,!179Resolve "Peer Reviewing: Deutlicherer Badge für erfolgreich gereviewte Aufgaben",!164211 peer reviewing functionality
......@@ -5,4 +5,5 @@ public enum ReviewStatus {
IMPROVEMENTS_REQUESTED,
REVIEW_REJECTED,
REVIEW_COMPLETED,
REVIEW_IMPROVED,
}
......@@ -2,6 +2,7 @@ package at.ac.uibk.gitsearch.repository.jpa;
import at.ac.uibk.gitsearch.domain.ReviewRating;
import at.ac.uibk.gitsearch.domain.User;
import at.ac.uibk.gitsearch.domain.enumeration.ReviewStatus;
import java.util.List;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
......@@ -15,7 +16,7 @@ public interface ReviewRatingRepository extends JpaRepository<ReviewRating, Long
*
*/
interface StatusAndCount {
String getStatus();
ReviewStatus getStatus();
Integer getStatusCount();
}
......
......@@ -98,14 +98,14 @@ public class ReviewService {
return review;
}
public void updateStatus(Long id, String status) {
public void updateStatus(Long id, ReviewStatus status) {
LOGGER.debug("REST request to update a review status");
Review review = reviewRepository.findById(id).get();
review
.getComments()
.stream()
.forEach(reviewRating -> {
reviewRating.setStatus(ReviewStatus.valueOf(status));
reviewRating.setStatus(status);
reviewRatingRepository.save(reviewRating);
});
}
......@@ -334,7 +334,7 @@ public class ReviewService {
public void rewardBadge(Long id) {
Review review = reviewRepository.findById(id).get();
updateStatus(review.getId(), "Review completed");
updateStatus(review.getId(), ReviewStatus.REVIEW_COMPLETED);
statisticsService.rewardBadgeForStatisticsByExerciseID(review.getResourceID());
notifyReviewers(
review.getId(),
......
package at.ac.uibk.gitsearch.service.dto;
import at.ac.uibk.gitsearch.domain.enumeration.ReviewStatus;
import java.io.Serializable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -100,15 +100,15 @@ public class ReviewRatingDTO {
this.unknownStats = unknownStats;
}
public void put(String status, int count) {
public void put(ReviewStatus status, int count) {
switch (status) {
case "Review In Progress":
case REVIEW_IN_PROGRESS:
reviewInProgress = count;
break;
case "Review improved":
case REVIEW_IMPROVED:
reviewImproved = count;
break;
case "Review completed":
case REVIEW_COMPLETED:
reviewCompleted = count;
break;
default:
......
package at.ac.uibk.gitsearch.web.rest;
import at.ac.uibk.gitsearch.domain.User;
import at.ac.uibk.gitsearch.domain.enumeration.ReviewStatus;
import at.ac.uibk.gitsearch.security.AuthoritiesConstants;
import at.ac.uibk.gitsearch.service.ReviewService;
import at.ac.uibk.gitsearch.service.UserService;
......@@ -9,12 +10,9 @@ import at.ac.uibk.gitsearch.service.dto.ReviewRatingDTO;
import at.ac.uibk.gitsearch.service.dto.ReviewRatingDTO.ReviewStatisticsDTO;
import at.ac.uibk.gitsearch.service.dto.ReviewRequest;
import at.ac.uibk.gitsearch.service.dto.UserDTO;
import java.util.List;
import java.util.Optional;
import javax.transaction.Transactional;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.ResponseEntity;
......@@ -126,7 +124,7 @@ public class ReviewResource {
@PreAuthorize(USER_ROLE)
public ResponseEntity notifyReviewers(@RequestBody ReviewDTO review) {
log.debug("REST request to notify reviewers of resource: {}", review.getResource());
reviewService.updateStatus(review.getId(), "Review improved");
reviewService.updateStatus(review.getId(), ReviewStatus.REVIEW_IMPROVED);
reviewService.notifyReviewers(
review.getId(),
"The review for " + review.getResource() + " has been updated. Please verify and update the status if applicable."
......
......@@ -6,6 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import at.ac.uibk.gitsearch.IntegrationTest;
import at.ac.uibk.gitsearch.domain.Review;
import at.ac.uibk.gitsearch.domain.Statistics;
import at.ac.uibk.gitsearch.domain.enumeration.ReviewStatus;
import at.ac.uibk.gitsearch.repository.jpa.ReviewRatingRepository;
import at.ac.uibk.gitsearch.repository.jpa.ReviewRepository;
import at.ac.uibk.gitsearch.repository.jpa.StatisticsRepository;
......@@ -89,11 +90,11 @@ public class ReviewServiceTest {
List<Review> reviewList = reviewRepository.findAll();
Review testReview = reviewList.get(0);
reviewService.updateStatus(testReview.getId(), "TEST");
reviewService.updateStatus(testReview.getId(), ReviewStatus.REVIEW_IN_PROGRESS);
reviewList = reviewRepository.findAll();
testReview = reviewList.get(0);
testReview.getComments().forEach(c -> assertThat(c.getStatus()).isEqualTo("TEST"));
testReview.getComments().forEach(c -> assertThat(c.getStatus()).isEqualTo(ReviewStatus.REVIEW_IN_PROGRESS));
}
@Test
......@@ -164,7 +165,7 @@ public class ReviewServiceTest {
assertEquals(reviewDTO.getId(), testReview.getId());
assertEquals(
reviewDTO.getStatus(),
testReview.getComments().stream().map(reviewRating -> reviewRating.getStatus()).collect(Collectors.toList())
testReview.getComments().stream().map(reviewRating -> reviewRating.getStatus().name()).collect(Collectors.toList())
);
assertEquals(reviewDTO.getLink(), testReview.getLink());
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment