exception two and nine passing

pauldambra · pauldambra · commit ae6efeb82bcd · 2017-06-18T23:06:24.000+01:00
diff --git a/src/main/java/com/dambra/paul/moduluschecker/Account/BankAccount.java b/src/main/java/com/dambra/paul/moduluschecker/Account/BankAccount.java
@@ -36,6 +36,14 @@ public int getNumberAt(int i) {
         return allDigits().toArray(Integer[]::new)[i];
     }
 
+    @Override
+    public String toString() {
+        return "BankAccount{" +
+                "sortCode='" + sortCode + '\'' +
+                ", accountNumber='" + accountNumber + '\'' +
+                '}';
+    }
+
     private static class NonStandardAccounts {
         public static String[] corrections(String sortCode, String accountNumber) {
 
diff --git a/src/main/java/com/dambra/paul/moduluschecker/ModulusChecker.java b/src/main/java/com/dambra/paul/moduluschecker/ModulusChecker.java
@@ -2,6 +2,9 @@
 
 import com.dambra.paul.moduluschecker.Account.BankAccount;
 import com.dambra.paul.moduluschecker.chain.*;
+import com.dambra.paul.moduluschecker.chain.checks.DoubleAlternateCheck;
+import com.dambra.paul.moduluschecker.chain.checks.ModulusElevenCheck;
+import com.dambra.paul.moduluschecker.chain.checks.ModulusTenCheck;
 import com.dambra.paul.moduluschecker.valacdosFile.ModulusWeightRows;
 
 import java.util.Optional;
@@ -23,6 +26,7 @@ public Boolean checkBankAccount(String sortCode, String accountNumber) {
 
         Boolean firstResult = modulusResults.firstCheck.orElse(false);
         Boolean secondResult = modulusResults.secondCheck.orElse(false);
+
         return firstResult || secondResult;
     }
 
diff --git a/src/main/java/com/dambra/paul/moduluschecker/chain/FirstModulusCheckRouter.java b/src/main/java/com/dambra/paul/moduluschecker/chain/FirstModulusCheckRouter.java
@@ -1,6 +1,9 @@
 package com.dambra.paul.moduluschecker.chain;
 
 import com.dambra.paul.moduluschecker.ModulusCheckParams;
+import com.dambra.paul.moduluschecker.chain.checks.DoubleAlternateCheck;
+import com.dambra.paul.moduluschecker.chain.checks.ModulusElevenCheck;
+import com.dambra.paul.moduluschecker.chain.checks.ModulusTenCheck;
 import com.dambra.paul.moduluschecker.valacdosFile.WeightRow;
 
 import java.util.Optional;
diff --git a/src/main/java/com/dambra/paul/moduluschecker/chain/SecondModulusCheckGate.java b/src/main/java/com/dambra/paul/moduluschecker/chain/SecondModulusCheckGate.java
@@ -14,6 +14,12 @@ public SecondModulusCheckGate(SecondModulusCheckRouter next) {
     public ModulusResult check(ModulusCheckParams params) {
         if (!params.getSecondWeightRow().isPresent()) { return params.getModulusResult().get(); }
 
+        if (params.getFirstWeightRow().get().isExceptionTwo()) {
+            if (params.getModulusResult().get().firstCheck.get()) {
+                return params.getModulusResult().get();
+            }
+        }
+
         return next.check(params);
     }
 }
diff --git a/src/main/java/com/dambra/paul/moduluschecker/chain/SecondModulusCheckRouter.java b/src/main/java/com/dambra/paul/moduluschecker/chain/SecondModulusCheckRouter.java
@@ -1,9 +1,13 @@
 package com.dambra.paul.moduluschecker.chain;
 
-import com.dambra.paul.moduluschecker.Account.BankAccount;
 import com.dambra.paul.moduluschecker.ModulusCheckParams;
+import com.dambra.paul.moduluschecker.chain.checks.DoubleAlternateCheck;
+import com.dambra.paul.moduluschecker.chain.checks.ModulusElevenCheck;
+import com.dambra.paul.moduluschecker.chain.checks.ModulusTenCheck;
 import com.dambra.paul.moduluschecker.valacdosFile.WeightRow;
 
+import java.util.function.Function;
+
 public class SecondModulusCheckRouter implements ModulusChainCheck {
     private final DoubleAlternateCheck doubleAlternateCheck;
     private final ModulusTenCheck modulusTenCheck;
@@ -27,25 +31,16 @@ public ModulusResult check(ModulusCheckParams params) {
             return params.getModulusResult().get();
         }
 
-
-        if (isExceptionTwoAndNineWithFailingFirstCheck(params)) {
-            params = new ModulusCheckParams(
-                    new BankAccount(BankAccount.LLOYDS_EURO_SORT_CODE, params.getAccount().accountNumber),
-                    params.getFirstWeightRow(),
-                    params.getSecondWeightRow(),
-                    params.getModulusResult()
-            );
-        }
-
+        Function<ModulusCheckParams, WeightRow> rowSelector = p -> p.getSecondWeightRow().get();
         switch (params.getSecondWeightRow().get().modulusAlgorithm) {
             case DOUBLE_ALTERNATE:
-                result = doubleAlternateCheck.check(params, p -> p.getSecondWeightRow().get());
+                result = doubleAlternateCheck.check(params, rowSelector);
                 break;
             case MOD10:
-                result = modulusTenCheck.check(params, p -> p.getSecondWeightRow().get());
+                result = modulusTenCheck.check(params, rowSelector);
                 break;
             case MOD11:
-                result = modulusElevenCheck.check(params, p -> p.getSecondWeightRow().get());
+                result = modulusElevenCheck.check(params, rowSelector);
                 break;
         }
 
@@ -60,11 +55,4 @@ private boolean isExceptionTwoAndNineWithPassingFirstCheck(ModulusCheckParams pa
 
         return isExceptionTwoAndNine && hasResults && hasFirstCheckResult && firstCheckSucceeded;
     }
-
-    private boolean isExceptionTwoAndNineWithFailingFirstCheck(ModulusCheckParams params) {
-        return WeightRow.isExceptionTwoAndNine(params.getFirstWeightRow(), params.getSecondWeightRow())
-                && params.getModulusResult().isPresent()
-                && params.getModulusResult().get().firstCheck.isPresent()
-                && !params.getModulusResult().get().firstCheck.get();
-    }
 }
diff --git a/src/main/java/com/dambra/paul/moduluschecker/chain/checks/DoubleAlternateCheck.java b/src/main/java/com/dambra/paul/moduluschecker/chain/checks/DoubleAlternateCheck.java
@@ -1,4 +1,4 @@
-package com.dambra.paul.moduluschecker.chain;
+package com.dambra.paul.moduluschecker.chain.checks;
 
 import com.dambra.paul.moduluschecker.As;
 import com.dambra.paul.moduluschecker.ModulusCheckParams;
diff --git a/src/main/java/com/dambra/paul/moduluschecker/chain/checks/LloydsAlternateModulusElevenCheck.java b/src/main/java/com/dambra/paul/moduluschecker/chain/checks/LloydsAlternateModulusElevenCheck.java
@@ -0,0 +1,28 @@
+package com.dambra.paul.moduluschecker.chain.checks;
+
+import com.dambra.paul.moduluschecker.Account.BankAccount;
+import com.dambra.paul.moduluschecker.ModulusCheckParams;
+import com.dambra.paul.moduluschecker.valacdosFile.WeightRow;
+import com.google.common.collect.Streams;
+
+import java.util.function.Function;
+
+public final class LloydsAlternateModulusElevenCheck {
+    public Boolean check(ModulusCheckParams params, Function<ModulusCheckParams, WeightRow> rowSelector) {
+        WeightRow selectedRow = rowSelector.apply(params);
+
+        if (!WeightRow.isExceptionTwoAndNine(params.getFirstWeightRow(), params.getSecondWeightRow())) {
+            return false;
+        }
+
+        BankAccount account = new BankAccount(BankAccount.LLOYDS_EURO_SORT_CODE, params.getAccount().accountNumber);
+
+        int total = Streams.zip(
+                account.allDigits(),
+                selectedRow.getWeights().stream(),
+                (l, r) -> l * r
+        ).reduce(0, Integer::sum);
+
+        return total % 11 == 0;
+    }
+}
diff --git a/src/main/java/com/dambra/paul/moduluschecker/chain/checks/ModulusElevenCheck.java b/src/main/java/com/dambra/paul/moduluschecker/chain/checks/ModulusElevenCheck.java
@@ -1,4 +1,4 @@
-package com.dambra.paul.moduluschecker.chain;
+package com.dambra.paul.moduluschecker.chain.checks;
 
 import com.dambra.paul.moduluschecker.Account.BankAccount;
 import com.dambra.paul.moduluschecker.ModulusCheckParams;
@@ -23,8 +23,15 @@ public Boolean check(ModulusCheckParams params, Function<ModulusCheckParams, Wei
 
         int remainder = total % 11;
 
-        boolean isExceptionFour = selectedRow.isExceptionFour();
-        return isExceptionFour ? remainder == exceptionFourCheckDigit(params) : remainder == 0;
+        if (selectedRow.isExceptionFour()) {
+            return remainder == exceptionFourCheckDigit(params);
+        }
+        else {
+            boolean result = remainder == 0;
+            if (result) { return true; }
+
+            return new LloydsAlternateModulusElevenCheck().check(params, rowSelector);
+        }
     }
 
     private int exceptionFourCheckDigit(ModulusCheckParams params) {
@@ -34,7 +41,7 @@ private int exceptionFourCheckDigit(ModulusCheckParams params) {
     }
 
     private ImmutableList<Integer> CheckForExceptionTwoAndNine(ModulusCheckParams params, WeightRow selectedRow) {
-        if (!WeightRow.isExceptionTwoAndNine(java.util.Optional.ofNullable(selectedRow), params.getSecondWeightRow())) {
+        if (!WeightRow.isExceptionTwoAndNine(params.getFirstWeightRow(), params.getSecondWeightRow())) {
             return selectedRow.getWeights();
         }
 
@@ -43,9 +50,9 @@ private ImmutableList<Integer> CheckForExceptionTwoAndNine(ModulusCheckParams pa
         }
 
         if (params.getAccount().getNumberAt(BankAccount.G) == 9) {
-            return ImmutableList.of(0, 0, 1, 2, 5, 3, 6, 4, 8, 7, 10, 9, 3, 1);
-        } else {
             return ImmutableList.of(0, 0, 0, 0, 0, 0, 0, 0, 8, 7, 10, 9, 3, 1);
+        } else {
+            return ImmutableList.of(0, 0, 1, 2, 5, 3, 6, 4, 8, 7, 10, 9, 3, 1);
         }
     }
 
diff --git a/src/main/java/com/dambra/paul/moduluschecker/chain/checks/ModulusTenCheck.java b/src/main/java/com/dambra/paul/moduluschecker/chain/checks/ModulusTenCheck.java
@@ -1,4 +1,4 @@
-package com.dambra.paul.moduluschecker.chain;
+package com.dambra.paul.moduluschecker.chain.checks;
 
 import com.dambra.paul.moduluschecker.ModulusCheckParams;
 import com.dambra.paul.moduluschecker.valacdosFile.WeightRow;
diff --git a/src/main/java/com/dambra/paul/moduluschecker/valacdosFile/ModulusWeightRows.java b/src/main/java/com/dambra/paul/moduluschecker/valacdosFile/ModulusWeightRows.java
@@ -24,38 +24,30 @@ public ModulusWeightRows(List<ValacdosRow> valacdosRows) {
         this.valacdosRows = ImmutableList.copyOf(valacdosRows);
     }
 
-    private ImmutableListMultimap<String, WeightRow> expand(ImmutableMap<SortCodeRange, WeightRow> weights) {
-        ListMultimap<String, WeightRow> expandedRows = ArrayListMultimap.create();
-        weights.forEach((scr, weightRow) -> scr.fullRange()
-                                               .forEach(sc -> expandedRows.put(sc, weightRow)));
-        return ImmutableListMultimap.copyOf(expandedRows);
-    }
-
     public ModulusCheckParams FindFor(BankAccount account) {
 
         WeightRow first = null;
         WeightRow second = null;
 
         for (ValacdosRow vr : this.valacdosRows) {
+            boolean stillSeekingFirstMatch = first == null;
+
             if (!vr.getSortCodeRange().contains(account.sortCode)) {
-                if (first == null) {
+                if (stillSeekingFirstMatch) {
                     continue;
                 } else {
                     break;
                 }
             }
 
-            if (first == null) {
+            if (stillSeekingFirstMatch) {
                 first = vr.getWeightRow();
                 continue;
             }
 
             second = vr.getWeightRow();
         }
 
-        System.out.println("first: " + first);
-        System.out.println("second: " + second);
-
         return new ModulusCheckParams(
                 account,
                 Optional.ofNullable(first),
diff --git a/src/main/java/com/dambra/paul/moduluschecker/valacdosFile/SortCodeRange.java b/src/main/java/com/dambra/paul/moduluschecker/valacdosFile/SortCodeRange.java
@@ -46,14 +46,6 @@ public static Optional<SortCodeRange> parse(String input) {
                         parts.get(HIGHEST_SORT_CODE_INDEX)));
     }
 
-    public boolean isAfter(String sortCode) {
-        return asInteger(sortCode) < start;
-    }
-
-    public boolean isBefore(String sortCode) {
-        return end < asInteger(sortCode);
-    }
-
     public boolean contains(String sortCode) {
         int i = asInteger(sortCode);
         return start <= i && i <= end;
diff --git a/src/main/java/com/dambra/paul/moduluschecker/valacdosFile/WeightRow.java b/src/main/java/com/dambra/paul/moduluschecker/valacdosFile/WeightRow.java
@@ -29,14 +29,12 @@ public WeightRow(ModulusAlgorithm modulusAlgorithm, List<Integer> weights, Optio
     }
 
     public static boolean isExceptionTwoAndNine(Optional<WeightRow> firstRow, Optional<WeightRow> secondWeightRow) {
-        System.out.println("first row: " + firstRow.get().exception);
         return firstRow.isPresent()
                 && firstRow.get().isExceptionTwo()
                 && secondCheckIsExceptionNine(secondWeightRow);
     }
 
     private static boolean secondCheckIsExceptionNine(Optional<WeightRow> secondWeightRow) {
-        System.out.println("second row: " + secondWeightRow.get().exception);
         return secondWeightRow.isPresent()
                 && secondWeightRow.get().isExceptionNine();
     }
diff --git a/src/test/java/DoubleAlternateTests.java b/src/test/java/DoubleAlternateTests.java
@@ -1,6 +1,6 @@
 import com.dambra.paul.moduluschecker.*;
 import com.dambra.paul.moduluschecker.Account.BankAccount;
-import com.dambra.paul.moduluschecker.chain.DoubleAlternateCheck;
+import com.dambra.paul.moduluschecker.chain.checks.DoubleAlternateCheck;
 import com.dambra.paul.moduluschecker.valacdosFile.WeightRow;
 import com.google.common.collect.ImmutableList;
 import org.junit.Test;
diff --git a/src/test/java/ModulusElevenTests.java b/src/test/java/ModulusElevenTests.java
@@ -2,7 +2,7 @@
 import com.dambra.paul.moduluschecker.ModulusAlgorithm;
 import com.dambra.paul.moduluschecker.ModulusCheckParams;
 import com.dambra.paul.moduluschecker.valacdosFile.WeightRow;
-import com.dambra.paul.moduluschecker.chain.ModulusElevenCheck;
+import com.dambra.paul.moduluschecker.chain.checks.ModulusElevenCheck;
 import com.google.common.collect.ImmutableList;
 import org.junit.Test;
 
diff --git a/src/test/java/ModulusTenTests.java b/src/test/java/ModulusTenTests.java
@@ -1,6 +1,6 @@
 import com.dambra.paul.moduluschecker.*;
 import com.dambra.paul.moduluschecker.Account.BankAccount;
-import com.dambra.paul.moduluschecker.chain.ModulusTenCheck;
+import com.dambra.paul.moduluschecker.chain.checks.ModulusTenCheck;
 import com.dambra.paul.moduluschecker.valacdosFile.WeightRow;
 import com.google.common.collect.ImmutableList;
 import org.junit.Test;
diff --git a/src/test/java/SortCodeRangeTests.java b/src/test/java/SortCodeRangeTests.java
@@ -1,42 +1,11 @@
 import com.dambra.paul.moduluschecker.valacdosFile.SortCodeRange;
 import org.junit.Test;
 
-import java.util.stream.Stream;
-
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsEqual.equalTo;
 
 public class SortCodeRangeTests {
-    @Test
-    public void CanMakeSingleItemRange() {
-        SortCodeRange sortCodeRange = new SortCodeRange("010023", "010023");
-        Assert.thatStreamEquals(sortCodeRange.fullRange(), Stream.of("010023"));
-    }
-
-    @Test
-    public void SortCodeRangeCanExpandTheRange() {
-        SortCodeRange scr = new SortCodeRange("010004", "010010");
-        Stream<String> expectedRange = Stream.of("010004", "010005", "010006", "010007", "010008", "010009", "010010");
-        Assert.thatStreamEquals(expectedRange, scr.fullRange());
-    }
-
-    @Test
-    public void SortCodeRangeCanBeAfter() {
-        SortCodeRange range = new SortCodeRange("010004", "010010");
-        assertThat(range.isAfter("010003"), is(equalTo(true)));
-        assertThat(range.isAfter("010004"), is(equalTo(false)));
-        assertThat(range.isAfter("010005"), is(equalTo(false)));
-    }
-
-    @Test
-    public void SortCodeRangeCanBeBefore() {
-        SortCodeRange range = new SortCodeRange("010004", "010010");
-        assertThat(range.isBefore("010009"), is(equalTo(false)));
-        assertThat(range.isBefore("010010"), is(equalTo(false)));
-        assertThat(range.isBefore("010011"), is(equalTo(true)));
-    }
-
     @Test
     public void SortCodeRangeCanContain() {
         SortCodeRange range = new SortCodeRange("010004", "010006");

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,12 @@ public SecondModulusCheckGate(SecondModulusCheckRouter next) {`
`14`	`14`	`public ModulusResult check(ModulusCheckParams params) {`
`15`	`15`	`if (!params.getSecondWeightRow().isPresent()) { return params.getModulusResult().get(); }`
`16`	`16`
	`17`	`+ if (params.getFirstWeightRow().get().isExceptionTwo()) {`
	`18`	`+ if (params.getModulusResult().get().firstCheck.get()) {`
	`19`	`+ return params.getModulusResult().get();`
	`20`	`+ }`
	`21`	`+ }`
	`22`	`+`
`17`	`23`	`return next.check(params);`
`18`	`24`	`}`
`19`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.dambra.paul.moduluschecker.chain;`
	`1`	`+package com.dambra.paul.moduluschecker.chain.checks;`
`2`	`2`
`3`	`3`	`import com.dambra.paul.moduluschecker.As;`
`4`	`4`	`import com.dambra.paul.moduluschecker.ModulusCheckParams;`