# HG changeset patch # User Prakash M # Date 1588847909 -19800 # Thu May 07 16:08:29 2020 +0530 # Node ID 217272094ae8aa9c051aa6df45dd30e28c8d42bd # Parent bfef93659de5427567b664b615ac09ce1c5482e7 Related to BUG-43818: Fixed error on importing Business Partner * Created new Entity Mapping for "Greeting" * In BusinessPartner Entity Mapping, Changed mapping of "Greeting" property from DirectPropertyMapping to EntityMapping * Created new Location Entity Mapping with DirectPropertyMapping for address, cityName, postalCode, regionName and country * In BusinessPartnerLocation Entity Mapping, Changed DirectPropertyMapping properties(address, cityName, postalCode, regionName and country) to single EntityMapping for Location. * In ADUser Entity Mapping, included new Java property mapping for the name property. Therefore name generated dynamically from firstName and lastName of contactInfo. diff -r bfef93659de5 -r 217272094ae8 api/org.openbravo.retail.api-RetailAPI.json --- a/api/org.openbravo.retail.api-RetailAPI.json Tue May 05 10:55:29 2020 +0530 +++ b/api/org.openbravo.retail.api-RetailAPI.json Thu May 07 16:08:29 2020 +0530 @@ -4779,7 +4779,7 @@ "type" : "string" }, "greeting" : { - "type" : "string" + "$ref" : "#/components/schemas/Greeting (Import)" }, "currency" : { "type" : "string" @@ -4813,7 +4813,7 @@ "locations" : { "type" : "array", "items" : { - "$ref" : "#/components/schemas/Location (Import)" + "$ref" : "#/components/schemas/BusinessPartnerLocation (Import)" } }, "contactInformation" : { @@ -4824,6 +4824,30 @@ } } }, + "BusinessPartnerLocation (Import)" : { + "required" : [ "name" ], + "type" : "object", + "properties" : { + "location" : { + "$ref" : "#/components/schemas/Location (Import)" + }, + "name" : { + "type" : "string" + } + } + }, + "Greeting (Import)" : { + "required" : [ "name" ], + "type" : "object", + "properties" : { + "name" : { + "type" : "string" + }, + "title" : { + "type" : "string" + } + } + }, "Location (Export) " : { "required" : [ "name" ], "type" : "object", @@ -4849,7 +4873,6 @@ } }, "Location (Import)" : { - "required" : [ "name" ], "type" : "object", "properties" : { "address" : { @@ -4866,9 +4889,6 @@ }, "region" : { "type" : "string" - }, - "name" : { - "type" : "string" } } }, diff -r bfef93659de5 -r 217272094ae8 src-db/database/sourcedata/OBEI_ENTITY_MAPPING.xml --- a/src-db/database/sourcedata/OBEI_ENTITY_MAPPING.xml Tue May 05 10:55:29 2020 +0530 +++ b/src-db/database/sourcedata/OBEI_ENTITY_MAPPING.xml Thu May 07 16:08:29 2020 +0530 @@ -22,7 +22,7 @@ - + @@ -225,6 +225,21 @@ + + + + + + + + + + + + + + + @@ -270,6 +285,21 @@ + + + + + + + + + + + + + + + diff -r bfef93659de5 -r 217272094ae8 src-db/database/sourcedata/OBEI_PROP_MAP_INSTANCE.xml --- a/src-db/database/sourcedata/OBEI_PROP_MAP_INSTANCE.xml Tue May 05 10:55:29 2020 +0530 +++ b/src-db/database/sourcedata/OBEI_PROP_MAP_INSTANCE.xml Thu May 07 16:08:29 2020 +0530 @@ -315,21 +315,6 @@ - - - - - - - - - - - - - - - @@ -375,21 +360,6 @@ - - - - - - - - - - - - - - - @@ -405,6 +375,22 @@ + + + + + + + + + + + + + + + + @@ -1322,6 +1308,21 @@ + + + + + + + + + + + + + + + @@ -1998,6 +1999,21 @@ + + + + + + + + + + + + + + + @@ -2269,6 +2285,21 @@ + + + + + + + + + + + + + + + @@ -2510,21 +2541,6 @@ - - - - - - - - - - - - - - - @@ -2675,6 +2691,21 @@ + + + + + + + + + + + + + + + @@ -2736,6 +2767,21 @@ + + + + + + + + + + + + + + + @@ -3129,6 +3175,21 @@ + + + + + + + + + + + + + + + @@ -3159,6 +3220,21 @@ + + + + + + + + + + + + + + + @@ -3210,12 +3286,13 @@ - + + @@ -3325,21 +3402,6 @@ - - - - - - - - - - - - - - - @@ -3490,21 +3552,6 @@ - - - - - - - - - - - - - - - @@ -3798,7 +3845,7 @@ - + diff -r bfef93659de5 -r 217272094ae8 src/org/openbravo/retail/api/mappings/user/ImportUserJavaPropertyMappingHandler.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/openbravo/retail/api/mappings/user/ImportUserJavaPropertyMappingHandler.java Thu May 07 16:08:29 2020 +0530 @@ -0,0 +1,76 @@ +/* + ************************************************************************************ + * Copyright (C) 2020 Openbravo S.L.U. + * Licensed under the Openbravo Commercial License version 1.0 + * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html + * or in the legal folder of this module distribution. + ************************************************************************************ + */ +package org.openbravo.retail.api.mappings.user; + +import java.util.HashMap; +import java.util.Map; + +import org.openbravo.base.exception.OBException; +import org.openbravo.model.ad.access.User; +import org.openbravo.service.external.integration.SynchronizableBusinessObject; +import org.openbravo.service.external.integration.mapping.EntityMappingId; +import org.openbravo.service.external.integration.mapping.ImportJavaPropertyMappingHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Import JavaPropertyMappingHandler for the Product entity of Retail API + */ +@EntityMappingId("585B58F55C0142D2971F0D1F66707802") +public class ImportUserJavaPropertyMappingHandler + extends ImportJavaPropertyMappingHandler { + + private static final Logger log = LoggerFactory + .getLogger(ImportUserJavaPropertyMappingHandler.class); + + @Override + public Map getPropertySorting() { + Map properties = new HashMap<>(); + properties.put(50, "name"); + return properties; + } + + @Override + public void setPropertyInImportedObject(User user, String mappingName, + SynchronizableBusinessObject sbo) { + Map properties = sbo.getProperties(); + try { + switch (mappingName) { + case "name": + int maxChar = 60; + String firstName = (String) properties.get("firstName"); + String lastName = (String) properties.get("lastName"); + String fullName; + + if (firstName.equals("null")) { + firstName = ""; + } + + if (lastName.equals("null")) { + lastName = ""; + } else { + lastName = " " + lastName; + } + + fullName = (firstName + lastName).trim(); + + if (fullName.length() > maxChar) { + fullName = fullName.substring(0, maxChar); + } + user.setName(fullName); + break; + default: + log.warn("Java property not defined in the mapping: {}", mappingName); + } + } catch (Exception ex) { + log.error("Error while importing the property " + mappingName, ex); + throw new OBException("Error applying import product java property mapping", ex); + } + } +}