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 enrichment of ThingCreated events with _policy #1863

Merged
merged 2 commits into from
Jan 16, 2024
Merged

Fix enrichment of ThingCreated events with _policy #1863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96cdbd5
fix _policy enrichment on ThingCreated event
alstanchev Jan 15, 2024
242aa1d
update EnforcementFlowTest tests to supports updated cache retrieval …
alstanchev Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...rg/eclipse/ditto/internal/models/signalenrichment/DittoCachingSignalEnrichmentFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,9 @@ private CompletableFuture<JsonObject> smartUpdateCachedObject(final SignalEnrich
final var nextExpectedThingEventsParameters =
new CachingParameters(fieldSelector, thingEvents, invalidateCacheOnPolicyChange,
cachingParameters.minAcceptableSeqNr);
result = handleNextExpectedThingEvents(cacheKey, JsonObject.empty(), nextExpectedThingEventsParameters)
.toCompletableFuture();
result = doCacheLookup(cacheKey, dittoHeaders).thenCompose(
cachedJsonObject -> handleNextExpectedThingEvents(cacheKey, cachedJsonObject,
nextExpectedThingEventsParameters));
} else {
// there are twin events; perform smart update
result = doCacheLookup(cacheKey, dittoHeaders).thenCompose(
Expand Down
6 changes: 6 additions & 0 deletions ...rg/eclipse/ditto/thingsearch/service/persistence/write/streaming/EnforcementFlowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,8 @@ public void computeThingCacheValueFromThingEvents() {
sourceProbe.sendNext(inputMap);
sourceProbe.sendComplete();

thingsProbe.expectMsgClass(Duration.apply(30, TimeUnit.SECONDS), SudoRetrieveThing.class);
thingsProbe.reply(SudoRetrieveThingResponse.of(JsonObject.empty(), DittoHeaders.empty()));
// WHEN: policy is retrieved with up-to-date revisions
policiesProbe.expectMsgClass(Duration.apply(30, TimeUnit.SECONDS), SudoRetrievePolicy.class);
final var policy = Policy.newBuilder(policyId).setRevision(1).build();
Expand Down Expand Up @@ -319,6 +321,10 @@ public void computeThingCacheValueFromThingEventsWhenLastEventWasDeleted() {
sourceProbe.sendNext(inputMap);
sourceProbe.sendComplete();

// WHEN
thingsProbe.expectMsgClass(Duration.apply(30, TimeUnit.SECONDS), SudoRetrieveThing.class);
thingsProbe.reply(SudoRetrieveThingResponse.of(JsonObject.empty(), DittoHeaders.empty()));

// THEN: the write model contains up-to-date revisions
final AbstractWriteModel deleteModel = sinkProbe.expectNext().get(0);
sinkProbe.expectComplete();
Expand Down