[NAE-2442] Fix dataset update from database and action handling#444
Conversation
Introduced `updateCaseFromDb` in `IWorkflowService` and its implementation in `WorkflowService` to synchronize case data with the database. Updated `EventService` to invoke this method during action execution.
|
Warning Review limit reached
More reviews will be available in 28 seconds. Learn how PR review limits work. Your organization has run out of usage credits. Purchase more in the billing tab. ⌛ How to resolve this issue?After more reviews become available, a review can be triggered using the We recommend that you space out your commits to avoid hitting the rate limit. 🚦 How do rate limits work?CodeRabbit enforces hourly rate limits for each developer per organization. Our paid plans include higher PR review limits than trial, open-source, and free plans. In all cases, reviews become available again over time. During sustained high-volume PR review activity, CodeRabbit may temporarily slow when the next review becomes available. Please see our Fair Usage Limits Policy for further information. ℹ️ Review info⚙️ Run configurationConfiguration used: Organization UI Review profile: ASSERTIVE Plan: Pro Run ID: 📒 Files selected for processing (1)
WalkthroughAdds updateCaseFromDb to refresh an in-memory Case from the persisted Case and integrates that refresh into EventService run paths; widens ActionApi.setData and ActionApiImpl.setData parameter types to accept non-string values (Map<String, Object>); and adds optional runtime type metadata to Nullable with accessor and factory overload. ChangesCase state refresh before action execution
Action API setData type widening
Nullable runtime type metadata
Sequence DiagramsequenceDiagram
participant EventService
participant WorkflowService
participant Repository
EventService->>WorkflowService: updateCaseFromDb(useCase)
WorkflowService->>Repository: find case by ID
Repository-->>WorkflowService: persisted Case
WorkflowService->>WorkflowService: merge newer DataSet entries
WorkflowService-->>EventService: refresh complete
EventService->>EventService: execute actions
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Suggested labels
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
coderabbitai
Bot
added
bugfix
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In
`@application-engine/src/main/java/com/netgrif/application/engine/workflow/service/EventService.java`:
- Around line 54-56: The refresh (updateCaseFromDb) is being called after
actionsRunner.run(...), causing actions to run against stale state; move the
call to workflowService.updateCaseFromDb(useCase) to immediately before each
actionsRunner.run(...) invocation within EventService so the case is reloaded
from the DB prior to executing actions (apply the same change at the other
occurrence referenced around the second actionsRunner.run(...) block as well).
In
`@application-engine/src/main/java/com/netgrif/application/engine/workflow/service/WorkflowService.java`:
- Around line 255-263: updateCaseFromDb currently assigns persisted DataField
objects from findOneNoNet directly into the runtime Case, which can mix
encrypted persisted fields into in-memory state; instead, when a persisted
DataField (from actual.getDataSet()) is newer than the corresponding runtime
field, copy only the safe primitive/value and metadata into the existing runtime
DataField (do not replace the object reference). In practice: in
updateCaseFromDb, for each id where
dataField.isNewerThen(useCase.getDataField(id)), obtain the target DataField =
useCase.getDataField(id) (or create a new non-persisted instance) and call its
setters to copy value, plainValue/decodedValue, timestamp, and other
non-persistence-specific metadata from dataField, rather than doing
useCase.getDataSet().put(id, dataField); this preserves in-memory
decryption/representation and avoids injecting persisted/encrypted objects
returned by findOneNoNet.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: ASSERTIVE
Plan: Pro
Run ID: 72387161-fb2d-4021-8388-5c4ed913dee0
📒 Files selected for processing (3)
application-engine/src/main/java/com/netgrif/application/engine/workflow/service/EventService.javaapplication-engine/src/main/java/com/netgrif/application/engine/workflow/service/WorkflowService.javaapplication-engine/src/main/java/com/netgrif/application/engine/workflow/service/interfaces/IWorkflowService.java
Refactored `setData` method in `ActionApi` to use `Map<String, Map<String, Object>>` for flexible data handling. Adjusted `WorkflowService` to use the `findOne` method for better database case update synchronization.
|
@coderabbitai pls review once more and approve if it is OK |
|
Tip For best results, initiate chat on the files or code changes. 🧩 Analysis chain🏁 Script executed: #!/bin/bash
# Get the PR diff
gh pr diff 444 --repo netgrif/application-engineLength of output: 5982 🏁 Script executed: #!/bin/bash
# Look at the changed files
fd -e java -t f | xargs grep -l "updateCaseFromDb\|setData" 2>/dev/null | head -20Length of output: 2289 🏁 Script executed: #!/bin/bash
# Check isNewerThen method on DataField
rg -n "isNewerThen" --type java -C 5
# Check findOne implementation
rg -n "findOne" application-engine/src/main/java/com/netgrif/application/engine/workflow/service/WorkflowService.java -A 5
# Check getDataField for null safety
rg -n "getDataField" --type java -C 3 | head -60
# Check callers of setData with old/new signature
rg -n "setData" --type java -C 2 | grep -v "\.class\|//\|\.xml" | head -60Length of output: 24185
Review Summary1.
2.
3.
The changes correctly fix the data-loss issue caused by stale in-memory state during multi-action execution. No blocking issues found. [approve] |
Introduced `type` field and updated constructors to allow runtime type tracking in `Nullable`. Added `getType` method and adjusted factory methods accordingly.
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In
`@nae-object-library/src/main/java/com/netgrif/application/engine/objects/utils/Nullable.java`:
- Around line 29-33: The equals()/hashCode() implementations in class Nullable
must include the type field so instances with different type parameters (e.g.,
Nullable.of(null, String.class) vs Nullable.of(null, Integer.class)) are
distinguished; update Nullable.equals(Object) to compare this.type (via
Objects.equals or equivalent) along with value, and update Nullable.hashCode()
to incorporate type (e.g., Objects.hash(value, type)) so sets/maps treat
differently-typed nullables as distinct; ensure getType() remains consistent
with these changes.
- Around line 82-83: The empty() helper currently returns a Nullable with both
value and type null, causing Nullable.of(...).filter(...) to lose its type
metadata; update the filter(...) implementation in class Nullable to preserve
the instance's type when the predicate fails by returning a new Nullable<>(null,
this.type) instead of calling empty(), so getType() still returns the original
Class metadata; alternatively, add/choose an empty(Class<T> type) factory and
have filter call that to preserve the type.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: ASSERTIVE
Plan: Pro
Run ID: ba7acd6b-e89c-46d0-8096-5fbe18df305a
📒 Files selected for processing (1)
nae-object-library/src/main/java/com/netgrif/application/engine/objects/utils/Nullable.java
Added `empty(Class<T>)` factory method for runtime type-safe `Nullable` instances and updated methods to incorporate type handling in equality checks and hash code computation.
3 participants
Description
Fixes NAE-2442
Dependencies
No new dependencies were introduced
Third party dependencies
No new dependencies were introduced
Blocking Pull requests
There are no dependencies on other PR
How Has Been This Tested?
This was tested manually, and with unit tests.
Test Configuration
Checklist:
Summary by CodeRabbit
Bug Fixes
New Features