2 files changed, 33 insertions, 23 deletions

diff --git a/src/main/java/org/traccar/session/cache/CacheManager.java b/src/main/java/org/traccar/session/cache/CacheManager.java
index 586237655..8e1737441 100644
--- a/src/main/java/org/traccar/session/cache/CacheManager.java
+++ b/src/main/java/org/traccar/session/cache/CacheManager.java
@@ -20,9 +20,9 @@ import org.traccar.model.BaseModel;
 import org.traccar.model.Device;
 import org.traccar.model.Driver;
 import org.traccar.model.Geofence;
+import org.traccar.model.GroupedModel;
 import org.traccar.model.Maintenance;
 import org.traccar.model.Notification;
-import org.traccar.model.Position;
 import org.traccar.model.Server;
 import org.traccar.model.User;
 import org.traccar.storage.Storage;
@@ -59,7 +59,6 @@ public class CacheManager {
     private final Map<Long, Map<Class<? extends BaseModel>, List<Long>>> deviceLinks = new HashMap<>();
 
     private Server server;
-    private final Map<Long, Position> devicePositions = new HashMap<>();
     private final Map<Long, List<User>> notificationUsers = new HashMap<>();
 
     @Inject
@@ -90,15 +89,6 @@ public class CacheManager {
         }
     }
 
-    public Position getPosition(long deviceId) {
-        try {
-            lock.readLock().lock();
-            return devicePositions.get(deviceId);
-        } finally {
-            lock.readLock().unlock();
-        }
-    }
-
     public Server getServer() {
         try {
             lock.readLock().lock();
@@ -146,18 +136,34 @@ public class CacheManager {
         }
     }
 
-    public void updatePosition(Position position) {
-        try {
-            lock.writeLock().lock();
-            devicePositions.put(position.getDeviceId(), position);
-        } finally {
-            lock.writeLock().unlock();
+    public void updateOrInvalidate(Class<? extends BaseModel> clazz, long id) throws StorageException {
+        boolean invalidate = false;
+        var before = getObject(clazz, id);
+        var after = storage.getObject(clazz, new Request(
+                new Columns.All(), new Condition.Equals("id", "id", id)));
+        if (before == null) {
+            return;
+        } else if (after == null) {
+            invalidate = true;
+        } else if (clazz.isInstance(GroupedModel.class)) {
+            if (((GroupedModel) before).getGroupId() != ((GroupedModel) after).getGroupId()) {
+                invalidate = true;
+            }
+        }
+        if (invalidate) {
+            invalidate(new CacheKey(clazz, id));
+        } else {
+            try {
+                lock.writeLock().lock();
+                var cacheValue = deviceCache.get(new CacheKey(clazz, id));
+                if (cacheValue != null) {
+                    cacheValue.setValue(after);
+                }
+                // TODO if device, also need to update geofences
+            } finally {
+                lock.writeLock().unlock();
+            }
         }
-    }
-
-    public void invalidate(
-            Class<? extends BaseModel> clazz, long id) throws StorageException {
-        invalidate(new CacheKey(clazz, id));
     }
 
     public void invalidate(
diff --git a/src/main/java/org/traccar/session/cache/CacheValue.java b/src/main/java/org/traccar/session/cache/CacheValue.java
index 9e955dfe5..1f0383ce5 100644
--- a/src/main/java/org/traccar/session/cache/CacheValue.java
+++ b/src/main/java/org/traccar/session/cache/CacheValue.java
@@ -22,7 +22,7 @@ import java.util.Set;
 
 class CacheValue {
 
-    private final BaseModel value;
+    private BaseModel value;
     private final Set<Long> references = new HashSet<>();
 
     CacheValue(BaseModel value) {
@@ -42,6 +42,10 @@ class CacheValue {
         return (T) value;
     }
 
+    public void setValue(BaseModel value) {
+        this.value = value;
+    }
+
     public Set<Long> getReferences() {
         return references;
     }