diff --git a/.vscode/launch.json b/.vscode/launch.json index b3e6474..9c70cd7 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,7 +10,7 @@ "request": "launch", "mainClass": "de.jeyp91.App", "envFile": "${workspaceFolder}/.env", - "args": " --mode APIFootballUpdater --season 2024 --league 1 --configFile Tippliga" + "args": " --mode APIFootballUpdater --season 2026 --league 1 --configFile Tippliga" }, { "type": "java", @@ -18,7 +18,7 @@ "request": "launch", "mainClass": "de.jeyp91.App", "envFile": "${workspaceFolder}/.env", - "args": " --mode MatchesUpdaterFootball --season 2024 --league 49 --configFile Tippliga" + "args": " --mode MatchesUpdaterFootball --season 2026 --league 49 --configFile Tippliga" }, { "type": "java", @@ -26,7 +26,7 @@ "request": "launch", "mainClass": "de.jeyp91.App", "envFile": "${workspaceFolder}/.env", - "args": " --mode MatchdaysUpdater --season 2025 --league 1 --configFile Tippliga" + "args": " --mode MatchdaysUpdater --season 2026 --league 1 --configFile Tippliga" }, { "type": "java", @@ -34,7 +34,7 @@ "request": "launch", "mainClass": "de.jeyp91.App", "envFile": "${workspaceFolder}/.env", - "args": " --mode MatchesResultsUpdater --season 2025 --league 1 --configFile Tippliga" + "args": " --mode MatchesResultsUpdater --season 2026 --league 1 --configFile Tippliga" }, { "type": "java", @@ -42,7 +42,7 @@ "request": "launch", "mainClass": "de.jeyp91.App", "envFile": "${workspaceFolder}/.env", - "args": " --mode MatchesListGistUpdater --season 2025 --league 1 --configFile Tippliga" + "args": " --mode MatchesListGistUpdater --season 2026 --league 1 --configFile Tippliga" } ] } \ No newline at end of file diff --git a/src/main/java/de/jeyp91/tippliga/TLWMatch.java b/src/main/java/de/jeyp91/tippliga/TLWMatch.java index 202d2c6..4162f3c 100644 --- a/src/main/java/de/jeyp91/tippliga/TLWMatch.java +++ b/src/main/java/de/jeyp91/tippliga/TLWMatch.java @@ -181,7 +181,7 @@ public class TLWMatch extends BaseMatch{ public String getFormulaHome() { String formula = "'D'"; if (this.formulaHome != null) { - formula = this.formulaHome; + formula = "'"+this.formulaHome+"'"; } return formula; } @@ -189,7 +189,7 @@ public class TLWMatch extends BaseMatch{ public String getFormulaGuest() { String formula = "'D'"; if (this.formulaGuest != null) { - formula = this.formulaGuest; + formula = "'"+this.formulaGuest+"'"; } return formula; } diff --git a/src/main/resources/Tippliga/Team_ID_Matcher_Config.json b/src/main/resources/Tippliga/Team_ID_Matcher_Config.json index 6bf5edc..f389f88 100644 --- a/src/main/resources/Tippliga/Team_ID_Matcher_Config.json +++ b/src/main/resources/Tippliga/Team_ID_Matcher_Config.json @@ -1298,5 +1298,25 @@ "teamname": "Rapid Wien", "tippligaID": 415, "apiFootballID": 781 + }, + { + "teamname": "ZFC Meuselwitz", + "tippligaID": 102, + "apiFootballID": 9358 + }, + { + "teamname": "Bahlinger SC", + "tippligaID": 585, + "apiFootballID": 9359 + }, + { + "teamname": "SV Hemelingen", + "tippligaID": 658, + "apiFootballID": 12783 + }, + { + "teamname": "RSV Eintracht", + "tippligaID": 659, + "apiFootballID": 14754 } ] diff --git a/src/main/resources/Tippliga/Tipper_Team_Config.json b/src/main/resources/Tippliga/Tipper_Team_Config.json index 5902374..fd29601 100644 --- a/src/main/resources/Tippliga/Tipper_Team_Config.json +++ b/src/main/resources/Tippliga/Tipper_Team_Config.json @@ -283,5 +283,10 @@ "team_id": 2138, "team_name": "TG ChatGPT", "team_name_short": "ChatGPT" + }, + { + "team_id": 2139, + "team_name": "Dustin", + "team_name_short": "Dustin" } ] diff --git a/src/main/resources/Tippliga_Configs/lc_2026.json b/src/main/resources/Tippliga_Configs/lc_2026.json new file mode 100644 index 0000000..8edfc1c --- /dev/null +++ b/src/main/resources/Tippliga_Configs/lc_2026.json @@ -0,0 +1,297 @@ +{ + "numberOfMatchdays": 7, + "matchesPerMatchday": 0, + "pointMode": 4, + "pointsTendency": 1, + "pointsDifference": 2, + "pointsDirectHit": 3, + "ko": 0, + "matchdayConfig": [ + { + "TLWMatchday": 1, + "numberOfMatches": 12, + "matchdayName": "1. Spieltag", + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 5858, + "leagueMatchday": 1, + "showTable": true + }, + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 5858, + "leagueMatchday": 2, + "showTable": true + }, + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 5858, + "leagueMatchday": 3, + "showTable": true + }, + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 5858, + "leagueMatchday": 4, + "showTable": true + }, + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 5858, + "leagueMatchday": 5, + "showTable": true + }, + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 5858, + "leagueMatchday": 6, + "showTable": true + } + ] + }, + { + "TLWMatchday": 2, + "numberOfMatches": 12, + "matchdayName": "2. Spieltag", + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 5858, + "leagueMatchday": 7, + "showTable": true + }, + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 5858, + "leagueMatchday": 8, + "showTable": true + }, + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 5858, + "leagueMatchday": 9, + "showTable": true + }, + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 5858, + "leagueMatchday": 10, + "showTable": true + }, + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 5858, + "leagueMatchday": 11, + "showTable": true + }, + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 5858, + "leagueMatchday": 12, + "showTable": true + } + ] + }, + { + "TLWMatchday": 3, + "numberOfMatches": 12, + "matchdayName": "3. Spieltag", + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 5858, + "leagueMatchday": 13, + "showTable": true + }, + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 5858, + "leagueMatchday": 14, + "showTable": true + }, + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 5858, + "leagueMatchday": 15, + "showTable": true + }, + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 5858, + "leagueMatchday": 16, + "showTable": true + }, + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 5858, + "leagueMatchday": 17, + "showTable": true + }, + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 5858, + "leagueMatchday": 18, + "showTable": true + } + ] + }, + { + "TLWMatchday": 4, + "numberOfMatches": 8, + "matchdayName": "Achtelfinale", + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 5858, + "leagueMatchday": 19, + "showTable": true + }, + { + "type": "PlaceholderSingleMatch", + "koMatch": true, + "placeholderDatetime": "2024-06-29 18:00:00", + "formulaHome": "G A2", + "formulaGuest": "G B2" + }, + { + "type": "PlaceholderSingleMatch", + "koMatch": true, + "placeholderDatetime": "2024-06-29 21:00:00", + "formulaHome": "G A1", + "formulaGuest": "G C2" + }, + { + "type": "PlaceholderSingleMatch", + "koMatch": true, + "placeholderDatetime": "2024-06-30 18:00:00", + "formulaHome": "G C1", + "formulaGuest": "D" + }, + { + "type": "PlaceholderSingleMatch", + "koMatch": true, + "placeholderDatetime": "2024-06-30 21:00:00", + "formulaHome": "G B1", + "formulaGuest": "D" + }, + { + "type": "PlaceholderSingleMatch", + "koMatch": true, + "placeholderDatetime": "2024-07-01 18:00:00", + "formulaHome": "G D2", + "formulaGuest": "G E2" + }, + { + "type": "PlaceholderSingleMatch", + "koMatch": true, + "placeholderDatetime": "2024-07-01 21:00:00", + "formulaHome": "G F1", + "formulaGuest": "D" + }, + { + "type": "PlaceholderSingleMatch", + "koMatch": true, + "placeholderDatetime": "2024-07-02 18:00:00", + "formulaHome": "G E1", + "formulaGuest": "D" + }, + { + "type": "PlaceholderSingleMatch", + "koMatch": true, + "placeholderDatetime": "2024-07-02 21:00:00", + "formulaHome": "G D1", + "formulaGuest": "G F2" + } + ] + }, + { + "TLWMatchday": 5, + "numberOfMatches": 4, + "matchdayName": "Viertelfinale", + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 5858, + "leagueMatchday": 20, + "showTable": true + }, + { + "type": "PlaceholderSingleMatch", + "koMatch": true, + "placeholderDatetime": "2024-07-05 18:00:00", + "formulaHome": "W 40", + "formulaGuest": "W 38" + }, + { + "type": "PlaceholderSingleMatch", + "koMatch": true, + "placeholderDatetime": "2024-07-05 21:00:00", + "formulaHome": "W 42", + "formulaGuest": "W 41" + }, + { + "type": "PlaceholderSingleMatch", + "koMatch": true, + "placeholderDatetime": "2024-07-06 18:00:00", + "formulaHome": "W 39", + "formulaGuest": "W 37" + }, + { + "type": "PlaceholderSingleMatch", + "koMatch": true, + "placeholderDatetime": "2024-07-06 21:00:00", + "formulaHome": "W 43", + "formulaGuest": "W 44" + } + ] + }, + { + "TLWMatchday": 6, + "numberOfMatches": 2, + "matchdayName": "Halbfinale", + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 5858, + "leagueMatchday": 21, + "showTable": true + }, + { + "type": "PlaceholderSingleMatch", + "koMatch": true, + "placeholderDatetime": "2024-07-09 21:00:00", + "formulaHome": "W 45", + "formulaGuest": "W 46" + }, + { + "type": "PlaceholderSingleMatch", + "koMatch": true, + "placeholderDatetime": "2024-07-10 21:00:00", + "formulaHome": "W 48", + "formulaGuest": "W 47" + } + ] + }, + { + "TLWMatchday": 7, + "numberOfMatches": 1, + "matchdayName": "Finale", + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 5858, + "leagueMatchday": 22, + "showTable": true + }, + { + "type": "PlaceholderSingleMatch", + "koMatch": true, + "placeholderDatetime": "2024-07-14 21:00:00", + "formulaHome": "W 49", + "formulaGuest": "W 50" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/Tippliga_Configs/tl_2026_ligen.sql b/src/main/resources/Tippliga_Configs/tl_2026_ligen.sql new file mode 100644 index 0000000..29fcb12 --- /dev/null +++ b/src/main/resources/Tippliga_Configs/tl_2026_ligen.sql @@ -0,0 +1,11 @@ +INSERT INTO `phpbb_footb_leagues` (`season`, `league`, `league_name`, `league_name_short`, `league_type`, `matchdays`, `matches_on_matchday`, `win_result`, `win_result_02`, `win_matchday`, `win_season`, `points_mode`, `points_result`, `points_tendency`, `points_diff`, `points_last`, `join_by_user`, `join_in_season`, `bet_in_time`, `rules_post_id`, `sort`, `bet_ko_type`, `bet_points`, `bet_type`) VALUES (2026, 1, '1. Tippliga Würzburg', '1TL', 1, 39, 12, '0', '0', '0', '0', 4, 3, 1, 2, 0, 0, 0, 0, 561, 0, 1, 0.00, 0); +INSERT INTO `phpbb_footb_leagues` (`season`, `league`, `league_name`, `league_name_short`, `league_type`, `matchdays`, `matches_on_matchday`, `win_result`, `win_result_02`, `win_matchday`, `win_season`, `points_mode`, `points_result`, `points_tendency`, `points_diff`, `points_last`, `join_by_user`, `join_in_season`, `bet_in_time`, `rules_post_id`, `sort`, `bet_ko_type`, `bet_points`, `bet_type`) VALUES (2026, 2, '2. Tippliga Würzburg', '2TL', 1, 39, 12, '0', '0', '0', '0', 4, 3, 1, 2, 0, 0, 0, 0, 561, 0, 1, 0.00, 0); +INSERT INTO `phpbb_footb_leagues` (`season`, `league`, `league_name`, `league_name_short`, `league_type`, `matchdays`, `matches_on_matchday`, `win_result`, `win_result_02`, `win_matchday`, `win_season`, `points_mode`, `points_result`, `points_tendency`, `points_diff`, `points_last`, `join_by_user`, `join_in_season`, `bet_in_time`, `rules_post_id`, `sort`, `bet_ko_type`, `bet_points`, `bet_type`) VALUES (2026, 45, 'Supercup', 'SC', 2, 1, 0, '0', '0', '0', '0', 4, 3, 1, 2, 0, 0, 0, 1, 561, 0, 1, 0.00, 0); +INSERT INTO `phpbb_footb_leagues` (`season`, `league`, `league_name`, `league_name_short`, `league_type`, `matchdays`, `matches_on_matchday`, `win_result`, `win_result_02`, `win_matchday`, `win_season`, `points_mode`, `points_result`, `points_tendency`, `points_diff`, `points_last`, `join_by_user`, `join_in_season`, `bet_in_time`, `rules_post_id`, `sort`, `bet_ko_type`, `bet_points`, `bet_type`) VALUES (2026, 47, 'Relegation', 'REL', 2, 1, 0, '0', '0', '0', '0', 4, 3, 1, 2, 0, 0, 0, 1, 561, 0, 1, 0.00, 1); +INSERT INTO `phpbb_footb_leagues` (`season`, `league`, `league_name`, `league_name_short`, `league_type`, `matchdays`, `matches_on_matchday`, `win_result`, `win_result_02`, `win_matchday`, `win_season`, `points_mode`, `points_result`, `points_tendency`, `points_diff`, `points_last`, `join_by_user`, `join_in_season`, `bet_in_time`, `rules_post_id`, `sort`, `bet_ko_type`, `bet_points`, `bet_type`) VALUES (2026, 48, 'WTL-Pokal', 'WTL', 2, 5, 0, '0', '0', '0', '0', 4, 3, 1, 2, 0, 0, 0, 0, 561, 0, 1, 0.00, 0); +INSERT INTO `phpbb_footb_leagues` (`season`, `league`, `league_name`, `league_name_short`, `league_type`, `matchdays`, `matches_on_matchday`, `win_result`, `win_result_02`, `win_matchday`, `win_season`, `points_mode`, `points_result`, `points_tendency`, `points_diff`, `points_last`, `join_by_user`, `join_in_season`, `bet_in_time`, `rules_post_id`, `sort`, `bet_ko_type`, `bet_points`, `bet_type`) VALUES (2026, 49, 'WM-Tippspiel', 'EM', 2, 7, 0, '0', '0', '0', '0', 4, 3, 1, 2, 0, 0, 0, 0, 0, 0, 1, 0.00, 1); +INSERT INTO `phpbb_footb_leagues` (`season`, `league`, `league_name`, `league_name_short`, `league_type`, `matchdays`, `matches_on_matchday`, `win_result`, `win_result_02`, `win_matchday`, `win_season`, `points_mode`, `points_result`, `points_tendency`, `points_diff`, `points_last`, `join_by_user`, `join_in_season`, `bet_in_time`, `rules_post_id`, `sort`, `bet_ko_type`, `bet_points`, `bet_type`) VALUES (2026, 51, '1. Tippliga Würzburg', '1TL', 1, 39, 7, '0', '0', '0', '0', 1, 0, 0, 0, 1, 0, 0, 0, 561, 0, 1, 0.00, 0); +INSERT INTO `phpbb_footb_leagues` (`season`, `league`, `league_name`, `league_name_short`, `league_type`, `matchdays`, `matches_on_matchday`, `win_result`, `win_result_02`, `win_matchday`, `win_season`, `points_mode`, `points_result`, `points_tendency`, `points_diff`, `points_last`, `join_by_user`, `join_in_season`, `bet_in_time`, `rules_post_id`, `sort`, `bet_ko_type`, `bet_points`, `bet_type`) VALUES (2026, 52, '2. Tippliga Würzburg', '2TL', 1, 39, 7, '0', '0', '0', '0', 1, 0, 0, 0, 1, 0, 0, 0, 561, 0, 1, 0.00, 0); +INSERT INTO `phpbb_footb_leagues` (`season`, `league`, `league_name`, `league_name_short`, `league_type`, `matchdays`, `matches_on_matchday`, `win_result`, `win_result_02`, `win_matchday`, `win_season`, `points_mode`, `points_result`, `points_tendency`, `points_diff`, `points_last`, `join_by_user`, `join_in_season`, `bet_in_time`, `rules_post_id`, `sort`, `bet_ko_type`, `bet_points`, `bet_type`) VALUES (2026, 95, 'Supercup', 'SC', 2, 2, 0, '0', '0', '0', '0', 1, 0, 0, 0, 1, 0, 0, 0, 561, 0, 1, 0.00, 0); +INSERT INTO `phpbb_footb_leagues` (`season`, `league`, `league_name`, `league_name_short`, `league_type`, `matchdays`, `matches_on_matchday`, `win_result`, `win_result_02`, `win_matchday`, `win_season`, `points_mode`, `points_result`, `points_tendency`, `points_diff`, `points_last`, `join_by_user`, `join_in_season`, `bet_in_time`, `rules_post_id`, `sort`, `bet_ko_type`, `bet_points`, `bet_type`) VALUES (2026, 97, 'Relegation', 'REL', 2, 1, 0, '0', '0', '0', '0', 1, 0, 0, 0, 1, 0, 0, 0, 561, 0, 1, 0.00, 0); +INSERT INTO `phpbb_footb_leagues` (`season`, `league`, `league_name`, `league_name_short`, `league_type`, `matchdays`, `matches_on_matchday`, `win_result`, `win_result_02`, `win_matchday`, `win_season`, `points_mode`, `points_result`, `points_tendency`, `points_diff`, `points_last`, `join_by_user`, `join_in_season`, `bet_in_time`, `rules_post_id`, `sort`, `bet_ko_type`, `bet_points`, `bet_type`) VALUES (2026, 98, 'WTL-Pokal', 'WTL', 2, 6, 0, '0', '0', '0', '0', 1, 0, 0, 0, 1, 0, 0, 0, 561, 0, 1, 0.00, 0); diff --git a/src/main/resources/Tippliga_Configs/tl_2026_v3.json b/src/main/resources/Tippliga_Configs/tl_2026_v3.json new file mode 100644 index 0000000..4f5a7f5 --- /dev/null +++ b/src/main/resources/Tippliga_Configs/tl_2026_v3.json @@ -0,0 +1,434 @@ +{ + "numberOfMatchdays": 39, + "matchesPerMatchday": 12, + "pointMode": 4, + "pointsTendency": 1, + "pointsDifference": 2, + "pointsDirectHit": 3, + "ko": 0, + "matchdayConfig": [ + { + "TLWMatchday": 1, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 79, + "leagueMatchday": 1, + "showTable": false + } + ] + }, + { + "TLWMatchday": 2, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 79, + "leagueMatchday": 2, + "showTable": false + } + ] + }, + { + "TLWMatchday": 3, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 1, + "showTable": true + } + ] + }, + { + "TLWMatchday": 4, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 2, + "showTable": true + } + ] + }, + { + "TLWMatchday": 5, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 3, + "showTable": true + } + ] + }, + { + "TLWMatchday": 6, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 4, + "showTable": true + } + ] + }, + { + "TLWMatchday": 7, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 5, + "showTable": true + } + ] + }, + { + "TLWMatchday": 8, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 6, + "showTable": true + } + ] + }, + { + "TLWMatchday": 9, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 7, + "showTable": true + } + ] + }, + { + "TLWMatchday": 10, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 8, + "showTable": true + } + ] + }, + { + "TLWMatchday": 11, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 9, + "showTable": true + } + ] + }, + { + "TLWMatchday": 12, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 10, + "showTable": true + } + ] + }, + { + "TLWMatchday": 13, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 11, + "showTable": true + } + ] + }, + { + "TLWMatchday": 14, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 12, + "showTable": true + } + ] + }, + { + "TLWMatchday": 15, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 13, + "showTable": true + } + ] + }, + { + "TLWMatchday": 16, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 14, + "showTable": true + } + ] + }, + { + "TLWMatchday": 17, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 15, + "showTable": true + } + ] + }, + { + "TLWMatchday": 18, + "matchesConfig": [ + { + "type": "Placeholder", + "placeholderDatetime": "2025-12-26 18:00:00" + } + ] + }, + { + "TLWMatchday": 19, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 16, + "showTable": true + } + ] + }, + { + "TLWMatchday": 20, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 17, + "showTable": true + } + ] + }, + { + "TLWMatchday": 21, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 18, + "showTable": true + } + ] + }, + { + "TLWMatchday": 22, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 19, + "showTable": true + } + ] + }, + { + "TLWMatchday": 23, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 20, + "showTable": true + } + ] + }, + { + "TLWMatchday": 24, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 21, + "showTable": true + } + ] + }, + { + "TLWMatchday": 25, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 22, + "showTable": true + } + ] + }, + { + "TLWMatchday": 26, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 23, + "showTable": true + } + ] + }, + { + "TLWMatchday": 27, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 24, + "showTable": true + } + ] + }, + { + "TLWMatchday": 28, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 25, + "showTable": true + } + ] + }, + { + "TLWMatchday": 29, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 26, + "showTable": true + } + ] + }, + { + "TLWMatchday": 30, + "matchesConfig": [ + { + "type": "Placeholder", + "placeholderDatetime": "2026-03-17 18:00:00" + } + ] + }, + { + "TLWMatchday": 31, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 27, + "showTable": true + } + ] + }, + { + "TLWMatchday": 32, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 28, + "showTable": true + } + ] + }, + { + "TLWMatchday": 33, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 29, + "showTable": true + } + ] + }, + { + "TLWMatchday": 34, + "matchesConfig": [ + { + "type": "Placeholder", + "placeholderDatetime": "2026-04-14 18:00:00" + } + ] + }, + { + "TLWMatchday": 35, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 30, + "showTable": true + } + ] + }, + { + "TLWMatchday": 36, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 31, + "showTable": true + } + ] + }, + { + "TLWMatchday": 37, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 32, + "showTable": true + } + ] + }, + { + "TLWMatchday": 38, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 33, + "showTable": true + } + ] + }, + { + "TLWMatchday": 39, + "matchesConfig": [ + { + "type": "AllMatchesOfMatchday", + "matchesLeague": 78, + "leagueMatchday": 34, + "showTable": true + } + ] + } + ] +} \ No newline at end of file diff --git a/src/test/java/de/jeyp91/S3ProviderTest.java b/src/test/java/de/jeyp91/S3ProviderTest.java index c4b0256..1f7ad7e 100644 --- a/src/test/java/de/jeyp91/S3ProviderTest.java +++ b/src/test/java/de/jeyp91/S3ProviderTest.java @@ -8,7 +8,7 @@ public class S3ProviderTest { @Test public void getFixturesFromS3Test() { S3Provider prov = new S3Provider(); - JSONObject rounds = prov.getFixturesJSONFromS3(2025, 1240); + JSONObject rounds = prov.getFixturesJSONFromS3(2026, 1240); System.out.println(rounds.toJSONString()); } } diff --git a/src/test/java/de/jeyp91/apifootball/APIFootballUpdaterTest.java b/src/test/java/de/jeyp91/apifootball/APIFootballUpdaterTest.java index e0353bd..35b7fc7 100644 --- a/src/test/java/de/jeyp91/apifootball/APIFootballUpdaterTest.java +++ b/src/test/java/de/jeyp91/apifootball/APIFootballUpdaterTest.java @@ -4,7 +4,7 @@ import org.junit.Test; public class APIFootballUpdaterTest { - int season = 2025; + int season = 2026; @Test public void checkErrorsTest() { @@ -21,7 +21,7 @@ public class APIFootballUpdaterTest { @Test public void updateFixturesTest() { APIFootballUpdater updater = new APIFootballUpdater(); - updater.updateFixtures(2025, 79); + updater.updateFixtures(season, 79); } @Test diff --git a/src/test/java/de/jeyp91/tippliga/TLWMatchdaysCreatorTest.java b/src/test/java/de/jeyp91/tippliga/TLWMatchdaysCreatorTest.java index 191c0af..3026dac 100644 --- a/src/test/java/de/jeyp91/tippliga/TLWMatchdaysCreatorTest.java +++ b/src/test/java/de/jeyp91/tippliga/TLWMatchdaysCreatorTest.java @@ -1,15 +1,13 @@ package de.jeyp91.tippliga; -import org.junit.Test; - -import java.text.ParseException; import java.util.ArrayList; import static org.junit.Assert.assertEquals; +import org.junit.Test; public class TLWMatchdaysCreatorTest { - int season = 2025; + int season = 2026; @Test public void getMatchdaysTippligaTest() { diff --git a/src/test/java/de/jeyp91/tippliga/TLWMatchesCreatorFootballTest.java b/src/test/java/de/jeyp91/tippliga/TLWMatchesCreatorFootballTest.java index 75eb69e..42a8778 100644 --- a/src/test/java/de/jeyp91/tippliga/TLWMatchesCreatorFootballTest.java +++ b/src/test/java/de/jeyp91/tippliga/TLWMatchesCreatorFootballTest.java @@ -8,7 +8,7 @@ import static org.junit.Assert.assertEquals; public class TLWMatchesCreatorFootballTest { - int season = 2025; + int season = 2026; @Test public void getMatchesTest() { diff --git a/src/test/java/de/jeyp91/tippliga/TLWMatchesCreatorTipperPokalTest.java b/src/test/java/de/jeyp91/tippliga/TLWMatchesCreatorTipperPokalTest.java index f690ba9..1c30e34 100644 --- a/src/test/java/de/jeyp91/tippliga/TLWMatchesCreatorTipperPokalTest.java +++ b/src/test/java/de/jeyp91/tippliga/TLWMatchesCreatorTipperPokalTest.java @@ -4,7 +4,7 @@ import org.junit.Test; public class TLWMatchesCreatorTipperPokalTest { - int season = 2025; + int season = 2026; @Test public void getMatchesWTLPokalTest() { diff --git a/src/test/java/de/jeyp91/tippliga/TLWMatchesCreatorTipperTest.java b/src/test/java/de/jeyp91/tippliga/TLWMatchesCreatorTipperTest.java index 0448fa6..c32b192 100644 --- a/src/test/java/de/jeyp91/tippliga/TLWMatchesCreatorTipperTest.java +++ b/src/test/java/de/jeyp91/tippliga/TLWMatchesCreatorTipperTest.java @@ -4,7 +4,7 @@ import org.junit.Test; public class TLWMatchesCreatorTipperTest { - int season = 2025; + int season = 2026; @Test public void getMatchesTippliga1Test() { diff --git a/src/test/java/de/jeyp91/tippliga/TLWMatchesUpdaterFootballTest.java b/src/test/java/de/jeyp91/tippliga/TLWMatchesUpdaterFootballTest.java index 056569a..75e9717 100644 --- a/src/test/java/de/jeyp91/tippliga/TLWMatchesUpdaterFootballTest.java +++ b/src/test/java/de/jeyp91/tippliga/TLWMatchesUpdaterFootballTest.java @@ -4,7 +4,7 @@ import org.junit.Test; public class TLWMatchesUpdaterFootballTest { - int season = 2025; + int season = 2026; @Test public void getUpdateSqlTest1() { TLWMatchesUpdaterFootball updater = new TLWMatchesUpdaterFootball(season, 1, "Tippliga"); diff --git a/src/test/java/de/jeyp91/tippliga/TLWTeamsCreatorTest.java b/src/test/java/de/jeyp91/tippliga/TLWTeamsCreatorTest.java index cd5472c..a9f86c6 100644 --- a/src/test/java/de/jeyp91/tippliga/TLWTeamsCreatorTest.java +++ b/src/test/java/de/jeyp91/tippliga/TLWTeamsCreatorTest.java @@ -6,7 +6,7 @@ import org.junit.Test; public class TLWTeamsCreatorTest { - int season = 2025; + int season = 2026; @Test public void getTeamsTippligaFootball1Test() { diff --git a/src/test/java/de/jeyp91/tippligaforum/MatchesListCreatorTest.java b/src/test/java/de/jeyp91/tippligaforum/MatchesListCreatorTest.java index 5e385a3..a97ab79 100644 --- a/src/test/java/de/jeyp91/tippligaforum/MatchesListCreatorTest.java +++ b/src/test/java/de/jeyp91/tippligaforum/MatchesListCreatorTest.java @@ -6,35 +6,35 @@ public class MatchesListCreatorTest { @Test public void getMatchesTest2664() { - MatchesListCreator creator = new MatchesListCreator(2025, 2664); + MatchesListCreator creator = new MatchesListCreator(2026, 2664); String matches = creator.getMatchesBeautiful(); // System.out.println(matches); } @Test public void getMatchesTest2743() { - MatchesListCreator creator = new MatchesListCreator(2025, 2743); + MatchesListCreator creator = new MatchesListCreator(2026, 2743); String matches = creator.getMatchesBeautiful(); System.out.println(matches); } @Test public void getMatchesTest2755() { - MatchesListCreator creator = new MatchesListCreator(2025, 2755); + MatchesListCreator creator = new MatchesListCreator(2026, 2755); String matches = creator.getMatchesBeautiful(); // System.out.println(matches); } @Test public void getMatchesTest2790() { - MatchesListCreator creator = new MatchesListCreator(2025, 2790); + MatchesListCreator creator = new MatchesListCreator(2026, 2790); String matches = creator.getMatchesBeautiful(); // System.out.println(matches); } @Test public void getMatchesTest2795() { - MatchesListCreator creator = new MatchesListCreator(2025, 2795); + MatchesListCreator creator = new MatchesListCreator(2026, 2795); String matches = creator.getMatchesBeautiful(); // System.out.println(matches); } diff --git a/src/test/java/de/jeyp91/tippligaforum/MatchesListForumUpdaterTest.java b/src/test/java/de/jeyp91/tippligaforum/MatchesListForumUpdaterTest.java index 2481c52..a1836b4 100644 --- a/src/test/java/de/jeyp91/tippligaforum/MatchesListForumUpdaterTest.java +++ b/src/test/java/de/jeyp91/tippligaforum/MatchesListForumUpdaterTest.java @@ -6,8 +6,8 @@ public class MatchesListForumUpdaterTest { @Test public void updateAllLeaguesTest() { - MatchesListForumUpdater updater = new MatchesListForumUpdater(2025); - updater.updateAllLeagues(2025); + MatchesListForumUpdater updater = new MatchesListForumUpdater(2026); + updater.updateAllLeagues(2026); } @Test