1 files changed, 15 insertions, 5 deletions

diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/viewupdate/ViewUpdateTranslator.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/viewupdate/ViewUpdateTranslator.java
index 2f7f9a9c..62a10e45 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/viewupdate/ViewUpdateTranslator.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/viewupdate/ViewUpdateTranslator.java
@@ -1,5 +1,6 @@
 package tools.refinery.store.query.viatra.internal.viewupdate;
 
+import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
 import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContextListener;
 import org.eclipse.viatra.query.runtime.matchers.tuple.ITuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
@@ -9,29 +10,38 @@ import tools.refinery.store.query.view.RelationView;
 import java.util.Objects;
 
 public class ViewUpdateTranslator<D> {
+        private final IInputKey wrappedKey;
+
         private final RelationView<D> key;
 
         private final ITuple filter;
 
         private final IQueryRuntimeContextListener listener;
 
-        public ViewUpdateTranslator(RelationView<D> key, ITuple filter, IQueryRuntimeContextListener listener) {
+        public ViewUpdateTranslator(IInputKey wrappedKey, RelationView<D> key, ITuple filter,
+                                                                IQueryRuntimeContextListener listener) {
                 super();
+                this.wrappedKey = wrappedKey;
                 this.key = key;
                 this.filter = filter;
                 this.listener = listener;
         }
 
-        public boolean equals(RelationView<?> relationView, ITuple seed, IQueryRuntimeContextListener listener) {
-                return key == relationView && filter.equals(seed) && this.listener == listener;
+        public boolean equals(IInputKey wrappedKey, RelationView<?> relationView, ITuple seed,
+                                                  IQueryRuntimeContextListener listener) {
+                return this.wrappedKey == wrappedKey && key == relationView && filter.equals(seed) && this.listener == listener;
         }
 
         public void processChange(ViewUpdate change) {
-                listener.update(key, Tuples.flatTupleOf(change.tuple()), change.isInsertion());
+                listener.update(wrappedKey, Tuples.flatTupleOf(change.tuple()), change.isInsertion());
         }
 
+        @SuppressWarnings("squid:S1168")
         public Object[] isMatching(Tuple tuple, D value) {
-                return isMatching(key.getWrappedKey().transform(tuple, value), filter);
+                if (!key.filter(tuple, value)) {
+                        return null;
+                }
+                return isMatching(key.forwardMap(tuple, value), filter);
         }
 
         @SuppressWarnings("squid:S1168")