fix indexing of country iso code #EA-3721

europeana · Apr 23, 2024 · 93d7e64 · 93d7e64
1 parent ddd18ce
commit 93d7e64
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.../main/java/eu/europeana/entitymanagement/common/config/EntityManagementConfiguration.java b/.../main/java/eu/europeana/entitymanagement/common/config/EntityManagementConfiguration.java
@@ -257,8 +257,10 @@ void addToCountryMappings(List<ZohoLabelUriMapping> countryMappingList) {
 
   void addToCountryIdMappings(List<ZohoLabelUriMapping> countryMappingList) {
     for (ZohoLabelUriMapping countryMapping : countryMappingList) {
-      //init entityID - to ZohoCountry mapping 
-      countryIdMappings.put(countryMapping.getZohoLabel(), countryMapping);
+      //init entityID - to ZohoCountry mapping
+      if(countryMapping.getEntityUri() != null) {
+        countryIdMappings.put(countryMapping.getEntityUri(), countryMapping);
+      }
     }
   }
 

diff --git a/...agement-solr/src/main/java/eu/europeana/entitymanagement/solr/model/SolrOrganization.java b/...agement-solr/src/main/java/eu/europeana/entitymanagement/solr/model/SolrOrganization.java
@@ -92,12 +92,12 @@ public SolrOrganization(Organization organization) {
 
     this.country=new ArrayList<>();
     String orgCountryId=organization.getCountryId();
-    String orgCoutryISO=organization.getCountryISO();
+    String orgCountryISO=organization.getCountryISO();
     if(orgCountryId!=null) {
       this.country.add(orgCountryId);
     }
-    if(orgCoutryISO!=null) {
-      this.country.add(orgCoutryISO);
+    if(orgCountryISO!=null) {
+      this.country.add(orgCountryISO);
     }
     if(organization.getCountry() != null) {
       this.setCountryLabel(organization.getCountry().getPrefLabel()); 

diff --git a/...ment-web/src/main/java/eu/europeana/entitymanagement/web/service/EntityRecordService.java b/...ment-web/src/main/java/eu/europeana/entitymanagement/web/service/EntityRecordService.java
@@ -184,7 +184,7 @@ public void dereferenceLinkedEntities(Organization org) {
           new String[] {EntityRecordFields.ENTITY});
       setDereferencedCountry(org, countryRecord);
 
-      ZohoLabelUriMapping mapping = emConfiguration.getCountryIdMappings().get(org.getEntityId());
+      ZohoLabelUriMapping mapping = emConfiguration.getCountryIdMappings().get(org.getCountryId());
       if(mapping != null) {
         //extract ISO code from ZohoCountry
         org.setCountryISO(mapping.getCountryISOCode());