From ee7a3004b3e10903e17adff0a12752b174d0e5dd Mon Sep 17 00:00:00 2001
From: Julian Arndt <julian@arndt-web.net>
Date: Mon, 10 Apr 2023 19:19:15 +0200
Subject: [PATCH] Add support for third delivery date

---
 .../java/de/jeyp91/tippliga/TLWMatchdaysCreator.java | 12 +++++++++---
 .../java/de/jeyp91/tippliga/TLWMatchdaysUpdater.java |  8 ++++++++
 .../de/jeyp91/tippliga/TLWMatchesManagerBase.java    | 12 ++++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/main/java/de/jeyp91/tippliga/TLWMatchdaysCreator.java b/src/main/java/de/jeyp91/tippliga/TLWMatchdaysCreator.java
index 3e6c852..c2751c8 100644
--- a/src/main/java/de/jeyp91/tippliga/TLWMatchdaysCreator.java
+++ b/src/main/java/de/jeyp91/tippliga/TLWMatchdaysCreator.java
@@ -130,9 +130,15 @@ public class TLWMatchdaysCreator {
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
             deliveryDates.add(firstMatchDate.format(formatter));
 
-            ArrayList<TLWMatch> remainingMatches = TLWMatchesManagerBase.getMatchesStartingFromSecondDay(matchesOfMatchday);
-            if(remainingMatches.size() > 0) {
-                firstMatchDate = TLWMatchesManagerBase.getFirstMatchtimeTLW(remainingMatches);
+            ArrayList<TLWMatch> matchesSecondDay = TLWMatchesManagerBase.getMatchesStartingFromSecondDay(matchesOfMatchday);
+            if(matchesSecondDay.size() > 0) {
+                firstMatchDate = TLWMatchesManagerBase.getFirstMatchtimeTLW(matchesSecondDay);
+                deliveryDates.add(firstMatchDate.format(formatter));
+            }
+
+            ArrayList<TLWMatch> matchesSecondWeek = TLWMatchesManagerBase.getMatchesStartingFromSecondWeek(matchesOfMatchday);
+            if(matchesSecondWeek.size() > 0) {
+                firstMatchDate = TLWMatchesManagerBase.getFirstMatchtimeTLW(matchesSecondWeek);
                 deliveryDates.add(firstMatchDate.format(formatter));
             }
         }
diff --git a/src/main/java/de/jeyp91/tippliga/TLWMatchdaysUpdater.java b/src/main/java/de/jeyp91/tippliga/TLWMatchdaysUpdater.java
index 581eada..05c07e8 100644
--- a/src/main/java/de/jeyp91/tippliga/TLWMatchdaysUpdater.java
+++ b/src/main/java/de/jeyp91/tippliga/TLWMatchdaysUpdater.java
@@ -84,6 +84,14 @@ public class TLWMatchdaysUpdater {
                                     "Tippabgabeschluss 2 zu '" + matchdayUpdated.getDeliveryDate2() + "'.\n";
                         }
 
+                        if (!matchdayOriginal.getDeliveryDate3().equals(matchdayUpdated.getDeliveryDate3())) {
+                            updateSql += updateStart +
+                                    "delivery_date_3 = '" + matchdayUpdated.getDeliveryDate3() + "' " +
+                                    condition;
+                            this.beautifulInfo += beautifulInfoStart +
+                                    "Tippabgabeschluss 3 zu '" + matchdayUpdated.getDeliveryDate3() + "'.\n";
+                        }
+
                         if (!matchdayOriginal.getMatchdayName().equals(matchdayUpdated.getMatchdayName())) {
                             updateSql += updateStart +
                                     "matchday_name = '" + matchdayUpdated.getMatchdayName() + "' " +
diff --git a/src/main/java/de/jeyp91/tippliga/TLWMatchesManagerBase.java b/src/main/java/de/jeyp91/tippliga/TLWMatchesManagerBase.java
index 27977d2..68a8c4b 100644
--- a/src/main/java/de/jeyp91/tippliga/TLWMatchesManagerBase.java
+++ b/src/main/java/de/jeyp91/tippliga/TLWMatchesManagerBase.java
@@ -41,6 +41,18 @@ public class TLWMatchesManagerBase {
         return filteredMatches;
     }
 
+    public static ArrayList<TLWMatch> getMatchesStartingFromSecondWeek(ArrayList<TLWMatch> matches) {
+        LocalDateTime firstMatchtime = getFirstMatchtimeTLW(matches);
+        ArrayList<TLWMatch> filteredMatches = new ArrayList<>();
+        for(TLWMatch match : matches) {
+            LocalDateTime matchDateTime = getDate(match);
+            if(getDaysDifference(matchDateTime, firstMatchtime) > 6) {
+                filteredMatches.add(match);
+            }
+        }
+        return filteredMatches;
+    }
+
     public static LocalDateTime getFirstMatchtimeTLW(ArrayList<TLWMatch> matches) {
         LocalDateTime matchtime = null;
         for(TLWMatch match : matches) {