Sync changes from 1.3.0 to master

GENERALBYTESCOM · Feb 23, 2024 · 3404042 · 3404042
2 parents 6342b94 + 618e5d8
commit 3404042
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # buildscript - project id
 projectGroup=com.generalbytes.batm.public
-projectVersion=1.4.5
+projectVersion=1.4.6
 
 # buildscript - common dependency versions
 bitrafaelVersion=1.0.44

diff --git a/...eneralbytes/batm/server/extensions/extra/bitcoin/exchanges/bitfinex/BitfinexExchange.java b/...eneralbytes/batm/server/extensions/extra/bitcoin/exchanges/bitfinex/BitfinexExchange.java
@@ -77,6 +77,9 @@ public class BitfinexExchange implements IExchangeAdvanced, IRateSourceAdvanced
 
     static {
         FIAT_CURRENCIES.add(FiatCurrency.USD.getCode());
+        FIAT_CURRENCIES.add(FiatCurrency.EUR.getCode());
+        FIAT_CURRENCIES.add(FiatCurrency.GBP.getCode());
+        FIAT_CURRENCIES.add(FiatCurrency.JPY.getCode());
         FIAT_CURRENCIES.add(CryptoCurrency.USDT.getCode());
     }
 

diff --git a/...ain/java/com/generalbytes/batm/server/extensions/extra/watchlists/ca/ParsedSanctions.java b/...ain/java/com/generalbytes/batm/server/extensions/extra/watchlists/ca/ParsedSanctions.java
@@ -36,7 +36,7 @@ public Set<Match> search(String firstName, String lastName) {
                         matchedParties.add(new Match(getPartyId(item), 100));
                         continue;
                     }
-                    if (containsSubstring(lastName, item.getAliases())) {
+                    if (aliasContainsLastName(lastName, item.getAliases())) {
                         matchedParties.add(new Match(getPartyId(item), 50));
                     }
                 }
@@ -56,7 +56,7 @@ public Set<Match> search(String firstName, String lastName) {
                     }
                     continue;
                 }
-                if (containsSubstring(lastName, item.getAliases())) {
+                if (aliasContainsLastName(lastName, item.getAliases())) {
                     candidateRecords.add(item);
                 }
             }
@@ -111,4 +111,18 @@ private String fixCountryName(String countryRaw) {
     private boolean containsSubstring(String substring, String input) {
         return input != null && input.toLowerCase().contains(substring.toLowerCase());
     }
+
+    private boolean aliasContainsLastName(String lastName, String alias) {
+        if (alias == null) {
+            return false;
+        }
+        String aliasNoSeparators = alias.replaceAll(";", "");
+        String[] aliasWords = aliasNoSeparators.split(" ");
+        for (String aliasWord : aliasWords) {
+            if (aliasWord.equalsIgnoreCase(lastName)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
diff --git a/...java/com/generalbytes/batm/server/extensions/extra/watchlists/ca/ParsedSanctionsTest.java b/...java/com/generalbytes/batm/server/extensions/extra/watchlists/ca/ParsedSanctionsTest.java
@@ -58,6 +58,15 @@ public void testSearchNotFound() {
         assertTrue(result.isEmpty());
     }
 
+    @Test
+    public void testSearchAliasNoMatch() {
+        final Record record = createRecord("Vladimir Rudolfovich", "SOLOVYOV");
+        record.setAliases("Владимир Рудольфович Соловьёв; Vladimir Solovev; Soloviev");
+        final ParsedSanctions parsedSanctions = initializeParsedSanctions(record);
+        Set<Match> result = parsedSanctions.search("Unknown", "Vlad");
+        assertTrue(result.isEmpty());
+    }
+
     private void assertMatch(Set<Match> result, int i) {
         assertEquals(1, result.size());
         final Match foundMatch = result.iterator().next();