MODTEMPENG-117: adjust tests

Author: mukhiddin-yusuf

NEWS.md

@@ -1,3 +1,6 @@
+## 2025-XX-XX v1.23.0-SNAPSHOT
+* Replace `mod-configuration` with `mod-settings` to get language and locale settings ([MODTEMPENG-117](https://folio-org.atlassian.net/browse/MODTEMPENG-117))
+
 ## 2025-03-13 v1.22.0
 * Support barcode image generate for HRID tokens (MODTEMPENG-111)
 * Upgrade Java and RMB version for Sunflower (FOLIO-4220)

ramls/configuration.json

@@ -0,0 +1,23 @@
+{
+  "type": "object",
+  "description": "Collection of settings records",
+  "properties": {
+    "items": {
+      "id": "settingsData",
+      "description": "List of settings records",
+      "type": "array",
+      "items": {
+        "type": "object",
+        "$ref": "entry.json"
+      }
+    },
+    "resultInfo": {
+      "$ref": "raml-util/schemas/resultInfo.schema",
+      "readonly": true
+    }
+  },
+  "additionalProperties": false,
+  "required": [
+    "items"
+  ]
+}

ramls/configurations.json

@@ -0,0 +1,38 @@
+{
+  "type": "object",
+  "description": "Setting",
+  "properties": {
+    "id": {
+      "type": "string",
+      "description": "setting id",
+      "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
+    },
+    "scope": {
+      "type": "string",
+      "description": "Scope for this entry (normally a module)"
+    },
+    "key": {
+      "type": "string",
+      "description": "Key within scope for this setting"
+    },
+    "value": {
+      "description": "Settings value (any type)"
+    },
+    "description": {
+      "type": "string",
+      "description": "Setting record description"
+    },
+    "userId": {
+      "type": "string",
+      "description": "User id",
+      "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
+    }
+  },
+  "additionalProperties": false,
+  "required": [
+    "id",
+    "scope",
+    "key",
+    "value"
+  ]
+}

ramls/entries.json

@@ -15,8 +15,8 @@ types:
   templateProcessingRequest: !include templateProcessingRequest.json
   templateProcessingResult: !include templateProcessingResult.json
   errors: !include raml-util/schemas/errors.schema
-  configuration: !include configuration.json
-  configurations: !include configurations.json
+  item: !include entry.json
+  settings: !include entries.json
 
 traits:
   pageable: !include ./raml-util/traits/pageable.raml

ramls/entry.json

@@ -42,7 +42,6 @@ private Future<JsonObject> lookupSettingsByScopeAndKey(String scope, String key,
 
     LOG.debug("lookupSettingsByScopeAndKey:: Lookup locale settings by scope {} and key {}", scope, key);
     String query = format("scope==%s and key==%s", scope, key);
-    LOG.info("lookupSettingsByScopeAndKey:: Locale settings with scope and key looked up successfully");
     return lookupSettingsByQuery(query, limit, offset);
   }
 
@@ -56,7 +55,7 @@ private Future<JsonObject> lookupSettingsByQuery(String query, int limit, int of
           throw new OkapiModuleClientException(
             format("Error getting locale settings. Status: %d, body: %s", response.statusCode(), response.body()));
         }
-        LOG.info("lookupSettingsByQuery:: Locale settings by query looked up successfully: {}", response.bodyAsJsonObject());
+        LOG.info("lookupSettingsByQuery:: Locale settings by query looked up successfully.");
       return response.bodyAsJsonObject();
     });
   }
@@ -70,7 +69,7 @@ private LocaleSettings mapToLocaleSettings(JsonObject localeSettings) {
       .map(obj -> (JsonObject)obj)
       .findFirst()
       .orElse(new JsonObject());
-    LOG.info("mapToLocaleSettings:: Found locale setting: {}", localeSetting);
+    LOG.debug("mapToLocaleSettings:: Found locale setting: {}", localeSetting);
 
     var valueObj = Optional.ofNullable(localeSetting.getJsonObject("value")).orElse(new JsonObject());
     String languageTag = valueObj.getString("locale", DEFAULT_LANGUAGE_TAG);

ramls/template-engine.raml

@@ -147,8 +147,7 @@ public Future<TemplateProcessingResult> processTemplate(TemplateProcessingReques
             .withLang(templateRequest.getLang())
             .withOutputFormat(templateRequest.getOutputFormat());
 
-          LOG.info("processTemplate:: Template processed successfully, body: {}, attachments: {}",
-            processedTemplate.getBody(), processedTemplate.getAttachments());
+          LOG.info("processTemplate:: Template processed successfully");
 
           return new TemplateProcessingResult()
             .withResult(processedTemplate)

src/main/java/org/folio/template/client/ConfigurationClient.java

@@ -53,7 +53,7 @@ public class TemplateRequestTest {
 
   private static final String TEMPLATE_PATH = "/templates";
   private static final String TEMPLATE_REQUEST_PATH = "/template-request";
-  private static final String CONFIG_REQUEST_PATH = "/configurations/entries";
+  private static final String SETTINGS_REQUEST_PATH = "/settings/entries";
 
   private static final String TXT_OUTPUT_FORMAT = "txt";
   private static final String HTML_OUTPUT_FORMAT = "html";
@@ -1004,22 +1004,25 @@ private Template createTemplateWithMultipleItems() {
   }
 
   private void mockConfigModule() {
-    Configurations configurations =
-      new Configurations().withConfigs(Collections.emptyList()).withTotalRecords(0);
-    stubFor(get(urlPathEqualTo(CONFIG_REQUEST_PATH))
-      .willReturn(okJson(toJson(mapFrom(configurations)))));
+    Settings settings =
+      new Settings().withItems(Collections.emptyList());
+    stubFor(get(urlPathEqualTo(SETTINGS_REQUEST_PATH))
+      .willReturn(okJson(toJson(mapFrom(settings)))));
   }
 
   private void mockLocaleSettings(String languageToken, String timezoneId) {
-    String localeConfigValue = new JsonObject()
+    var localeConfigValue = new JsonObject()
       .put("locale", languageToken)
-      .put("timezone", timezoneId).encode();
+      .put("timezone", timezoneId);
 
-    Config config = new Config().withValue(localeConfigValue);
-    Configurations configurations =
-      new Configurations().withConfigs(Collections.singletonList(config)).withTotalRecords(1);
+    Item setting = new Item()
+      .withScope("stripes-core.prefs.manage")
+      .withKey("tenantLocaleSettings")
+      .withValue(localeConfigValue);
+    Settings settings =
+      new Settings().withItems(Collections.singletonList(setting));
 
-    stubFor(get(urlPathEqualTo(CONFIG_REQUEST_PATH))
-      .willReturn(okJson(toJson(configurations))));
+    stubFor(get(urlPathEqualTo(SETTINGS_REQUEST_PATH))
+      .willReturn(okJson(toJson(settings))));
   }
 }