4 files changed, 39 insertions, 25 deletions
diff --git a/src/main/java/design/model/League.java b/src/main/java/design/model/League.java
index 2a7366a..44dc83e 100644
--- a/src/main/java/design/model/League.java
+++ b/src/main/java/design/model/League.java
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -104,6 +105,15 @@ public abstract class League {
         schedule.add(match);
     }
 
+    public Match getCurrentMatch() {
+        for(Match m : schedule){
+            if(m.getStart().isBefore(LocalDateTime.now()) && m.getEnd().isAfter(LocalDateTime.now())){
+                return m;
+            }
+        }
+        return null;
+    }
+
     public void setId(int id) {
         assert this.id == -1;
         this.id = id;
@@ -130,5 +140,5 @@ public abstract class League {
 
     public abstract Map<?, Integer> getResults();
 
-    public abstract void finalizeMatch(Match match);
+    //public abstract void finalizeMatch(Match match);
 }
diff --git a/src/main/java/design/model/Match.java b/src/main/java/design/model/Match.java
index 525f281..3c19230 100644
--- a/src/main/java/design/model/Match.java
+++ b/src/main/java/design/model/Match.java
@@ -49,6 +49,10 @@ public class Match {
         return start;
     }
 
+    public LocalDateTime getEnd() {
+        return end;
+    }
+
     public int getHoleCount() {
         return holeCount;
     }
diff --git a/src/main/java/design/model/ScrambleLeague.java b/src/main/java/design/model/ScrambleLeague.java
index adf2105..64f62f5 100644
--- a/src/main/java/design/model/ScrambleLeague.java
+++ b/src/main/java/design/model/ScrambleLeague.java
@@ -89,17 +89,17 @@ public class ScrambleLeague extends League {
         return getTotalTeamScores();
     }
 
-    @Override
-    public void finalizeMatch(Match match) {
-        getCompletedMatches().add(match);
-        for(int i = 0; i < participants.size(); i++){
-            Team team = participants.get(i);
-            Round round = match.getRoundFor(i);
-            if(round != null){
-                for(Golfer member : team.getMembers()){
-                    member.addRound(round);
-                }
-            }
-        }
-    }
+//    @Override
+//    public void finalizeMatch(Match match) {
+//        getCompletedMatches().add(match);
+//        for(int i = 0; i < participants.size(); i++){
+//            Team team = participants.get(i);
+//            Round round = match.getRoundFor(i);
+//            if(round != null){
+//                for(Golfer member : team.getMembers()){
+//                    member.addRound(round);
+//                }
+//            }
+//        }
+//    }
 }
diff --git a/src/main/java/design/model/StrokeLeague.java b/src/main/java/design/model/StrokeLeague.java
index 48889b7..497db20 100644
--- a/src/main/java/design/model/StrokeLeague.java
+++ b/src/main/java/design/model/StrokeLeague.java
@@ -73,15 +73,15 @@ public class StrokeLeague extends League {
         return getTotalStrokes();
     }
 
-    @Override
-    public void finalizeMatch(Match match) {
-        getCompletedMatches().add(match);
-        for(int i = 0; i < participants.size(); i++){
-            Golfer player = participants.get(i);
-            Round round = match.getRoundFor(i);
-            if(round != null){
-                player.addRound(round);
-            }
-        }
-    }
+//    @Override
+//    public void finalizeMatch(Match match) {
+//        getCompletedMatches().add(match);
+//        for(int i = 0; i < participants.size(); i++){
+//            Golfer player = participants.get(i);
+//            Round round = match.getRoundFor(i);
+//            if(round != null){
+//                player.addRound(round);
+//            }
+//        }
+//    }
 }