This commit is contained in:
2024-07-28 22:16:22 +02:00
parent cf35b899a1
commit a697ef0e88
2 changed files with 5 additions and 2 deletions

View File

@@ -16,7 +16,7 @@ public class TLWMatchesManagerBase {
protected int season; protected int season;
protected int league; protected int league;
protected int numberOfMatchdays; protected int numberOfMatchdays;
protected int matchesPerMatchday; protected Integer matchesPerMatchday = null;
protected int ko; protected int ko;
protected int betKOType; protected int betKOType;
@@ -27,6 +27,7 @@ public class TLWMatchesManagerBase {
TippligaConfigProvider prov = new TippligaConfigProvider(this.season); TippligaConfigProvider prov = new TippligaConfigProvider(this.season);
JSONObject config = prov.getTippligaConfig(configFileName); JSONObject config = prov.getTippligaConfig(configFileName);
this.numberOfMatchdays = ((Long) config.get("numberOfMatchdays")).intValue(); this.numberOfMatchdays = ((Long) config.get("numberOfMatchdays")).intValue();
try { this.matchesPerMatchday = ((Long) config.get("matchesPerMatchday")).intValue(); } catch (Exception ignored) {}
this.matchdayConfig = (JSONArray) config.get("matchdayConfig"); this.matchdayConfig = (JSONArray) config.get("matchdayConfig");
this.ko = ((Long) config.get("ko")).intValue(); this.ko = ((Long) config.get("ko")).intValue();
Long parsedBetKOType = (Long) config.get("betKOType"); Long parsedBetKOType = (Long) config.get("betKOType");

View File

@@ -196,6 +196,8 @@ public class TLWMatchesUpdaterFootball extends TLWMatchesManagerBase {
private void addPlaceholderMatches(ArrayList<TLWMatch> tlwMatches, private void addPlaceholderMatches(ArrayList<TLWMatch> tlwMatches,
JSONObject matchdayConfig) { JSONObject matchdayConfig) {
Integer numberOfMatches = this.matchesPerMatchday;
try { numberOfMatches = ((Long) matchdayConfig.get("numberOfMatches")).intValue();} catch (Exception ignored) {}
ArrayList<TLWMatch> placeholderMatches = new ArrayList<>(); ArrayList<TLWMatch> placeholderMatches = new ArrayList<>();
ArrayList<TLWMatch> tlwMatchesCopy = new ArrayList<>(tlwMatches); ArrayList<TLWMatch> tlwMatchesCopy = new ArrayList<>(tlwMatches);
JSONArray matchesConfig = (JSONArray) matchdayConfig.get("matchesConfig"); JSONArray matchesConfig = (JSONArray) matchdayConfig.get("matchesConfig");
@@ -224,7 +226,7 @@ public class TLWMatchesUpdaterFootball extends TLWMatchesManagerBase {
} }
} }
// check if total number of matches is not too high // check if total number of matches is not too high
if(tlwMatches.size() + placeholderMatches.size() > (Integer.parseInt(matchdayConfig.get("numberOfMatches").toString()))) { if(tlwMatches.size() + placeholderMatches.size() > (numberOfMatches)) {
logger.error("Too many matches in config: " + this.season + ", " + this.league + ", " + tlwMatches.get(0).getMatchday()); logger.error("Too many matches in config: " + this.season + ", " + this.league + ", " + tlwMatches.get(0).getMatchday());
} else { } else {
// add placeholderMatches to tlwMatches // add placeholderMatches to tlwMatches