[ofbiz-framework] branch trunk updated: Fixed: Service calls of "createPartyContactMech" now include the needed contactMechTypeId (OFBIZ-12175) (#292)

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 983f04d  Fixed: Service calls of "createPartyContactMech" now include the needed contactMechTypeId (OFBIZ-12175) (#292)
983f04d is described below

commit 983f04dfd623c85876bffa08b25699e53c503bd4
Author: bjugl <[hidden email]>
AuthorDate: Thu Apr 8 11:05:38 2021 +0200

    Fixed: Service calls of "createPartyContactMech" now include the needed contactMechTypeId (OFBIZ-12175) (#292)
   
    This was broken by OFBIZ-8358 where, as well explained at OFBIZ-12175, "createPartyContactMech Service has been changed to expect an OUT contactMechTypeId paramter and the call on this end has not been modified."
---
 .../src/main/java/org/apache/ofbiz/party/party/PartyServices.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java b/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java
index 6aad675..460a3bd 100644
--- a/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java
+++ b/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java
@@ -2595,6 +2595,7 @@ public class PartyServices {
                     if (currentContactMechPurposeTypeId != null && ("TELECOM_NUMBER".equals(currentContactMechTypeId)
                             || "POSTAL_ADDRESS".equals(currentContactMechTypeId) || "EMAIL_ADDRESS".equals(currentContactMechTypeId))) {
                         partyContactMechPurpose.put("contactMechPurposeTypeId", currentContactMechPurposeTypeId);
+                        partyContactMechPurpose.put("contactMechTypeId", currentContactMechTypeId);
                         partyContactMechPurposeChanged = (lastContactMechPurposeTypeId == null
                                 || !lastContactMechPurposeTypeId.equals(currentContactMechPurposeTypeId)) && !telecomNumberChanged
                                 && !postalAddressChanged && !emailAddressChanged;
@@ -2617,7 +2618,7 @@ public class PartyServices {
                                 currentContactMechPurposeTypeId = "GENERAL_LOCATION";
                             }
                             Map<String, Object> serviceResult = dispatcher.runSync("createPartyContactMech", UtilMisc.toMap("partyId", newPartyId,
-                                    "contactMechId", newContactMechId, "contactMechPurposeTypeId", currentContactMechPurposeTypeId,
+                                    "contactMechId", newContactMechId, "contactMechTypeId", currentContactMechTypeId, "contactMechPurposeTypeId", currentContactMechPurposeTypeId,
                                     "userLogin", userLogin));
                             if (ServiceUtil.isError(serviceResult)) {
                                 return ServiceUtil.returnError(ServiceUtil.getErrorMessage(serviceResult));
@@ -2634,7 +2635,7 @@ public class PartyServices {
                                 currentContactMechPurposeTypeId = "PHONE_WORK";
                             }
                             Map<String, Object> resultMap = dispatcher.runSync("createPartyContactMech", UtilMisc.toMap("partyId", newPartyId,
-                                    "contactMechId", newContactMechId, "contactMechPurposeTypeId", currentContactMechPurposeTypeId,
+                                    "contactMechId", newContactMechId, "contactMechTypeId", currentContactMechTypeId, "contactMechPurposeTypeId", currentContactMechPurposeTypeId,
                                     "userLogin", userLogin));
                             if (ServiceUtil.isError(resultMap)) {
                                 return ServiceUtil.returnError(ServiceUtil.getErrorMessage(result));
@@ -2651,7 +2652,7 @@ public class PartyServices {
                                 currentContactMechPurposeTypeId = "PRIMARY_EMAIL";
                             }
                             Map<String, Object> resultMap = dispatcher.runSync("createPartyContactMech", UtilMisc.toMap("partyId", newPartyId,
-                                    "contactMechId", newContactMechId, "contactMechPurposeTypeId", currentContactMechPurposeTypeId, "userLogin",
+                                    "contactMechId", newContactMechId, "contactMechTypeId", currentContactMechTypeId, "contactMechPurposeTypeId", currentContactMechPurposeTypeId, "userLogin",
                                     userLogin));
                             if (ServiceUtil.isError(resultMap)) {
                                 return ServiceUtil.returnError(ServiceUtil.getErrorMessage(result));