Skip to content

Commit 07cdc18

Browse files
author
Craig Dennis
committed
Fixes getWinner to display the winners name should it exist
1 parent e82422e commit 07cdc18

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

src/main/java/com/teamtreehouse/tinypencil/model/Party.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,21 @@ public void takeScore(String name, int hole, int score) {
3838
}
3939
}
4040

41-
public Optional<Sheet> getWinner() {
41+
public String getWinner() {
4242
return sheets.stream()
4343
.filter(sheet -> sheet.getRemainingHoleCount() < Sheet.PAR.length)
44-
.min(Comparator.comparing(Sheet::getScore));
44+
.min(Comparator.comparing(Sheet::getScore))
45+
.map(Sheet::getName)
46+
.orElse("No winner yet!");
4547
}
4648

4749

48-
public Optional<Sheet> getAdjustedWinner() {
50+
public String getAdjustedWinner() {
4951
return sheets.stream()
5052
.filter(sheet -> sheet.getRemainingHoleCount() < Sheet.PAR.length)
51-
.min(Comparator.comparing(Sheet::getAdjustedScore));
53+
.min(Comparator.comparing(Sheet::getAdjustedScore))
54+
.map(Sheet::getName)
55+
.orElse("No winner currently");
5256
}
5357

5458
public List<Sheet> ranked() {

src/main/java/com/teamtreehouse/tinypencil/ui/Dashboard.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public void displayHeading(String title) {
1717

1818
public void displayWinner(Party party) {
1919
displayHeading("Winner");
20-
// FIXME: THESE OPTIONALS ARE UGLYYYYYYY!!!!!
2120
System.out.println(party.getAdjustedWinner());
2221
}
2322

0 commit comments

Comments
 (0)