This is an automated email from the ASF dual-hosted git repository.
mridulpathak pushed a commit to branch release24.09
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release24.09 by this push:
new 2f4be5f76b Fixed: PartyServices contact-lookup and role-hierarchy
regressions (OFBIZ-13534)
2f4be5f76b is described below
commit 2f4be5f76bece77df37a51fc75de8a00d6771386
Author: Mridul Pathak <[email protected]>
AuthorDate: Wed Sep 9 22:30:10 2026 +0530
Fixed: PartyServices contact-lookup and role-hierarchy regressions
(OFBIZ-13534)
- Restore priority-order search for contactMechPurposeTypeId in
getPartyTelephone and getPartyPostalAddress
- Ensure followPartyRelationshipsInline includes the base roleTypeId in the
role type list when including child types
- Correctly resolve partyId from the target UserLogin in
sendAccountActivatedEmailNotification
---
.../ofbiz/party/party/PartyServicesScript.groovy | 30 ++++++++++++----------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git
a/applications/party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy
b/applications/party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy
index 93aaa03366..6d1a768462 100644
---
a/applications/party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy
+++
b/applications/party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy
@@ -19,9 +19,7 @@
package org.apache.ofbiz.party.party
import org.apache.ofbiz.entity.condition.EntityCondition
-import org.apache.ofbiz.entity.condition.EntityJoinOperator
import org.apache.ofbiz.entity.condition.EntityOperator
-import org.apache.ofbiz.entity.util.EntityUtil
import org.apache.ofbiz.minilang.SimpleMapProcessor
import java.sql.Timestamp
@@ -306,10 +304,12 @@ Map getPartyTelephone () {
'PHONE_SHIPPING', 'PHONE_SHIP_ORIG']
}
- telephone =
EntityUtil.getFirst(EntityUtil.filterByCondition(telephoneList,
- EntityCondition.makeCondition('contactMechPurposeTypeId',
EntityJoinOperator.IN, types)))
- if (telephone) {
- resultMap.contactMechPurposeTypeId =
telephone.contactMechPurposeTypeId
+ for (String type : types) {
+ telephone = telephoneList.find { it.contactMechPurposeTypeId ==
type }
+ if (telephone) {
+ resultMap.contactMechPurposeTypeId =
telephone.contactMechPurposeTypeId
+ break
+ }
}
} else {
telephone = from('PartyAndContactMech')
@@ -363,11 +363,12 @@ Map getPartyPostalAddress () {
// search in this order if not provided
types = ['GENERAL_LOCATION', 'BILLING_LOCATION',
'PAYMENT_LOCATION', 'SHIPPING_LOCATION']
}
- addressList = EntityUtil.filterByCondition(addressList,
- EntityCondition.makeCondition('contactMechPurposeTypeId',
EntityJoinOperator.IN, types))
- if (addressList) {
- address = addressList[0]
- resultMap.contactMechPurposeTypeId =
address.contactMechPurposeTypeId
+ for (String type : types) {
+ address = addressList.find { it.contactMechPurposeTypeId == type }
+ if (address) {
+ resultMap.contactMechPurposeTypeId =
address.contactMechPurposeTypeId
+ break
+ }
}
} else {
address = from('PartyAndContactMech')
@@ -633,7 +634,8 @@ Map sendAccountActivatedEmailNotification() {
.where(lookupMap)
.queryOne()
if (storeEmail && storeEmail.bodyScreenLocation) {
- String partyId = parameters.partyId ?: userLogin.partyId
+ GenericValue userLoginParty = from('UserLogin').where(userLoginId:
parameters.userLoginId).queryOne()
+ String partyId = userLoginParty?.partyId
GenericValue webSite = from('WebSite')
.where(productStoreId: storeEmail.productStoreId)
@@ -823,7 +825,7 @@ Map followPartyRelationshipsInline(List relatedPartyIdList,
String partyRelation
if (roleTypeIdFromIncludeAllChildTypes == 'Y') {
List roleTypeIdListName = roleTypeIdFromList
Map res = getChildRoleTypesInline(roleTypeIdListName)
- roleTypeIdFromList = res.childRoleTypeIdList
+ roleTypeIdFromList = [roleTypeIdFrom] + (res.childRoleTypeIdList ?: [])
}
List roleTypeIdToList = null
@@ -833,7 +835,7 @@ Map followPartyRelationshipsInline(List relatedPartyIdList,
String partyRelation
if (roleTypeIdToInclueAllChildTypes == 'Y') {
List roleTypeIdListName = roleTypeIdToList
Map res = getChildRoleTypesInline(roleTypeIdListName)
- roleTypeIdToList = res.childRoleTypeIdList
+ roleTypeIdToList = [roleTypeIdTo] + (res.childRoleTypeIdList ?: [])
}
Map res = followPartyRelationshipsInlineRecurse(relatedPartyIdList,
roleTypeIdFromList, roleTypeIdToList,
