Refactoring Tests and simplifying Mail Sending

src/main/java/at/ac/uibk/gitsearch/service/MailService.java

@@ -119,7 +119,7 @@ public class MailService {
 
     /**
      * send an info mail to user, if relevant.
-     * For test purposes mainly
+     * For test purposes mainly.
      * @param user
      * @return
      */
@@ -139,13 +139,22 @@ public class MailService {
 			user = userRepository.save(user);
 		}
 		Map<SearchResultDTO, UserWatchList> findChangesSince = null;
-		for(CheckFrequency freq: new CheckFrequency[] {CheckFrequency.DAILY, CheckFrequency.WEEKLY, CheckFrequency.MONTHLY}) {
-			if(lastMailSending.isBefore(freq.getChangedBefore())) {
-				findChangesSince = userWatchListService.findChangesSince(freq, user);
-				if(!findChangesSince.isEmpty()) break;
-			}
-		}
-		hasContent = hasContent || findChangesSince!=null && !findChangesSince.isEmpty();
+		
+		findChangesSince = userWatchListService.findChangesSince(lastMailSending, user);
+		
+		
+		boolean dailyRelevant = findChangesSince.entrySet().stream().anyMatch(entry -> entry.getValue().getCheckFrequency() == CheckFrequency.DAILY);
+		boolean weeklyRelevant = findChangesSince.entrySet().stream().anyMatch(entry -> entry.getValue().getCheckFrequency() == CheckFrequency.WEEKLY);
+		boolean monthlyRelevant = findChangesSince.entrySet().stream().anyMatch(entry -> entry.getValue().getCheckFrequency() == CheckFrequency.MONTHLY);
+
+		boolean shouldSend = 
+				(dailyRelevant && lastMailSending.isBefore(CheckFrequency.DAILY.getChangedBefore())) ||
+				(weeklyRelevant && lastMailSending.isBefore(CheckFrequency.WEEKLY.getChangedBefore())) ||
+				(monthlyRelevant && lastMailSending.isBefore(CheckFrequency.MONTHLY.getChangedBefore()));
+				
+		
+		
+		hasContent = hasContent || shouldSend;
 		
 		if(hasContent) {
 			final List<Entry<SearchResultDTO, UserWatchList>> changedExercises = findChangesSince.entrySet().stream().collect(Collectors.toList());

src/main/java/at/ac/uibk/gitsearch/service/UserWatchListService.java

@@ -222,12 +222,13 @@ public class UserWatchListService {
  		return result;
     }
     
-    public Map<SearchResultDTO, UserWatchList> findChangesSince(CheckFrequency checkFrequency, at.ac.uibk.gitsearch.domain.User user) {
-    	Map<SearchResultDTO, UserWatchList> changesSince = findChangesSince(checkFrequency.getChangedBefore(), user);
-    	return changesSince.entrySet().stream().
-    			filter(entry -> entry.getValue().getCheckFrequency().ordinal() <= checkFrequency.ordinal())
-    			.collect(Collectors.toMap(x -> x.getKey(), x -> x.getValue()));
-    	
-    }
+    // falscher Weg
+//    public Map<SearchResultDTO, UserWatchList> findChangesSince(CheckFrequency checkFrequency, at.ac.uibk.gitsearch.domain.User user) {
+//    	Map<SearchResultDTO, UserWatchList> changesSince = findChangesSince(checkFrequency.getChangedBefore(), user);
+//    	return changesSince.entrySet().stream().
+//    			filter(entry -> entry.getValue().getCheckFrequency().ordinal() <= checkFrequency.ordinal())
+//    			.collect(Collectors.toMap(x -> x.getKey(), x -> x.getValue()));
+//    	
+//    }
     
 }