FIX: urlop wypocz. przysług. field is calculated wrongly (#217)

* FIX: https://jira.fingo.info/browse/IJ-326 urlop wypocz. przysług. field is calculated wrongly

Author: DaDudek

src/main/java/info/fingo/urlopia/config/authentication/noauth/NoAuthFilter.java

@@ -7,6 +7,7 @@
 import info.fingo.urlopia.user.User;
 import info.fingo.urlopia.user.UserService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -21,6 +22,7 @@
 
 @Component
 @RequiredArgsConstructor
+@ConditionalOnProperty(name = "ad.configuration.enabled", havingValue = "false")
 public class NoAuthFilter extends OncePerRequestFilter {
 
     private final UserAuthoritiesProvider userAuthoritiesProvider;

src/main/java/info/fingo/urlopia/history/HistoryLogService.java

@@ -21,7 +21,6 @@
 import java.time.LocalDateTime;
 import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -235,12 +234,8 @@ public Float countRemainingHours(Long userId) {
     public float countRemainingForCurrentYear(Long userId,
                                               Integer year){
         var currentYearLogs = getCountForNextYearLogs(year, userId, false);
-        var fromLastYear = getCountForNextYearLogs(year-1, userId, true);
-        var resultLogs = new ArrayList<HistoryLog>();
-        resultLogs.addAll(currentYearLogs);
-        resultLogs.addAll(fromLastYear);
         var hours = 0f;
-        for (var log: resultLogs){
+        for (var log: currentYearLogs){
             var request = log.getRequest();
             if (request == null){
                 hours += log.getHours();
@@ -252,16 +247,17 @@ public float countRemainingForCurrentYear(Long userId,
     private float countRemainingFromPreviousYear(Long userId,
                                                 Integer year){
         var hours = 0f;
-        var lastDayOfPrevYear = LocalDate.of(year-1, 12, 31);
+        var prevYear = year - 1;
+        var lastDayOfPrevYear = LocalDate.of(prevYear, 12, 31);
         var firstDay = LocalDate.of(0, 1,1);
         var logs = get(firstDay, lastDayOfPrevYear, userId);
         for (var log: logs){
             var request = log.getRequest();
             if (request == null){
-                hours += countForPrevYearFromLogWithoutRequest(log, year);
+                hours += countForPrevYearFromLogWithoutRequest(log, prevYear);
             }
-            else if (request.isNormal()){
-                hours += countForPrevYearFromRequest(log, request, year-1);
+            else if (request.isNormal() && request.getStatus() == Request.Status.ACCEPTED){
+                hours += countForPrevYearFromRequest(log, request, prevYear);
             }
         }
         return hours;
@@ -272,8 +268,8 @@ private float countForPrevYearFromRequest(HistoryLog historyLog,
                                               Integer year){
         var lastDayOfYear = LocalDate.of(year, 12, 31);
         if (request.getEndDate().isBefore(lastDayOfYear)){
-            return -1 * request.getWorkingHours();
-        }//we need to handle "next year requests"
+            return historyLog.getHours();
+        }
         else {
             var firstMonthOfRequest = request.getStartDate().getMonthValue();
             var hours = 0;
@@ -287,15 +283,11 @@ private float countForPrevYearFromRequest(HistoryLog historyLog,
     private float countForPrevYearFromLogWithoutRequest(HistoryLog historyLog,
                                                         Integer year){
         var logYear = historyLog.getCreated().getYear();
-        var logIsFromPastYear = logYear < year;
         var logIsFromNextYear = logYear > year;
         if (logIsFromNextYear){
             return 0;
         }
-        if (!historyLog.getCountForNextYear() || logIsFromPastYear){
-            return historyLog.getHours();
-        }
-        return 0;
+        return historyLog.getHours();
     }
 
     public float countRemainingHoursForYear(Long userId,

src/main/java/info/fingo/urlopia/request/Request.java

@@ -176,10 +176,6 @@ public Integer getWorkingDays() {
         return workingDays;
     }
 
-    public float getWorkingHours(){
-        return workingDays * requester.getWorkTime();
-    }
-
     public void setWorkingDays(Integer workingDays) {
         this.workingDays = workingDays;
     }

src/test/groovy/info/fingo/urlopia/history/HistoryLogServiceSpec.groovy

@@ -299,25 +299,26 @@ class HistoryLogServiceSpec extends Specification {
         result == 100
     }
 
-    def "countRemainingForCurrentYear WHEN log without request from prev year but countedOnNext SHOULD be added"(){
+    def "countRemainingForCurrentYear WHEN log without request from prev year SHOULD be added"(){
         given:
         def log = Mock(HistoryLog){
             getHours() >> 100
         }
         def log2 = Mock(HistoryLog) {
             getHours() >> -20
+            getCreated() >> LocalDateTime.of(1,1,1,1,1,1)
         }
         historyLogRepository.findAll(_ as Filter) >>> [[log], [log2], []]
 
         when:
-        def result = historyLogService.countRemainingForCurrentYear(1,1)
+        def result = historyLogService.countRemainingForCurrentYear(1,2)
 
         then:
         result == 80
     }
 
 
-    def "countRemainingForCurrentYear WHEN remaining from prev year SHOULD be added"(){
+    def "countRemainingForCurrentYear WHEN remaining from prev year from accepted request SHOULD be added"(){
         given:
         def log = Mock(HistoryLog){
             getHours() >> 100
@@ -328,9 +329,10 @@ class HistoryLogServiceSpec extends Specification {
                 isNormal() >> true
                 getEndDate() >> LocalDate.MAX
                 getStartDate() >> LocalDate.of(2022,12,1)
+                getStatus() >> Request.Status.ACCEPTED
             }
         }
-        historyLogRepository.findAll(_ as Filter) >>> [[log], [], [log2]]
+        historyLogRepository.findAll(_ as Filter) >>> [[log], [log2], []]
         usedHoursFromMonthCalculator.countUsedHours(_ as Integer, _ as Integer, _ as HistoryLog) >> 20
 
         when:
@@ -340,6 +342,77 @@ class HistoryLogServiceSpec extends Specification {
         result == 80
     }
 
+    def "countRemainingForCurrentYear WHEN remaining from prev year from not accepted request SHOULD not be added"(){
+        given:
+        def log = Mock(HistoryLog){
+            getHours() >> 100
+        }
+        def log2 = Mock(HistoryLog) {
+            getHours() >> -20
+            getRequest() >> Mock(Request) {
+                isNormal() >> true
+                getEndDate() >> LocalDate.MAX
+                getStartDate() >> LocalDate.of(2022,12,1)
+                getStatus() >> status
+            }
+        }
+        historyLogRepository.findAll(_ as Filter) >>> [[log], [log2], []]
+        usedHoursFromMonthCalculator.countUsedHours(_ as Integer, _ as Integer, _ as HistoryLog) >> 20
+
+        when:
+        def result = historyLogService.countRemainingForCurrentYear(1,1)
+
+        then:
+        result == 100
+
+        where:
+        status << [Request.Status.CANCELED, Request.Status.PENDING, Request.Status.REJECTED]
+    }
+
+    def "countRemainingForCurrentYear WHEN remaining from prev year without request SHOULD be added"(){
+        given:
+        def log = Mock(HistoryLog){
+            getHours() >> 100
+        }
+        def log2 = Mock(HistoryLog) {
+            getHours() >> -20
+            getCreated() >> LocalDateTime.of(1,1,1,1,1,1)
+        }
+        historyLogRepository.findAll(_ as Filter) >>> [[log], [log2], []]
+        usedHoursFromMonthCalculator.countUsedHours(_ as Integer, _ as Integer, _ as HistoryLog) >> 20
+
+        when:
+        def result = historyLogService.countRemainingForCurrentYear(1,2)
+
+        then:
+        result == 80
+    }
+
+    def "countRemainingForCurrentYear WHEN remaining from prev year with special request SHOULD not be added"(){
+        given:
+        def log = Mock(HistoryLog){
+            getHours() >> 100
+        }
+        def log2 = Mock(HistoryLog) {
+            getHours() >> -20
+            getCreated() >> LocalDateTime.of(1,1,1,1,1,1)
+            getRequest() >> Mock(Request) {
+                isNormal() >> false
+                getEndDate() >> LocalDate.MAX
+                getStartDate() >> LocalDate.of(2022,12,1)
+                getStatus() >> Request.Status.ACCEPTED
+            }
+        }
+        historyLogRepository.findAll(_ as Filter) >>> [[log], [log2], []]
+        usedHoursFromMonthCalculator.countUsedHours(_ as Integer, _ as Integer, _ as HistoryLog) >> 20
+
+        when:
+        def result = historyLogService.countRemainingForCurrentYear(1,2)
+
+        then:
+        result == 100
+    }
+
 
 
     def "countRemainingForCurrentYear WHEN no logs SHOULD return 0"(){