BAEL-8198: full impl

Author: etrandafir93

patterns-modules/data-oriented-programming/src/main/java/com/baeldung/patterns/dataoriented/ScoringRules.java

@@ -2,14 +2,15 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import static java.util.Comparator.reverseOrder;
 import static java.util.function.Function.identity;
 import static java.util.stream.Collectors.counting;
 import static java.util.stream.Collectors.groupingBy;
 
 public class ScoringRules {
-	static int calculatePairs(List<Integer> dices, int nrOfPairs) {
+	static int pairs(List<Integer> dices, int nrOfPairs) {
 		Map<Integer, Long> frequency = dices.stream()
 				.collect(groupingBy(identity(), counting()));
 
@@ -30,4 +31,23 @@ static int calculatePairs(List<Integer> dices, int nrOfPairs) {
 				.sum();
 	}
 
+	public static Integer moreOfSameKind(List<Integer> roll, int nrOfDicesOfSameKind) {
+		Map<Integer, Long> frequency = roll.stream()
+				.collect(groupingBy(identity(), counting()));
+
+		Optional<Integer> diceValue = frequency.entrySet().stream()
+				.filter(entry -> entry.getValue() >= nrOfDicesOfSameKind)
+				.map(Map.Entry::getKey)
+				.max(Integer::compare);
+
+		return diceValue.map(it -> it * nrOfDicesOfSameKind)
+				.orElse(0);
+	}
+
+	public static Integer specificValue(List<Integer> dices, Integer value) {
+		return dices.stream()
+				.filter(value::equals)
+				.mapToInt(it -> it)
+				.sum();
+	}
 }

patterns-modules/data-oriented-programming/src/main/java/com/baeldung/patterns/dataoriented/YahtzeeDO.java

@@ -1,8 +1,10 @@
 package com.baeldung.patterns.dataoriented;
 
 
+import com.baeldung.patterns.dataoriented.plays.MoreOfTheSameKind;
 import com.baeldung.patterns.dataoriented.plays.Pairs;
 import com.baeldung.patterns.dataoriented.plays.PlayedHand;
+import com.baeldung.patterns.dataoriented.plays.SpecificDiceValue;
 
 import java.util.List;
 
@@ -12,11 +14,11 @@ public enum Strategy {
 		ONES, TWOS, THREES, FOURS, FIVES, SIXES, PAIR, TWO_PAIRS, THREE_OF_A_KIND, FOUR_OF_A_KIND;
 	}
 
-	public Integer calculateScore(List<Integer> dices, Strategy strategy) {
-		PlayedHand hand = PlayFactory.createPlayedHand(dices, strategy);
-		return switch (hand) {
-			case Pairs p -> ScoringRules.calculatePairs(p.dices(), p.nrOfPairs());
-			default -> 0;
+	public static int calculateScore(List<Integer> dices, Strategy strategy) {
+		return switch (PlayFactory.createPlayedHand(dices, strategy)) {
+			case SpecificDiceValue(List<Integer> roll, int value) -> ScoringRules.specificValue(roll, value);
+			case Pairs(List<Integer> roll, int pairsCount) -> ScoringRules.pairs(roll, pairsCount);
+			case MoreOfTheSameKind(List<Integer> roll, int sameKindCount) -> ScoringRules.moreOfSameKind(roll, sameKindCount);
 		};
 	}
 

patterns-modules/data-oriented-programming/src/test/java/com/baeldung/patterns/objectoriented/YahtzeeTest.java renamed to patterns-modules/data-oriented-programming/src/test/java/com/baeldung/patterns/YahtzeeTest.java

@@ -1,7 +1,7 @@
-package com.baeldung.patterns.objectoriented;
+package com.baeldung.patterns;
 
 import com.baeldung.patterns.dataoriented.YahtzeeDO;
-import com.baeldung.patterns.objectoriented.YahtzeeOO.Strategy;
+import com.baeldung.patterns.objectoriented.YahtzeeOO;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -40,7 +40,7 @@ void testCalculateScore_OO(List<Integer> dices, String strategyStr, Integer expe
 	void testCalculateScore_DO(List<Integer> dices, String strategyStr, Integer expectedScore) {
 		YahtzeeDO.Strategy strategy = YahtzeeDO.Strategy.valueOf(strategyStr);
 
-		Integer actualScore = new YahtzeeDO().calculateScore(dices, strategy);
+		Integer actualScore = YahtzeeDO.calculateScore(dices, strategy);
 
 		assertEquals(expectedScore, actualScore,
 				() -> String.format("Failed for roll %s and category %s", dices, strategy));