From b415d22cafbae7478d9175b16521b440e0a25e0b Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Tue, 18 Jun 2024 15:51:27 +0300
Subject: [PATCH] LocaleUtil treat empty currency as RUB

---
 .../src/main/java/ru/spcex/clearing/util/LocaleUtil.java  | 8 ++++----
 .../java/ru/spcex/platform/enumeration/CurrencyCode.java  | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/util/LocaleUtil.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/util/LocaleUtil.java
index d1563e9bc..864b5a36d 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/util/LocaleUtil.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/util/LocaleUtil.java
@@ -13,7 +13,7 @@ public class LocaleUtil {
     }
 
     public static Locale locale(Account acc) {
-        if (CurrencyCode.isRub(acc.getCurrency())) {
+        if (CurrencyCode.isRubDefault(acc.getCurrency())) {
             return ru;
         } else {
             return eng;
@@ -22,10 +22,10 @@ public class LocaleUtil {
 
     public static Locale locale(String... currencyCode) {
         for (String s : currencyCode) {
-            if (CurrencyCode.isRub(s)) {
-                return ru;
+            if (!CurrencyCode.isRubDefault(s)) {
+                return eng;
             }
         }
-        return eng;
+        return ru;
     }
 }
diff --git a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/CurrencyCode.java b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/CurrencyCode.java
index 2404d3b9f..f8d564186 100644
--- a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/CurrencyCode.java
+++ b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/CurrencyCode.java
@@ -1,6 +1,7 @@
 package ru.spcex.platform.enumeration;
 
 import ru.spcex.platform.utils.enumeration.IEnumKey;
+import ru.spcex.platform.utils.text.TextUtil;
 
 public enum CurrencyCode implements IEnumKey {
     RUB("RUB"),
@@ -12,6 +13,11 @@ public enum CurrencyCode implements IEnumKey {
     public static boolean isRub(String currencyCode) {
         return  IEnumKey.containsIgnoreCase(currencyCode, RUB, RUR, SUR);
     }
+
+    public static boolean isRubDefault(String currencyCode) {
+        return TextUtil.isEmpty(currencyCode) || isRub(currencyCode);
+    }
+
     private final String key;
 
     CurrencyCode(String key) {