added zoho alternative acronym

europeana · Dec 16, 2024 · 35cdb61 · 35cdb61
1 parent 9bddcf9
commit 35cdb61
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/...src/integration-test/java/eu/europeana/entitymanagement/service/DereferenceServiceIT.java b/...src/integration-test/java/eu/europeana/entitymanagement/service/DereferenceServiceIT.java
@@ -77,9 +77,8 @@ public void zohoOrganizationDereferenceTest() throws Exception {
     Organization org = (Organization) orgOptional.get();
     assertEquals(2, org.getPrefLabel().size());
     assertNull(org.getAltLabel());
-    assertEquals(1, org.getAcronym().size());
+    assertEquals(2, org.getAcronym().size());
     assertEquals(1, org.getEuropeanaRole().size());
-    assertEquals(1, org.getAcronym().size());
     Assertions.assertNotNull(org.getHomepage());
     Assertions.assertNotNull(org.getLogo());
     Assertions.assertNotNull(org.getAddress().getVcardStreetAddress());

diff --git a/...gration-test/java/eu/europeana/entitymanagement/testutils/ZohoRecordTestDeserializer.java b/...gration-test/java/eu/europeana/entitymanagement/testutils/ZohoRecordTestDeserializer.java
@@ -1,6 +1,7 @@
 package eu.europeana.entitymanagement.testutils;
 
 import static eu.europeana.entitymanagement.zoho.utils.ZohoConstants.ACCOUNT_NAME_FIELD;
+import static eu.europeana.entitymanagement.zoho.utils.ZohoConstants.ACRONYM_1_FIELD;
 import static eu.europeana.entitymanagement.zoho.utils.ZohoConstants.ACRONYM_FIELD;
 import static eu.europeana.entitymanagement.zoho.utils.ZohoConstants.AGGREGATING_FROM;
 import static eu.europeana.entitymanagement.zoho.utils.ZohoConstants.AGGREGATORS;
@@ -18,6 +19,7 @@
 import static eu.europeana.entitymanagement.zoho.utils.ZohoConstants.ID_FIELD;
 import static eu.europeana.entitymanagement.zoho.utils.ZohoConstants.INDUSTRY_FIELD;
 import static eu.europeana.entitymanagement.zoho.utils.ZohoConstants.LANGUAGE_CODE_LENGTH;
+import static eu.europeana.entitymanagement.zoho.utils.ZohoConstants.LANG_ACRONYM_1_FIELD;
 import static eu.europeana.entitymanagement.zoho.utils.ZohoConstants.LANG_ACRONYM_FIELD;
 import static eu.europeana.entitymanagement.zoho.utils.ZohoConstants.LANG_ALTERNATIVE_FIELD;
 import static eu.europeana.entitymanagement.zoho.utils.ZohoConstants.LANG_ORGANIZATION_NAME_FIELD;
@@ -62,6 +64,8 @@ public class ZohoRecordTestDeserializer extends StdDeserializer<Record> {
           LANG_ORGANIZATION_NAME_FIELD,
           LANG_ACRONYM_FIELD,
           ACRONYM_FIELD,
+          LANG_ACRONYM_1_FIELD,
+          ACRONYM_1_FIELD,
           LOGO_LINK_TO_WIKIMEDIACOMMONS_FIELD,
           WEBSITE_FIELD,
           STREET_FIELD,

diff --git a/...ement-tests/src/integration-test/resources/zoho-deref/organization_zoho_bnf_response.json b/...ement-tests/src/integration-test/resources/zoho-deref/organization_zoho_bnf_response.json
@@ -24,5 +24,7 @@
   "Logo" : "http://commons.wikimedia.org/wiki/Special:FilePath/Logo_BnF.svg",
   "Continent" : "Europe",
   "Tag" : [ ],
-  "Acronym" : "BnF"
+  "Acronym" : "BnF",
+  "Alternative_Acronym_1" : "FNL",
+  "Lang_Acronym_1" : "EN(English)"
 }
diff --git a/.../main/java/eu/europeana/entitymanagement/zoho/organization/ZohoOrganizationConverter.java b/.../main/java/eu/europeana/entitymanagement/zoho/organization/ZohoOrganizationConverter.java
@@ -47,7 +47,13 @@ public static void fillOrganizationInfoFromZohoRecord(Organization org, Record z
 
     String acronym = getStringFieldValue(zohoRecord, ZohoConstants.ACRONYM_FIELD);
     String langAcronym = getStringFieldValue(zohoRecord, ZohoConstants.LANG_ACRONYM_FIELD);
-    org.setAcronym(ZohoUtils.createLanguageMapOfStringList(langAcronym, acronym));
+    String acronym_1 = getStringFieldValue(zohoRecord, ZohoConstants.ACRONYM_1_FIELD);
+    String langAcronym_1 = getStringFieldValue(zohoRecord, ZohoConstants.LANG_ACRONYM_1_FIELD);
+    Map<String, List<String>> acronymMap = ZohoUtils.createLanguageMapOfStringList(langAcronym, acronym);
+    Map<String, List<String>> acronym_1_Map = ZohoUtils.createLanguageMapOfStringList(langAcronym_1, acronym_1);
+    Map<String, List<String>> acronymFinalMap = ZohoUtils.mergeMapsWithLists(acronymMap, acronym_1_Map);
+    org.setAcronym(acronymFinalMap);
+
     String logoFieldName = ZohoConstants.LOGO_LINK_TO_WIKIMEDIACOMMONS_FIELD;
     org.setLogo(buildWebResource(zohoRecord, logoFieldName));
     org.setHomepage(getStringFieldValue(zohoRecord, ZohoConstants.WEBSITE_FIELD));

diff --git a/...management-zoho/src/main/java/eu/europeana/entitymanagement/zoho/utils/ZohoConstants.java b/...management-zoho/src/main/java/eu/europeana/entitymanagement/zoho/utils/ZohoConstants.java
@@ -32,6 +32,8 @@ public final class ZohoConstants {
   public static final String ALTERNATIVE_FIELD = "Alternative";
   public static final String LANG_ACRONYM_FIELD = "Lang_Acronym";
   public static final String ACRONYM_FIELD = "Acronym";
+  public static final String LANG_ACRONYM_1_FIELD = "Lang_Acronym_1";
+  public static final String ACRONYM_1_FIELD = "Alternative_Acronym_1";
 //  public static final String LOGO_LINK_TO_WIKIMEDIACOMMONS_FIELD = "Logo_link_to_WikimediaCommons";
   public static final String LOGO_LINK_TO_WIKIMEDIACOMMONS_FIELD = "Logo";
   public static final String WEBSITE_FIELD = "Website";