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

Skip to content
Snippets Groups Projects
Commit 0dab62c3 authored by Michael Breu's avatar Michael Breu
Browse files

prettier

parent 895033cf
1 merge request!195Resolve "Reviewing Badges: Zusätzliche Icons"
This commit is part of merge request !195. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
Showing
with 52 additions and 78 deletions
src/main/java/at/ac/uibk/gitsearch/repository/jpa/ReviewRatingJPARepository.java
+ 4
− 6
View file @ 0dab62c3
......@@ -3,9 +3,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;
import org.springframework.data.repository.query.Param;
......@@ -35,12 +33,12 @@ public interface ReviewRatingJPARepository extends JpaRepository<ReviewRating, L
@Query("SELECT rr FROM ReviewRating rr WHERE rr.review.id=:reviewId")
List<ReviewRating> findByReview(@Param("reviewId") Long reviewId);
@Query("SELECT rr.status as status, count(*) as statusCount FROM Review r LEFT JOIN ReviewRating rr ON rr.review = r WHERE r.requestedBy = :userId GROUP BY status")
List<StatusAndCount> countReviewsForUserByStatus(@Param("userId") long userIdl);
@Query(
"SELECT rr.status as status, count(*) as statusCount FROM ReviewRating rr WHERE rr.user = :user GROUP BY status"
"SELECT rr.status as status, count(*) as statusCount FROM Review r LEFT JOIN ReviewRating rr ON rr.review = r WHERE r.requestedBy = :userId GROUP BY status"
)
List<StatusAndCount> countReviewsForUserByStatus(@Param("userId") long userIdl);
@Query("SELECT rr.status as status, count(*) as statusCount FROM ReviewRating rr WHERE rr.user = :user GROUP BY status")
List<StatusAndCount> countReviewsTasksForUserByStatus(@Param("user") User user);
@Query("SELECT count(*) as statusCount from Review r LEFT JOIN ReviewRating rr ON rr.review=r.id WHERE r.requestedBy = :userId")
......
src/main/java/at/ac/uibk/gitsearch/service/MailService.java
+ 0
− 4
View file @ 0dab62c3
......@@ -4,7 +4,6 @@ import at.ac.uibk.gitsearch.domain.User;
import at.ac.uibk.gitsearch.domain.UserWatchList;
import at.ac.uibk.gitsearch.domain.enumeration.CheckFrequency;
import at.ac.uibk.gitsearch.repository.jpa.UserRepository;
import java.nio.charset.StandardCharsets;
import java.time.Instant;
import java.util.List;
......@@ -13,9 +12,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
import java.util.stream.Collectors;
import javax.mail.internet.MimeMessage;
import org.codeability.sharing.plugins.api.search.SearchResultDTO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -32,7 +29,6 @@ import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import org.thymeleaf.context.Context;
import org.thymeleaf.spring5.SpringTemplateEngine;
import tech.jhipster.config.JHipsterProperties;
/**
......
src/main/java/at/ac/uibk/gitsearch/service/ReviewService.java
+ 1
− 5
View file @ 0dab62c3
......@@ -14,7 +14,6 @@ import at.ac.uibk.gitsearch.service.dto.ReviewRatingDTO;
import at.ac.uibk.gitsearch.service.dto.ReviewRequest;
import at.ac.uibk.gitsearch.service.dto.StatisticsDTO;
import at.ac.uibk.gitsearch.service.mapper.ReviewRatingMapper;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
......@@ -22,9 +21,7 @@ import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import javax.transaction.Transactional;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -288,8 +285,7 @@ public class ReviewService {
Integer badgeCount = reviewRatingRepository.countBadgesForRequestingUser(user.getId());
if (badgeCount != null) {
result.setBadgesRewarded(badgeCount);
result.setReviewsAssignedToReviewer(
reviewRatingRepository.countreviewsRequestedByReviewer(user.getId()) - badgeCount);
result.setReviewsAssignedToReviewer(reviewRatingRepository.countreviewsRequestedByReviewer(user.getId()) - badgeCount);
}
return result;
}
......
src/main/java/at/ac/uibk/gitsearch/service/UserService.java
+ 0
− 3
View file @ 0dab62c3
......@@ -10,7 +10,6 @@ import at.ac.uibk.gitsearch.security.AuthoritiesConstants;
import at.ac.uibk.gitsearch.security.SecurityUtils;
import at.ac.uibk.gitsearch.service.dto.AdminUserDTO;
import at.ac.uibk.gitsearch.service.dto.UserDTO;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.HashSet;
......@@ -20,7 +19,6 @@ import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cache.CacheManager;
......@@ -31,7 +29,6 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import tech.jhipster.security.RandomUtil;
/**
......
src/main/java/at/ac/uibk/gitsearch/service/criteria/ReviewRatingCriteria.java
+ 0
− 2
View file @ 0dab62c3
package at.ac.uibk.gitsearch.service.criteria;
import at.ac.uibk.gitsearch.domain.enumeration.ReviewStatus;
import java.io.Serializable;
import java.util.Objects;
import tech.jhipster.service.Criteria;
import tech.jhipster.service.filter.Filter;
import tech.jhipster.service.filter.LongFilter;
......
src/main/java/at/ac/uibk/gitsearch/service/dto/ReviewRatingDTO.java
+ 21
− 23
View file @ 0dab62c3
package at.ac.uibk.gitsearch.service.dto;
import at.ac.uibk.gitsearch.domain.enumeration.ReviewStatus;
import java.io.Serializable;
import java.util.Objects;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -170,29 +168,29 @@ public class ReviewRatingDTO implements Serializable {
if (status == null) {
reviewRequested = count;
} else {
switch (status) {
case REVIEW_IN_PROGRESS:
setReviewInProgress(count);
break;
case REVIEW_IMPROVED:
setReviewImproved(count);
break;
case REVIEW_COMPLETED:
setReviewCompleted(count);
break;
case REVIEW_REJECTED:
setReviewCompleted(count);
break;
case IMPROVEMENTS_REQUESTED:
setReviewImprovementRequested(count);
break;
default:
LOGGER.error("status {} not yet supported!", status);
setUnknownStats(getUnknownStats() + count);
break;
switch (status) {
case REVIEW_IN_PROGRESS:
setReviewInProgress(count);
break;
case REVIEW_IMPROVED:
setReviewImproved(count);
break;
case REVIEW_COMPLETED:
setReviewCompleted(count);
break;
case REVIEW_REJECTED:
setReviewCompleted(count);
break;
case IMPROVEMENTS_REQUESTED:
setReviewImprovementRequested(count);
break;
default:
LOGGER.error("status {} not yet supported!", status);
setUnknownStats(getUnknownStats() + count);
break;
}
}
}
}
public void putByReviewer(ReviewStatus status, int count) {
if (status == null) { // this should never happen
......
src/test/java/at/ac/uibk/gitsearch/service/ReviewServiceTest.java
+ 26
− 31
View file @ 0dab62c3
......@@ -16,12 +16,10 @@ import at.ac.uibk.gitsearch.security.AuthoritiesConstants;
import at.ac.uibk.gitsearch.service.dto.ReviewDTO;
import at.ac.uibk.gitsearch.service.dto.ReviewRatingDTO.ReviewStatisticsDTO;
import at.ac.uibk.gitsearch.service.dto.ReviewRequest;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
......@@ -173,8 +171,7 @@ public class ReviewServiceTest {
User admin = userService.getUserByLogin("admin").orElseThrow(() -> new IllegalArgumentException());
// there seem to be some other reviews already in test db?
final ReviewStatisticsDTO reviewStatusCountsByCurrentUserReference = reviewService
.getReviewStatusCountsByUser(loggedInUser);
final ReviewStatisticsDTO reviewStatusCountsByCurrentUserReference = reviewService.getReviewStatusCountsByUser(loggedInUser);
final ReviewStatisticsDTO reviewStatusCountsByAdminReference = reviewService.getReviewStatusCountsByUser(admin);
Review unstartedReview = new Review();
......@@ -184,7 +181,6 @@ public class ReviewServiceTest {
unstartedReview.setResourceID("resourceToReview");
reviewRepository.save(unstartedReview);
// create another review with improvement request
Review improvmentRequestedReview = new Review();
improvmentRequestedReview.setLink("unused improvement Link)");
......@@ -238,37 +234,36 @@ public class ReviewServiceTest {
);
assertEquals(reviewDTO.getLink(), testReview.getLink());
final ReviewStatisticsDTO reviewStatusCountsByCurrentUser = reviewService
.getReviewStatusCountsByUser(loggedInUser);
assertThat(reviewStatusCountsByCurrentUser.getReviewRequested()
- reviewStatusCountsByCurrentUserReference.getReviewRequested())
.isEqualTo(2); // "Status not as expected. This may result from changed testdata"
assertThat(reviewStatusCountsByCurrentUser.getReviewInProgress()
- reviewStatusCountsByCurrentUserReference.getReviewInProgress())
.isEqualTo(1); // "Status not as expected. This may result from changed testdata"
assertThat(reviewStatusCountsByCurrentUser.getReviewImproved()
- reviewStatusCountsByCurrentUserReference.getReviewImproved())
.isZero(); // "Status not as expected. This may result from changed testdata"
assertThat(reviewStatusCountsByCurrentUser.getReviewCompleted()
- reviewStatusCountsByCurrentUserReference.getReviewCompleted())
.isEqualTo(1); // "Status not as expected. This may result from changed testdata"
assertThat(reviewStatusCountsByCurrentUser.getReviewImprovementRequestedByReviewer()
- reviewStatusCountsByCurrentUserReference.getReviewImprovementRequestedByReviewer())
.isZero(); // "Status not as expected. This may result from changed testdata"
final ReviewStatisticsDTO reviewStatusCountsByCurrentUser = reviewService.getReviewStatusCountsByUser(loggedInUser);
assertThat(reviewStatusCountsByCurrentUser.getReviewRequested() - reviewStatusCountsByCurrentUserReference.getReviewRequested())
.isEqualTo(2); // "Status not as expected. This may result from changed testdata"
assertThat(reviewStatusCountsByCurrentUser.getReviewInProgress() - reviewStatusCountsByCurrentUserReference.getReviewInProgress())
.isEqualTo(1); // "Status not as expected. This may result from changed testdata"
assertThat(reviewStatusCountsByCurrentUser.getReviewImproved() - reviewStatusCountsByCurrentUserReference.getReviewImproved())
.isZero(); // "Status not as expected. This may result from changed testdata"
assertThat(reviewStatusCountsByCurrentUser.getReviewCompleted() - reviewStatusCountsByCurrentUserReference.getReviewCompleted())
.isEqualTo(1); // "Status not as expected. This may result from changed testdata"
assertThat(
reviewStatusCountsByCurrentUser.getReviewImprovementRequestedByReviewer() -
reviewStatusCountsByCurrentUserReference.getReviewImprovementRequestedByReviewer()
)
.isZero(); // "Status not as expected. This may result from changed testdata"
assertThat(reviewStatusCountsByCurrentUser.getBadgesRewarded())
.withFailMessage("One badge awarded?. This may result from changed testdata")
.isEqualTo(1);
.withFailMessage("One badge awarded?. This may result from changed testdata")
.isEqualTo(1);
final ReviewStatisticsDTO reviewStatusCountsByAdmin = reviewService.getReviewStatusCountsByUser(admin);
assertThat(reviewStatusCountsByAdmin.getReviewInProgressByReviewer()
- reviewStatusCountsByAdminReference.getReviewInProgressByReviewer())
.isZero(); // "Status not as expected. This may result from changed testdata"
assertThat(reviewStatusCountsByAdmin.getReviewImprovementRequestedByReviewer()
- reviewStatusCountsByAdminReference.getReviewImprovementRequestedByReviewer())
.isEqualTo(1); // "Status not as expected. This may result from changed testdata"
assertThat(
reviewStatusCountsByAdmin.getReviewInProgressByReviewer() - reviewStatusCountsByAdminReference.getReviewInProgressByReviewer()
)
.isZero(); // "Status not as expected. This may result from changed testdata"
assertThat(
reviewStatusCountsByAdmin.getReviewImprovementRequestedByReviewer() -
reviewStatusCountsByAdminReference.getReviewImprovementRequestedByReviewer()
)
.isEqualTo(1); // "Status not as expected. This may result from changed testdata"
}
@Test
......
src/test/java/at/ac/uibk/gitsearch/service/SearchServiceIT.java
+ 0
− 3
View file @ 0dab62c3
......@@ -25,7 +25,6 @@ import at.ac.uibk.gitsearch.repository.search.testESService.ElasticSearchTestCon
import at.ac.uibk.gitsearch.security.jwt.TokenProvider;
import at.ac.uibk.gitsearch.service.PluginManagementService.ConnectorConfigWrapper;
import at.ac.uibk.gitsearch.service.dto.AutoCompleteEntry;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.util.ArrayList;
......@@ -35,9 +34,7 @@ import java.util.Optional;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import javax.ws.rs.NotFoundException;
import org.codeability.sharing.plugins.api.SharingPluginConfig;
import org.codeability.sharing.plugins.api.search.SearchInputDTO;
import org.codeability.sharing.plugins.api.search.SearchInputMetadataDTO;
......
src/test/java/at/ac/uibk/gitsearch/service/dto/StatisticsDTOTest.java
+ 0
− 1
View file @ 0dab62c3
......@@ -3,7 +3,6 @@ package at.ac.uibk.gitsearch.service.dto;
import static org.assertj.core.api.Assertions.assertThat;
import at.ac.uibk.gitsearch.web.rest.TestUtil;
import org.junit.jupiter.api.Test;
public class StatisticsDTOTest {
......
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