diff --git a/src/main/java/de/jeyp91/tippliga/TLWMatch.java b/src/main/java/de/jeyp91/tippliga/TLWMatch.java index ca100ad..f144ef3 100644 --- a/src/main/java/de/jeyp91/tippliga/TLWMatch.java +++ b/src/main/java/de/jeyp91/tippliga/TLWMatch.java @@ -119,7 +119,7 @@ public class TLWMatch extends BaseMatch{ this.matchDatetime = matchDatetime; } - public TLWMatch(int season, int league, int matchday, int matchNo, int teamIdHome, int teamIdGuest, String matchDatetime) { + public TLWMatch(int season, int league, int matchday, int matchNo, int teamIdHome, int teamIdGuest, String matchDatetime, int koMatch) { this.season = season; this.matchday = matchday; this.league = league; @@ -128,6 +128,7 @@ public class TLWMatch extends BaseMatch{ this.teamIdGuest = teamIdGuest; this.matchDatetime = matchDatetime; this.status = 0; + this.koMatch = koMatch; } public TLWMatch(TLWMatch referenceMatch) { diff --git a/src/main/java/de/jeyp91/tippliga/TLWMatchesCreatorTipperLeague.java b/src/main/java/de/jeyp91/tippliga/TLWMatchesCreatorTipperLeague.java index 95a6fb2..bd0323f 100644 --- a/src/main/java/de/jeyp91/tippliga/TLWMatchesCreatorTipperLeague.java +++ b/src/main/java/de/jeyp91/tippliga/TLWMatchesCreatorTipperLeague.java @@ -58,7 +58,7 @@ public class TLWMatchesCreatorTipperLeague extends TLWMatchesCreatorBase { String matchDatetime = getDeliveryDateForMatchday(matchday); - TLWMatch tlwMatch = new TLWMatch(this.season, this.league, matchday, matchNo, teamIdHome, teamIdGuest, matchDatetime); + TLWMatch tlwMatch = new TLWMatch(this.season, this.league, matchday, matchNo, teamIdHome, teamIdGuest, matchDatetime, 0); this.TLWMatches.add(tlwMatch); } } diff --git a/src/main/java/de/jeyp91/tippliga/TLWMatchesCreatorTipperPokal.java b/src/main/java/de/jeyp91/tippliga/TLWMatchesCreatorTipperPokal.java index 2c5fdc3..46a1116 100644 --- a/src/main/java/de/jeyp91/tippliga/TLWMatchesCreatorTipperPokal.java +++ b/src/main/java/de/jeyp91/tippliga/TLWMatchesCreatorTipperPokal.java @@ -50,7 +50,7 @@ public class TLWMatchesCreatorTipperPokal extends TLWMatchesCreatorBase{ String matchDatetime = getDeliveryDateForMatchday(matchday); - TLWMatch tlwMatch = new TLWMatch(this.season, this.league, matchday, matchNo, teamIdHome, teamIdGuest, matchDatetime); + TLWMatch tlwMatch = new TLWMatch(this.season, this.league, matchday, matchNo, teamIdHome, teamIdGuest, matchDatetime, 1); this.TLWMatches.add(tlwMatch); } } diff --git a/src/main/resources/Tippliga/Team_ID_Matcher_Config.json b/src/main/resources/Tippliga/Team_ID_Matcher_Config.json index c7f0835..0615ff3 100644 --- a/src/main/resources/Tippliga/Team_ID_Matcher_Config.json +++ b/src/main/resources/Tippliga/Team_ID_Matcher_Config.json @@ -933,5 +933,70 @@ "teamname": "Brentford", "tippligaID": 635, "apiFootballID": 55 + }, + { + "teamname": "1. FC Kaan-Marienborn 07", + "tippligaID": 636, + "apiFootballID": 12799 + }, + { + "teamname": "Neustrelitz", + "tippligaID": 58, + "apiFootballID": 12820 + }, + { + "teamname": "SV Straelen", + "tippligaID": 637, + "apiFootballID": 12862 + }, + { + "teamname": "FC Einheit Wernigerode", + "tippligaID": 638, + "apiFootballID": 17035 + }, + { + "teamname": "Illertissen", + "tippligaID": 591, + "apiFootballID": 9330 + }, + { + "teamname": "Stuttgarter Kickers", + "tippligaID": 600, + "apiFootballID": 12868 + }, + { + "teamname": "Schwarz-Weiß Rehden", + "tippligaID": 592, + "apiFootballID": 9345 + }, + { + "teamname": "SV Rödinghausen", + "tippligaID": 165, + "apiFootballID": 1650 + }, + { + "teamname": "TSV Schott Mainz", + "tippligaID": 639, + "apiFootballID": 14524 + }, + { + "teamname": "SV Oberachern", + "tippligaID": 640, + "apiFootballID": 12822 + }, + { + "teamname": "Blau-Weiß Lohne", + "tippligaID": 641, + "apiFootballID": 14629 + }, + { + "teamname": "Energie Cottbus", + "tippligaID": 10, + "apiFootballID": 1320 + }, + { + "teamname": "FC Teutonia 05 Ottensen", + "tippligaID": 642, + "apiFootballID": 12878 } ] diff --git a/src/main/resources/Tippliga/Tipper_Team_Config.json b/src/main/resources/Tippliga/Tipper_Team_Config.json index 8946fad..ec70ff6 100644 --- a/src/main/resources/Tippliga/Tipper_Team_Config.json +++ b/src/main/resources/Tippliga/Tipper_Team_Config.json @@ -263,5 +263,15 @@ "team_id": 2124, "team_name": "Olli L.", "team_name_short": "Olli L." + }, + { + "team_id": 2131, + "team_name": "Adrian", + "team_name_short": "Adrian" + }, + { + "team_id": 2133, + "team_name": "Barb", + "team_name_short": "Barb" } ] diff --git a/src/test/java/de/jeyp91/tippliga/TLWMatchdaysCreatorTest.java b/src/test/java/de/jeyp91/tippliga/TLWMatchdaysCreatorTest.java index aa0dcf0..66f6f71 100644 --- a/src/test/java/de/jeyp91/tippliga/TLWMatchdaysCreatorTest.java +++ b/src/test/java/de/jeyp91/tippliga/TLWMatchdaysCreatorTest.java @@ -9,7 +9,7 @@ import static org.junit.Assert.assertEquals; public class TLWMatchdaysCreatorTest { - int season = 2022; + int season = 2023; @Test public void getMatchdaysTippligaTest() { @@ -22,7 +22,7 @@ public class TLWMatchdaysCreatorTest { @Test public void getMatchdaysWTLPokalTest() { - TLWMatchdaysCreator matchdaysCreator = new TLWMatchdaysCreator(season, 1, "WTL-Pokal"); + TLWMatchdaysCreator matchdaysCreator = new TLWMatchdaysCreator(season, 48, "WTL-Pokal"); ArrayList matchdays = matchdaysCreator.getMatchdays(); assertEquals((Integer) 1, matchdays.get(0).getMatchday()); diff --git a/src/test/java/de/jeyp91/tippliga/TLWMatchesCreatorFootballTest.java b/src/test/java/de/jeyp91/tippliga/TLWMatchesCreatorFootballTest.java index 5a20b13..24a24c4 100644 --- a/src/test/java/de/jeyp91/tippliga/TLWMatchesCreatorFootballTest.java +++ b/src/test/java/de/jeyp91/tippliga/TLWMatchesCreatorFootballTest.java @@ -8,11 +8,11 @@ import static org.junit.Assert.assertEquals; public class TLWMatchesCreatorFootballTest { - int season = 2022; + int season = 2023; @Test public void getMatchesTest() { - TLWMatchesCreatorFootball creator = new TLWMatchesCreatorFootball(2021, 1, "WTL-Pokal"); + TLWMatchesCreatorFootball creator = new TLWMatchesCreatorFootball(season, 48, "WTL-Pokal"); ArrayList matches = creator.getMatches(); assertEquals((Integer) 1, matches.get(0).getMatchNo()); diff --git a/src/test/java/de/jeyp91/tippliga/TLWMatchesCreatorTipperPokalTest.java b/src/test/java/de/jeyp91/tippliga/TLWMatchesCreatorTipperPokalTest.java index f74e12e..d42c265 100644 --- a/src/test/java/de/jeyp91/tippliga/TLWMatchesCreatorTipperPokalTest.java +++ b/src/test/java/de/jeyp91/tippliga/TLWMatchesCreatorTipperPokalTest.java @@ -4,11 +4,13 @@ import org.junit.Test; public class TLWMatchesCreatorTipperPokalTest { + int season = 2023; + @Test public void getMatchesWTLPokalTest() { - TLWMatchdaysCreator matchdaysCreator = new TLWMatchdaysCreator(2022, 48, "WTL-Pokal"); + TLWMatchdaysCreator matchdaysCreator = new TLWMatchdaysCreator(season, 48, "WTL-Pokal"); - TLWMatchesCreatorTipperPokal creator = new TLWMatchesCreatorTipperPokal(2022, 98, "WTL-Pokal Tipper", matchdaysCreator.getMatchdays()); + TLWMatchesCreatorTipperPokal creator = new TLWMatchesCreatorTipperPokal(season, 98, "WTL-Pokal Tipper", matchdaysCreator.getMatchdays()); String sql = creator.getSQLInsertString(); System.out.println(sql); diff --git a/src/test/java/de/jeyp91/tippliga/TLWMatchesCreatorTipperTest.java b/src/test/java/de/jeyp91/tippliga/TLWMatchesCreatorTipperTest.java index f38e695..b052894 100644 --- a/src/test/java/de/jeyp91/tippliga/TLWMatchesCreatorTipperTest.java +++ b/src/test/java/de/jeyp91/tippliga/TLWMatchesCreatorTipperTest.java @@ -8,7 +8,7 @@ import static org.junit.Assert.assertEquals; public class TLWMatchesCreatorTipperTest { - int season = 2022; + int season = 2023; @Test public void getMatchesTippliga1Test() { diff --git a/src/test/java/de/jeyp91/tippliga/TLWTeamsCreatorTest.java b/src/test/java/de/jeyp91/tippliga/TLWTeamsCreatorTest.java index b37fa8c..8163c68 100644 --- a/src/test/java/de/jeyp91/tippliga/TLWTeamsCreatorTest.java +++ b/src/test/java/de/jeyp91/tippliga/TLWTeamsCreatorTest.java @@ -9,7 +9,7 @@ import static org.junit.Assert.assertEquals; public class TLWTeamsCreatorTest { - int season = 2022; + int season = 2023; @Test public void getTeamsTippligaFootball1Test() { @@ -48,7 +48,7 @@ public class TLWTeamsCreatorTest { TLWTeamsCreator teamCreator = new TLWTeamsCreator(2021, 49, matches); String sql = teamCreator.getSql(); -// System.out.println(sql); + System.out.println(sql); } @Test