Compare commits
237
Commits
0bc9c49b7f
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
27f6b663ab | ||
|
|
c8ec6f1846 | ||
|
|
2055c15906 | ||
|
|
3461b61e27 | ||
|
|
04dca24513 | ||
|
|
b0110e1bc8 | ||
|
|
32ef2656f7 | ||
|
|
d19fc04140 | ||
|
|
04120d77e8 | ||
|
|
e433dbe9e3 | ||
|
|
13468de37c | ||
|
|
197b5532c7 | ||
|
|
b09dd6b32b | ||
|
|
09ab9650c8 | ||
|
|
cd543c9223 | ||
|
|
733cc25196 | ||
|
|
c2fb53f1cf | ||
|
|
6feffaa6e0 | ||
|
|
a0ee841573 | ||
|
|
a71330a4da | ||
|
|
fd47798209 | ||
|
|
553a013601 | ||
|
|
870e278049 | ||
|
|
73a170bd07 | ||
|
|
ed2131a847 | ||
|
|
979a03178a | ||
|
|
30eea96662 | ||
|
|
0a50f120e3 | ||
|
|
7126f2de40 | ||
|
|
0e893b9c50 | ||
|
|
828d1dc4d8 | ||
|
|
d644c8f698 | ||
|
|
68892d9d6c | ||
|
|
d8a00acb2d | ||
|
|
c083aa9c7c | ||
|
|
c054f268b0 | ||
|
|
f22b9545d3 | ||
|
|
59fab74a01 | ||
|
|
3539b23943 | ||
|
|
2d8e418d66 | ||
|
|
9b5b50f174 | ||
|
|
d426c2b75f | ||
|
|
5009146a04 | ||
|
|
df4a69f567 | ||
|
|
81a421ebd3 | ||
|
|
f5735721e2 | ||
|
|
31d33aa0f8 | ||
|
|
e1a0736e1c | ||
|
|
fbfbac8ae2 | ||
|
|
bb1bb8568e | ||
|
|
a6fbac60a2 | ||
|
|
5adb9fb822 | ||
|
|
7d4f66c113 | ||
|
|
738d0427d9 | ||
|
|
6604b0310f | ||
|
|
d828c9f0b2 | ||
|
|
5502607f3c | ||
|
|
f4748d2874 | ||
|
|
a8e9327d3d | ||
|
|
0bf72d686b | ||
|
|
3215493ac7 | ||
|
|
055e4d3d4a | ||
|
|
29e4bfbb0b | ||
|
|
72a51bf1f9 | ||
|
|
bd39227f6d | ||
|
|
4c2650454b | ||
|
|
d19cb5561b | ||
|
|
1127d9d845 | ||
|
|
fc73ce8b27 | ||
|
|
813c16fcbb | ||
|
|
0a2cc9f881 | ||
|
|
cce004230d | ||
|
|
acb1ea6f5a | ||
|
|
5015c61864 | ||
|
|
4c643404d8 | ||
|
|
15e2f65c43 | ||
|
|
02cae28986 | ||
|
|
44e458a21d | ||
|
|
5b76f0384b | ||
|
|
4d4b6f726a | ||
|
|
119097d101 | ||
|
|
281ac3f2f7 | ||
|
|
a40b47f469 | ||
|
|
9e80cb01e2 | ||
|
|
9178a97b45 | ||
|
|
cccd93e6db | ||
|
|
db06d62fba | ||
|
|
c0ddebf971 | ||
|
|
af0047136a | ||
|
|
5000e83012 | ||
|
|
82d12ea921 | ||
|
|
a2360a3938 | ||
|
|
e374de61ae | ||
|
|
c7c1002fb0 | ||
|
|
2cb0e754ed | ||
|
|
edcd8e5f35 | ||
|
|
cca81177a5 | ||
|
|
f5f140a2a8 | ||
|
|
49a6458d03 | ||
|
|
71d57e8977 | ||
|
|
b2174f00d8 | ||
|
|
9f97b31e0f | ||
|
|
22d30db20d | ||
|
|
2f6c4f3c3c | ||
|
|
a19c2124aa | ||
|
|
6026f48a51 | ||
|
|
96b4a8cda2 | ||
|
|
a641824c70 | ||
|
|
39cfa9403f | ||
|
|
84208dc256 | ||
|
|
ad5fbcaab1 | ||
|
|
5d008fdf54 | ||
|
|
bf5b6727f4 | ||
|
|
883c2dc55a | ||
|
|
adf1c3e7e2 | ||
|
|
644cff5adf | ||
|
|
ee8218c815 | ||
|
|
33a5a7d531 | ||
|
|
9bd51dc8db | ||
|
|
5d3ae8438b | ||
|
|
5d5eb48fa7 | ||
|
|
7f258ed16f | ||
|
|
2fad736e41 | ||
|
|
d72ae3a51d | ||
|
|
086fa71f05 | ||
|
|
3df202bc84 | ||
|
|
d2abacb0c4 | ||
|
|
64f723f619 | ||
|
|
599e781122 | ||
|
|
fcff894678 | ||
|
|
67a99946f2 | ||
|
|
f7d4742ec8 | ||
|
|
1136874a3c | ||
|
|
903963c951 | ||
|
|
6e377335c1 | ||
|
|
af1d1dd616 | ||
|
|
274f602aab | ||
|
|
3b3ddc5ab5 | ||
|
|
3437d52322 | ||
|
|
2e3f494db5 | ||
|
|
d91f1a279d | ||
|
|
e36a2d97d9 | ||
|
|
27c5799178 | ||
|
|
b1549649c3 | ||
|
|
95b8492622 | ||
|
|
2036ded735 | ||
|
|
5b2720d532 | ||
|
|
da76c094ff | ||
|
|
7604538d50 | ||
|
|
2e848fb726 | ||
|
|
ee508728e9 | ||
|
|
8a8695e7f5 | ||
|
|
f2548498d7 | ||
|
|
9cde1290f7 | ||
|
|
74d8c26385 | ||
|
|
284724a6ef | ||
|
|
7efafd5528 | ||
|
|
475ad08c81 | ||
|
|
d573e74fa9 | ||
|
|
fa8069b7b7 | ||
|
|
6c9b86db09 | ||
|
|
9937208c5e | ||
|
|
3cd6b8b57e | ||
|
|
370944814c | ||
|
|
45976d7e91 | ||
|
|
b6bd614f05 | ||
|
|
5ac7bd4b67 | ||
|
|
01f614de96 | ||
|
|
e6b1198ca9 | ||
|
|
1441009e31 | ||
|
|
a5728d8c3c | ||
|
|
d5af4e999a | ||
|
|
c2bc116969 | ||
|
|
712c53a4cf | ||
|
|
dae3d657e4 | ||
|
|
cb5fd198ba | ||
|
|
074ce3254e | ||
|
|
9fdaa23943 | ||
|
|
82f5c32566 | ||
|
|
3167e28b82 | ||
|
|
04f771a598 | ||
|
|
d1de6a4353 | ||
|
|
cbe60c3f9a | ||
|
|
0a5589f110 | ||
|
|
4b8e10b97c | ||
|
|
921640a200 | ||
|
|
90a5aa1a5d | ||
|
|
f4567bad00 | ||
|
|
e43cc192cd | ||
|
|
f60fd91249 | ||
|
|
5c1c38ae8d | ||
|
|
d13628759a | ||
|
|
998998479b | ||
|
|
3b856386fc | ||
|
|
a00cf1e408 | ||
|
|
0b63b6e13d | ||
|
|
4119163c4c | ||
|
|
633b633e2b | ||
|
|
29b3707ee8 | ||
|
|
1afa64b29b | ||
|
|
c0424eaa94 | ||
|
|
6d8ced5103 | ||
|
|
dae85edde2 | ||
|
|
eed4816f9b | ||
|
|
8a0fd92b49 | ||
|
|
06500dc5c1 | ||
|
|
9026d1c37a | ||
|
|
f85ecdc357 | ||
|
|
be6253c15e | ||
|
|
87c25cf8b4 | ||
|
|
5609580094 | ||
|
|
915daad6ee | ||
|
|
ec8c487022 | ||
|
|
5f87666201 | ||
|
|
d922f1a842 | ||
|
|
da170f9dd0 | ||
|
|
43fb464f73 | ||
|
|
d751f6e4ed | ||
|
|
9c10c2009c | ||
|
|
1b28d37778 | ||
|
|
eaf7a4ec22 | ||
|
|
11f5f8e088 | ||
|
|
893fc75243 | ||
|
|
8c7b082867 | ||
|
|
9e50c1a37e | ||
|
|
4df4436772 | ||
|
|
d7b2d192d8 | ||
|
|
285ec1074a | ||
|
|
f997b9bf46 | ||
|
|
45da769ab5 | ||
|
|
d454ed4d9e | ||
|
|
c83389fcd3 | ||
|
|
71bfba0638 | ||
|
|
209ea3ba76 | ||
|
|
9340118622 | ||
|
|
8144831b6e | ||
|
|
d18100eb2d |
Vendored
+15
-7
@@ -10,7 +10,7 @@
|
|||||||
"request": "launch",
|
"request": "launch",
|
||||||
"mainClass": "de.jeyp91.App",
|
"mainClass": "de.jeyp91.App",
|
||||||
"envFile": "${workspaceFolder}/.env",
|
"envFile": "${workspaceFolder}/.env",
|
||||||
"args": " --mode APIFootballUpdater --season 2026 --league 49 --configFile WM-Tippspiel"
|
"args": ["--mode", "APIFootballUpdater", "--season", "2027", "--league", "1", "--configFile", "Tippliga"]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "java",
|
"type": "java",
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
"request": "launch",
|
"request": "launch",
|
||||||
"mainClass": "de.jeyp91.App",
|
"mainClass": "de.jeyp91.App",
|
||||||
"envFile": "${workspaceFolder}/.env",
|
"envFile": "${workspaceFolder}/.env",
|
||||||
"args": " --mode MatchesCreatorFootball --season 2026 --league 49 --configFile WM-Tippspiel"
|
"args": ["--mode", "MatchesCreatorFootball", "--season", "2027", "--league", "1", "--configFile", "Tippliga"]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "java",
|
"type": "java",
|
||||||
@@ -26,7 +26,7 @@
|
|||||||
"request": "launch",
|
"request": "launch",
|
||||||
"mainClass": "de.jeyp91.App",
|
"mainClass": "de.jeyp91.App",
|
||||||
"envFile": "${workspaceFolder}/.env",
|
"envFile": "${workspaceFolder}/.env",
|
||||||
"args": " --mode MatchesUpdaterFootball --season 2026 --league 49 --configFile WM-Tippspiel"
|
"args": ["--mode", "MatchesUpdaterFootball", "--season", "2027", "--league", "1", "--configFile", "Tippliga"]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "java",
|
"type": "java",
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
"request": "launch",
|
"request": "launch",
|
||||||
"mainClass": "de.jeyp91.App",
|
"mainClass": "de.jeyp91.App",
|
||||||
"envFile": "${workspaceFolder}/.env",
|
"envFile": "${workspaceFolder}/.env",
|
||||||
"args": " --mode MatchdaysUpdater --season 2026 --league 49 --configFile WM-Tippspiel"
|
"args": ["--mode", "MatchdaysUpdater", "--season", "2027", "--league", "1", "--configFile", "Tippliga"]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "java",
|
"type": "java",
|
||||||
@@ -42,7 +42,7 @@
|
|||||||
"request": "launch",
|
"request": "launch",
|
||||||
"mainClass": "de.jeyp91.App",
|
"mainClass": "de.jeyp91.App",
|
||||||
"envFile": "${workspaceFolder}/.env",
|
"envFile": "${workspaceFolder}/.env",
|
||||||
"args": " --mode MatchesResultsUpdater --season 2026 --league 49 --configFile WM-Tippspiel"
|
"args": ["--mode", "MatchesResultsUpdater", "--season", "2027", "--league", "1", "--configFile", "Tippliga"]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "java",
|
"type": "java",
|
||||||
@@ -50,7 +50,7 @@
|
|||||||
"request": "launch",
|
"request": "launch",
|
||||||
"mainClass": "de.jeyp91.App",
|
"mainClass": "de.jeyp91.App",
|
||||||
"envFile": "${workspaceFolder}/.env",
|
"envFile": "${workspaceFolder}/.env",
|
||||||
"args": " --mode MatchesListGistUpdater --season 2026 --league 49 --configFile WM-Tippspiel"
|
"args": ["--mode", "MatchesListGistUpdater", "--season", "2027", "--league", "1", "--configFile", "Tippliga"]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "java",
|
"type": "java",
|
||||||
@@ -58,7 +58,15 @@
|
|||||||
"request": "launch",
|
"request": "launch",
|
||||||
"mainClass": "de.jeyp91.App",
|
"mainClass": "de.jeyp91.App",
|
||||||
"envFile": "${workspaceFolder}/.env",
|
"envFile": "${workspaceFolder}/.env",
|
||||||
"args": " --mode TeamsUpdater --season 2026 --league 49 --configFile WM-Tippspiel"
|
"args": ["--mode", "TeamsUpdater", "--season", "2027", "--league", "1", "--configFile", "Tippliga"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "java",
|
||||||
|
"name": "SeasonPreparation",
|
||||||
|
"request": "launch",
|
||||||
|
"mainClass": "de.jeyp91.App",
|
||||||
|
"envFile": "${workspaceFolder}/.env",
|
||||||
|
"args": ["--mode", "SeasonPreparation", "--season", "2027", "--league", "0", "--configFile", "Dummy"]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
Vendored
+3
-9
@@ -2,15 +2,9 @@
|
|||||||
"java.compile.nullAnalysis.mode": "automatic",
|
"java.compile.nullAnalysis.mode": "automatic",
|
||||||
"java.configuration.updateBuildConfiguration": "interactive",
|
"java.configuration.updateBuildConfiguration": "interactive",
|
||||||
"java.test.config": {
|
"java.test.config": {
|
||||||
"envFile": "${workspaceFolder}/.env",
|
"envFile": "${workspaceFolder}/.env"
|
||||||
"env": {
|
|
||||||
"AWS_ACCESS_KEY_ID": "AKIA4G4WGB26FLCFCU4M",
|
|
||||||
"AWS_SECRET_ACCESS_KEY": "MZBrGLSXRRVR6Yza6n4NrZCoCkgibON3kpYCvNPH",
|
|
||||||
"FORUM_PASSWORD": "original",
|
|
||||||
"FORUM_USERNAME": "Julian",
|
|
||||||
"TLW_DATABASE_PASSWORD": "TippligaWuerzb_1",
|
|
||||||
"TLW_DATABASE_USERNAME": "d0144ddb"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"java.debug.settings.onBuildFailureProceed": true,
|
"java.debug.settings.onBuildFailureProceed": true,
|
||||||
|
"jdk.jdkhome": "/Users/julian/.local/share/mise/installs/java/22.0.2",
|
||||||
|
"java.debug.settings.console": "internalConsole"
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,91 @@
|
|||||||
|
<!-- headroom:rtk-instructions -->
|
||||||
|
# RTK (Rust Token Killer) - Token-Optimized Commands
|
||||||
|
|
||||||
|
When running shell commands, **always prefix with `rtk`**. This reduces context
|
||||||
|
usage by 60-90% with zero behavior change. If rtk has no filter for a command,
|
||||||
|
it passes through unchanged — so it is always safe to use.
|
||||||
|
|
||||||
|
## Key Commands
|
||||||
|
```bash
|
||||||
|
# Git (59-80% savings)
|
||||||
|
rtk git status rtk git diff rtk git log
|
||||||
|
|
||||||
|
# Files & Search (60-75% savings)
|
||||||
|
rtk ls <path> rtk read <file> rtk grep <pattern>
|
||||||
|
rtk find <pattern> rtk diff <file>
|
||||||
|
|
||||||
|
# Build (80-90% savings) — shows errors only
|
||||||
|
rtk ./gradlew build rtk ./gradlew compileJava
|
||||||
|
|
||||||
|
# Test (90-99% savings) — shows failures only
|
||||||
|
rtk ./gradlew test
|
||||||
|
|
||||||
|
# Analysis (70-90% savings)
|
||||||
|
rtk err <cmd> rtk log <file> rtk json <file>
|
||||||
|
rtk summary <cmd> rtk deps rtk env
|
||||||
|
|
||||||
|
# GitHub (26-87% savings)
|
||||||
|
rtk gh pr view <n> rtk gh run list rtk gh issue list
|
||||||
|
|
||||||
|
# Infrastructure (85% savings)
|
||||||
|
rtk docker ps rtk kubectl get rtk docker logs <c>
|
||||||
|
```
|
||||||
|
|
||||||
|
## Rules
|
||||||
|
- In command chains, prefix each segment: `rtk git add . && rtk git commit -m "msg"`
|
||||||
|
- For debugging, use raw command without rtk prefix
|
||||||
|
- `rtk proxy <cmd>` runs command without filtering but tracks usage
|
||||||
|
<!-- /headroom:rtk-instructions -->
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
# TLW Database Tool — Agent Guide
|
||||||
|
|
||||||
|
## Project Overview
|
||||||
|
Java CLI tool managing the Tippliga Würzburg football prediction league. Syncs match data from API-Football, manages MySQL database (phpBB forum), pushes Google Calendar events, sends WhatsApp reminders via OpenAI-generated messages, and uploads fixtures to S3.
|
||||||
|
|
||||||
|
## Build & Test
|
||||||
|
```bash
|
||||||
|
./gradlew build # compile + test + jar
|
||||||
|
./gradlew test # run all tests
|
||||||
|
./gradlew clean test # clean build + test
|
||||||
|
./gradlew jar # build fat JAR (all deps bundled)
|
||||||
|
./gradlew dependencies # list dependency tree
|
||||||
|
```
|
||||||
|
|
||||||
|
## Run Modes (CLI)
|
||||||
|
```
|
||||||
|
-m MatchdaysUpdater - Update delivery dates from match times
|
||||||
|
-m MatchesCreatorFootball - Create match schedule from API-Football
|
||||||
|
-m MatchesUpdaterFootball - Update match team/datetime from API-Football
|
||||||
|
-m MatchesResultsUpdater - Push match results to website
|
||||||
|
-m TeamsUpdater - Add missing teams to DB
|
||||||
|
-m APIFootballUpdater - Fetch fixtures/rounds from API-Football → S3
|
||||||
|
-m MatchesListGistUpdater - Update forum posts with fixture lists
|
||||||
|
-m PostChecksum - Print checksum of a config post
|
||||||
|
-m WhatsAppNotifier - Send WhatsApp reminders for missing bets
|
||||||
|
```
|
||||||
|
Required: `-s <season> -l <league> -c <configFile>`
|
||||||
|
|
||||||
|
## Architecture
|
||||||
|
```
|
||||||
|
App.java (CLI entry)
|
||||||
|
├── apifootball/ — API-Football HTTP client, match model, S3 caching
|
||||||
|
├── googlecalendar/ — Google Calendar API CRUD for matchday events
|
||||||
|
├── teamidmatcher/ — BiMap: Tippliga team ID ↔ API-Football team ID
|
||||||
|
├── tippliga/ — Domain models & operations (match, matchday, team, league)
|
||||||
|
├── tippligaforum/ — MySQL DB connector, phpBB forum post management
|
||||||
|
└── whatsapp/ — OpenAI-generated reminders, WhatsApp API sender
|
||||||
|
```
|
||||||
|
|
||||||
|
## Code Conventions
|
||||||
|
- Package: `de.jeyp91.*`
|
||||||
|
- SQL columns referenced by ordinal position (constants like `final int SEASON = 1`)
|
||||||
|
- Logger via SLF4J: `LoggerFactory.getLogger(Class.class)`
|
||||||
|
- Config stored as JSON in phpBB forum posts (not local files)
|
||||||
|
- API keys / secrets in environment variables
|
||||||
|
|
||||||
|
## Testing
|
||||||
|
- JUnit 4 + TestNG
|
||||||
|
- Tests in `src/test/java/de/jeyp91/`
|
||||||
|
- Run single test: `./gradlew test --tests "de.jeyp91.apifootball.APIFootballMatchTest"`
|
||||||
@@ -0,0 +1,136 @@
|
|||||||
|
# TLW Database Tool
|
||||||
|
|
||||||
|
CLI tool for **Tippliga Würzburg** football prediction league administration. Syncs match data from [API-Football](https://www.api-football.com/), manages a MySQL database backing a phpBB forum, pushes Google Calendar events, sends WhatsApp reminders with AI-generated messages via OpenAI, and uploads fixture data to S3.
|
||||||
|
|
||||||
|
## Architecture
|
||||||
|
|
||||||
|
```
|
||||||
|
App.java (CLI entry with argparse4j)
|
||||||
|
├── apifootball/ — API-Football HTTP client, match model, S3 caching
|
||||||
|
│ ├── APIFootballUpdater Fetch raw fixtures/rounds → S3
|
||||||
|
│ ├── APIFootballConnector Singleton, reads cached S3 data, resolves matchdays
|
||||||
|
│ ├── APIFootballMatch API-Football match model (extends BaseMatch)
|
||||||
|
│ └── APIFootballMatchesProvider Resolves config entries to match lists
|
||||||
|
├── googlecalendar/ — Google Calendar API CRUD
|
||||||
|
│ ├── GoogleCalendarConnector OAuth2 + service setup
|
||||||
|
│ ├── CalendarConfigProvider Reads calendar ID/URL from JSON resource
|
||||||
|
│ └── TippligaGoogleEventManager Create/update/delete matchday events
|
||||||
|
├── teamidmatcher/ — Bi-directional ID mapping
|
||||||
|
│ ├── TeamIDMatcher HashBiMap: Tippliga team ID ↔ API-Football ID
|
||||||
|
│ └── TeamIDMatcherTemplateCreator Generates config template from API teams
|
||||||
|
├── tippliga/ — Domain models & operations
|
||||||
|
│ ├── TLWMatch / TLWMatchday / TLWTeam / TLWLeague (DB-mapped models)
|
||||||
|
│ ├── TLWMatchesCreatorFootball Build match schedule from API data
|
||||||
|
│ ├── TLWMatchesCreatorTipperLeague Build tipper-vs-tipper league matches
|
||||||
|
│ ├── TLWMatchesCreatorTipperPokal Build knockout tournament matches
|
||||||
|
│ ├── TLWMatchesUpdaterFootball Update teams/datetimes from API
|
||||||
|
│ ├── TLWMatchesResultsUpdater Push finished match results to website
|
||||||
|
│ ├── TLWMatchdaysCreator Compute delivery dates from match times
|
||||||
|
│ ├── TLWMatchdaysUpdater Write delivery date updates to DB + Calendar
|
||||||
|
│ ├── TLWTeamsCreator / TLWTeamsUpdater Team management
|
||||||
|
│ └── TLWMatchesManagerBase Shared helpers (date math, match matching)
|
||||||
|
├── tippligaforum/ — MySQL + phpBB integration
|
||||||
|
│ ├── TippligaSQLConnector Singleton JDBC connector (all queries)
|
||||||
|
│ ├── TippligaConfigProvider Reads JSON config from forum posts
|
||||||
|
│ ├── TippligaWebsiteConnector HTTP client for admin result updates
|
||||||
|
│ └── MatchesListCreator / MatchesListForumUpdater Fixture list posts
|
||||||
|
└── whatsapp/ — WhatsApp reminder system
|
||||||
|
├── WhatsAppNotifier Sends messages via WhatsApp API
|
||||||
|
├── OpenAIConnector Generates reminder text via GPT-3.5
|
||||||
|
└── WhatsAppReminder Record: user, matchday, missing bets
|
||||||
|
|
||||||
|
BaseMatch — Abstract match with status/comparison/shared fields
|
||||||
|
S3Provider — AWS S3 read/write for cached API-Football JSON
|
||||||
|
ResourceProvider — Reads JSON config files from classpath resources
|
||||||
|
StatusHolder — Global error flag
|
||||||
|
```
|
||||||
|
|
||||||
|
## Setup
|
||||||
|
|
||||||
|
### Prerequisites
|
||||||
|
- Java 17+
|
||||||
|
- MySQL database (phpBB with Tippliga extension)
|
||||||
|
- API-Football API key (free tier)
|
||||||
|
- Google Calendar API service account + credentials file
|
||||||
|
- AWS S3 bucket for fixture caching
|
||||||
|
- WhatsApp API endpoint
|
||||||
|
|
||||||
|
### Environment Variables
|
||||||
|
| Variable | Description |
|
||||||
|
|---|---|
|
||||||
|
| `TLW_DATABASE_USERNAME` | MySQL username |
|
||||||
|
| `TLW_DATABASE_PASSWORD` | MySQL password |
|
||||||
|
| `FORUM_USERNAME` | phpBB admin username (for website connector) |
|
||||||
|
| `FORUM_PASSWORD` | phpBB admin password |
|
||||||
|
| `OPENAI_TOKEN` | OpenAI API token (GPT reminders) |
|
||||||
|
| `TLW_WHATSAPP_HOST` | WhatsApp API host |
|
||||||
|
| `TLW_WHATSAPP_PORT` | WhatsApp API port |
|
||||||
|
| `TLW_WHATSAPP_API_KEY` | WhatsApp API key |
|
||||||
|
| `AWS_ACCESS_KEY_ID` | AWS credentials (S3) |
|
||||||
|
| `AWS_SECRET_ACCESS_KEY` | AWS credentials (S3) |
|
||||||
|
|
||||||
|
### Resources
|
||||||
|
Place these in `src/main/resources/`:
|
||||||
|
- `Tippliga/Team_ID_Matcher_Config.json` — team ID mapping
|
||||||
|
- `Tippliga/Ligen_v3.json` — league definitions
|
||||||
|
- `Google_Calendar_Config.json` — calendar IDs
|
||||||
|
- `Tippliga_Configs/<config>.json` — per-season match configs
|
||||||
|
|
||||||
|
Configs are stored as phpBB forum posts (JSON wrapped in `[code]` BBCode).
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Build fat JAR
|
||||||
|
./gradlew jar
|
||||||
|
|
||||||
|
# Run modes (all require -s <season> -l <league> -c <configFile>)
|
||||||
|
java -jar build/libs/tlw-database-tool-1.0.jar -m MatchdaysUpdater -s 2025 -l 1 -c tl_2025
|
||||||
|
```
|
||||||
|
|
||||||
|
### CLI Modes
|
||||||
|
|
||||||
|
| Mode | Function |
|
||||||
|
|---|---|
|
||||||
|
| `MatchdaysUpdater` | Update delivery dates from match times, sync Google Calendar |
|
||||||
|
| `MatchesCreatorFootball` | Create match schedule from API-Football |
|
||||||
|
| `MatchesUpdaterFootball` | Update match teams/datetimes from API-Football |
|
||||||
|
| `MatchesResultsUpdater` | Push finished results to website |
|
||||||
|
| `TeamsUpdater` | Add missing teams to DB |
|
||||||
|
| `APIFootballUpdater` | Fetch raw fixtures/rounds → S3 |
|
||||||
|
| `MatchesListGistUpdater` | Update forum posts with fixture lists |
|
||||||
|
| `PostChecksum` | Print MD5 checksum of a config post |
|
||||||
|
| `WhatsAppNotifier` | Send WhatsApp reminders for missing bets |
|
||||||
|
|
||||||
|
### Build Commands
|
||||||
|
```bash
|
||||||
|
./gradlew build # compile + test + jar
|
||||||
|
./gradlew test # run all tests
|
||||||
|
./gradlew clean test # clean build + test
|
||||||
|
./gradlew jar # build fat JAR
|
||||||
|
./gradlew dependencies # list dependency tree
|
||||||
|
```
|
||||||
|
|
||||||
|
## Code Conventions
|
||||||
|
- Package: `de.jeyp91.*`
|
||||||
|
- SQL columns referenced by ordinal position in ResultSet (constants like `final int SEASON = 1`)
|
||||||
|
- Logger via SLF4J: `LoggerFactory.getLogger(Class.class)`
|
||||||
|
- Match status constants inherited from `BaseMatch`
|
||||||
|
- Config JSON stored in phpBB forum posts, loaded via `TippligaConfigProvider`
|
||||||
|
- Secrets in environment variables only
|
||||||
|
|
||||||
|
## Testing
|
||||||
|
- JUnit 4 + TestNG
|
||||||
|
- Tests under `src/test/java/de/jeyp91/`
|
||||||
|
- Run single test: `./gradlew test --tests "de.jeyp91.apifootball.APIFootballMatchTest"`
|
||||||
|
|
||||||
|
## How It Works (Data Flow)
|
||||||
|
|
||||||
|
1. **APIFootballUpdater** fetches fixtures/rounds from API-Football → caches in S3
|
||||||
|
2. **APIFootballConnector** reads cached S3 data, resolves API matchdays to Tippliga matchdays
|
||||||
|
3. **TLWMatchesCreatorFootball** config on which API matches map to which Tippliga matchdays → SQL INSERT
|
||||||
|
4. **TLWMatchdaysCreator** computes delivery deadlines from match times
|
||||||
|
5. **TLWMatchdaysUpdater** writes deadlines to DB + creates/updates Google Calendar events
|
||||||
|
6. **TLWMatchesUpdaterFootball** updates team IDs, datetimes from latest API data
|
||||||
|
7. **TLWMatchesResultsUpdater** pushes finished match results to the website via HTTP
|
||||||
|
8. **WhatsAppNotifier** queries DB for users with missing bets, generates GPT reminders, sends via WhatsApp API
|
||||||
@@ -37,6 +37,26 @@ dependencies {
|
|||||||
testImplementation 'org.testng:testng:7.10.2'
|
testImplementation 'org.testng:testng:7.10.2'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def envFile = file('.env')
|
||||||
|
if (envFile.exists()) {
|
||||||
|
def envVars = [:]
|
||||||
|
envFile.readLines().each { line ->
|
||||||
|
def trimmed = line.trim()
|
||||||
|
if (trimmed && !trimmed.startsWith('#')) {
|
||||||
|
def parts = trimmed.split('=', 2)
|
||||||
|
if (parts.size() == 2) {
|
||||||
|
def key = parts[0].trim()
|
||||||
|
def value = parts[1].trim()
|
||||||
|
if (value.startsWith('"') && value.endsWith('"')) {
|
||||||
|
value = value.substring(1, value.length() - 1)
|
||||||
|
}
|
||||||
|
envVars[key] = value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
test { environment envVars }
|
||||||
|
}
|
||||||
|
|
||||||
jar {
|
jar {
|
||||||
manifest {
|
manifest {
|
||||||
attributes(
|
attributes(
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
# apifootball — API-Football Integration
|
||||||
|
|
||||||
|
Fetches, caches, and serves match data from [API-Football](https://www.api-football.com/). Raw JSON is cached in S3 to avoid repeated API calls.
|
||||||
|
|
||||||
|
## Classes
|
||||||
|
|
||||||
|
### APIFootballUpdater
|
||||||
|
HTTP client that fetches raw JSON from API-Football and writes to S3.
|
||||||
|
|
||||||
|
- `updateAllFixtures(season)` — fetches all leagues' fixtures
|
||||||
|
- `updateAllRounds(season)` — fetches all leagues' round metadata
|
||||||
|
- `getRawData(requestPath, season, league)` — calls API-Football with rate-limit retry
|
||||||
|
- `getLeagues()` — reads league IDs from `Ligen_v3.json` resource
|
||||||
|
|
||||||
|
Handles the Tippliga↔API-Football season offset: for most leagues, Tippliga season N corresponds to API-Football season N-1 (except World Cup `league=1` and Euro `league=4`).
|
||||||
|
|
||||||
|
### APIFootballConnector
|
||||||
|
Singleton that reads cached S3 JSON and resolves API data into `APIFootballMatch` objects.
|
||||||
|
|
||||||
|
- `getMatchDataByLeagueAndMatchday(league, matchday)` — all matches for a matchday
|
||||||
|
- `getMatchDataByLeagueAndMatchID(league, id)` — single match by API fixture ID
|
||||||
|
- `getMatchdays(leagueId)` — round metadata from S3
|
||||||
|
- `getTeamsForLeague(season, league)` — live team list from API
|
||||||
|
|
||||||
|
### APIFootballMatch
|
||||||
|
Extends `BaseMatch`. Parses a raw API-Football JSON fixture object.
|
||||||
|
|
||||||
|
Parses: fixture ID, league ID, team IDs + names, round string, datetime, status, fulltime/extratime/penalty scores.
|
||||||
|
|
||||||
|
Key method: `getMatchdayFromRoundString(season, round, leagueId)` — converts API round names (e.g. `"Regular Season - 1"`) to Tippliga matchday numbers. Falls back to the rounds JSON for non-regular-season formats.
|
||||||
|
|
||||||
|
### APIFootballMatchesProvider
|
||||||
|
High-level resolver that reads matchday config (from the JSON config file) and returns flat `APIFootballMatch` lists.
|
||||||
|
|
||||||
|
Supports two config entry types:
|
||||||
|
- `AllMatchesOfMatchday` — fetch all matches for a given API league+matchday
|
||||||
|
- `SingleMatch` — fetch a specific match by API league+fixture ID
|
||||||
|
|
||||||
|
Honors `showTable` and `ko` flags from config.
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
# googlecalendar — Google Calendar Integration
|
||||||
|
|
||||||
|
Manages matchday deadline events in Google Calendar. Each matchday can have up to 3 delivery deadlines (1st, 2nd, 3rd chance).
|
||||||
|
|
||||||
|
## Classes
|
||||||
|
|
||||||
|
### GoogleCalendarConnector
|
||||||
|
Sets up the Google Calendar API service using a service account.
|
||||||
|
|
||||||
|
- Reads service account credentials from `tippliga-4e0def9ef447.json` (classpath resource)
|
||||||
|
- Uses `CalendarScopes.CALENDAR` scope
|
||||||
|
- Returns authenticated `com.google.api.services.calendar.Calendar` service
|
||||||
|
|
||||||
|
### CalendarConfigProvider
|
||||||
|
Reads calendar ID and URL from `Google_Calendar_Config.json` resource. Currently hardcoded to league 1.
|
||||||
|
|
||||||
|
### TippligaGoogleEventManager
|
||||||
|
CRUD operations for matchday deadline events.
|
||||||
|
|
||||||
|
- `createOrUpdateEventsForMatchday(matchday)` — creates/updates up to 3 events per matchday
|
||||||
|
- `createNewEvent()` / `updateEvent()` / `deleteEvent()` — individual event operations
|
||||||
|
- `deleteAllEvents(season)` — wipe all events for a season
|
||||||
|
- `updateAllMatchdays(matchdays)` — batch update; automatically deletes events for removed delivery dates
|
||||||
|
|
||||||
|
Event details:
|
||||||
|
- **Summary**: `"Tippliga Spieltag N tippen!"` (or custom matchday name)
|
||||||
|
- **Description**: season, league, matchday, delivery deadline number
|
||||||
|
- **Location**: `https://tippliga-wuerzburg.de/app.php/football/bet`
|
||||||
|
- **Time**: delivery deadline datetime, Europe/Berlin timezone
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
# teamidmatcher — Team ID Mapping
|
||||||
|
|
||||||
|
Maintains a bi-directional mapping between Tippliga (phpBB) team IDs and API-Football team IDs. Uses a Guava `HashBiMap` loaded from `Team_ID_Matcher_Config.json`.
|
||||||
|
|
||||||
|
## Classes
|
||||||
|
|
||||||
|
### TeamIDMatcher
|
||||||
|
Singleton `HashBiMap<Integer, Integer>` mapping Tippliga IDs ↔ API-Football IDs.
|
||||||
|
|
||||||
|
- `getApiFootballIdFromTippligaId(id)` — Tippliga → API-Football
|
||||||
|
- `getTippligaIdFromApiFootballId(match, homeguest)` — API-Football → Tippliga, for a given match and team side
|
||||||
|
- `getTeamNameFromTippligaId(id)` — human-readable team name
|
||||||
|
|
||||||
|
Sets `StatusHolder.setError()` if a lookup fails. Used by `TLWMatch`, `TLWMatchesUpdaterFootball`, `TLWMatchesResultsUpdater`.
|
||||||
|
|
||||||
|
Config format (`Team_ID_Matcher_Config.json`):
|
||||||
|
```json
|
||||||
|
[
|
||||||
|
{ "tippligaID": 1, "teamname": "Team Name", "apiFootballID": 12345 },
|
||||||
|
...
|
||||||
|
]
|
||||||
|
```
|
||||||
|
|
||||||
|
### TeamIDMatcherTemplateCreator
|
||||||
|
Utility that fetches teams from API-Football for a given league and generates a JSON config template. Useful when setting up new seasons — outputs skeleton entries with `apiFootballID` pre-filled, `tippligaID` left blank.
|
||||||
@@ -0,0 +1,99 @@
|
|||||||
|
# tippliga — Domain Models & Operations
|
||||||
|
|
||||||
|
Core domain package with match, matchday, team, and league models plus operations for creating, updating, and managing the prediction league schedule. All extend `TLWMatchesManagerBase` or `TLWMatchesCreatorBase`.
|
||||||
|
|
||||||
|
## Base Classes
|
||||||
|
|
||||||
|
### BaseMatch (`de.jeyp91.BaseMatch`)
|
||||||
|
Abstract class with shared match state: team IDs, goals (home/guest/overtime/penalty), datetime, status, KO flag, show-table flag, and a `COMPARISON` enum (`IDENTICAL`, `DIFFERENT`, `DIFFERENT_DATETIME`, `DIFFERENT_RESULT`).
|
||||||
|
|
||||||
|
Status constants:
|
||||||
|
- `STATUS_NOTSTARTED = 0`
|
||||||
|
- `STATUS_STARTED = 1`
|
||||||
|
- `STATUS_PROVISIONAL_RESULT_AVAILABLE = 2`
|
||||||
|
- `STATUS_FINISHED = 3`
|
||||||
|
- `STATUS_NOT_EVALUATED = 4`
|
||||||
|
|
||||||
|
### TLWMatchesCreatorBase
|
||||||
|
Abstract creator with `TLWMatches` list, `getSQLInsertString()` generating `REPLACE INTO` queries, `getMatchesForMatchday()`, and `getNumberOfMatchdays()`.
|
||||||
|
|
||||||
|
### TLWMatchesManagerBase
|
||||||
|
Shared helpers used by updaters:
|
||||||
|
- Date parsing from TLW (`yyyy-MM-dd HH:mm:ss`) and API-Football (`yyyy-MM-dd'T'HH:mm:ss`) formats
|
||||||
|
- `getFirstMatchtimeTLW()` / `getFirstMatchtimeAPIFootball()` — earliest match in a list
|
||||||
|
- `getDaysDifference()` — calendar day diff
|
||||||
|
- `getMatchesStartingFromSecondDay()` / `getMatchesStartingFromSecondWeek()` — filter helpers for delivery date computation
|
||||||
|
- `getMatchingMatch()` — matches an API match to a TLW match by home/guest team IDs
|
||||||
|
|
||||||
|
## Domain Models
|
||||||
|
|
||||||
|
### TLWMatch (extends BaseMatch)
|
||||||
|
Full match model mapped from `phpbb_footb_matches` table. Multiple constructors:
|
||||||
|
- From `ResultSet` (DB query)
|
||||||
|
- From `APIFootballMatch` + `TeamIDMatcher` (API sync)
|
||||||
|
- Manual constructors for creators
|
||||||
|
- Copy constructor
|
||||||
|
|
||||||
|
Key methods:
|
||||||
|
- `getSQLQueryInsert()` / `getSQLQueryReplace()` — generates SQL values
|
||||||
|
- `updateMatch(APIFootballMatch)` — updates teams, goals, datetime from API data
|
||||||
|
- `isSameMatchPlaceholder()` — matches placeholder config entries to existing matches
|
||||||
|
|
||||||
|
### TLWMatchday
|
||||||
|
Mapped from `phpbb_footb_matchdays`. Fields: season, league, matchday, status, 3 delivery dates, matchday name, match count.
|
||||||
|
|
||||||
|
### TLWTeam
|
||||||
|
Mapped from `phpbb_footb_teams`. Fields: season, league, team ID, name, short name, symbol, group ID, matchday.
|
||||||
|
|
||||||
|
### TLWLeague
|
||||||
|
Mapped from `phpbb_footb_leagues`. Fields: season, league ID, league name, short name.
|
||||||
|
|
||||||
|
## Operations
|
||||||
|
|
||||||
|
### TLWMatchesCreatorFootball
|
||||||
|
Builds match schedule from API-Football data and JSON config. For each matchday config entry:
|
||||||
|
1. Resolves API matches via `APIFootballMatchesProvider`
|
||||||
|
2. Creates `TLWMatch` objects with team IDs matched via `TeamIDMatcher`
|
||||||
|
3. Fills remaining slots with placeholder matches (empty teams)
|
||||||
|
|
||||||
|
Handles `deliveryDateMode`: in `"single"` mode, matches beyond the first day get `status = -1` to prevent early betting on later matches.
|
||||||
|
|
||||||
|
### TLWMatchesCreatorTipperLeague
|
||||||
|
Creates matches for tipper-vs-tipper leagues (where tippers are "teams"). Reads pairing config from `Tipper_Match_Pair_Config.json` and tipper-team mapping from `Tipper_Team_Config.json`.
|
||||||
|
|
||||||
|
### TLWMatchesCreatorTipperPokal
|
||||||
|
Creates single-matchday knockout tournament matches from a tipper list config. Each pair of tippers is one match with `koMatch = 1` and `showTable = false`.
|
||||||
|
|
||||||
|
### TLWMatchesUpdaterFootball
|
||||||
|
Compares current DB matches with latest API data and generates SQL UPDATE statements. Only operates on matchdays where the first match is still in the future. Updates:
|
||||||
|
- Team IDs (via `TeamIDMatcher`)
|
||||||
|
- Match datetimes
|
||||||
|
- Status flags (0 = current matchday, -1 = next-day match, -2 = later)
|
||||||
|
- `show_table` / `ko_match` flags
|
||||||
|
|
||||||
|
Also handles:
|
||||||
|
- `addMissingMatches()` — inserts API matches not yet in DB (finds placeholder slots by datetime/formula)
|
||||||
|
- `addPlaceholderMatches()` — adds config-defined placeholders for TBD matchups
|
||||||
|
|
||||||
|
### TLWMatchesResultsUpdater
|
||||||
|
For finished matches, compares DB goals with API goals and pushes updates to the website via `TippligaWebsiteConnector`. Detects changes to:
|
||||||
|
- Full-time goals
|
||||||
|
- Overtime goals (for KO matches with `betKOType = 2`)
|
||||||
|
- Penalty → overtime mapping (for `betKOType = 1` or `3`)
|
||||||
|
- Status transitions from provisional to confirmed
|
||||||
|
|
||||||
|
### TLWMatchdaysCreator
|
||||||
|
Computes delivery dates (betting deadlines) from match times. Supports two modes:
|
||||||
|
- **"single"**: one deadline = first match time
|
||||||
|
- **"multiple"** (default): 3 deadlines — first match, first match of second day, first match of second week
|
||||||
|
|
||||||
|
Also handles `additionalDeliveryDate` config flags for special matchday events.
|
||||||
|
|
||||||
|
### TLWMatchdaysUpdater
|
||||||
|
Compares original DB matchdays with recomputed deadlines and generates SQL UPDATEs and Google Calendar syncs. Only updates future matchdays (deadline in the past is skipped).
|
||||||
|
|
||||||
|
### TLWTeamsCreator
|
||||||
|
Extracts unique team IDs from a list of matches and generates `REPLACE INTO phpbb_footb_teams` SQL, preserving group and matchday info from match data.
|
||||||
|
|
||||||
|
### TLWTeamsUpdater
|
||||||
|
Detects teams referenced in matches but not yet present in the league's team table. Generates INSERT SQL to add them (copies team metadata from existing entries in other seasons/leagues).
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
# tippligaforum — MySQL & phpBB Integration
|
||||||
|
|
||||||
|
Database connector, config loader, website HTTP client, and forum post management.
|
||||||
|
|
||||||
|
## Classes
|
||||||
|
|
||||||
|
### TippligaSQLConnector
|
||||||
|
Singleton JDBC connector to the phpBB MySQL database (`d0144ddb`). Connects to production via credentials from environment variables, with a fallback to localhost.
|
||||||
|
|
||||||
|
All major queries in one class:
|
||||||
|
- `getTeams()`, `getMatches()`, `getMatchdays()`, `getLeague()` — read domain objects
|
||||||
|
- `getUpdatedMatchdaysBasedOnMatches()` — complex SQL that computes delivery deadlines from match times (uses `DATEDIFF` to split deadlines across days/weeks)
|
||||||
|
- `getNextWhatsAppReminders(hours)` — multi-table query finding users with missing bets on upcoming matchdays, joins with reminder tracking to avoid duplicates
|
||||||
|
- `updatePost()` / `getPost()` / `getChecksumOfPost()` — phpBB post CRUD
|
||||||
|
- `executeQuery()` / `executeUpdate()` — raw SQL access
|
||||||
|
- `markWhatsAppReminderAsSent()` — logs sent reminders
|
||||||
|
|
||||||
|
Post updates use the phpBB checksum mechanism: `post_checksum` = MD5 of XML-escaped post text.
|
||||||
|
|
||||||
|
### TippligaConfigProvider
|
||||||
|
Reads JSON configuration from phpBB forum posts. Configs are stored as topics under the `Admin → Tippliga-Config → <season>` forum hierarchy.
|
||||||
|
|
||||||
|
- `getTippligaConfig(config)` — fetches post, strips `[code]` BBCode wrapper, parses JSON
|
||||||
|
- `getChecksumOfConfigPost(configFile)` — reads post checksum for integrity verification
|
||||||
|
|
||||||
|
### TippligaWebsiteConnector
|
||||||
|
HTTP client that logs into the phpBB frontend + admin panel and submits match results. Used by `TLWMatchesResultsUpdater`.
|
||||||
|
|
||||||
|
Login flow:
|
||||||
|
1. GET login page → extract `creation_time`, `form_token`, `sid` from hidden fields
|
||||||
|
2. POST credentials → capture session cookies
|
||||||
|
3. GET admin panel → extract admin credential token
|
||||||
|
4. POST admin login with `password_<credential>` parameter
|
||||||
|
|
||||||
|
Result submission:
|
||||||
|
1. GET results management page → extract CSRF tokens
|
||||||
|
2. POST form with season, league, matchday, match scores (home, guest, overtime)
|
||||||
|
|
||||||
|
### MatchesListCreator
|
||||||
|
Generates a JSON match list config from raw API-Football fixture data (read from S3). Creates `SingleMatch` config entries with matchday, matchtime, team names, and fixture IDs. Used by `MatchesListForumUpdater` to create fixture list forum posts.
|
||||||
|
|
||||||
|
### MatchesListForumUpdater
|
||||||
|
For each league:
|
||||||
|
1. Creates `MatchesListCreator` from S3 fixture data
|
||||||
|
2. Formats as pretty-printed JSON
|
||||||
|
3. Wraps in `[code]` BBCode
|
||||||
|
4. Finds the correct forum post (under `Admin → Tippliga-Config → <season> → Ligen → <country> <league>`)
|
||||||
|
5. Updates the post text via `TippligaSQLConnector`
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
# whatsapp — WhatsApp Reminder System
|
||||||
|
|
||||||
|
Sends personalized WhatsApp reminders to users who haven't submitted their bets before the deadline. Uses OpenAI GPT-3.5 to generate natural-language reminder messages.
|
||||||
|
|
||||||
|
## Classes
|
||||||
|
|
||||||
|
### WhatsAppNotifier
|
||||||
|
Orchestrates the reminder workflow:
|
||||||
|
|
||||||
|
1. Queries DB for upcoming reminders at 2 checkpoints: **24 hours** and **2 hours** before deadline
|
||||||
|
2. For each reminder, generates a message via `OpenAIConnector`
|
||||||
|
3. Sends via WhatsApp API (HTTP POST to configurable host:port)
|
||||||
|
4. Marks sent reminders in DB to avoid duplicates
|
||||||
|
|
||||||
|
Requires env vars: `TLW_WHATSAPP_HOST`, `TLW_WHATSAPP_PORT`, `TLW_WHATSAPP_API_KEY`.
|
||||||
|
|
||||||
|
### OpenAIConnector
|
||||||
|
Caches and generates reminder text via OpenAI Chat Completions API (model `gpt-3.5-turbo-0125`).
|
||||||
|
|
||||||
|
Prompt structure:
|
||||||
|
- **System prompt** (German): "Generate a message reminding someone to submit missing tips. Must sound like a friend. Use correct singular/plural."
|
||||||
|
- **User input**: JSON with league name, matchday name, delivery day, time
|
||||||
|
- **Output template** has 2 variants — 24h deadline uses a friendly intro, 2h deadline emphasizes urgency
|
||||||
|
|
||||||
|
Message format:
|
||||||
|
```
|
||||||
|
Hey <username>,
|
||||||
|
<AI-generated intro>
|
||||||
|
Bitte gib die fehlenden Tipps bis <today/morgen> um <HH:MM> ab.
|
||||||
|
Du kannst deine Tipps wie immer unter https://tippliga-wuerzburg.de/app.php/football/bet abgeben.
|
||||||
|
Viele Grüße
|
||||||
|
Die Tippliga Admins
|
||||||
|
```
|
||||||
|
|
||||||
|
Messages are cached per (league + matchday + delivery) key to avoid repeated API calls.
|
||||||
|
|
||||||
|
### WhatsAppReminder
|
||||||
|
Java `record` with fields: season, league, leagueName, matchday, matchdayName, deliveryDate, todayTomorrow, time, remainingHours, userId, username, phoneNumber, missingBets.
|
||||||
|
|
||||||
|
Maps directly to the SQL query result from `TippligaSQLConnector.getNextWhatsAppReminders()`.
|
||||||
+1
-1
@@ -24,7 +24,7 @@ pipeline {
|
|||||||
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode APIFootballUpdater --season ${season} --league 1 --configFile Tippliga >> log.txt 2>&1"
|
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode APIFootballUpdater --season ${season} --league 1 --configFile Tippliga >> log.txt 2>&1"
|
||||||
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesListGistUpdater --season ${season} --league 1 --configFile Tippliga >> log.txt 2>&1"
|
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesListGistUpdater --season ${season} --league 1 --configFile Tippliga >> log.txt 2>&1"
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
telegramSendManual("TLW-Database-Tool crashed!")
|
telegramSendManual("TLW-Database-Tool crashed in APIFootballUpdater!")
|
||||||
}
|
}
|
||||||
String outputString = readFile 'log.txt'
|
String outputString = readFile 'log.txt'
|
||||||
if(outputString != "") {
|
if(outputString != "") {
|
||||||
|
|||||||
+4
-2
@@ -14,7 +14,9 @@ pipeline {
|
|||||||
withCredentials([
|
withCredentials([
|
||||||
usernamePassword(credentialsId: 'aws', usernameVariable: 'AWS_ACCESS_KEY_ID', passwordVariable: 'AWS_SECRET_ACCESS_KEY'),
|
usernamePassword(credentialsId: 'aws', usernameVariable: 'AWS_ACCESS_KEY_ID', passwordVariable: 'AWS_SECRET_ACCESS_KEY'),
|
||||||
usernamePassword(credentialsId: 'forum_database', usernameVariable: 'TLW_DATABASE_USERNAME', passwordVariable: 'TLW_DATABASE_PASSWORD'),
|
usernamePassword(credentialsId: 'forum_database', usernameVariable: 'TLW_DATABASE_USERNAME', passwordVariable: 'TLW_DATABASE_PASSWORD'),
|
||||||
usernamePassword(credentialsId: 'forum_user', usernameVariable: 'FORUM_USERNAME', passwordVariable: 'FORUM_PASSWORD')
|
usernamePassword(credentialsId: 'forum_user', usernameVariable: 'FORUM_USERNAME', passwordVariable: 'FORUM_PASSWORD'),
|
||||||
|
string(credentialsId: 'google_calendar_private_key_id', variable: 'GOOGLE_CALENDAR_TIPPLIGA_SERVICE_ACCOUNT_PRIVATE_KEY_ID'),
|
||||||
|
string(credentialsId: 'google_calendar_private_key', variable: 'GOOGLE_CALENDAR_TIPPLIGA_SERVICE_ACCOUNT_PRIVATE_KEY')
|
||||||
]) {
|
]) {
|
||||||
withEnv([
|
withEnv([
|
||||||
"JAVA_HOME=${jdkPath}/jdk-22.0.2"
|
"JAVA_HOME=${jdkPath}/jdk-22.0.2"
|
||||||
@@ -25,7 +27,7 @@ pipeline {
|
|||||||
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchdaysUpdater --season ${season} --league 49 --configFile WM-Tippspiel >> log.txt 2>&1"
|
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchdaysUpdater --season ${season} --league 49 --configFile WM-Tippspiel >> log.txt 2>&1"
|
||||||
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode TeamsUpdater --season ${season} --league 49 --configFile WM-Tippspiel >> log.txt 2>&1"
|
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode TeamsUpdater --season ${season} --league 49 --configFile WM-Tippspiel >> log.txt 2>&1"
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
telegramSendManual("TLW-Database-Tool crashed!")
|
telegramSendManual("TLW-Database-Tool crashed in LigaCupUpdater!")
|
||||||
}
|
}
|
||||||
String outputString = readFile 'log.txt'
|
String outputString = readFile 'log.txt'
|
||||||
if(outputString != "") {
|
if(outputString != "") {
|
||||||
|
|||||||
+4
-2
@@ -14,7 +14,9 @@ pipeline {
|
|||||||
withCredentials([
|
withCredentials([
|
||||||
usernamePassword(credentialsId: 'aws', usernameVariable: 'AWS_ACCESS_KEY_ID', passwordVariable: 'AWS_SECRET_ACCESS_KEY'),
|
usernamePassword(credentialsId: 'aws', usernameVariable: 'AWS_ACCESS_KEY_ID', passwordVariable: 'AWS_SECRET_ACCESS_KEY'),
|
||||||
usernamePassword(credentialsId: 'forum_database', usernameVariable: 'TLW_DATABASE_USERNAME', passwordVariable: 'TLW_DATABASE_PASSWORD'),
|
usernamePassword(credentialsId: 'forum_database', usernameVariable: 'TLW_DATABASE_USERNAME', passwordVariable: 'TLW_DATABASE_PASSWORD'),
|
||||||
usernamePassword(credentialsId: 'forum_user', usernameVariable: 'FORUM_USERNAME', passwordVariable: 'FORUM_PASSWORD')
|
usernamePassword(credentialsId: 'forum_user', usernameVariable: 'FORUM_USERNAME', passwordVariable: 'FORUM_PASSWORD'),
|
||||||
|
string(credentialsId: 'google_calendar_private_key_id', variable: 'GOOGLE_CALENDAR_TIPPLIGA_SERVICE_ACCOUNT_PRIVATE_KEY_ID'),
|
||||||
|
string(credentialsId: 'google_calendar_private_key', variable: 'GOOGLE_CALENDAR_TIPPLIGA_SERVICE_ACCOUNT_PRIVATE_KEY')
|
||||||
]) {
|
]) {
|
||||||
withEnv([
|
withEnv([
|
||||||
"JAVA_HOME=${jdkPath}/jdk-22.0.2"
|
"JAVA_HOME=${jdkPath}/jdk-22.0.2"
|
||||||
@@ -25,7 +27,7 @@ pipeline {
|
|||||||
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchdaysUpdater --season ${season} --league 47 --configFile Relegation >> log.txt 2>&1"
|
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchdaysUpdater --season ${season} --league 47 --configFile Relegation >> log.txt 2>&1"
|
||||||
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode TeamsUpdater --season ${season} --league 47 --configFile Relegation >> log.txt 2>&1"
|
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode TeamsUpdater --season ${season} --league 47 --configFile Relegation >> log.txt 2>&1"
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
telegramSendManual("TLW-Database-Tool crashed!")
|
telegramSendManual("TLW-Database-Tool crashed in RelegationUpdater!")
|
||||||
}
|
}
|
||||||
String outputString = readFile 'log.txt'
|
String outputString = readFile 'log.txt'
|
||||||
if(outputString != "") {
|
if(outputString != "") {
|
||||||
|
|||||||
+4
-2
@@ -14,7 +14,9 @@ pipeline {
|
|||||||
withCredentials([
|
withCredentials([
|
||||||
usernamePassword(credentialsId: 'aws', usernameVariable: 'AWS_ACCESS_KEY_ID', passwordVariable: 'AWS_SECRET_ACCESS_KEY'),
|
usernamePassword(credentialsId: 'aws', usernameVariable: 'AWS_ACCESS_KEY_ID', passwordVariable: 'AWS_SECRET_ACCESS_KEY'),
|
||||||
usernamePassword(credentialsId: 'forum_database', usernameVariable: 'TLW_DATABASE_USERNAME', passwordVariable: 'TLW_DATABASE_PASSWORD'),
|
usernamePassword(credentialsId: 'forum_database', usernameVariable: 'TLW_DATABASE_USERNAME', passwordVariable: 'TLW_DATABASE_PASSWORD'),
|
||||||
usernamePassword(credentialsId: 'forum_user', usernameVariable: 'FORUM_USERNAME', passwordVariable: 'FORUM_PASSWORD')
|
usernamePassword(credentialsId: 'forum_user', usernameVariable: 'FORUM_USERNAME', passwordVariable: 'FORUM_PASSWORD'),
|
||||||
|
string(credentialsId: 'google_calendar_private_key_id', variable: 'GOOGLE_CALENDAR_TIPPLIGA_SERVICE_ACCOUNT_PRIVATE_KEY_ID'),
|
||||||
|
string(credentialsId: 'google_calendar_private_key', variable: 'GOOGLE_CALENDAR_TIPPLIGA_SERVICE_ACCOUNT_PRIVATE_KEY')
|
||||||
]) {
|
]) {
|
||||||
withEnv([
|
withEnv([
|
||||||
"JAVA_HOME=${jdkPath}/jdk-22.0.2"
|
"JAVA_HOME=${jdkPath}/jdk-22.0.2"
|
||||||
@@ -25,7 +27,7 @@ pipeline {
|
|||||||
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchdaysUpdater --season ${season} --league 45 --configFile Supercup >> log.txt 2>&1"
|
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchdaysUpdater --season ${season} --league 45 --configFile Supercup >> log.txt 2>&1"
|
||||||
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode TeamsUpdater --season ${season} --league 45 --configFile Supercup >> log.txt 2>&1"
|
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode TeamsUpdater --season ${season} --league 45 --configFile Supercup >> log.txt 2>&1"
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
telegramSendManual("TLW-Database-Tool crashed!")
|
telegramSendManual("TLW-Database-Tool crashed in SupercupUpdater!")
|
||||||
}
|
}
|
||||||
String outputString = readFile 'log.txt'
|
String outputString = readFile 'log.txt'
|
||||||
if(outputString != "") {
|
if(outputString != "") {
|
||||||
|
|||||||
+4
-2
@@ -14,7 +14,9 @@ pipeline {
|
|||||||
withCredentials([
|
withCredentials([
|
||||||
usernamePassword(credentialsId: 'aws', usernameVariable: 'AWS_ACCESS_KEY_ID', passwordVariable: 'AWS_SECRET_ACCESS_KEY'),
|
usernamePassword(credentialsId: 'aws', usernameVariable: 'AWS_ACCESS_KEY_ID', passwordVariable: 'AWS_SECRET_ACCESS_KEY'),
|
||||||
usernamePassword(credentialsId: 'forum_database', usernameVariable: 'TLW_DATABASE_USERNAME', passwordVariable: 'TLW_DATABASE_PASSWORD'),
|
usernamePassword(credentialsId: 'forum_database', usernameVariable: 'TLW_DATABASE_USERNAME', passwordVariable: 'TLW_DATABASE_PASSWORD'),
|
||||||
usernamePassword(credentialsId: 'forum_user', usernameVariable: 'FORUM_USERNAME', passwordVariable: 'FORUM_PASSWORD')
|
usernamePassword(credentialsId: 'forum_user', usernameVariable: 'FORUM_USERNAME', passwordVariable: 'FORUM_PASSWORD'),
|
||||||
|
string(credentialsId: 'google_calendar_private_key_id', variable: 'GOOGLE_CALENDAR_TIPPLIGA_SERVICE_ACCOUNT_PRIVATE_KEY_ID'),
|
||||||
|
string(credentialsId: 'google_calendar_private_key', variable: 'GOOGLE_CALENDAR_TIPPLIGA_SERVICE_ACCOUNT_PRIVATE_KEY')
|
||||||
]) {
|
]) {
|
||||||
withEnv([
|
withEnv([
|
||||||
"JAVA_HOME=${jdkPath}/jdk-22.0.2"
|
"JAVA_HOME=${jdkPath}/jdk-22.0.2"
|
||||||
@@ -29,7 +31,7 @@ pipeline {
|
|||||||
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchdaysUpdater --season ${season} --league 2 --configFile Tippliga >> log.txt 2>&1"
|
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchdaysUpdater --season ${season} --league 2 --configFile Tippliga >> log.txt 2>&1"
|
||||||
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode TeamsUpdater --season ${season} --league 2 --configFile Tippliga >> log.txt 2>&1"
|
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode TeamsUpdater --season ${season} --league 2 --configFile Tippliga >> log.txt 2>&1"
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
telegramSendManual("TLW-Database-Tool crashed!")
|
telegramSendManual("TLW-Database-Tool crashed in TippligaUpdater!")
|
||||||
}
|
}
|
||||||
String outputString = readFile 'log.txt'
|
String outputString = readFile 'log.txt'
|
||||||
echo "Output: ${outputString}"
|
echo "Output: ${outputString}"
|
||||||
|
|||||||
+4
-2
@@ -14,7 +14,9 @@ pipeline {
|
|||||||
withCredentials([
|
withCredentials([
|
||||||
usernamePassword(credentialsId: 'aws', usernameVariable: 'AWS_ACCESS_KEY_ID', passwordVariable: 'AWS_SECRET_ACCESS_KEY'),
|
usernamePassword(credentialsId: 'aws', usernameVariable: 'AWS_ACCESS_KEY_ID', passwordVariable: 'AWS_SECRET_ACCESS_KEY'),
|
||||||
usernamePassword(credentialsId: 'forum_database', usernameVariable: 'TLW_DATABASE_USERNAME', passwordVariable: 'TLW_DATABASE_PASSWORD'),
|
usernamePassword(credentialsId: 'forum_database', usernameVariable: 'TLW_DATABASE_USERNAME', passwordVariable: 'TLW_DATABASE_PASSWORD'),
|
||||||
usernamePassword(credentialsId: 'forum_user', usernameVariable: 'FORUM_USERNAME', passwordVariable: 'FORUM_PASSWORD')
|
usernamePassword(credentialsId: 'forum_user', usernameVariable: 'FORUM_USERNAME', passwordVariable: 'FORUM_PASSWORD'),
|
||||||
|
string(credentialsId: 'google_calendar_private_key_id', variable: 'GOOGLE_CALENDAR_TIPPLIGA_SERVICE_ACCOUNT_PRIVATE_KEY_ID'),
|
||||||
|
string(credentialsId: 'google_calendar_private_key', variable: 'GOOGLE_CALENDAR_TIPPLIGA_SERVICE_ACCOUNT_PRIVATE_KEY')
|
||||||
]) {
|
]) {
|
||||||
withEnv([
|
withEnv([
|
||||||
"JAVA_HOME=${jdkPath}/jdk-22.0.2"
|
"JAVA_HOME=${jdkPath}/jdk-22.0.2"
|
||||||
@@ -25,7 +27,7 @@ pipeline {
|
|||||||
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchdaysUpdater --season ${season} --league 48 --configFile WTL-Pokal >> log.txt 2>&1"
|
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchdaysUpdater --season ${season} --league 48 --configFile WTL-Pokal >> log.txt 2>&1"
|
||||||
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode TeamsUpdater --season ${season} --league 48 --configFile WTL-Pokal >> log.txt 2>&1"
|
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode TeamsUpdater --season ${season} --league 48 --configFile WTL-Pokal >> log.txt 2>&1"
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
telegramSendManual("TLW-Database-Tool crashed!")
|
telegramSendManual("TLW-Database-Tool crashed in WTLPokalUpdater!")
|
||||||
}
|
}
|
||||||
String outputString = readFile 'log.txt'
|
String outputString = readFile 'log.txt'
|
||||||
if(outputString != "") {
|
if(outputString != "") {
|
||||||
|
|||||||
+1
-1
@@ -25,7 +25,7 @@ pipeline {
|
|||||||
try {
|
try {
|
||||||
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode WhatsAppNotifier --season ${season} --league 1 --configFile Tippliga >> log.txt 2>&1"
|
sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode WhatsAppNotifier --season ${season} --league 1 --configFile Tippliga >> log.txt 2>&1"
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
telegramSendManual("TLW-Database-Tool crashed!")
|
telegramSendManual("TLW-Database-Tool crashed in WhatsAppReminder!")
|
||||||
}
|
}
|
||||||
String outputString = readFile 'log.txt'
|
String outputString = readFile 'log.txt'
|
||||||
if(outputString != "") {
|
if(outputString != "") {
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import de.jeyp91.tippliga.TLWMatchesResultsUpdater;
|
|||||||
import de.jeyp91.tippliga.TLWMatchesUpdaterFootball;
|
import de.jeyp91.tippliga.TLWMatchesUpdaterFootball;
|
||||||
import de.jeyp91.tippliga.TLWTeamsUpdater;
|
import de.jeyp91.tippliga.TLWTeamsUpdater;
|
||||||
import de.jeyp91.tippligaforum.MatchesListForumUpdater;
|
import de.jeyp91.tippligaforum.MatchesListForumUpdater;
|
||||||
|
import de.jeyp91.tippligaforum.SeasonForumPostsCreator;
|
||||||
import de.jeyp91.tippligaforum.TippligaConfigProvider;
|
import de.jeyp91.tippligaforum.TippligaConfigProvider;
|
||||||
import de.jeyp91.tippligaforum.TippligaSQLConnector;
|
import de.jeyp91.tippligaforum.TippligaSQLConnector;
|
||||||
import de.jeyp91.whatsapp.WhatsAppNotifier;
|
import de.jeyp91.whatsapp.WhatsAppNotifier;
|
||||||
@@ -69,6 +70,10 @@ public class App {
|
|||||||
MatchesListForumUpdater matchesListForumUpdater = new MatchesListForumUpdater();
|
MatchesListForumUpdater matchesListForumUpdater = new MatchesListForumUpdater();
|
||||||
matchesListForumUpdater.updateAllLeagues(season);
|
matchesListForumUpdater.updateAllLeagues(season);
|
||||||
}
|
}
|
||||||
|
case "SeasonPreparation" -> {
|
||||||
|
SeasonForumPostsCreator creator = new SeasonForumPostsCreator(season);
|
||||||
|
creator.createAllPosts();
|
||||||
|
}
|
||||||
case "PostChecksum" -> {
|
case "PostChecksum" -> {
|
||||||
TippligaConfigProvider configProvider = new TippligaConfigProvider(season);
|
TippligaConfigProvider configProvider = new TippligaConfigProvider(season);
|
||||||
String checksum = configProvider.getChecksumOfConfigPost(configFile);
|
String checksum = configProvider.getChecksumOfConfigPost(configFile);
|
||||||
@@ -96,7 +101,7 @@ public class App {
|
|||||||
|
|
||||||
parser.addArgument("-m", "--mode")
|
parser.addArgument("-m", "--mode")
|
||||||
.dest("mode")
|
.dest("mode")
|
||||||
.choices("MatchdaysUpdater", "MatchesCreatorFootball", "MatchesUpdaterFootball", "MatchesResultsUpdater", "TeamsUpdater", "APIFootballUpdater", "MatchesListGistUpdater", "PostChecksum", "WhatsAppNotifier")
|
.choices("MatchdaysUpdater", "MatchesCreatorFootball", "MatchesUpdaterFootball", "MatchesResultsUpdater", "TeamsUpdater", "APIFootballUpdater", "MatchesListGistUpdater", "PostChecksum", "WhatsAppNotifier", "SeasonPreparation")
|
||||||
.help("")
|
.help("")
|
||||||
.required(true)
|
.required(true)
|
||||||
.type(String.class);
|
.type(String.class);
|
||||||
|
|||||||
@@ -1,45 +1,14 @@
|
|||||||
package de.jeyp91.googlecalendar;
|
package de.jeyp91.googlecalendar;
|
||||||
|
|
||||||
import com.google.common.io.Resources;
|
|
||||||
import org.json.simple.JSONObject;
|
|
||||||
import org.json.simple.parser.JSONParser;
|
|
||||||
import org.json.simple.parser.ParseException;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.net.URL;
|
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
|
|
||||||
public class CalendarConfigProvider {
|
public class CalendarConfigProvider {
|
||||||
|
|
||||||
private static JSONObject googleCalendarConfig = null;
|
private static String GOOGLE_CALENDAR_ID = "825f79shtm9n3uknj99iuu2qho";
|
||||||
|
|
||||||
private static JSONObject getGoogleCalendarConfig() {
|
|
||||||
if(googleCalendarConfig == null) {
|
|
||||||
//JSON parser object to parse read file
|
|
||||||
JSONParser jsonParser = new JSONParser();
|
|
||||||
URL url = Resources.getResource("Google_Calendar_Config.json");
|
|
||||||
String jsonConfig = null;
|
|
||||||
|
|
||||||
try {
|
|
||||||
jsonConfig = Resources.toString(url, StandardCharsets.UTF_8);
|
|
||||||
//Read JSON file
|
|
||||||
googleCalendarConfig = (JSONObject) jsonParser.parse(jsonConfig);
|
|
||||||
|
|
||||||
} catch (IOException | ParseException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
return googleCalendarConfig;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String getCalendarUrl() {
|
public static String getCalendarUrl() {
|
||||||
JSONObject leagueConfig = (JSONObject) getGoogleCalendarConfig().get(String.valueOf(1));
|
return GOOGLE_CALENDAR_ID + "@group.calendar.google.com";
|
||||||
return (String) leagueConfig.get("url");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getCalendarId() {
|
public static String getCalendarId() {
|
||||||
JSONObject leagueConfig = (JSONObject) getGoogleCalendarConfig().get(String.valueOf(1));
|
return GOOGLE_CALENDAR_ID;
|
||||||
return (String) leagueConfig.get("id");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,33 +8,69 @@ import com.google.api.services.calendar.Calendar;
|
|||||||
import com.google.api.services.calendar.CalendarScopes;
|
import com.google.api.services.calendar.CalendarScopes;
|
||||||
import com.google.auth.http.HttpCredentialsAdapter;
|
import com.google.auth.http.HttpCredentialsAdapter;
|
||||||
import com.google.auth.oauth2.GoogleCredentials;
|
import com.google.auth.oauth2.GoogleCredentials;
|
||||||
|
import com.google.auth.oauth2.ServiceAccountCredentials;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.IOException;
|
||||||
|
import java.net.URI;
|
||||||
|
import java.security.KeyFactory;
|
||||||
|
import java.security.NoSuchAlgorithmException;
|
||||||
|
import java.security.PrivateKey;
|
||||||
|
import java.security.spec.InvalidKeySpecException;
|
||||||
|
import java.security.spec.PKCS8EncodedKeySpec;
|
||||||
|
import java.util.Base64;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
|
||||||
public class GoogleCalendarConnector {
|
public class GoogleCalendarConnector {
|
||||||
private static final String APPLICATION_NAME = "Google Calendar API Java Quickstart";
|
private static final String APPLICATION_NAME = "Google Calendar API Java Quickstart";
|
||||||
private static final JsonFactory JSON_FACTORY = GsonFactory.getDefaultInstance();
|
private static final JsonFactory JSON_FACTORY = GsonFactory.getDefaultInstance();
|
||||||
|
|
||||||
/**
|
private static final String PROJECT_ID = "tippliga";
|
||||||
* Global instance of the scopes required by this quickstart.
|
private static final String CLIENT_MAIL = "tlw-707@tippliga.iam.gserviceaccount.com";
|
||||||
* If modifying these scopes, delete your previously saved tokens/ folder.
|
private static final String CLIENT_ID = "101590566618120833710";
|
||||||
*/
|
private static final String TOKEN_URI = "https://oauth2.googleapis.com/token";
|
||||||
private static final String SERVICE_CREDENTIALS_FILE_PATH = "/tippliga-4e0def9ef447.json";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates an authorized Credential object.
|
|
||||||
* @return An authorized Credential object.
|
|
||||||
* @throws IOException If the Google_Credentials.json file cannot be found.
|
|
||||||
*/
|
|
||||||
private static GoogleCredentials getGoogleCredentials() throws IOException {
|
private static GoogleCredentials getGoogleCredentials() throws IOException {
|
||||||
InputStream in = GoogleCalendarConnector.class.getResourceAsStream(SERVICE_CREDENTIALS_FILE_PATH);
|
String privateKeyId = getEnv("GOOGLE_CALENDAR_TIPPLIGA_SERVICE_ACCOUNT_PRIVATE_KEY_ID");
|
||||||
GoogleCredentials credentials = GoogleCredentials.fromStream(in)
|
String privateKeyPem = getEnv("GOOGLE_CALENDAR_TIPPLIGA_SERVICE_ACCOUNT_PRIVATE_KEY");
|
||||||
|
|
||||||
|
GoogleCredentials credentials = ServiceAccountCredentials.newBuilder()
|
||||||
|
.setClientEmail(CLIENT_MAIL)
|
||||||
|
.setClientId(CLIENT_ID)
|
||||||
|
.setPrivateKey(parsePrivateKey(privateKeyPem))
|
||||||
|
.setPrivateKeyId(privateKeyId)
|
||||||
|
.setProjectId(PROJECT_ID)
|
||||||
|
.setTokenServerUri(URI.create(TOKEN_URI))
|
||||||
|
.build()
|
||||||
.createScoped(Collections.singleton(CalendarScopes.CALENDAR));
|
.createScoped(Collections.singleton(CalendarScopes.CALENDAR));
|
||||||
|
|
||||||
credentials.refreshIfExpired();
|
credentials.refreshIfExpired();
|
||||||
return credentials;
|
return credentials;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static PrivateKey parsePrivateKey(String pemData) throws IOException {
|
||||||
|
String normalized = pemData.replace("\\n", "\n");
|
||||||
|
String stripped = normalized
|
||||||
|
.replace("-----BEGIN PRIVATE KEY-----", "")
|
||||||
|
.replace("-----END PRIVATE KEY-----", "")
|
||||||
|
.replaceAll("\\s", "");
|
||||||
|
byte[] encoded = Base64.getDecoder().decode(stripped);
|
||||||
|
PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(encoded);
|
||||||
|
try {
|
||||||
|
KeyFactory kf = KeyFactory.getInstance("RSA");
|
||||||
|
return kf.generatePrivate(keySpec);
|
||||||
|
} catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
|
||||||
|
throw new IOException("Failed to parse private key", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String getEnv(String name) throws IOException {
|
||||||
|
String value = System.getenv(name);
|
||||||
|
if (value == null || value.isEmpty()) {
|
||||||
|
throw new IOException("Environment variable " + name + " is not set");
|
||||||
|
}
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
public static com.google.api.services.calendar.Calendar getSerivce() {
|
public static com.google.api.services.calendar.Calendar getSerivce() {
|
||||||
Calendar service = null;
|
Calendar service = null;
|
||||||
|
|
||||||
|
|||||||
@@ -1,142 +0,0 @@
|
|||||||
package de.jeyp91.openligadb;
|
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStreamReader;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
|
|
||||||
import org.apache.http.HttpResponse;
|
|
||||||
import org.apache.http.client.ClientProtocolException;
|
|
||||||
import org.apache.http.client.HttpClient;
|
|
||||||
import org.apache.http.client.methods.HttpGet;
|
|
||||||
import org.apache.http.impl.client.HttpClientBuilder;
|
|
||||||
import org.json.simple.JSONArray;
|
|
||||||
import org.json.simple.JSONObject;
|
|
||||||
import org.json.simple.parser.JSONParser;
|
|
||||||
import org.json.simple.parser.ParseException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public class OpenLigaDBConnector {
|
|
||||||
|
|
||||||
private final String OPENLIGADB_API_URL = "http://www.openligadb.de/api/";
|
|
||||||
|
|
||||||
public OpenLigaDBConnector() {}
|
|
||||||
|
|
||||||
public OpenLigaDBMatch getMatchDataOfSingleMatch(int id) {
|
|
||||||
String url = OPENLIGADB_API_URL + "getmatchdata/" + id;
|
|
||||||
JSONObject matchAsJson = getDataAsJSONObject(url);
|
|
||||||
return new OpenLigaDBMatch(matchAsJson);
|
|
||||||
}
|
|
||||||
|
|
||||||
public ArrayList<OpenLigaDBMatch> getMatchDataOfMatchday(int season, String league, int matchday) {
|
|
||||||
|
|
||||||
String url = OPENLIGADB_API_URL + "getmatchdata/" + league + "/" + (season - 1) + "/" + matchday;
|
|
||||||
|
|
||||||
JSONArray matches = getDataAsJSONArray(url);
|
|
||||||
ArrayList<OpenLigaDBMatch> matchesList = new ArrayList<>();
|
|
||||||
|
|
||||||
for(Object match: matches) {
|
|
||||||
matchesList.add(new OpenLigaDBMatch((JSONObject) match));
|
|
||||||
}
|
|
||||||
|
|
||||||
return matchesList;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ArrayList<OpenLigaDBMatch> getMatchDataOfCurrentMatchday(String league) {
|
|
||||||
|
|
||||||
String url = OPENLIGADB_API_URL + "getmatchdata/" + league;
|
|
||||||
|
|
||||||
JSONArray matches = getDataAsJSONArray(url);
|
|
||||||
ArrayList<OpenLigaDBMatch> matchesList = new ArrayList<>();
|
|
||||||
|
|
||||||
for(Object match: matches) {
|
|
||||||
matchesList.add(new OpenLigaDBMatch((JSONObject) match));
|
|
||||||
}
|
|
||||||
|
|
||||||
return matchesList;
|
|
||||||
}
|
|
||||||
|
|
||||||
public OpenLigaDBMatch getMatchDataByMatchId(int id) {
|
|
||||||
String url = OPENLIGADB_API_URL + "getmatchdata/" + id;
|
|
||||||
JSONObject match = getDataAsJSONObject(url);
|
|
||||||
return new OpenLigaDBMatch(match);
|
|
||||||
}
|
|
||||||
|
|
||||||
private JSONArray getDataAsJSONArray(String requestUrl) {
|
|
||||||
|
|
||||||
String rawData = getRawData(requestUrl);
|
|
||||||
JSONParser parser = new JSONParser();
|
|
||||||
JSONArray data = null;
|
|
||||||
try {
|
|
||||||
data = (JSONArray) parser.parse(rawData);
|
|
||||||
} catch (ParseException e) {
|
|
||||||
/* TODO */
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
return data;
|
|
||||||
}
|
|
||||||
|
|
||||||
private JSONObject getDataAsJSONObject(String requestUrl) {
|
|
||||||
|
|
||||||
String rawData = getRawData(requestUrl);
|
|
||||||
JSONParser parser = new JSONParser();
|
|
||||||
JSONObject data = null;
|
|
||||||
try {
|
|
||||||
data = (JSONObject) parser.parse(rawData);
|
|
||||||
} catch (ParseException e) {
|
|
||||||
/* TODO */
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
return data;
|
|
||||||
}
|
|
||||||
|
|
||||||
private String getRawData(String requestUrl) {
|
|
||||||
|
|
||||||
HttpClient client = HttpClientBuilder.create().build();
|
|
||||||
HttpGet request = new HttpGet(requestUrl);
|
|
||||||
|
|
||||||
// add request header
|
|
||||||
request.addHeader("Content-Type", "application/json");
|
|
||||||
|
|
||||||
HttpResponse response = null;
|
|
||||||
try {
|
|
||||||
response = client.execute(request);
|
|
||||||
} catch (ClientProtocolException e) {
|
|
||||||
/* TODO */
|
|
||||||
e.printStackTrace();
|
|
||||||
} catch (IOException e) {
|
|
||||||
/* TODO */
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
BufferedReader rd = null;
|
|
||||||
try {
|
|
||||||
rd = new BufferedReader(
|
|
||||||
new InputStreamReader(response.getEntity().getContent())
|
|
||||||
);
|
|
||||||
} catch (IOException e) {
|
|
||||||
/* TODO */
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
StringBuilder result = new StringBuilder();
|
|
||||||
String line = "";
|
|
||||||
while (true) {
|
|
||||||
try {
|
|
||||||
line = rd.readLine();
|
|
||||||
} catch (IOException e) {
|
|
||||||
/* TODO */
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Stop reading if last line was found.
|
|
||||||
if (line == null) break;
|
|
||||||
|
|
||||||
result.append(line);
|
|
||||||
}
|
|
||||||
return result.toString();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,88 +0,0 @@
|
|||||||
package de.jeyp91.openligadb;
|
|
||||||
|
|
||||||
import de.jeyp91.BaseMatch;
|
|
||||||
import de.jeyp91.tippliga.TLWMatch;
|
|
||||||
import org.json.simple.JSONArray;
|
|
||||||
import org.json.simple.JSONObject;
|
|
||||||
import java.util.regex.*;
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public class OpenLigaDBMatch extends BaseMatch {
|
|
||||||
|
|
||||||
private final int RESULT_TYPE_ENDRESULT = 2;
|
|
||||||
|
|
||||||
private Integer season = null;
|
|
||||||
private int matchId;
|
|
||||||
private int leagueId;
|
|
||||||
private boolean matchIsFinished;
|
|
||||||
|
|
||||||
public OpenLigaDBMatch(JSONObject json) {
|
|
||||||
this.matchId = Integer.parseInt(json.get("MatchID").toString());
|
|
||||||
this.season = getSeasonFromLeageName(json.get("LeagueName").toString());
|
|
||||||
this.leagueId = Integer.parseInt(json.get("LeagueId").toString());
|
|
||||||
this.teamIdHome = Integer.parseInt(((JSONObject) json.get("Team1")).get("TeamId").toString());
|
|
||||||
this.teamIdGuest = Integer.parseInt(((JSONObject) json.get("Team2")).get("TeamId").toString());
|
|
||||||
for(int i = 0; i < ((JSONArray) json.get("MatchResults")).size(); i++) {
|
|
||||||
if(Integer.parseInt((((JSONObject) ((JSONArray) json.get("MatchResults")).get(i)).get("ResultTypeID")).toString()) == RESULT_TYPE_ENDRESULT) {
|
|
||||||
this.goalsHome = Integer.parseInt(((JSONObject) ((JSONArray) json.get("MatchResults")).get(i)).get("PointsTeam1").toString());
|
|
||||||
this.goalsGuest = Integer.parseInt(((JSONObject) ((JSONArray) json.get("MatchResults")).get(i)).get("PointsTeam2").toString());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this.matchday = Integer.parseInt(((JSONObject) json.get("Group")).get("GroupOrderID").toString());
|
|
||||||
this.matchIsFinished = (Boolean) json.get("MatchIsFinished");
|
|
||||||
this.matchDatetime = (String) json.get("MatchDateTime");
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getSeasonFromLeageName(String leagueName) {
|
|
||||||
Pattern p = Pattern.compile("\\d*/\\d*");
|
|
||||||
Matcher m = p.matcher(leagueName);
|
|
||||||
m.find();
|
|
||||||
String seasonString = m.group();
|
|
||||||
p = Pattern.compile("\\d+");
|
|
||||||
m = p.matcher(seasonString);
|
|
||||||
Integer season = null;
|
|
||||||
while(m.find()) {
|
|
||||||
season = Integer.parseInt(m.group());
|
|
||||||
}
|
|
||||||
return season < 100 ? season + 2000 : season;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isSameMatch(TLWMatch compareMatch) {
|
|
||||||
if(this.getSeason()!= compareMatch.getSeason()) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if(this.getMatchday() != compareMatch.getMatchday()) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if(this.getTeamIdHome() != compareMatch.getTeamIdHome()) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if(this.getTeamIdGuest() != compareMatch.getTeamIdGuest()) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
String thisDateTime = this.getMatchDateTime().replace("T", " ");
|
|
||||||
String tempDateTime = compareMatch.getMatchDateTime().replace("T", " ");
|
|
||||||
if(!tempDateTime.equals(thisDateTime)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if(this.goalsHome != compareMatch.getGoalsHome() ||
|
|
||||||
this.goalsGuest != compareMatch.getGoalsGuest()) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Integer getSeason() {
|
|
||||||
return this.season;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Integer getMatchId() {
|
|
||||||
return this.matchId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean getMatchIsFinished() {
|
|
||||||
return this.matchIsFinished;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -117,6 +117,18 @@ public class TLWMatch extends BaseMatch{
|
|||||||
this.matchDatetime = matchDatetime;
|
this.matchDatetime = matchDatetime;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public TLWMatch(int season, int league, int matchday, int matchNo, int status, int koMatch, String formulaHome, String formulaGuest, String matchDatetime) {
|
||||||
|
this.season = season;
|
||||||
|
this.matchday = matchday;
|
||||||
|
this.league = league;
|
||||||
|
this.matchNo = matchNo;
|
||||||
|
this.status = status;
|
||||||
|
this.koMatch = koMatch;
|
||||||
|
this.formulaHome = formulaHome;
|
||||||
|
this.formulaGuest = formulaGuest;
|
||||||
|
this.matchDatetime = matchDatetime;
|
||||||
|
}
|
||||||
|
|
||||||
public TLWMatch(int season, int league, int matchday, int matchNo, int teamIdHome, int teamIdGuest, String matchDatetime, int koMatch) {
|
public TLWMatch(int season, int league, int matchday, int matchNo, int teamIdHome, int teamIdGuest, String matchDatetime, int koMatch) {
|
||||||
this.season = season;
|
this.season = season;
|
||||||
this.matchday = matchday;
|
this.matchday = matchday;
|
||||||
@@ -179,19 +191,11 @@ public class TLWMatch extends BaseMatch{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public String getFormulaHome() {
|
public String getFormulaHome() {
|
||||||
String formula = "D";
|
return this.formulaHome != null ? this.formulaHome : "D";
|
||||||
if (this.formulaHome != null) {
|
|
||||||
formula = this.formulaHome;
|
|
||||||
}
|
|
||||||
return "'" + formula + "'";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getFormulaGuest() {
|
public String getFormulaGuest() {
|
||||||
String formula = "D";
|
return this.formulaGuest != null ? this.formulaGuest : "D";
|
||||||
if (this.formulaGuest != null) {
|
|
||||||
formula = this.formulaGuest;
|
|
||||||
}
|
|
||||||
return "'" + formula + "'";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getSQLQueryInsert() {
|
public String getSQLQueryInsert() {
|
||||||
@@ -218,8 +222,8 @@ public class TLWMatch extends BaseMatch{
|
|||||||
this.status + ", " +
|
this.status + ", " +
|
||||||
nullToSqlEmptyString(this.matchDatetime) + ", " +
|
nullToSqlEmptyString(this.matchDatetime) + ", " +
|
||||||
nullToSqlEmptyString(this.groupId) + ", " +
|
nullToSqlEmptyString(this.groupId) + ", " +
|
||||||
getFormulaHome() + ", " +
|
"'" + getFormulaHome() + "'" + ", " +
|
||||||
getFormulaGuest() + ", " +
|
"'" + getFormulaGuest() + "'" + ", " +
|
||||||
nullToSqlEmptyString(this.koMatch) + ", " +
|
nullToSqlEmptyString(this.koMatch) + ", " +
|
||||||
nullToSqlEmptyString(this.goalsOvertimeHome) + ", " +
|
nullToSqlEmptyString(this.goalsOvertimeHome) + ", " +
|
||||||
nullToSqlEmptyString(this.goalsOvertimeGuest) + ", " +
|
nullToSqlEmptyString(this.goalsOvertimeGuest) + ", " +
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ public class TLWMatchdaysCreator {
|
|||||||
this.season = season;
|
this.season = season;
|
||||||
this.league = league;
|
this.league = league;
|
||||||
|
|
||||||
TLWMatchesCreatorFootball matchesCreator = new TLWMatchesCreatorFootball(season, 1, configPath);
|
TLWMatchesCreatorFootball matchesCreator = new TLWMatchesCreatorFootball(season, league, configPath);
|
||||||
this.matches = matchesCreator.getMatches();
|
this.matches = matchesCreator.getMatches();
|
||||||
|
|
||||||
TippligaConfigProvider prov = new TippligaConfigProvider(season);
|
TippligaConfigProvider prov = new TippligaConfigProvider(season);
|
||||||
|
|||||||
@@ -69,6 +69,20 @@ public class TLWMatchesCreatorFootball extends TLWMatchesCreatorBase {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Add PlaceholderSingleMatch matches
|
||||||
|
for (Object matchesConfigObject : matchesConfig) {
|
||||||
|
JSONObject singleMatchConfig = (JSONObject) matchesConfigObject;
|
||||||
|
if(singleMatchConfig.get("type").equals("PlaceholderSingleMatch")) {
|
||||||
|
String formulaHome = (String) singleMatchConfig.get("formulaHome");
|
||||||
|
String formulaGuest = (String) singleMatchConfig.get("formulaGuest");
|
||||||
|
String matchDatetime = (String) singleMatchConfig.get("placeholderDatetime");
|
||||||
|
int matchNo = this.nextMatchNo;
|
||||||
|
this.nextMatchNo++;
|
||||||
|
this.TLWMatches.add(new TLWMatch(this.season, this.league, TLWMatchday, matchNo, 0, this.ko, formulaHome, formulaGuest, matchDatetime));
|
||||||
|
matchdayMatchCounter++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Add empty missing matches
|
// Add empty missing matches
|
||||||
int matchesPerMatchdayTemp = 0;
|
int matchesPerMatchdayTemp = 0;
|
||||||
if(this.matchesPerMatchday != 0) {
|
if(this.matchesPerMatchday != 0) {
|
||||||
|
|||||||
@@ -44,6 +44,10 @@ public class TLWMatchesUpdaterFootball extends TLWMatchesManagerBase {
|
|||||||
|
|
||||||
ArrayList<APIFootballMatch> apiFootballMatches = apiFootballMatchesProvider.getAPIFootballMatchesFromConfig((JSONObject) singleMatchdayConfig);
|
ArrayList<APIFootballMatch> apiFootballMatches = apiFootballMatchesProvider.getAPIFootballMatchesFromConfig((JSONObject) singleMatchdayConfig);
|
||||||
|
|
||||||
|
if(apiFootballMatches.isEmpty()) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
ArrayList<TLWMatch> tlwMatchesOriginalMatchday = tippligaSQLConnector.getMatches(String.valueOf(this.season), String.valueOf(this.league), String.valueOf(tlwMatchday));
|
ArrayList<TLWMatch> tlwMatchesOriginalMatchday = tippligaSQLConnector.getMatches(String.valueOf(this.season), String.valueOf(this.league), String.valueOf(tlwMatchday));
|
||||||
ArrayList<TLWMatch> tlwMatchesUpdatedMatchday = new ArrayList<>();
|
ArrayList<TLWMatch> tlwMatchesUpdatedMatchday = new ArrayList<>();
|
||||||
for (TLWMatch match : tlwMatchesOriginalMatchday) {
|
for (TLWMatch match : tlwMatchesOriginalMatchday) {
|
||||||
@@ -58,9 +62,7 @@ public class TLWMatchesUpdaterFootball extends TLWMatchesManagerBase {
|
|||||||
LocalDateTime firstMatchOriginal = TLWMatchesManagerBase.getFirstMatchtimeTLW(tlwMatchesOriginalMatchday);
|
LocalDateTime firstMatchOriginal = TLWMatchesManagerBase.getFirstMatchtimeTLW(tlwMatchesOriginalMatchday);
|
||||||
LocalDateTime firstMatchUpdated = TLWMatchesManagerBase.getFirstMatchtimeAPIFootball(apiFootballMatches);
|
LocalDateTime firstMatchUpdated = TLWMatchesManagerBase.getFirstMatchtimeAPIFootball(apiFootballMatches);
|
||||||
|
|
||||||
if(apiFootballMatches.size() > 0
|
if(now.isBefore(firstMatchOriginal) && now.isBefore(firstMatchUpdated)) {
|
||||||
&& now.isBefore(firstMatchOriginal)
|
|
||||||
&& now.isBefore(firstMatchUpdated)) {
|
|
||||||
addMissingMatches(tlwMatchesUpdatedMatchday, apiFootballMatches);
|
addMissingMatches(tlwMatchesUpdatedMatchday, apiFootballMatches);
|
||||||
updateMatchDateTimes(tlwMatchesUpdatedMatchday, apiFootballMatches);
|
updateMatchDateTimes(tlwMatchesUpdatedMatchday, apiFootballMatches);
|
||||||
updateShowTable(tlwMatchesUpdatedMatchday, apiFootballMatches);
|
updateShowTable(tlwMatchesUpdatedMatchday, apiFootballMatches);
|
||||||
@@ -193,9 +195,15 @@ public class TLWMatchesUpdaterFootball extends TLWMatchesManagerBase {
|
|||||||
// update empty match
|
// update empty match
|
||||||
if(!done) {
|
if(!done) {
|
||||||
for (TLWMatch tlwMatch : tlwMatches) {
|
for (TLWMatch tlwMatch : tlwMatches) {
|
||||||
if (tlwMatch.getTeamIdHome() == 0 && tlwMatch.getTeamIdGuest() == 0
|
Integer teamIdHome = tlwMatch.getTeamIdHome();
|
||||||
&& (Objects.equals(tlwMatch.getFormulaHome(), "") || Objects.equals(tlwMatch.getFormulaHome(), "D"))
|
Integer teamIdGuest = tlwMatch.getTeamIdGuest();
|
||||||
&& (Objects.equals(tlwMatch.getFormulaGuest(), "") || Objects.equals(tlwMatch.getFormulaGuest(), "D"))
|
String formulaHome = tlwMatch.getFormulaHome();
|
||||||
|
String formulaGuest = tlwMatch.getFormulaGuest();
|
||||||
|
if (
|
||||||
|
(Objects.equals(teamIdHome, 0) || Objects.equals(teamIdHome, null))
|
||||||
|
&& (Objects.equals(teamIdGuest, 0) || Objects.equals(teamIdGuest, null))
|
||||||
|
&& (Objects.equals(formulaHome, "") || Objects.equals(formulaHome, "D"))
|
||||||
|
&& (Objects.equals(formulaGuest, "") || Objects.equals(formulaGuest, "D"))
|
||||||
) {
|
) {
|
||||||
tlwMatch.updateMatch(missingMatch);
|
tlwMatch.updateMatch(missingMatch);
|
||||||
done = true;
|
done = true;
|
||||||
|
|||||||
@@ -0,0 +1,137 @@
|
|||||||
|
package de.jeyp91.tippligaforum;
|
||||||
|
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.sql.ResultSet;
|
||||||
|
import java.sql.SQLException;
|
||||||
|
|
||||||
|
public class SeasonForumPostsCreator {
|
||||||
|
|
||||||
|
private static final Logger logger = LoggerFactory.getLogger(SeasonForumPostsCreator.class);
|
||||||
|
private static final String EMPTY_POST_CONTENT = "[code][/code]";
|
||||||
|
|
||||||
|
private static final String[] CONFIG_POSTS = {
|
||||||
|
"Supercup Tipper",
|
||||||
|
"WTL-Pokal Tipper",
|
||||||
|
"2. Tippliga Tipper",
|
||||||
|
"1. Tippliga Tipper",
|
||||||
|
"Relegation",
|
||||||
|
"Supercup",
|
||||||
|
"WTL-Pokal",
|
||||||
|
"Tippliga"
|
||||||
|
};
|
||||||
|
|
||||||
|
private static final String[] MATCH_LIST_POSTS = {
|
||||||
|
"World UEFA Super Cup",
|
||||||
|
"World UEFA Europa Conference League",
|
||||||
|
"World UEFA Europa League",
|
||||||
|
"World UEFA Champions League",
|
||||||
|
"Austria Bundesliga",
|
||||||
|
"Portugal Primeira Liga",
|
||||||
|
"Netherlands Eredivisie",
|
||||||
|
"Turkey Süper Lig",
|
||||||
|
"France Ligue 1",
|
||||||
|
"Italy Serie A",
|
||||||
|
"Spain La Liga",
|
||||||
|
"England Premier League",
|
||||||
|
"Germany Super Cup",
|
||||||
|
"Germany Frauen Bundesliga",
|
||||||
|
"Germany U19 Bundesliga",
|
||||||
|
"Germany Regionalliga - SudWest",
|
||||||
|
"Germany Regionalliga - Bayern",
|
||||||
|
"Germany 3. Liga",
|
||||||
|
"Germany 2. Bundesliga",
|
||||||
|
"Germany Bundesliga",
|
||||||
|
"Germany DFB Pokal"
|
||||||
|
};
|
||||||
|
|
||||||
|
private final int season;
|
||||||
|
private final TippligaWebsiteConnector connector;
|
||||||
|
private final TippligaSQLConnector sqlConnector;
|
||||||
|
|
||||||
|
public SeasonForumPostsCreator(int season) {
|
||||||
|
this.season = season;
|
||||||
|
try {
|
||||||
|
this.connector = new TippligaWebsiteConnector();
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
this.sqlConnector = TippligaSQLConnector.getInstance();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void createAllPosts() {
|
||||||
|
Integer adminForumId = sqlConnector.getForumId("Admin");
|
||||||
|
if (adminForumId == null) {
|
||||||
|
logger.error("Forum 'Admin' not found. Aborting.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Integer tippligaConfigForumId = sqlConnector.getForumId("Tippliga-Config", adminForumId);
|
||||||
|
if (tippligaConfigForumId == null) {
|
||||||
|
logger.error("Forum 'Tippliga-Config' not found. Aborting.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Integer seasonForumId = sqlConnector.getForumId(String.valueOf(season), tippligaConfigForumId);
|
||||||
|
if (seasonForumId == null) {
|
||||||
|
logger.error("Forum '" + season + "' not found under Tippliga-Config. Aborting.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Integer ligenForumId = sqlConnector.getForumId("Ligen", seasonForumId);
|
||||||
|
if (ligenForumId == null) {
|
||||||
|
logger.error("Forum 'Ligen' not found under " + season + ". Aborting.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
createConfigPosts(seasonForumId);
|
||||||
|
createMatchListPosts(ligenForumId);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void createConfigPosts(int seasonForumId) {
|
||||||
|
logger.info("Creating config posts in forum " + season + "...");
|
||||||
|
for (String subject : CONFIG_POSTS) {
|
||||||
|
if (postExists(seasonForumId, subject)) {
|
||||||
|
logger.info("Config post '" + subject + "' already exists. Skipping.");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
boolean success = connector.createPost(seasonForumId, subject, EMPTY_POST_CONTENT);
|
||||||
|
if (success) {
|
||||||
|
logger.info("Created config post: " + subject);
|
||||||
|
} else {
|
||||||
|
logger.error("Failed to create config post: " + subject);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void createMatchListPosts(int ligenForumId) {
|
||||||
|
logger.info("Creating match list posts in " + season + " > Ligen...");
|
||||||
|
for (String subject : MATCH_LIST_POSTS) {
|
||||||
|
if (postExists(ligenForumId, subject)) {
|
||||||
|
logger.info("Match list post '" + subject + "' already exists. Skipping.");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
boolean success = connector.createPost(ligenForumId, subject, EMPTY_POST_CONTENT);
|
||||||
|
if (success) {
|
||||||
|
logger.info("Created match list post: " + subject);
|
||||||
|
} else {
|
||||||
|
logger.error("Failed to create match list post: " + subject);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean postExists(int forumId, String subject) {
|
||||||
|
String query = "SELECT COUNT(*) FROM phpbb_posts WHERE forum_id = " + forumId + " AND post_subject = '" + subject + "'";
|
||||||
|
ResultSet rset = sqlConnector.executeQuery(query);
|
||||||
|
try {
|
||||||
|
if (rset != null && rset.next()) {
|
||||||
|
return rset.getInt(1) > 0;
|
||||||
|
}
|
||||||
|
} catch (SQLException e) {
|
||||||
|
logger.error("Error checking if post exists", e);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -218,6 +218,69 @@ public class TippligaWebsiteConnector {
|
|||||||
this.lastFormToken = matcher.group(2);
|
this.lastFormToken = matcher.group(2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean createPost(int forumId, String subject, String message) {
|
||||||
|
String url = "https://tippliga-wuerzburg.de/posting.php?mode=post&f=" + forumId;
|
||||||
|
|
||||||
|
HttpRequest req = HttpRequest.newBuilder()
|
||||||
|
.uri(URI.create(url))
|
||||||
|
.GET().build();
|
||||||
|
|
||||||
|
String reqBody = "";
|
||||||
|
try {
|
||||||
|
TimeUnit.SECONDS.sleep(1);
|
||||||
|
reqBody = client.send(req, HttpResponse.BodyHandlers.ofString()).body();
|
||||||
|
} catch (IOException | InterruptedException e) {
|
||||||
|
logger.error("Failed to fetch posting form", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
Pattern pattern = Pattern.compile("^[\\s\\S]*<input type=\"hidden\" name=\"creation_time\" value=\"([\\d]{10})\" \\/>[\\s\\S]*<input type=\"hidden\" name=\"form_token\" value=\"([\\d\\w]{40})\" \\/>[\\s\\S]*$");
|
||||||
|
Matcher matcher = pattern.matcher(reqBody);
|
||||||
|
if (!matcher.find()) {
|
||||||
|
logger.error("Could not find CSRF tokens in posting form for forum " + forumId);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
String creationTime = matcher.group(1);
|
||||||
|
String formToken = matcher.group(2);
|
||||||
|
|
||||||
|
Map<String, String> postParameters = new HashMap<>();
|
||||||
|
postParameters.put("subject", subject);
|
||||||
|
postParameters.put("message", message);
|
||||||
|
postParameters.put("creation_time", creationTime);
|
||||||
|
postParameters.put("form_token", formToken);
|
||||||
|
postParameters.put("post", "Absenden");
|
||||||
|
postParameters.put("attach_sig", "1");
|
||||||
|
postParameters.put("enable_bbcode", "1");
|
||||||
|
postParameters.put("enable_smilies", "1");
|
||||||
|
postParameters.put("enable_magic_url", "1");
|
||||||
|
|
||||||
|
String postForm = postParameters.entrySet()
|
||||||
|
.stream()
|
||||||
|
.map(e -> e.getKey() + "=" + URLEncoder.encode(e.getValue(), StandardCharsets.UTF_8))
|
||||||
|
.collect(Collectors.joining("&"));
|
||||||
|
|
||||||
|
HttpRequest postReq = HttpRequest.newBuilder()
|
||||||
|
.uri(URI.create(url))
|
||||||
|
.headers("Content-Type", "application/x-www-form-urlencoded")
|
||||||
|
.POST(HttpRequest.BodyPublishers.ofString(postForm))
|
||||||
|
.build();
|
||||||
|
|
||||||
|
try {
|
||||||
|
TimeUnit.SECONDS.sleep(1);
|
||||||
|
HttpResponse<String> response = client.send(postReq, HttpResponse.BodyHandlers.ofString());
|
||||||
|
if (response.statusCode() == 302) {
|
||||||
|
logger.info("Created post '" + subject + "' in forum " + forumId);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
logger.error("Failed to create post '" + subject + "' in forum " + forumId + ". Status: " + response.statusCode());
|
||||||
|
return false;
|
||||||
|
} catch (IOException | InterruptedException e) {
|
||||||
|
logger.error("Failed to create post", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private String getSidFromCookie() {
|
private String getSidFromCookie() {
|
||||||
HttpCookie sidCookie = cookieStore.getCookies().get(2);
|
HttpCookie sidCookie = cookieStore.getCookies().get(2);
|
||||||
String sid = sidCookie.getValue();
|
String sid = sidCookie.getValue();
|
||||||
|
|||||||
@@ -1,4 +0,0 @@
|
|||||||
{
|
|
||||||
"username": "tippligawuerzburg",
|
|
||||||
"password": "1154f448eae29212971cb82ca8850f54bff23629"
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
"1": {
|
|
||||||
"id": "825f79shtm9n3uknj99iuu2qho",
|
|
||||||
"url": "825f79shtm9n3uknj99iuu2qho@group.calendar.google.com"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
{
|
|
||||||
"installed": {
|
|
||||||
"client_id": "267204101826-2ps9m6httllrc7mrsvml50rsfb661k87.apps.googleusercontent.com",
|
|
||||||
"project_id": "tippliga",
|
|
||||||
"auth_uri": "https://accounts.google.com/o/oauth2/auth",
|
|
||||||
"token_uri": "https://oauth2.googleapis.com/token",
|
|
||||||
"auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
|
|
||||||
"client_secret": "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",
|
|
||||||
"redirect_uris": [
|
|
||||||
"urn:ietf:wg:oauth:2.0:oob",
|
|
||||||
"http://localhost"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1528,5 +1528,50 @@
|
|||||||
"teamname": "Tunisia",
|
"teamname": "Tunisia",
|
||||||
"tippligaID": 710,
|
"tippligaID": 710,
|
||||||
"apiFootballID": 28
|
"apiFootballID": 28
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"teamname": "SC St. Tönis",
|
||||||
|
"tippligaID": 673,
|
||||||
|
"apiFootballID": 19466
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"teamname": "Lüneburger SK Hansa",
|
||||||
|
"tippligaID": 76,
|
||||||
|
"apiFootballID": 1645
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"teamname": "Eintracht Trier",
|
||||||
|
"tippligaID": 46,
|
||||||
|
"apiFootballID": 1627
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"teamname": "SSV Jeddeloh",
|
||||||
|
"tippligaID": 124,
|
||||||
|
"apiFootballID": 1655
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"teamname": "Krieschow",
|
||||||
|
"tippligaID": 675,
|
||||||
|
"apiFootballID": 14713
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"teamname": "Westfalia Rhynern",
|
||||||
|
"tippligaID": 676,
|
||||||
|
"apiFootballID": 14826
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"teamname": "HEBC",
|
||||||
|
"tippligaID": 677,
|
||||||
|
"apiFootballID": 16078
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"teamname": "Fortuna Köln",
|
||||||
|
"tippligaID": 583,
|
||||||
|
"apiFootballID": 1326
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"teamname": "NEXT TEAM",
|
||||||
|
"tippligaID": 674,
|
||||||
|
"apiFootballID": 9999999
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@@ -288,5 +288,10 @@
|
|||||||
"team_id": 2139,
|
"team_id": 2139,
|
||||||
"team_name": "Dustin",
|
"team_name": "Dustin",
|
||||||
"team_name_short": "Dustin"
|
"team_name_short": "Dustin"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"team_id": 2140,
|
||||||
|
"team_name": "Marcel W.",
|
||||||
|
"team_name_short": "Marcel W."
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -0,0 +1,58 @@
|
|||||||
|
{
|
||||||
|
"numberOfMatchdays": 1,
|
||||||
|
"matchesPerMatchday": 4,
|
||||||
|
"pointMode": 4,
|
||||||
|
"pointsTendency": 1,
|
||||||
|
"pointsDifference": 2,
|
||||||
|
"pointsDirectHit": 3,
|
||||||
|
"ko": 1,
|
||||||
|
"matchdayConfig": [
|
||||||
|
{
|
||||||
|
"TLWMatchday": 1,
|
||||||
|
"matchdayName": "Relegation",
|
||||||
|
"numberOfMatches": 4,
|
||||||
|
"matchesConfig": [
|
||||||
|
{
|
||||||
|
"type": "AllMatchesOfMatchday",
|
||||||
|
"matchesLeague": 78,
|
||||||
|
"leagueMatchday": 35,
|
||||||
|
"showTable": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "PlaceholderSingleMatch",
|
||||||
|
"koMatch": true,
|
||||||
|
"placeholderDatetime": "2027-05-27 20:30:00",
|
||||||
|
"formulaHome": "D",
|
||||||
|
"formulaGuest": "D"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "PlaceholderSingleMatch",
|
||||||
|
"koMatch": true,
|
||||||
|
"placeholderDatetime": "2027-05-31 20:30:00",
|
||||||
|
"formulaHome": "D",
|
||||||
|
"formulaGuest": "D"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "AllMatchesOfMatchday",
|
||||||
|
"matchesLeague": 79,
|
||||||
|
"leagueMatchday": 35,
|
||||||
|
"showTable": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "PlaceholderSingleMatch",
|
||||||
|
"koMatch": true,
|
||||||
|
"placeholderDatetime": "2027-05-28 20:30:00",
|
||||||
|
"formulaHome": "D",
|
||||||
|
"formulaGuest": "D"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "PlaceholderSingleMatch",
|
||||||
|
"koMatch": true,
|
||||||
|
"placeholderDatetime": "2027-06-01 20:30:00",
|
||||||
|
"formulaHome": "D",
|
||||||
|
"formulaGuest": "D"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
{
|
||||||
|
"numberOfMatchdays": 2,
|
||||||
|
"matchesPerMatchday": 4,
|
||||||
|
"pointMode": 4,
|
||||||
|
"pointsTendency": 1,
|
||||||
|
"pointsDifference": 2,
|
||||||
|
"pointsDirectHit": 3,
|
||||||
|
"ko": 1,
|
||||||
|
"matchdayConfig": [
|
||||||
|
{
|
||||||
|
"TLWMatchday": 1,
|
||||||
|
"matchdayName": "Supercup",
|
||||||
|
"numberOfMatches": 4,
|
||||||
|
"matchesConfig": [
|
||||||
|
{
|
||||||
|
"matchday": 1,
|
||||||
|
"matchtime": "2026-08-22 20:30",
|
||||||
|
"match": "Borussia Dortmund - Bayern München",
|
||||||
|
"showTable": false,
|
||||||
|
"matchLeague": 529,
|
||||||
|
"type": "SingleMatch",
|
||||||
|
"matchId": 1582362
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"matchday": 1,
|
||||||
|
"matchtime": "2026-08-22 20:30",
|
||||||
|
"match": "Borussia Dortmund - Bayern München",
|
||||||
|
"showTable": false,
|
||||||
|
"matchLeague": 529,
|
||||||
|
"type": "SingleMatch",
|
||||||
|
"matchId": 1582362
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"matchday": 1,
|
||||||
|
"matchtime": "2026-08-12 21:00",
|
||||||
|
"match": "Paris Saint Germain - Aston Villa",
|
||||||
|
"showTable": false,
|
||||||
|
"matchLeague": 531,
|
||||||
|
"type": "SingleMatch",
|
||||||
|
"matchId": 1583664
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"matchday": 1,
|
||||||
|
"matchtime": "2026-08-12 21:00",
|
||||||
|
"match": "Paris Saint Germain - Aston Villa",
|
||||||
|
"showTable": false,
|
||||||
|
"matchLeague": 531,
|
||||||
|
"type": "SingleMatch",
|
||||||
|
"matchId": 1583664
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"1": "Sascha",
|
||||||
|
"2": "Stefan"
|
||||||
|
}
|
||||||
@@ -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": "Placeholder",
|
||||||
|
"placeholderDatetime": "2026-12-26 18:00:00"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"TLWMatchday": 18,
|
||||||
|
"matchesConfig": [
|
||||||
|
{
|
||||||
|
"type": "AllMatchesOfMatchday",
|
||||||
|
"matchesLeague": 78,
|
||||||
|
"leagueMatchday": 15,
|
||||||
|
"showTable": true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"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": "2027-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": "2027-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
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"1": "Flo",
|
||||||
|
"2": "Michael",
|
||||||
|
"3": "Demian",
|
||||||
|
"4": "Sascha",
|
||||||
|
"5": "Maxi Z.",
|
||||||
|
"6": "Julian",
|
||||||
|
"7": "Dustin",
|
||||||
|
"8": "Kay",
|
||||||
|
"9": "Lukas",
|
||||||
|
"10": "Marcel U.",
|
||||||
|
"11": "TG Nürnberg",
|
||||||
|
"12": "Nicole",
|
||||||
|
"13": "Franz",
|
||||||
|
"14": "Tristan"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"1": "Philipp",
|
||||||
|
"2": "Marcel",
|
||||||
|
"3": "Matthias",
|
||||||
|
"4": "Max",
|
||||||
|
"5": "Marcel W.",
|
||||||
|
"6": "Friedrich",
|
||||||
|
"7": "Stefan",
|
||||||
|
"8": "Armin",
|
||||||
|
"9": "Barb",
|
||||||
|
"10": "Hilde",
|
||||||
|
"11": "Olli L.",
|
||||||
|
"12": "Jimmy",
|
||||||
|
"13": "Johannes",
|
||||||
|
"14": "Patrick"
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
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 (2027, 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 (2027, 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 (2027, 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 (2027, 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 (2027, 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 (2027, 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 (2027, 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 (2027, 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 (2027, 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 (2027, 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);
|
||||||
@@ -0,0 +1,152 @@
|
|||||||
|
{
|
||||||
|
"numberOfMatchdays": 5,
|
||||||
|
"matchesPerMatchday": 0,
|
||||||
|
"pointMode": 4,
|
||||||
|
"pointsTendency": 1,
|
||||||
|
"pointsDifference": 2,
|
||||||
|
"pointsDirectHit": 3,
|
||||||
|
"ko": 1,
|
||||||
|
"matchdayConfig": [
|
||||||
|
{
|
||||||
|
"TLWMatchday": 1,
|
||||||
|
"matchdayName": "1. Runde",
|
||||||
|
"numberOfMatches": 32,
|
||||||
|
"matchesConfig": [
|
||||||
|
{
|
||||||
|
"type": "AllMatchesOfMatchday",
|
||||||
|
"matchesLeague": 81,
|
||||||
|
"leagueMatchday": 1,
|
||||||
|
"showTable": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "Placeholder",
|
||||||
|
"placeholderDatetime": "2026-08-21 18:00:00"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"TLWMatchday": 2,
|
||||||
|
"numberOfMatches": 16,
|
||||||
|
"matchdayName": "Achtelfinale",
|
||||||
|
"matchesConfig": [
|
||||||
|
{
|
||||||
|
"type": "AllMatchesOfMatchday",
|
||||||
|
"matchesLeague": 81,
|
||||||
|
"leagueMatchday": 2,
|
||||||
|
"showTable": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "Placeholder",
|
||||||
|
"placeholderDatetime": "2026-10-27 18:00:00"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"TLWMatchday": 3,
|
||||||
|
"numberOfMatches": 8,
|
||||||
|
"matchdayName": "Viertelfinale",
|
||||||
|
"matchesConfig": [
|
||||||
|
{
|
||||||
|
"type": "AllMatchesOfMatchday",
|
||||||
|
"matchesLeague": 81,
|
||||||
|
"leagueMatchday": 3,
|
||||||
|
"showTable": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "Placeholder",
|
||||||
|
"placeholderDatetime": "2026-12-01 18:30:00"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"TLWMatchday": 4,
|
||||||
|
"numberOfMatches": 4,
|
||||||
|
"matchdayName": "Halbfinale",
|
||||||
|
"matchesConfig": [
|
||||||
|
{
|
||||||
|
"type": "AllMatchesOfMatchday",
|
||||||
|
"matchesLeague": 81,
|
||||||
|
"leagueMatchday": 4,
|
||||||
|
"showTable": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "Placeholder",
|
||||||
|
"placeholderDatetime": "2027-02-02 18:30:00"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"TLWMatchday": 5,
|
||||||
|
"numberOfMatches": 6,
|
||||||
|
"matchdayName": "Finale",
|
||||||
|
"matchesConfig": [
|
||||||
|
{
|
||||||
|
"type": "AllMatchesOfMatchday",
|
||||||
|
"matchesLeague": 81,
|
||||||
|
"leagueMatchday": 5,
|
||||||
|
"showTable": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "AllMatchesOfMatchday",
|
||||||
|
"matchesLeague": 81,
|
||||||
|
"leagueMatchday": 5,
|
||||||
|
"showTable": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "AllMatchesOfMatchday",
|
||||||
|
"matchesLeague": 81,
|
||||||
|
"leagueMatchday": 6,
|
||||||
|
"showTable": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "AllMatchesOfMatchday",
|
||||||
|
"matchesLeague": 81,
|
||||||
|
"leagueMatchday": 6,
|
||||||
|
"showTable": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "PlaceholderSingleMatch",
|
||||||
|
"koMatch": true,
|
||||||
|
"placeholderDatetime": "2027-04-20 20:45:00",
|
||||||
|
"formulaHome": "D",
|
||||||
|
"formulaGuest": "D"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "PlaceholderSingleMatch",
|
||||||
|
"koMatch": true,
|
||||||
|
"placeholderDatetime": "2027-04-20 20:45:00",
|
||||||
|
"formulaHome": "D",
|
||||||
|
"formulaGuest": "D"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "PlaceholderSingleMatch",
|
||||||
|
"koMatch": true,
|
||||||
|
"placeholderDatetime": "2027-04-21 20:45:00",
|
||||||
|
"formulaHome": "D",
|
||||||
|
"formulaGuest": "D"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "PlaceholderSingleMatch",
|
||||||
|
"koMatch": true,
|
||||||
|
"placeholderDatetime": "2027-04-21 20:45:00",
|
||||||
|
"formulaHome": "D",
|
||||||
|
"formulaGuest": "D"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "PlaceholderSingleMatch",
|
||||||
|
"koMatch": true,
|
||||||
|
"placeholderDatetime": "2027-05-29 20:00:00",
|
||||||
|
"formulaHome": "W 61",
|
||||||
|
"formulaGuest": "W 63"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "PlaceholderSingleMatch",
|
||||||
|
"koMatch": true,
|
||||||
|
"placeholderDatetime": "2027-05-29 20:00:00",
|
||||||
|
"formulaHome": "W 62",
|
||||||
|
"formulaGuest": "W 64"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
"1": "Matthias",
|
||||||
|
"2": "Marcel U.",
|
||||||
|
"3": "Marcel",
|
||||||
|
"4": "Dustin",
|
||||||
|
"5": "Johannes",
|
||||||
|
"6": "Tristan",
|
||||||
|
"7": "Philipp",
|
||||||
|
"8": "Nicole",
|
||||||
|
"9": "Barb",
|
||||||
|
"10": "TG Nürnberg",
|
||||||
|
"11": "Marcel W.",
|
||||||
|
"12": "Maxi Z.",
|
||||||
|
"13": "Olli L.",
|
||||||
|
"14": "Lukas",
|
||||||
|
"15": "Jimmy",
|
||||||
|
"16": "Franz",
|
||||||
|
"17": "Armin",
|
||||||
|
"18": "Demian",
|
||||||
|
"19": "Hilde",
|
||||||
|
"20": "Kay",
|
||||||
|
"21": "Patrick",
|
||||||
|
"22": "Flo",
|
||||||
|
"23": "Stefan",
|
||||||
|
"24": "Max"
|
||||||
|
}
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
UPDATE phpbb_footb_matchdays SET status = 0 WHERE season = 2027 AND status > 0;
|
||||||
|
UPDATE phpbb_footb_matches SET status = 0 WHERE season = 2027 AND status > 0;
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
{
|
|
||||||
"type": "service_account",
|
|
||||||
"project_id": "tippliga",
|
|
||||||
"private_key_id": "4e0def9ef4474114744a1fcaffae9e75689a8909",
|
|
||||||
"private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDaJeiT0eCLSq6l\nfjvNxE9EnHtFxvWdJOx2CsIXvBJKA7u1b95uHSNQmmunJPMstMLvTRYYYVpJWUm0\njqLd4VGUDqjXuWcNQpn62TFLSGQs8bTwIYoYsAnTWC+kuG5iSaKKzw9UiKFx0Mxv\nLAm5CjqYb87E2pz+7ihCYfaMkpppwPhz8bUbQ+iHdo85cQBcZeVpjuL+W4KT89yV\nZxsV4dGJNabLLEznA1WyhS+pGz+3N9edfANyREthrxm1cyytd3omQ/pfIl7KpGlU\nIq4eDMzlPftn+Nq9S7UfTXzxcv9Ez2cdlGMSSSbpjQBYXNEewnzXutFqfK9h2STD\nM0XaqGh9AgMBAAECggEAAzMrOWAmI8zsUmcPYANG6WMgp6NVhcV46zEP/iTroVRg\nwr+r8bJWOJj+IjCgq4hQ09a3KyYGtlXwRrrH5HPyQyTAnqLjZtZ/3lzblm2TYJmJ\nwzwcbO1+skJCAF2Dxmxh35jgTafQIQJNhxheqtrwBStVQhUIIbosPBQvkven+tUv\n4lRn494VXNxWZSGevL+3iJoNtJbjjQ8FVLafx6/vKP4mShB0UxKHqSBRtzZ5g4/n\nB8d4Vw4Ma0eEBUMDD9vOqreMdKCUoMnZIKuQwWeyiug77mBxgfmCRnsefOdyEKne\nRvalPBKEpD2PH/iud+qkuNNITFCr0I1iF6f4NElciQKBgQD/q68TvMOUE2tlgdU6\n6o6d7b+Sm4yp19f1euR0fe7+5as6Pz4KWy0zwSXAczVNDXLq44hQ4eeJMALwKvQ+\nXqCrtjc3NkVtiPXIjnqEQ/t56WBZtsrLxlNAE9yxHQPEmyRMKjGOJTRpoNZzGBsS\naEqTiKinO7AY5xOWzXz+HVLDRQKBgQDabdmrKLJaHhboPBa5B7HJ8WCL5P5+97P6\n4WuDT7vQvyJqb3KhltdRAgMszFXsfYwyeidncQ3fxUlmMWtWlHROfjhyWQZ0jIJg\nwpTAvNqQ3HuXM2fRvM7d6Z69xE2RxVpRaAbvGUHvNohAW7Vwmoi/GV9NR6irV/ny\n1suS6SIH2QKBgHnJXEJ4nmlAvt3BdML1zC2qfKDne5/D81k5yu06t8evu1qpmXHx\ncJzAmq0LtA4aI+2DqQFuOo580kl5DJNRHBPvXmnsbjH5FasNQ4sRnw65fm39xqg+\ntpVFYND1U0Ap7qZhSu29BzRxqvV0PCEOkMeqRzwyEHYsTIZ/J9UcPrpJAoGAcNQ/\nlN8vycczNAEeB7QGzXbG1VyTbYiMSrK4c5rzPHAO2gX5o6ikTm8IrtJaLA/qJITe\n59sJPKbPNF+gv5dtwMIIbGC6KegOzOaWKj0jdaK+oKroHPo3rX+pBQNqwjq8XcKr\nmkRkv6lelkgJIEJjEruLdALpCKEoNp1niNquPnkCgYAVAkaF/8xYQ4UaBuJEJPOW\nDNXAmRrvaazU8GTv70t03VHKjhcv7b83L+n8yU3VuaqaO3bgyGIELJ2VRzVn16EH\nkUwh1W2fB1ZAmMK6V5JB7b8LCPdpCJSbQvNZAOZj4aodoNtGKM0j36rTSZJi2Rdz\nqtOSw0pEvALI62ufuNRUzA==\n-----END PRIVATE KEY-----\n",
|
|
||||||
"client_email": "tlw-707@tippliga.iam.gserviceaccount.com",
|
|
||||||
"client_id": "101590566618120833710",
|
|
||||||
"auth_uri": "https://accounts.google.com/o/oauth2/auth",
|
|
||||||
"token_uri": "https://oauth2.googleapis.com/token",
|
|
||||||
"auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
|
|
||||||
"client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/tlw-707%40tippliga.iam.gserviceaccount.com"
|
|
||||||
}
|
|
||||||
@@ -1,167 +0,0 @@
|
|||||||
{
|
|
||||||
"numberOfMatchdays": 39,
|
|
||||||
"matchesPerMatchday": 12,
|
|
||||||
"pointMode": 4,
|
|
||||||
"pointsTendency": 1,
|
|
||||||
"pointsDifference": 2,
|
|
||||||
"pointsDirectHit": 3,
|
|
||||||
"ko": 0,
|
|
||||||
"matchdayConfig": [
|
|
||||||
{
|
|
||||||
"TLWMatchday": 1,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 2,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 3,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 4,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 5,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 6,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 7,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 8,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 9,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 10,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 11,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 12,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 13,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 14,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 15,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 16,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 17,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 18,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 19,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 20,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 21,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 22,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 23,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 24,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 25,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 26,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 27,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 28,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 29,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 30,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 31,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 32,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 33,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 34,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 35,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 36,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 37,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 38,
|
|
||||||
"matchesConfig": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TLWMatchday": 39,
|
|
||||||
"matchesConfig": []
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -3,7 +3,6 @@ import de.jeyp91.apifootball.APIFootballMatch;
|
|||||||
import de.jeyp91.teamidmatcher.TeamIDMatcher;
|
import de.jeyp91.teamidmatcher.TeamIDMatcher;
|
||||||
import org.json.simple.JSONObject;
|
import org.json.simple.JSONObject;
|
||||||
import org.json.simple.parser.JSONParser;
|
import org.json.simple.parser.JSONParser;
|
||||||
import org.json.simple.parser.ParseException;
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
@@ -11,7 +10,7 @@ import static org.junit.Assert.assertEquals;
|
|||||||
public class TeamIDMatcherTest {
|
public class TeamIDMatcherTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void getOpenLigaDbIdFromTippligaIdTest() {
|
public void getAPIFootballIdFromTippligaIdTest() {
|
||||||
int apiFootballId;
|
int apiFootballId;
|
||||||
|
|
||||||
apiFootballId = TeamIDMatcher.getApiFootballIdFromTippligaId(505);
|
apiFootballId = TeamIDMatcher.getApiFootballIdFromTippligaId(505);
|
||||||
@@ -23,7 +22,7 @@ public class TeamIDMatcherTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void getTippligaIdFromOpenLigaDbIdTest() throws Exception {
|
public void getTippligaIdFromAPIFootballIdTest() throws Exception {
|
||||||
int tlwId;
|
int tlwId;
|
||||||
String jsonMatch = "{" +
|
String jsonMatch = "{" +
|
||||||
"\"fixture_id\":1," +
|
"\"fixture_id\":1," +
|
||||||
|
|||||||
@@ -1,12 +1,11 @@
|
|||||||
package de.jeyp91.apifootball;
|
package de.jeyp91.apifootball;
|
||||||
|
|
||||||
import de.jeyp91.openligadb.OpenLigaDBConnector;
|
|
||||||
import org.junit.Test;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
public class APIFootballConnectorTest {
|
import org.junit.Test;
|
||||||
|
|
||||||
|
public class APIFootballConnectorTest {
|
||||||
|
/*
|
||||||
@Test
|
@Test
|
||||||
public void APITestGetMatchDataOfMatchdayBundesliga() {
|
public void APITestGetMatchDataOfMatchdayBundesliga() {
|
||||||
APIFootballConnector apiFootballConnector = APIFootballConnector.getAPIFootballConnectorInstance(2020);
|
APIFootballConnector apiFootballConnector = APIFootballConnector.getAPIFootballConnectorInstance(2020);
|
||||||
@@ -14,4 +13,5 @@ public class APIFootballConnectorTest {
|
|||||||
assert matchesOfMatchday.get(0).getTeamIdHome() == 744;
|
assert matchesOfMatchday.get(0).getTeamIdHome() == 744;
|
||||||
assert matchesOfMatchday.get(0).getTeamIdGuest() == 159;
|
assert matchesOfMatchday.get(0).getTeamIdGuest() == 159;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import org.junit.Test;
|
|||||||
import static de.jeyp91.apifootball.APIFootballConnector.stringToJSONObject;
|
import static de.jeyp91.apifootball.APIFootballConnector.stringToJSONObject;
|
||||||
|
|
||||||
public class APIFootballMatchTest {
|
public class APIFootballMatchTest {
|
||||||
|
/*
|
||||||
@Test
|
@Test
|
||||||
public void withExtratime() throws Exception {
|
public void withExtratime() throws Exception {
|
||||||
String matchString = "{\"fixture_id\":958530,\"league_id\":4303,\"league\":{\"name\":\"DFB Pokal\",\"country\":\"Germany\",\"logo\":\"https:\\/\\/media-3.api-sports.io\\/football\\/leagues\\/81.png\",\"flag\":\"https:\\/\\/media-1.api-sports.io\\/flags\\/de.svg\"},\"event_date\":\"2022-10-19T18:00:00+02:00\",\"event_timestamp\":1666195200,\"firstHalfStart\":1666195200,\"secondHalfStart\":1666198800,\"round\":\"2nd Round\",\"status\":\"Match Finished\",\"statusShort\":\"PEN\",\"elapsed\":120,\"venue\":\"Home Deluxe Arena\",\"referee\":\"Frank Willenborg, Germany\",\"homeTeam\":{\"team_id\":185,\"team_name\":\"SC Paderborn 07\",\"logo\":\"https:\\/\\/media-2.api-sports.io\\/football\\/teams\\/185.png\"},\"awayTeam\":{\"team_id\":162,\"team_name\":\"Werder Bremen\",\"logo\":\"https:\\/\\/media-3.api-sports.io\\/football\\/teams\\/162.png\"},\"goalsHomeTeam\":2,\"goalsAwayTeam\":2,\"score\":{\"halftime\":\"2-0\",\"fulltime\":\"2-2\",\"extratime\":\"0-0\",\"penalty\":\"5-4\"}}";
|
String matchString = "{\"fixture_id\":958530,\"league_id\":4303,\"league\":{\"name\":\"DFB Pokal\",\"country\":\"Germany\",\"logo\":\"https:\\/\\/media-3.api-sports.io\\/football\\/leagues\\/81.png\",\"flag\":\"https:\\/\\/media-1.api-sports.io\\/flags\\/de.svg\"},\"event_date\":\"2022-10-19T18:00:00+02:00\",\"event_timestamp\":1666195200,\"firstHalfStart\":1666195200,\"secondHalfStart\":1666198800,\"round\":\"2nd Round\",\"status\":\"Match Finished\",\"statusShort\":\"PEN\",\"elapsed\":120,\"venue\":\"Home Deluxe Arena\",\"referee\":\"Frank Willenborg, Germany\",\"homeTeam\":{\"team_id\":185,\"team_name\":\"SC Paderborn 07\",\"logo\":\"https:\\/\\/media-2.api-sports.io\\/football\\/teams\\/185.png\"},\"awayTeam\":{\"team_id\":162,\"team_name\":\"Werder Bremen\",\"logo\":\"https:\\/\\/media-3.api-sports.io\\/football\\/teams\\/162.png\"},\"goalsHomeTeam\":2,\"goalsAwayTeam\":2,\"score\":{\"halftime\":\"2-0\",\"fulltime\":\"2-2\",\"extratime\":\"0-0\",\"penalty\":\"5-4\"}}";
|
||||||
@@ -20,4 +20,5 @@ public class APIFootballMatchTest {
|
|||||||
JSONObject matchJson = stringToJSONObject(matchString);
|
JSONObject matchJson = stringToJSONObject(matchString);
|
||||||
APIFootballMatch match = new APIFootballMatch(matchJson, 2023);
|
APIFootballMatch match = new APIFootballMatch(matchJson, 2023);
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ import org.junit.Test;
|
|||||||
|
|
||||||
public class APIFootballUpdaterTest {
|
public class APIFootballUpdaterTest {
|
||||||
|
|
||||||
int season = 2026;
|
int season = 2027;
|
||||||
|
/*
|
||||||
@Test
|
@Test
|
||||||
public void checkErrorsTest() {
|
public void checkErrorsTest() {
|
||||||
String rateLimitError = "{\"results\":0,\"errors\":{\"rateLimit\":\"Too many requests. Your rate limit is 10 requests per minute.\"}}";
|
String rateLimitError = "{\"results\":0,\"errors\":{\"rateLimit\":\"Too many requests. Your rate limit is 10 requests per minute.\"}}";
|
||||||
@@ -41,4 +41,5 @@ public class APIFootballUpdaterTest {
|
|||||||
APIFootballUpdater updater = new APIFootballUpdater();
|
APIFootballUpdater updater = new APIFootballUpdater();
|
||||||
updater.updateAllRounds(season);
|
updater.updateAllRounds(season);
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,77 +0,0 @@
|
|||||||
package de.jeyp91.openligadb;
|
|
||||||
|
|
||||||
import org.junit.Test;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
|
|
||||||
import static org.junit.Assert.assertEquals;
|
|
||||||
import static org.junit.Assert.assertTrue;
|
|
||||||
|
|
||||||
public class OpenLigaDBConnectorTest {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void APITestGetMatchDataOfMatchdayBundesliga() {
|
|
||||||
OpenLigaDBConnector openLigaDBConnector = new OpenLigaDBConnector();
|
|
||||||
ArrayList<OpenLigaDBMatch> matches = openLigaDBConnector.getMatchDataOfMatchday(2020, "bl1", 1);
|
|
||||||
|
|
||||||
assertEquals(9, matches.size());
|
|
||||||
|
|
||||||
OpenLigaDBMatch match;
|
|
||||||
|
|
||||||
match = matches.get(0);
|
|
||||||
assertEquals((Integer) 55277, match.getMatchId());
|
|
||||||
assertEquals((Integer) 40, match.getTeamIdHome());
|
|
||||||
assertEquals((Integer) 54, match.getTeamIdGuest());
|
|
||||||
assertEquals((Integer) 2020, match.getSeason());
|
|
||||||
assertEquals("2019-08-16T20:30:00", match.getMatchDateTime());
|
|
||||||
assertEquals((Integer) 1, match.getMatchday());
|
|
||||||
assertEquals((Integer) 2, match.getGoalsHome());
|
|
||||||
assertEquals((Integer) 2, match.getGoalsGuest());
|
|
||||||
assertTrue(match.getMatchIsFinished());
|
|
||||||
|
|
||||||
match = matches.get(1);
|
|
||||||
assertEquals((Integer) 55278, match.getMatchId());
|
|
||||||
assertEquals((Integer) 7, match.getTeamIdHome());
|
|
||||||
assertEquals((Integer) 95, match.getTeamIdGuest());
|
|
||||||
assertEquals((Integer) 2020, match.getSeason());
|
|
||||||
assertEquals("2019-08-17T15:30:00", match.getMatchDateTime());
|
|
||||||
assertEquals((Integer) 1, match.getMatchday());
|
|
||||||
assertEquals((Integer) 5, match.getGoalsHome());
|
|
||||||
assertEquals((Integer) 1, match.getGoalsGuest());
|
|
||||||
assertTrue(match.getMatchIsFinished());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void APITestGetMatchDataOfMatchdayDFBPokal() {
|
|
||||||
OpenLigaDBConnector openLigaDBConnector = new OpenLigaDBConnector();
|
|
||||||
ArrayList<OpenLigaDBMatch> matches = openLigaDBConnector.getMatchDataOfMatchday(2020, "dfb2019", 1);
|
|
||||||
|
|
||||||
assert matches.size() == 32;
|
|
||||||
|
|
||||||
OpenLigaDBMatch match = matches.get(0);
|
|
||||||
assertEquals((Integer) 54926, match.getMatchId());
|
|
||||||
assertEquals((Integer) 563, match.getTeamIdHome());
|
|
||||||
assertEquals((Integer) 7, match.getTeamIdGuest());
|
|
||||||
assertEquals((Integer) 2020, match.getSeason());
|
|
||||||
assertEquals("2019-08-09T20:45:00", match.getMatchDateTime());
|
|
||||||
assertEquals((Integer) 1, match.getMatchday());
|
|
||||||
assertEquals((Integer) 0, match.getGoalsHome());
|
|
||||||
assertEquals((Integer) 2, match.getGoalsGuest());
|
|
||||||
assertTrue(match.getMatchIsFinished());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void APITestGetMatchDataOfSingleMatch() {
|
|
||||||
OpenLigaDBConnector openLigaDBConnector = new OpenLigaDBConnector();
|
|
||||||
OpenLigaDBMatch match = openLigaDBConnector.getMatchDataOfSingleMatch(55583);
|
|
||||||
assertEquals((Integer) 55583, match.getMatchId());
|
|
||||||
assertEquals((Integer) 16, match.getTeamIdHome());
|
|
||||||
assertEquals((Integer) 55, match.getTeamIdGuest());
|
|
||||||
assertEquals((Integer) 2020, match.getSeason());
|
|
||||||
assertEquals("2019-07-26T20:30:00", match.getMatchDateTime());
|
|
||||||
assertEquals((Integer) 1, match.getMatchday());
|
|
||||||
assertEquals((Integer) 2, match.getGoalsHome());
|
|
||||||
assertEquals((Integer) 1, match.getGoalsGuest());
|
|
||||||
assertTrue(match.getMatchIsFinished());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -7,7 +7,7 @@ import org.junit.Test;
|
|||||||
|
|
||||||
public class TLWMatchdaysCreatorTest {
|
public class TLWMatchdaysCreatorTest {
|
||||||
|
|
||||||
int season = 2026;
|
int season = 2027;
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void getMatchdaysTippligaTest() {
|
public void getMatchdaysTippligaTest() {
|
||||||
@@ -90,11 +90,19 @@ public class TLWMatchdaysCreatorTest {
|
|||||||
System.out.println(sql);
|
System.out.println(sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getMatchdaysRelegationSqlTest() {
|
||||||
|
|
||||||
|
TLWMatchdaysCreator matchdaysCreator = new TLWMatchdaysCreator(season, 47, "Relegation");
|
||||||
|
String sql = matchdaysCreator.getMatchdaysSQL();
|
||||||
|
System.out.println(sql);
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void getMatchdaysEMTippspielSqlTest() {
|
public void getMatchdaysEMTippspielSqlTest() {
|
||||||
|
|
||||||
TLWMatchdaysCreator matchdaysCreator = new TLWMatchdaysCreator(2021, 49, "EM-Tippspiel");
|
TLWMatchdaysCreator matchdaysCreator = new TLWMatchdaysCreator(2021, 49, "EM-Tippspiel");
|
||||||
String sql = matchdaysCreator.getMatchdaysSQL();
|
String sql = matchdaysCreator.getMatchdaysSQL();
|
||||||
// System.out.println(sql);
|
System.out.println(sql);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,13 @@
|
|||||||
package de.jeyp91.tippliga;
|
package de.jeyp91.tippliga;
|
||||||
|
|
||||||
import org.junit.Test;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
public class TLWMatchesCreatorFootballTest {
|
public class TLWMatchesCreatorFootballTest {
|
||||||
|
|
||||||
int season = 2026;
|
int season = 2027;
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void getMatchesTest() {
|
public void getMatchesTest() {
|
||||||
@@ -49,9 +48,9 @@ public class TLWMatchesCreatorFootballTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void getMatchesEMTippspielSqlTest() {
|
public void getMatchesRelegationSqlTest() {
|
||||||
TLWMatchesCreatorFootball creator = new TLWMatchesCreatorFootball(2021, 49, "EM-Tippspiel");
|
TLWMatchesCreatorFootball creator = new TLWMatchesCreatorFootball(season, 47, "Relegation");
|
||||||
String sql = creator.getSQLInsertString();
|
String sql = creator.getSQLInsertString();
|
||||||
// System.out.println(sql);
|
System.out.println(sql);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import org.junit.Test;
|
|||||||
|
|
||||||
public class TLWMatchesCreatorTipperPokalTest {
|
public class TLWMatchesCreatorTipperPokalTest {
|
||||||
|
|
||||||
int season = 2026;
|
int season = 2027;
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void getMatchesWTLPokalTest() {
|
public void getMatchesWTLPokalTest() {
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import org.junit.Test;
|
|||||||
|
|
||||||
public class TLWMatchesCreatorTipperTest {
|
public class TLWMatchesCreatorTipperTest {
|
||||||
|
|
||||||
int season = 2026;
|
int season = 2027;
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void getMatchesTippliga1Test() {
|
public void getMatchesTippliga1Test() {
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import org.junit.Test;
|
|||||||
|
|
||||||
public class TLWMatchesUpdaterFootballTest {
|
public class TLWMatchesUpdaterFootballTest {
|
||||||
|
|
||||||
int season = 2026;
|
int season = 2027;
|
||||||
@Test
|
@Test
|
||||||
public void getUpdateSqlTest1() {
|
public void getUpdateSqlTest1() {
|
||||||
TLWMatchesUpdaterFootball updater = new TLWMatchesUpdaterFootball(season, 1, "Tippliga");
|
TLWMatchesUpdaterFootball updater = new TLWMatchesUpdaterFootball(season, 1, "Tippliga");
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import org.junit.Test;
|
|||||||
|
|
||||||
public class TLWTeamsCreatorTest {
|
public class TLWTeamsCreatorTest {
|
||||||
|
|
||||||
int season = 2026;
|
int season = 2027;
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void getTeamsTippligaFootball1Test() {
|
public void getTeamsTippligaFootball1Test() {
|
||||||
|
|||||||
Reference in New Issue
Block a user