Skip to content
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

Jump to bottom

Fix new rule ItemGroup and Item expression validation #311

Merged
merged 1 commit into from
Feb 10, 2022
Merged

Fix new rule ItemGroup and Item expression validation #311

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
52 changes: 29 additions & 23 deletions core/src/main/java/org/akaza/openclinica/service/rule/expression/ExpressionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.TimeZone;
Expand All @@ -26,7 +25,6 @@
import javax.sql.DataSource;

import org.akaza.openclinica.bean.admin.CRFBean;
import org.akaza.openclinica.bean.core.EntityBean;
import org.akaza.openclinica.bean.core.ItemDataType;
import org.akaza.openclinica.bean.core.Status;
import org.akaza.openclinica.bean.core.SubjectEventStatus;
Expand Down Expand Up @@ -320,8 +318,7 @@ public String getValueFromForm(String expression) {
if (formValues != null && !formValues.isEmpty()) {
String withGroup = getItemGroupPLusItem(expression);
String withoutGroup = getItemOidFromExpression(expression);
result = formValues.containsKey(withGroup) ? formValues.get(withGroup) : formValues
.containsKey(withoutGroup) ? formValues.get(withoutGroup) : null;
result = formValues.containsKey(withGroup) ? formValues.get(withGroup) : formValues.getOrDefault(withoutGroup, null);
} else {
logger.warn("The HashMap that stores form values was null, Better this be a Bulk operation");
}
Expand All @@ -337,11 +334,9 @@ public String getValueFromForm(String expression, Map<String, ItemBean> itemBean
if (formValues != null && !formValues.isEmpty()) {
String withGroup = getItemGroupPLusItem(expression);
String withoutGroup = getItemOidFromExpression(expression);
result = formValues.containsKey(withGroup) ? formValues.get(withGroup) : formValues
.containsKey(withoutGroup) ? formValues.get(withoutGroup) : null;
result = formValues.containsKey(withGroup) ? formValues.get(withGroup) : formValues.getOrDefault(withoutGroup, null);
if (itemBeans != null) {
ItemBean itemBean = itemBeans.containsKey(withGroup) ? itemBeans.get(withGroup) : itemBeans
.containsKey(withoutGroup) ? itemBeans.get(withoutGroup) : null;
ItemBean itemBean = itemBeans.containsKey(withGroup) ? itemBeans.get(withGroup) : itemBeans.getOrDefault(withoutGroup, null);
result = ifValueIsDate(itemBean, result);
}
} else {
Expand All @@ -355,9 +350,7 @@ public String evaluateExpression(String expression) throws OpenClinicaSystemExce
Map<Integer, ItemBean> itemBeansI = new HashMap<>();

if (items != null) {
Iterator<ItemBean> iter = items.values().iterator();
while (iter.hasNext()) {
ItemBean item = iter.next();
for (ItemBean item : items.values()) {
itemBeansI.put(item.getId(), item);
}
}
Expand Down Expand Up @@ -736,8 +729,8 @@ private String deContextualizeExpression(int j, String ruleExpression, String ru
} else {
buildExpression = buildExpression + splitRuleSetExpression[i] + SEPARATOR;
}

}

return buildExpression + ruleExpression;
}

Expand Down Expand Up @@ -1254,47 +1247,60 @@ public EventDefinitionCRFBean getEventDefinitionCRF(String expression) {
public String checkValidityOfItemOrItemGroupOidInCrf(String oid, RuleSetBean ruleSet) {
oid = oid.trim();
String[] theOid = oid.split(ESCAPED_SEPARATOR);

// OID expression consists from ItemGroupOID and ItemOID
if (theOid.length == 2) {

// Query for ItemGroup with OID specified in the expression
ItemGroupBean itemGroup = getItemGroupDao().findByOid(theOid[0]);
boolean isItemGroupBePartOfCrfOrNull = ruleSet.getCrfId() == null || itemGroup.getCrfId().equals(ruleSet.getCrfId());
// TODO: because of DAO refactoring we may need to also check itemGroup.isActive()
if (itemGroup != null && isItemGroupBePartOfCrfOrNull) {

if (itemGroup != null && itemGroup.isActive() && isItemGroupBePartOfCrfOrNull) {

if (ruleSet.getCrfId() != null && itemGroup.getCrfId().equals(ruleSet.getCrfId())) {
return "OK";
}
if (ruleSet.getCrfId() != null && !itemGroup.getCrfId().equals(ruleSet.getCrfId())) {
return oid;
}

// Query for Item in existing ItemGroup with OID specified in the expression
ItemBean item = getItemDao().findItemByGroupIdandItemOid(itemGroup.getId(), theOid[1]);
// TODO: because of DAO refactoring we may need to also check item.isActive()
if (item != null) {

if (item != null && item.isActive()) {
return "OK";
}
}

}
if (theOid.length == 1) {
else if (theOid.length == 1) { // OID expression consists from ItemGroupOID or Item OID only

// Query for ItemGroup with OID specified in the expression
ItemGroupBean itemGroup = getItemGroupDao().findByOid(oid);
// TODO: because of DAO refactoring we may need to also check itemGroup.isActive()
if (itemGroup != null) {

// When such ItemGroup exist in database
if (itemGroup != null && itemGroup.isActive()) {

if (ruleSet.getCrfId() != null && itemGroup.getCrfId().equals(ruleSet.getCrfId())) {
return "OK";
}
if (ruleSet.getCrfId() != null && !itemGroup.getCrfId().equals(ruleSet.getCrfId())) {
return oid;
}

// TODO: if this statement reached it will force to pass validity check, seems wierd...
return "OK";
}

// ItemBean item =
// getItemDao().findItemByGroupIdandItemOid(getItemGroupExpression(ruleSet.getTarget().getValue()).getId(),
// oid);
// No ItemGroup was found so the expression is supposed to be ItemOID
ArrayList<ItemBean> items = getItemDao().findByOid(oid);

// Corresponding item was found in database
if (items == null || items.size() != 0) {
return "OK";
}
}

// Return the expression that did not pass the validity check
return oid;
}

Expand Down