eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-24 14:38:45 +00:00
Code Activity

bug5292: moved computation of effective ToT and ToD values down in

Browse Source 
application logic
This commit is contained in:
Dennis Aulenbacher
2020-07-02 00:31:08 +02:00
parent c4917b4cae
commit 4eeb6f228e
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/IncrementalLeaderboardDTO.java
+15 -11
View File
@@ -425,15 +425,6 @@ public class IncrementalLeaderboardDTO extends LeaderboardDTO implements Increme
row.competitor = expandedCompetitor;
rows.put(expandedCompetitor, row);
}
// replace null values of Regatta specific competitor handicap values with the respective competitor's default values
for(LeaderboardRowDTO row : rows.values()) {
if(row.effectiveTimeOnDistanceAllowancePerNauticalMile == null) {
row.effectiveTimeOnDistanceAllowancePerNauticalMile = row.competitor.getTimeOnDistanceAllowancePerNauticalMile();
}
if(row.effectiveTimeOnTimeFactor == null) {
row.effectiveTimeOnTimeFactor = row.competitor.getTimeOnTimeFactor();
}
}
final Set<String> rowsUnchangedForCompetitorsWithIdAsString = new HashSet<>();
if (rowsUnchanged != null) {
for (Entry<String, Set<Void>> rowUnchanged : rowsUnchanged.getAllUnchangedCompetitorIdsAsStringAndKeys(previousVersion).entrySet()) {
@@ -496,6 +487,19 @@ public class IncrementalLeaderboardDTO extends LeaderboardDTO implements Increme
}
}
}
// replace null values of Regatta specific competitor handicap values with the respective competitor's
// default values
for (LeaderboardRowDTO row : rows.values()) {
if(row != null) {
if (row.effectiveTimeOnDistanceAllowancePerNauticalMile == null) {
row.effectiveTimeOnDistanceAllowancePerNauticalMile = row.competitor
.getTimeOnDistanceAllowancePerNauticalMile();
}
if (row.effectiveTimeOnTimeFactor == null) {
row.effectiveTimeOnTimeFactor = row.competitor.getTimeOnTimeFactor();
}
}
}
}
}
@@ -620,11 +624,11 @@ public class IncrementalLeaderboardDTO extends LeaderboardDTO implements Increme
cloner.clone(competitorAndRow.getValue(), newRowDTO);
// if the Regatta specific competitor handicap values are equal to the competitor's default values they
// do not need to be transfered reduntantly
if (newRowDTO.effectiveTimeOnDistanceAllowancePerNauticalMile
if (newRowDTO.effectiveTimeOnDistanceAllowancePerNauticalMile != null && newRowDTO.effectiveTimeOnDistanceAllowancePerNauticalMile
.equals(competitorDTO.getTimeOnDistanceAllowancePerNauticalMile())) {
newRowDTO.effectiveTimeOnDistanceAllowancePerNauticalMile = null;
}
if (newRowDTO.effectiveTimeOnTimeFactor.equals(competitorDTO.getTimeOnTimeFactor())) {
if (newRowDTO.effectiveTimeOnTimeFactor != null && newRowDTO.effectiveTimeOnTimeFactor.equals(competitorDTO.getTimeOnTimeFactor())) {
newRowDTO.effectiveTimeOnTimeFactor = null;
}
CompetitorDTO compactCompetitor = compactCompetitorMap.get(competitorDTO);