Skip to content

Improved: createPartyRelationship service (OFBIZ-12765) #818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cshan-ecomify wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Improved: createPartyRelationship service (OFBIZ-12765) #818

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 40 additions & 5 deletions applications/party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,13 +437,48 @@ Map createPartyRelationship() {
partyIdTo: parameters.partyIdTo,
roleTypeIdFrom: parameters.roleTypeIdFrom,
roleTypeIdTo: parameters.roleTypeIdTo)
.filterByDate()
.queryList()
if (!partyRels) {
GenericValue partyRelationship = makeValue('PartyRelationship', parameters)
partyRelationship.create()

if (partyRels) {
// checks for conflicts with existing unlimited valid entries
for (GenericValue partyRel : partyRels) {
if (!partyRel.thruDate) {
if (parameters.fromDate.after(partyRel.fromDate)) {
return success()
}
}
}
// checks if there are any conflicts with the time periods of the entries
if (parameters.thruDate) {
EntityCondition partyCond =
EntityCondition.makeCondition(
EntityCondition.makeCondition('partyIdFrom', parameters.partyIdFrom),
EntityCondition.makeCondition('partyIdTo', parameters.partyIdTo),
EntityCondition.makeCondition('roleTypeIdFrom', parameters.roleTypeIdFrom),
EntityCondition.makeCondition('roleTypeIdTo', parameters.roleTypeIdTo),
EntityCondition.makeCondition('fromDate', EntityOperator.LESS_THAN_EQUAL_TO, parameters.thruDate),
EntityCondition.makeCondition('thruDate', EntityOperator.GREATER_THAN_EQUAL_TO, parameters.fromDate)
)

List<GenericValue> partyRelsToChecks = from('PartyRelationship')
.where(partyCond)
.queryList()

if (partyRelsToChecks) {
return success()
}
} else {
for (GenericValue partyRel : partyRels) {
if ((parameters.fromDate.before(partyRel.fromDate)) || (parameters.fromDate.before(partyRel.thruDate))) {
return success()
}
}
}
}
return success()
GenericValue partyRelationship = makeValue('PartyRelationship', parameters)
partyRelationship.create()

return success('create new PartyRelationship was successful')
}

/**
Expand Down