[NAE-2119] Fix menuItem #315
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -86,7 +86,7 @@ public Task(com.netgrif.application.engine.objects.workflow.domain.Task task, Lo | |
| this.caseTitle = task.getCaseTitle(); | ||
| this.priority = task.getPriority(); | ||
| this.userId = task.getUser() != null ? task.getUser().getStringId() : null; | ||
| this.userRealmId = task.getUser() != null ? task.getUser().getRealmId() : null; | ||
| this.roles = task.getRoles(); | ||
| this.users = task.getUsers(); | ||
| this.startDate = task.getStartDate(); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -341,6 +341,9 @@ public boolean validateRequiredAttributes() { | |
|
|
||
| @Override | ||
| public String getTelNumber() { | ||
| if (attributes == null) { | ||
| return null; | ||
| } | ||
| if (attributes.containsKey("tel")) { | ||
| return (String) attributes.get("tel").getValue(); | ||
| } | ||
|
|
@@ -349,9 +352,13 @@ public String getTelNumber() { | |
|
|
||
| @Override | ||
| public void setTelNumber(String telNumber) { | ||
| if (attributes == null) { | ||
| attributes = new HashMap<>(); | ||
| } | ||
| if (attributes.containsKey("tel")) { | ||
| ((Attribute<String>) attributes.get("tel")).setValue(telNumber); | ||
| } | ||
| attributes.put("tel", new Attribute<>(telNumber, false)); | ||
|
renczesstefan marked this conversation as resolved.
renczesstefan marked this conversation as resolved.
|
||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,4 +16,9 @@ public BooleanField(Boolean value) { | |
| super(value.toString()); | ||
| this.booleanValue = value; | ||
| } | ||
|
|
||
| @Override | ||
| public Object getValue() { | ||
| return booleanValue; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,4 +16,9 @@ public ButtonField(Integer value) { | |
| super(value.toString()); | ||
| this.buttonValue = value; | ||
| } | ||
|
|
||
| @Override | ||
| public Object getValue() { | ||
| return buttonValue; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package com.netgrif.application.engine.objects.elastic.domain; | ||
|
|
||
| import lombok.Data; | ||
| import lombok.EqualsAndHashCode; | ||
| import lombok.NoArgsConstructor; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| @Data | ||
| @NoArgsConstructor | ||
| @EqualsAndHashCode(callSuper = true) | ||
| public abstract class CaseField extends FieldWithAllowedNetsField { | ||
|
|
||
| public CaseField(String[] fullTextValue, String[] allowedNets) { | ||
| super(fullTextValue, allowedNets); | ||
| } | ||
|
|
||
| @Override | ||
| public Object getValue() { | ||
| return new ArrayList<>(List.of(fulltextValue)); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,4 +22,8 @@ public abstract class DataField implements Serializable { | |
| this.fulltextValue = new String[1]; | ||
| this.fulltextValue[0] = fulltextValue; | ||
| } | ||
|
|
||
| public Object getValue() { | ||
| return (fulltextValue != null && fulltextValue.length > 0) ? fulltextValue[0] : null; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,4 +23,9 @@ public DateField(String value, LocalDateTime dateTime) { | |
| this.dateValue = dateTime; | ||
| this.timestampValue = Timestamp.valueOf(dateTime).getTime(); | ||
| } | ||
|
|
||
| @Override | ||
| public Object getValue() { | ||
| return dateValue; | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Add type safety checks for CaseField transformation.
The method assumes
dataField.getValue()returnsList<String>and thatgetAllowedNets()exists on the workflow DataField. Add null checks and type verification to prevent runtime exceptions.protected Optional<DataField> transformCaseFieldField(com.netgrif.application.engine.objects.workflow.domain.DataField dataField, com.netgrif.application.engine.objects.petrinet.domain.dataset.CaseField netField) { + if (dataField.getValue() == null || dataField.getAllowedNets() == null) { + return Optional.empty(); + } + if (!(dataField.getValue() instanceof List)) { + log.error("CaseField value is not a List. Found: " + dataField.getValue().getClass().getCanonicalName()); + return Optional.empty(); + } String[] allowedNets = dataField.getAllowedNets().toArray(new String[0]); - String[] referencedCases = ((List<String>) dataField.getValue()).toArray(new String[0]); + List<?> valueList = (List<?>) dataField.getValue(); + String[] referencedCases = valueList.stream() + .filter(Objects::nonNull) + .map(Object::toString) + .toArray(String[]::new); return Optional.of(new com.netgrif.application.engine.adapter.spring.elastic.domain.CaseField(referencedCases,allowedNets)); }🤖 Prompt for AI Agents