MODFQMMGR-746 Switch from mod-config to mod-settings for locale

Author: mweaver-ebsco

src/main/java/org/folio/fqm/repository/DataRefreshRepository.java

@@ -31,10 +31,7 @@ public class DataRefreshRepository {
   public static final Field<Double> EXCHANGE_RATE_FIELD = field("exchange_rate", Double.class);
   public static final String EXCHANGE_RATE_TABLE = "currency_exchange_rates";
   private static final String GET_EXCHANGE_RATE_PATH = "finance/exchange-rate";
-  private static final String GET_LOCALE_SETTINGS_PATH = "configurations/entries";
-  private static final Map<String, String> GET_LOCALE_SETTINGS_PARAMS = Map.of(
-    "query", "(module==ORG and configName==localeSettings)"
-  );
+  private static final String GET_LOCALE_SETTINGS_PATH = "locale";
 
   private static final List<String> SYSTEM_SUPPORTED_CURRENCIES = List.of(
     "USD",
@@ -120,16 +117,12 @@ public boolean refreshExchangeRates(String tenantId) {
   private String getSystemCurrencyCode() {
     log.info("Getting system currency");
     try {
-      String localeSettingsResponse = simpleHttpClient.get(GET_LOCALE_SETTINGS_PATH, GET_LOCALE_SETTINGS_PARAMS);
+      String localeSettingsResponse = simpleHttpClient.get(GET_LOCALE_SETTINGS_PATH, Map.of());
       ObjectMapper objectMapper = new ObjectMapper();
       JsonNode localeSettingsNode = objectMapper.readTree(localeSettingsResponse);
-      String valueString = localeSettingsNode
-        .path("configs")
-        .get(0)
-        .path("value")
+      return localeSettingsNode
+        .path("currency")
         .asText();
-      JsonNode valueNode = objectMapper.readTree(valueString);
-      return valueNode.path("currency").asText();
     } catch (Exception e) {
       log.info("No system currency defined, defaulting to USD");
       return "USD";

src/main/java/org/folio/fqm/service/EntityTypeService.java

@@ -78,10 +78,7 @@ public class EntityTypeService {
 
   private static final int COLUMN_VALUE_DEFAULT_PAGE_SIZE = 1000;
   private static final String LANGUAGES_FILEPATH = "languages.json5";
-  private static final String GET_LOCALE_SETTINGS_PATH = "configurations/entries";
-  private static final Map<String, String> GET_LOCALE_SETTINGS_PARAMS = Map.of(
-    "query", "(module==ORG and configName==localeSettings)"
-  );
+  private static final String GET_LOCALE_SETTINGS_PATH = "locale";
   private static final List<String> EXCLUDED_CURRENCY_CODES = List.of(
     "XUA", "AYM", "AFA", "ADP", "ATS", "AZM", "BYB", "BYR", "BEF", "BOV", "BGL", "CLF", "COU", "CUC", "CYP", "NLG", "EEK", "XBA", "XBB",
     "XBC", "XBD", "FIM", "FRF", "XFO", "XFU", "GHC", "DEM", "XAU", "GRD", "GWP", "IEP", "ITL", "LVL", "LTL", "LUF", "MGF", "MTL", "MRO", "MXV",
@@ -395,16 +392,10 @@ private ColumnValues getLanguages(String searchText, List<String> tenantsToQuery
 
     Locale folioLocale;
     try {
-      String localeSettingsResponse = simpleHttpClient.get(GET_LOCALE_SETTINGS_PATH, GET_LOCALE_SETTINGS_PARAMS);
+      String localeSettingsResponse = simpleHttpClient.get(GET_LOCALE_SETTINGS_PATH, Map.of());
       ObjectMapper objectMapper = new ObjectMapper();
       JsonNode localeSettingsNode = objectMapper.readTree(localeSettingsResponse);
-      String valueString = localeSettingsNode
-        .path("configs")
-        .get(0)
-        .path("value")
-        .asText();
-      JsonNode valueNode = objectMapper.readTree(valueString);
-      String localeString = valueNode.path("locale").asText();
+      String localeString = localeSettingsNode.path("locale").asText();
       folioLocale = new Locale(localeString.substring(0, 2)); // Java locales are in form xx, FOLIO stores locales as xx-YY
     } catch (Exception e) {
       log.debug("No default locale defined. Defaulting to English for language translations.");

src/main/resources/entity-types/configuration/simple_config_data.json5

@@ -2,10 +2,6 @@
   id: '7a14b9b7-701b-4f81-bdb3-c4dee4121fdf',
   name: 'composite_po_instance',
   private: false,
-  requiredPermissions: [
-    // This inherited from simple_config_data, but is also included here because of the added columns here that also retrieve config data
-    'configuration.entries.collection.get',
-  ],
   sources: [
     {
       alias: 'pol',

src/main/resources/entity-types/orders/composite_po_instance.json5

@@ -112,14 +112,6 @@
       queryable: true,
       visibleByDefault: false,
       valueGetter: ":sourceAlias.jsonb->>'billTo'",
-      joinsTo: [
-        {
-          targetId: 'abb28bac-e090-48c1-a48b-3fe805638041',
-          targetField: 'id',
-          type: 'equality-cast-uuid',
-          direction: 'left',
-        },
-      ],
     },
     {
       name: 'close_reason',
@@ -298,14 +290,6 @@
       queryable: true,
       visibleByDefault: false,
       valueGetter: ":sourceAlias.jsonb->>'shipTo'",
-      joinsTo: [
-        {
-          targetId: 'abb28bac-e090-48c1-a48b-3fe805638041',
-          targetField: 'id',
-          type: 'equality-cast-uuid',
-          direction: 'left',
-        },
-      ],
     },
     {
       name: 'template',