Per device trip config

5 files changed, 127 insertions, 43 deletions

diff --git a/src/main/java/org/traccar/config/Keys.java b/src/main/java/org/traccar/config/Keys.java
index f0e0bf2b6..432182fdd 100644
--- a/src/main/java/org/traccar/config/Keys.java
+++ b/src/main/java/org/traccar/config/Keys.java
@@ -373,7 +373,7 @@ public final class Keys {
      */
     public static final ConfigKey<Boolean> EVENT_MOTION_PROCESS_INVALID_POSITIONS = new BooleanConfigKey(
             "event.motion.processInvalidPositions",
-            List.of(KeyType.CONFIG));
+            List.of(KeyType.CONFIG, KeyType.DEVICE));
 
     /**
      * If the speed is above specified value, the object is considered to be in motion. Default value is 0.01 knots.
@@ -1167,7 +1167,7 @@ public final class Keys {
      */
     public static final ConfigKey<Long> REPORT_TRIP_MINIMAL_TRIP_DISTANCE = new LongConfigKey(
             "report.trip.minimalTripDistance",
-            List.of(KeyType.CONFIG),
+            List.of(KeyType.CONFIG, KeyType.DEVICE),
             500L);
 
     /**
@@ -1175,7 +1175,7 @@ public final class Keys {
      */
     public static final ConfigKey<Long> REPORT_TRIP_MINIMAL_TRIP_DURATION = new LongConfigKey(
             "report.trip.minimalTripDuration",
-            List.of(KeyType.CONFIG),
+            List.of(KeyType.CONFIG, KeyType.DEVICE),
             300L);
 
     /**
@@ -1183,7 +1183,7 @@ public final class Keys {
      */
     public static final ConfigKey<Long> REPORT_TRIP_MINIMAL_PARKING_DURATION = new LongConfigKey(
             "report.trip.minimalParkingDuration",
-            List.of(KeyType.CONFIG),
+            List.of(KeyType.CONFIG, KeyType.DEVICE),
             300L);
 
     /**
@@ -1191,7 +1191,7 @@ public final class Keys {
      */
     public static final ConfigKey<Long> REPORT_TRIP_MINIMAL_NO_DATA_DURATION = new LongConfigKey(
             "report.trip.minimalNoDataDuration",
-            List.of(KeyType.CONFIG),
+            List.of(KeyType.CONFIG, KeyType.DEVICE),
             3600L);
 
     /**
@@ -1199,7 +1199,7 @@ public final class Keys {
      */
     public static final ConfigKey<Boolean> REPORT_TRIP_USE_IGNITION = new BooleanConfigKey(
             "report.trip.useIgnition",
-            List.of(KeyType.CONFIG));
+            List.of(KeyType.CONFIG, KeyType.DEVICE));
 
     /**
      * Ignore odometer value reported by the device and use server-calculated total distance instead. This is useful
diff --git a/src/main/java/org/traccar/handler/events/MotionEventHandler.java b/src/main/java/org/traccar/handler/events/MotionEventHandler.java
index c406bd935..63b512291 100644
--- a/src/main/java/org/traccar/handler/events/MotionEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/MotionEventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2022 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2023 Anton Tananaev (anton@traccar.org)
  * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,6 +19,8 @@ package org.traccar.handler.events;
 import io.netty.channel.ChannelHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.traccar.config.Keys;
+import org.traccar.helper.model.AttributeUtil;
 import org.traccar.helper.model.PositionUtil;
 import org.traccar.model.Device;
 import org.traccar.model.Event;
@@ -46,14 +48,12 @@ public class MotionEventHandler extends BaseEventHandler {
 
     private final CacheManager cacheManager;
     private final Storage storage;
-    private final TripsConfig tripsConfig;
 
     @Inject
     public MotionEventHandler(
             CacheManager cacheManager, Storage storage, TripsConfig tripsConfig) {
         this.cacheManager = cacheManager;
         this.storage = storage;
-        this.tripsConfig = tripsConfig;
     }
 
     @Override
@@ -61,14 +61,16 @@ public class MotionEventHandler extends BaseEventHandler {
 
         long deviceId = position.getDeviceId();
         Device device = cacheManager.getObject(Device.class, deviceId);
-        if (device == null) {
+        if (device == null || !PositionUtil.isLatest(cacheManager, position)) {
             return null;
         }
-        if (!PositionUtil.isLatest(cacheManager, position)
-                || !tripsConfig.getProcessInvalidPositions() && !position.getValid()) {
+        boolean processInvalid = AttributeUtil.lookup(
+                cacheManager, Keys.EVENT_MOTION_PROCESS_INVALID_POSITIONS, deviceId);
+        if (!processInvalid && !position.getValid()) {
             return null;
         }
 
+        TripsConfig tripsConfig = new TripsConfig(new AttributeUtil.CacheProvider(cacheManager, deviceId));
         MotionState state = MotionState.fromDevice(device);
         MotionProcessor.updateState(state, position, position.getBoolean(Position.KEY_MOTION), tripsConfig);
         if (state.isChanged()) {
diff --git a/src/main/java/org/traccar/helper/model/AttributeUtil.java b/src/main/java/org/traccar/helper/model/AttributeUtil.java
index 43558e8f7..2630f64f0 100644
--- a/src/main/java/org/traccar/helper/model/AttributeUtil.java
+++ b/src/main/java/org/traccar/helper/model/AttributeUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Anton Tananaev (anton@traccar.org)
+ * Copyright 2022 - 2023 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,25 +15,44 @@
  */
 package org.traccar.helper.model;
 
+import org.traccar.api.security.PermissionsService;
+import org.traccar.config.Config;
 import org.traccar.config.ConfigKey;
 import org.traccar.config.KeyType;
 import org.traccar.config.Keys;
 import org.traccar.model.Device;
 import org.traccar.model.Group;
+import org.traccar.model.Server;
 import org.traccar.session.cache.CacheManager;
+import org.traccar.storage.Storage;
+import org.traccar.storage.StorageException;
+import org.traccar.storage.query.Columns;
+import org.traccar.storage.query.Condition;
+import org.traccar.storage.query.Request;
 
 public final class AttributeUtil {
 
     private AttributeUtil() {
     }
 
-    @SuppressWarnings({ "deprecation", "unchecked" })
+    public interface Provider {
+        Device getDevice();
+        Group getGroup(long groupId);
+        Server getServer();
+        Config getConfig();
+    }
+
     public static <T> T lookup(CacheManager cacheManager, ConfigKey<T> key, long deviceId) {
-        Device device = cacheManager.getObject(Device.class, deviceId);
+        return lookup(new CacheProvider(cacheManager, deviceId), key);
+    }
+
+    @SuppressWarnings({ "deprecation", "unchecked" })
+    public static <T> T lookup(Provider provider, ConfigKey<T> key) {
+        Device device = provider.getDevice();
         Object result = device.getAttributes().get(key.getKey());
         long groupId = device.getGroupId();
         while (result == null && groupId > 0) {
-            Group group = cacheManager.getObject(Group.class, groupId);
+            Group group = provider.getGroup(groupId);
             if (group != null) {
                 result = group.getAttributes().get(key.getKey());
                 groupId = group.getGroupId();
@@ -42,10 +61,10 @@ public final class AttributeUtil {
             }
         }
         if (result == null && key.hasType(KeyType.SERVER)) {
-            result = cacheManager.getServer().getAttributes().get(key.getKey());
+            result = provider.getServer().getAttributes().get(key.getKey());
         }
         if (result == null && key.hasType(KeyType.CONFIG)) {
-            result = cacheManager.getConfig().getString(key.getKey());
+            result = provider.getConfig().getString(key.getKey());
         }
 
         if (result != null) {
@@ -91,4 +110,79 @@ public final class AttributeUtil {
         return defaultPassword;
     }
 
+    public static class CacheProvider implements Provider {
+
+        private final CacheManager cacheManager;
+        private final long deviceId;
+
+        public CacheProvider(CacheManager cacheManager, long deviceId) {
+            this.cacheManager = cacheManager;
+            this.deviceId = deviceId;
+        }
+
+        @Override
+        public Device getDevice() {
+            return cacheManager.getObject(Device.class, deviceId);
+        }
+
+        @Override
+        public Group getGroup(long groupId) {
+            return cacheManager.getObject(Group.class, groupId);
+        }
+
+        @Override
+        public Server getServer() {
+            return cacheManager.getServer();
+        }
+
+        @Override
+        public Config getConfig() {
+            return cacheManager.getConfig();
+        }
+    }
+
+    public static class StorageProvider implements Provider {
+
+        private final Config config;
+        private final Storage storage;
+        private final PermissionsService permissionsService;
+        private final Device device;
+
+        public StorageProvider(Config config, Storage storage, PermissionsService permissionsService, Device device) {
+            this.config = config;
+            this.storage = storage;
+            this.permissionsService = permissionsService;
+            this.device = device;
+        }
+
+        @Override
+        public Device getDevice() {
+            return device;
+        }
+
+        @Override
+        public Group getGroup(long groupId) {
+            try {
+                return storage.getObject(
+                        Group.class, new Request(new Columns.All(), new Condition.Equals("id", groupId)));
+            } catch (StorageException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        @Override
+        public Server getServer() {
+            try {
+                return permissionsService.getServer();
+            } catch (StorageException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        @Override
+        public Config getConfig() {
+            return config;
+        }
+    }
+
 }
diff --git a/src/main/java/org/traccar/reports/common/ReportUtils.java b/src/main/java/org/traccar/reports/common/ReportUtils.java
index 0c168e4ef..f5aa6d040 100644
--- a/src/main/java/org/traccar/reports/common/ReportUtils.java
+++ b/src/main/java/org/traccar/reports/common/ReportUtils.java
@@ -31,6 +31,7 @@ import org.traccar.config.Config;
 import org.traccar.config.Keys;
 import org.traccar.geocoder.Geocoder;
 import org.traccar.helper.UnitsConverter;
+import org.traccar.helper.model.AttributeUtil;
 import org.traccar.helper.model.PositionUtil;
 import org.traccar.helper.model.UserUtil;
 import org.traccar.model.BaseModel;
@@ -67,18 +68,16 @@ public class ReportUtils {
     private final Config config;
     private final Storage storage;
     private final PermissionsService permissionsService;
-    private final TripsConfig tripsConfig;
     private final VelocityEngine velocityEngine;
     private final Geocoder geocoder;
 
     @Inject
     public ReportUtils(
             Config config, Storage storage, PermissionsService permissionsService,
-            TripsConfig tripsConfig, VelocityEngine velocityEngine, @Nullable Geocoder geocoder) {
+            VelocityEngine velocityEngine, @Nullable Geocoder geocoder) {
         this.config = config;
         this.storage = storage;
         this.permissionsService = permissionsService;
-        this.tripsConfig = tripsConfig;
         this.velocityEngine = velocityEngine;
         this.geocoder = geocoder;
     }
@@ -306,6 +305,8 @@ public class ReportUtils {
             Class<T> reportClass) throws StorageException {
 
         Collection<T> result = new ArrayList<>();
+        TripsConfig tripsConfig = new TripsConfig(
+                new AttributeUtil.StorageProvider(config, storage, permissionsService, device));
 
         ArrayList<Position> positions = new ArrayList<>(positionCollection);
         if (!positions.isEmpty()) {
diff --git a/src/main/java/org/traccar/reports/common/TripsConfig.java b/src/main/java/org/traccar/reports/common/TripsConfig.java
index 841d9c652..2792114d4 100644
--- a/src/main/java/org/traccar/reports/common/TripsConfig.java
+++ b/src/main/java/org/traccar/reports/common/TripsConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2022 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 - 2023 Anton Tananaev (anton@traccar.org)
  * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,35 +16,28 @@
  */
 package org.traccar.reports.common;
 
-import org.traccar.config.Config;
 import org.traccar.config.Keys;
+import org.traccar.helper.model.AttributeUtil;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-@Singleton
 public class TripsConfig {
 
-    @Inject
-    public TripsConfig(Config config) {
+    public TripsConfig(AttributeUtil.Provider attributeProvider) {
         this(
-                config.getLong(Keys.REPORT_TRIP_MINIMAL_TRIP_DISTANCE),
-                config.getLong(Keys.REPORT_TRIP_MINIMAL_TRIP_DURATION) * 1000,
-                config.getLong(Keys.REPORT_TRIP_MINIMAL_PARKING_DURATION) * 1000,
-                config.getLong(Keys.REPORT_TRIP_MINIMAL_NO_DATA_DURATION) * 1000,
-                config.getBoolean(Keys.REPORT_TRIP_USE_IGNITION),
-                config.getBoolean(Keys.EVENT_MOTION_PROCESS_INVALID_POSITIONS));
+                AttributeUtil.lookup(attributeProvider, Keys.REPORT_TRIP_MINIMAL_TRIP_DISTANCE),
+                AttributeUtil.lookup(attributeProvider, Keys.REPORT_TRIP_MINIMAL_TRIP_DURATION) * 1000,
+                AttributeUtil.lookup(attributeProvider, Keys.REPORT_TRIP_MINIMAL_PARKING_DURATION) * 1000,
+                AttributeUtil.lookup(attributeProvider, Keys.REPORT_TRIP_MINIMAL_NO_DATA_DURATION) * 1000,
+                AttributeUtil.lookup(attributeProvider, Keys.REPORT_TRIP_USE_IGNITION));
     }
 
     public TripsConfig(
             double minimalTripDistance, long minimalTripDuration, long minimalParkingDuration,
-            long minimalNoDataDuration, boolean useIgnition, boolean processInvalidPositions) {
+            long minimalNoDataDuration, boolean useIgnition) {
         this.minimalTripDistance = minimalTripDistance;
         this.minimalTripDuration = minimalTripDuration;
         this.minimalParkingDuration = minimalParkingDuration;
         this.minimalNoDataDuration = minimalNoDataDuration;
         this.useIgnition = useIgnition;
-        this.processInvalidPositions = processInvalidPositions;
     }
 
     private final double minimalTripDistance;
@@ -77,10 +70,4 @@ public class TripsConfig {
         return useIgnition;
     }
 
-    private final boolean processInvalidPositions;
-
-    public boolean getProcessInvalidPositions() {
-        return processInvalidPositions;
-    }
-
 }